Windows: Fix compilation error caused by latest MacOSX change.

Linux: added TiB support to text mode.

.gitattributes

@@ -0,0 +1,50 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+*	text=auto
+
+# Explicitly declare text files that could be normalized and converted
+# to native line endings on checkout. However, as per the policy they're
+# supposed to have LF endings on all platforms.
+*.[ch]	text diff=cpp eol=lf
+*.[ch]pp	text diff=cpp eol=lf
+*.asm	text eol=lf
+Makefile	text eol=lf
+*.make	text eol=lf
+*.mk	text eol=lf
+*.inc	text eol=lf
+*.md	text eol=lf
+*.xml	text eol=lf
+*.xpm	text -diff -merge eol=lf
+*.pem	text -diff -merge eol=lf
+*.cer	text -diff -merge eol=lf
+*.manifest	text eol=lf
+*.sh	text eol=lf
+*.txt	text eol=lf
+*.html	text diff=html eol=lf
+*.idl	text eol=lf
+*.fbp	text eol=lf
+*.rgs	text eol=lf
+*.pkgproj	text eol=lf
+Sources	text eol=lf
+
+# Declare files that will always have LF line endings on checkout.
+*.desktop	text eol=lf
+
+# Declare files that will always have CRLF line endings on checkout.
+*.sln	text eol=crlf
+*.vcproj	text eol=crlf
+*.rc	text eol=crlf
+*.bat	text eol=crlf
+*.cmd	text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.png	binary
+*.jpg	binary
+*.pdf	binary
+*.bmp	binary
+*.ico	binary
+*.od[fgpst]	binary
+*.hc	binary
+*.icns	binary
+*.rtf	binary
+*.bz2	binary
+*.pfx	binary

README.md

@@ -43,14 +43,16 @@ I. Windows
 Requirements for Building VeraCrypt for Windows:
 ------------------------------------------------
 
-- Microsoft Visual C++ 2008 SP1 (Professional Edition or compatible)
+- Microsoft Visual C++ 2010 SP1 (Professional Edition or compatible)
 - Microsoft Visual C++ 1.52 (available from MSDN Subscriber Downloads)
-- Microsoft Windows SDK for Windows 7 (configured for Visual C++)
+- Microsoft Windows SDK for Windows 7.1 (configured for Visual C++ 2010)
+- Microsoft Windows SDK for Windows 8.1 (needed for SHA-256 code signing)
 - Microsoft Windows Driver Kit 7.1.0 (build 7600.16385.1)
 - RSA Security Inc. PKCS #11 Cryptographic Token Interface (Cryptoki) 2.20
   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:
 
@@ -59,11 +61,12 @@ some cases (e.g. playback of HD DVD content) also the 32-bit editions, do not
 allow the VeraCrypt driver to run without an appropriate digital signature.
 Therefore, all .sys files in official VeraCrypt binary packages are digitally
 signed with the digital certificate of the IDRIX, which was
-issued by Thawt certification authority. At the end of each official .exe and
+issued by Thawte certification authority. At the end of each official .exe and
 .sys file, there are embedded digital signatures and all related certificates
 (i.e. all certificates in the relevant certification chain, such as the
 certification authority certificates, CA-MS cross-certificate, and the
-IDRIX certificate). Keep this in mind if you compile VeraCrypt
+IDRIX certificate).
+Keep this in mind if you compile VeraCrypt
 and compare your binaries with the official binaries. If your binaries are
 unsigned, the sizes of the official binaries will usually be approximately
 10 KB greater than sizes of your binaries (there may be further differences
@@ -91,7 +94,7 @@ Instructions for Building VeraCrypt for Windows:
    environment variable 'PKCS11_INC' pointing to the directory where
    the PKCS #11 header files are installed.
 
-4) Open the solution file 'VeraCrypt.sln' in Microsoft Visual Studio 2008.
+4) Open the solution file 'VeraCrypt.sln' in Microsoft Visual Studio 2010.
 
 5) Select 'All' as the active solution configuration.
 
@@ -100,9 +103,11 @@ Instructions for Building VeraCrypt for Windows:
 7) If successful, there should be newly built VeraCrypt binaries in the
    'Release' folder.
 
-Instructions for Signing VeraCrypt for Windows:
+Instructions for Signing and Packaging VeraCrypt for Windows:
-------------------------------------------------
+-------------------------------------------------------------
 
+First, create an environment variable 'WSDK81' pointing to the Windows SDK
+for Windows 8.1 installation directory.
 The folder "Signing" contains a batch file (sign.bat) that will sign all
 VeraCrypt components using a code signing certificate present on the
 certificate store and also build the final installation setup.
@@ -111,6 +116,14 @@ This is the case for IDRIX's certificate. If yours is issued by another CA,
 then you should put the Root and Intermediate certificates in the "Signing"
 folder and then modify sign.bat accordingly.
 
+VeraCrypt EFI Boot Loader:
+--------------------------
+
+VeraCrypt source code contains pre-built EFI binaries under src\Boot\EFI.
+The source code of VeraCrypt EFI Boot Loader is licensed under LGPL and 
+it is available at https://github.com/veracrypt/VeraCrypt-DCS.
+For build instructions, please refer to the file src\Boot\EFI\Readme.txt.
+
 
 II. Linux and Mac OS X
 ======================
@@ -126,7 +139,7 @@ Requirements for Building VeraCrypt for Linux and Mac OS X:
 - makeself (Linux only)
 - wxWidgets 3.0 shared library and header files installed or
   wxWidgets 3.0 library source code (available at http://www.wxwidgets.org)
-- FUSE library and header files (available at http://fuse.sourceforge.net
+- FUSE library and header files (available at https://github.com/libfuse/libfuse
   and https://osxfuse.github.io/)
 - RSA Security Inc. PKCS #11 Cryptographic Token Interface (Cryptoki) 2.20
   header files (available at ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20).
@@ -174,7 +187,7 @@ Mac OS X specifics:
 -----------------------------------------------------------
 
 Under MacOSX, the SDK for OSX 10.7 is used by default. To use another version
-of the SDK (e.i. 10.6), you can export the environment variable VC_OSX_TARGET :
+of the SDK (i.e. 10.6), you can export the environment variable VC_OSX_TARGET:
 
 	$ export VC_OSX_TARGET=10.6
 
@@ -193,8 +206,8 @@ https://osxfuse.github.io/ (MacFUSE compatibility layer must selected)
 The script build_veracrypt_macosx.sh available under "src/Build" performs the
 full build of VeraCrypt including the creation of the installer pkg. It expects
 to find the wxWidgets 3.0.2 sources at the same level as where you put
-VeraCrypt sources (e.i. if "src" path is "/Users/joe/Projects/VeraCrypt/src" 
+VeraCrypt sources (i.e. if "src" path is "/Users/joe/Projects/VeraCrypt/src"
-then wxWidgets should be at "/Users/joe/Projects/wxWidgets-wxWidgets-3.0.2")
+then wxWidgets should be at "/Users/joe/Projects/wxWidgets-3.0.2")
 
 The build process uses Code Signing certificates whose ID is specified in
 src/Main/Main.make (lines 167 & 169). You'll have to modify these lines to put
@@ -235,13 +248,18 @@ Copyright Information
 ---------------------
 
 This software as a whole:
-Copyright (c) 2013-2015 IDRIX. All rights reserved.
+Copyright (c) 2013-2016 IDRIX. All rights reserved.
 
 Portions of this software:
+Copyright (c) 2013-2016 IDRIX. All rights reserved.
 Copyright (c) 2003-2012 TrueCrypt Developers Association. All rights reserved.
 Copyright (c) 1998-2000 Paul Le Roux. All rights reserved.
 Copyright (c) 1998-2008 Brian Gladman, Worcester, UK. All rights reserved.
 Copyright (c) 2002-2004 Mark Adler. All rights reserved.
+Copyright (c) 2016 Disk Cryptography Services for EFI (DCS), Alex Kolotnikov
+Copyright (c) 1990-2002 Info-ZIP. All rights reserved.
+Copyright (c) 2013, Alexey Degtyarev. All rights reserved.
+
 For more information, please see the legal notices attached to parts of the
 source code.
 
@@ -257,4 +275,3 @@ VI. Further Information
 =======================
 
 http://www.veracrypt.fr
-

Tests/bench.bat

@@ -10,6 +10,8 @@ goto :exit
 echo Using drive letter %mydriveletter%: for our tests
 echo.
 
+IF NOT EXIST test.sha512.hc GOTO :whirlpool
+
 rem Get start time:
 for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
    set /A "start=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
@@ -63,6 +65,10 @@ echo.
 
 "c:\Program Files\VeraCrypt\veracrypt.exe" /dismount %mydriveletter% /silent /q
 
+:whirlpool
+
+IF NOT EXIST test.whirlpool.hc GOTO :sha256
+
 rem Get start time:
 for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
    set /A "start=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
@@ -116,6 +122,10 @@ echo.
 
 "c:\Program Files\VeraCrypt\veracrypt.exe" /dismount %mydriveletter% /silent /q
 
+:sha256
+
+IF NOT EXIST test.sha256.hc GOTO :ripemd160
+
 rem Get start time:
 for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
    set /A "start=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
@@ -169,6 +179,10 @@ echo.
 
 "c:\Program Files\VeraCrypt\veracrypt.exe" /dismount %mydriveletter% /silent /q
 
+:ripemd160
+
+IF NOT EXIST test.ripemd160.hc GOTO :autodetect
+
 rem Get start time:
 for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
    set /A "start=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
@@ -222,13 +236,19 @@ echo.
 
 "c:\Program Files\VeraCrypt\veracrypt.exe" /dismount %mydriveletter% /silent /q
 
+:autodetect
+
+call :availablevolume testvolume && goto :contautodetect
+goto :exit
+:contautodetect
+
 rem Get start time:
 for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
    set /A "start=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
 )
 
 rem Try to mount with a wrong password and PRF autodetection
-"c:\Program Files\VeraCrypt\veracrypt.exe" /volume test.sha512.hc /l %mydriveletter% /password wrongpassword /q /silent /m ro
+"c:\Program Files\VeraCrypt\veracrypt.exe" /volume %testvolume% /l %mydriveletter% /password wrongpassword /q /silent /m ro
 
 rem Get end time:
 for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
@@ -283,4 +303,19 @@ set drive=
 :freedrive0
 endlocal & set "%output_var%=%drive%" & exit /b %exitcode%
 
+:availablevolume
+setlocal EnableDelayedExpansion
+set exitcode=0
+set "output_var=%~1"
+for %%i in (test.sha512.hc,test.sha256.hc,test.whirlpool.hc,test.ripemd160.hc) do (
+    if exist %%i (
+        set "volume=%%i"
+        goto :availablevolume0
+    )
+)
+set exitcode=1
+set volume=
+:availablevolume0
+endlocal & set "%output_var%=%volume%" & exit /b %exitcode%
+
 :exit

Translations/Language.be.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="be" name="Беларуская" en-name="Belarusian" version="0.1.0" translators="Aleg Azarousky" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="be" key="IDC_BROWSE">Агляд...</control>
     <control lang="be" key="IDC_DESKTOP_ICON">Значок VeraCrypt на працоўны стол</control>
     <control lang="en" key="IDC_DONATE">Donate now...</control>
-    <control lang="be" key="IDC_FILE_TYPE">Адкрываць VeraCrypt для ўсіх файлаў з пашырэннем '.tc'</control>
+    <control lang="be" key="IDC_FILE_TYPE">Адкрываць VeraCrypt для ўсіх файлаў з пашырэннем '.hc'</control>
     <control lang="be" key="IDC_OPEN_CONTAINING_FOLDER">Па заканчэнню адкрыць тэчку ўсталёўкі</control>
     <control lang="be" key="IDC_PROG_GROUP">Дадаць VeraCrypt у меню 'Пуск'</control>
     <control lang="be" key="IDC_SYSTEM_RESTORE">Стварыць пункт аднаўлення сістэмы</control>
@@ -37,6 +37,7 @@
     <control lang="be" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Спампаваць ПЗ для запісу CD/DVD</control>
     <control lang="en" key="IDC_FILE_CONTAINER">Create an encrypted file container</control>
     <control lang="en" key="IDC_GB">&amp;GB</control>
+    <control lang="en" key="IDC_TB">&amp;TB</control>
     <control lang="en" key="IDC_HIDDEN_SYSENC_INFO_LINK">More information</control>
     <control lang="be" key="IDC_HIDDEN_VOL">Схаваны том VeraCrypt </control>
     <control lang="be" key="IDC_HIDDEN_VOL_HELP">Што такое 'Схаваны том'?</control>
@@ -44,6 +45,7 @@
     <control lang="be" key="IDC_HIDVOL_WIZ_MODE_FULL">Звычайны рэжым</control>
     <control lang="be" key="IDC_KB">&amp;Кб</control>
     <control lang="be" key="IDC_KEYFILES_ENABLE">Ключавыя файлы</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="be" key="IDC_KEY_FILES">Файлы...</control>
     <control lang="be" key="IDC_LINK_HASH_INFO">Звесткі пра хэш-алгарытмы</control>
@@ -58,7 +60,8 @@
     <control lang="be" key="IDC_NO_HISTORY">Не захоўваць гісторыю</control>
     <control lang="be" key="IDC_OPEN_OUTER_VOLUME">Адкрыць вонкавы том</control>
     <control lang="be" key="IDC_PAUSE">Паўза</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="be" key="IDC_QUICKFORMAT">Хуткае фарматаванне</control>
     <control lang="be" key="IDC_SHOW_PASSWORD">Паказаць пароль</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Display password</control>
@@ -118,6 +121,7 @@
     <control lang="be" key="IDC_CREATE">Стварыць</control>
     <control lang="be" key="IDC_CREATE_VOLUME">Стварыць том</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <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="be" key="IDC_ENABLE_KEYFILES">Выкарыстоўваць ключавыя файлы</control>
     <control lang="be" key="IDC_ENABLE_NEW_KEYFILES">Выкарыстоўваць ключавыя файлы</control>
@@ -132,6 +136,7 @@
     <control lang="en" key="IDC_FAVORITE_MOVE_UP">Move &amp;Up</control>
     <control lang="en" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Open &amp;Explorer window for selected volume when successfully mounted</control>
     <control lang="en" key="IDC_FAVORITE_REMOVE">&amp;Remove</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="en" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Global Settings</control>
     <control lang="en" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Display balloon tooltip after successful hot-key dismount</control>
     <control lang="en" key="IDC_HK_DISMOUNT_PLAY_SOUND">Play system notification sound after successful hot-key dismount</control>
@@ -189,7 +194,7 @@
     <control lang="be" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="be" key="IDD_PASSWORDCHANGE_DLG">Змена пароля ці ключавых файлаў</control>
     <control lang="be" key="IDD_PASSWORD_DLG">Увядзіце пароль для тома</control>
-    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance Options</control>
+    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance and Driver Options</control>
     <control lang="be" key="IDD_PREFERENCES_DLG">VeraCrypt - Налады</control>
     <control lang="en" key="IDD_SYSENC_SETTINGS">VeraCrypt - System Encryption Settings</control>
     <control lang="en" key="IDD_TOKEN_PREFERENCES">VeraCrypt - Security Token Preferences</control>
@@ -235,7 +240,7 @@
     <control lang="be" key="IDM_ONLINE_TUTORIAL">Падручнік для пачаткоўцаў</control>
     <control lang="en" key="IDM_ORGANIZE_FAVORITES">Organize Favorite Volumes...</control>
     <control lang="en" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organize System Favorite Volumes...</control>
-    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance...</control>
+    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance/Driver Configuration</control>
     <control lang="be" key="IDM_PERMANENTLY_DECRYPT_SYS">Назаўсёды расшыфраваць сістэмны падзел/дыск</control>
     <control lang="be" key="IDM_PREFERENCES">Налады...</control>
     <control lang="be" key="IDM_REFRESH_DRIVE_LETTERS">Абнавіць літары дыскаў</control>
@@ -256,6 +261,7 @@
     <control lang="be" key="IDM_UNMOUNTALL">Размантаваць усе змантаваныя тамы</control>
     <control lang="be" key="IDM_UNMOUNT_VOLUME">Размантаваць том</control>
     <control lang="be" key="IDM_VERIFY_RESCUE_DISK">Праверыць дыск узнаўлення</control>
+    <control lang="en" key="IDM_VERIFY_RESCUE_DISK_ISO">Verify Rescue Disk Image</control>
     <control lang="be" key="IDM_VERSION_HISTORY">Гісторыя версій</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="be" key="IDM_VOLUME_PROPERTIES">Налады тома</control>
@@ -365,7 +371,7 @@
     <control lang="en" key="IDT_SECURITY_TOKEN">Security token:</control>
     <control lang="be" key="IDT_SORT_METHOD">Сартаванне:</control>
     <control lang="en" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Please wait. This process may take a long time...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="be" key="IDT_TEST_BLOCK_NUMBER">Block number:</control>
     <control lang="be" key="IDT_TEST_CIPHERTEXT">Шыфраваны тэкст (шаснаццатковы)</control>
     <control lang="be" key="IDT_TEST_DATA_UNIT_NUMBER">Лік адзінак з дадзенымі (64-біт 16-ковы, памер адзінкі з дадзенымі - 512 байтаў)</control>
@@ -410,13 +416,13 @@
     <string lang="be" key="CIPHER_TITLE">Налады шыфравання</string>
     <string lang="be" key="CLEAN_WINMRU_FAILED">УВАГА: Памылка ачысткі шляху да апошняга абранага тома/ключавога файла (запомненаму селектарам файлаў)!</string>
     <string lang="be" key="COMPRESSION_NOT_SUPPORTED">ПАМЫЛКА: Кантэйнер быў сціснуты на ўзроўні файлавай сістэмы. VeraCrypt не падтрымлівае сціснутыя кантэйнеры (сціск зашыфраваных дадзеных неэфектыўны і залішні).\n\nАдключыце сціск кантэйнера, выканаўшы наступныя крокі: 1) Пстрыкніце правай кнопкай мышы ў Аглядальніку Windows (не ў VeraCrypt). 2) Абярыце пункт 'Уласцівасці'. 3) У дыялогавым акне 'Уласцівасці' націсніце кнопку 'Дадаткова'. 4) У дыялогавым акне 'Дадатковыя атрыбуты' выключыце параметр 'Сціскаць змесціва для эканоміі месца на дыску' і націсніце 'OK'. 5) Націсніце 'OK' у дыялогавым акне 'Уласцівасці'.</string>
-    <string lang="be" key="CREATE_FAILED">Памылка стварэння тома %hs</string>
+    <string lang="be" key="CREATE_FAILED">Памылка стварэння тома %s</string>
-    <string lang="be" key="DEVICE_FREE_BYTES">Памер %hs - %.2f байт</string>
+    <string lang="be" key="DEVICE_FREE_BYTES">Памер %s - %.2f байт</string>
-    <string lang="be" key="DEVICE_FREE_KB">Памер %hs - %.2f Кб</string>
+    <string lang="be" key="DEVICE_FREE_KB">Памер %s - %.2f Кб</string>
-    <string lang="be" key="DEVICE_FREE_MB">Памер %hs - %.2f Мб</string>
+    <string lang="be" key="DEVICE_FREE_MB">Памер %s - %.2f Мб</string>
-    <string lang="en" key="DEVICE_FREE_GB">Size of %hs is %.2f GB</string>
+    <string lang="en" key="DEVICE_FREE_GB">Size of %s is %.2f GB</string>
-    <string lang="en" key="DEVICE_FREE_TB">Size of %hs is %.2f TB</string>
+    <string lang="en" key="DEVICE_FREE_TB">Size of %s is %.2f TB</string>
-    <string lang="en" key="DEVICE_FREE_PB">Size of %hs is %.2f PB</string>
+    <string lang="en" key="DEVICE_FREE_PB">Size of %s is %.2f PB</string>
     <string lang="be" key="DEVICE_IN_USE_FORMAT">УВАГА: Прылада/падзел выкарыстоўваецца аперацыйнай сістэмай ці прыкладаннямі. Фарматаванне прылады/падзелу можа прывесці да страты дадзеных ці нестабільнасці сістэмы.\n\nПрацягнуць?</string>
     <string lang="en" key="DEVICE_IN_USE_INPLACE_ENC">Warning: The partition is in use by the operating system or applications. You should close any applications that might be using the partition (including antivirus software).\n\nContinue?</string>
     <string lang="be" key="FORMAT_CANT_DISMOUNT_FILESYS">ПАМЫЛКА: Прылада/падзел мае файлавую сістэму, якая не можа быць размантаваная. Магчыма, яна выкарыстоўваецца аперацыйнай сістэмай. Фарматаванне прылады/падзела хутчэй за ўсё выкліча пашкоджанне дадзеных і нестабільнасць сістэмы.\n\nДля вырашэння гэтай праблемы мы рэкамендуем спачатку выдаліць гэты падзел, затым ізноў стварыць яго без фарматавання. Вось як гэта зрабіць: 1) Пстрыкніце правай кнопкай мышы па цэтліку 'Кампутар' (ці 'Мой кампутар') в меню 'Пуск' і абярыце 'Кіраванне'. Павінна адчыніцца акно 'Кіраванне кампутарам'. 2) У акне 'Кіраванне кампутарам', абярыце 'Запамінальныя прылады' &gt; 'Кіраванне дыскамі'. 3) Пстрыкніце правай кнопкай мышы па падзелу, які вы жадаеце зашыфраваць, і абярыце альбо 'Выдаліць падзел', альбо 'Выдаліць том', альбо 'Выдаліць лагічны дыск'. 4) Націсніце 'Так'. Калі Windows спытае перазагрузіць кампутар, зрабіце гэта. Затым паўтарыце крокі 1 і 2 і пераходзьце да крока 5. 5) Пстрыкніце правай кнопкай мышы на ўчастку з пустым месцам (ён павінен мець надпіс 'Не размеркавана'), і абярыце 'Асноўны падзел', 'Дадатковы падзел', ці 'Лагічны дыск'. 6) Павінна з'явіцца акно майстра стварэння падзелаў ці тамоў; выканайце яго інструкцыі. У акне майстра на старонцы 'Фарматаванне падзелу' абярыце альбо 'Не фарматаваць гэты падзел', альбо 'Не фарматаваць гэты том'. У тым жа акне майстра націсніце кнопку 'Далей' і затым 'Гатова'. 7) Майце на ўвазе, што абраны вамі ў VeraCrypt шлях да прылады можа быць зараз няслушным. Таму скончыце працу майстра стварэння тамоў VeraCrypt (калі ён усё яшчэ выконваецца) і запусціце яго зноў. 8) Паспрабуйце зноў зашыфраваць прыладу/падзел у VeraCrypt.\n\nКалі VeraCrypt па-ранейшаму адмовіцца шыфраваць прыладу/падзел, адкарэктуйце свае планы і стварыце замест гэтага файлавы кантэйнер.</string>
@@ -435,15 +441,15 @@
     <string lang="en" key="INPLACE_ENC_INVALID_PATH">Error: VeraCrypt can in-place encrypt only a partition, a dynamic volume, or an entire system drive. Please make sure the specified path is valid.</string>
     <string lang="en" key="CANNOT_RESIZE_FILESYS">Error: Cannot shrink the filesystem (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPossible causes and solutions:\n\n- Not enough free space on the volume. Please make sure no other application is writing to the filesystem.\n\n- Corrupted file system. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
     <string lang="en" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Error: There is not enough free space on the volume and so the filesystem cannot be shrunk (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPlease delete any redundant files and empty the Recycle Bin so as to free at least 256 KB of space and then try again. Note that due to a Windows issue, the amount of free space reported by the Windows Explorer may be incorrect until the operating system is restarted. If restarting the system does not help, the file system may be corrupted. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
-    <string lang="be" key="DISK_FREE_BYTES">На дыску %hs вольна %.2f байт</string>
+    <string lang="be" key="DISK_FREE_BYTES">На дыску %s вольна %.2f байт</string>
-    <string lang="en" key="DISK_FREE_KB">Free space on drive %hs is %.2f KB</string>
+    <string lang="en" key="DISK_FREE_KB">Free space on drive %s is %.2f KB</string>
-    <string lang="en" key="DISK_FREE_MB">Free space on drive %hs is %.2f MB</string>
+    <string lang="en" key="DISK_FREE_MB">Free space on drive %s is %.2f MB</string>
-    <string lang="en" key="DISK_FREE_GB">Free space on drive %hs is %.2f GB</string>
+    <string lang="en" key="DISK_FREE_GB">Free space on drive %s is %.2f GB</string>
-    <string lang="en" key="DISK_FREE_TB">Free space on drive %hs is %.2f TB</string>
+    <string lang="en" key="DISK_FREE_TB">Free space on drive %s is %.2f TB</string>
-    <string lang="en" key="DISK_FREE_PB">Free space on drive %hs is %.2f PB</string>
+    <string lang="en" key="DISK_FREE_PB">Free space on drive %s is %.2f PB</string>
     <string lang="be" key="DRIVELETTERS">Не магу атрымаць вольныя літары дыскаў.</string>
     <string lang="en" key="DRIVER_NOT_FOUND">Error: VeraCrypt driver not found.\n\nPlease copy the files 'veracrypt.sys' and 'veracrypt-x64.sys' to the directory where the main VeraCrypt application (VeraCrypt.exe) is located.</string>
-    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall; on Windows XP, select 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
+    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' > Computer > 'Uninstall or change a program' > VeraCrypt > Uninstall; on Windows XP, select 'Start Menu' > Settings > 'Control Panel' > 'Add Or Remove Programs' > VeraCrypt > Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
     <string lang="be" key="ERR_CIPHER_INIT_FAILURE">Памылка ініцыявання шыфра.</string>
     <string lang="be" key="ERR_CIPHER_INIT_WEAK_KEY">Памылка: слабы ці патэнцыйна слабы ключ! Гэты ключ не прыняты. Паўтарыце спробу.</string>
     <string lang="en" key="EXCEPTION_REPORT">A critical error has occurred and VeraCrypt must be terminated. If this is caused by a bug in VeraCrypt, we would like to fix it. To help us, you can send us an automatically generated error report containing the following items:\n\n- Program version\n- Operating system version\n- Type of CPU\n- VeraCrypt component name\n- Checksum of VeraCrypt executable\n- Symbolic name of dialog window\n- Error category\n- Error address\n- VeraCrypt call stack\n\nIf you select 'Yes', the following URL (which contains the entire error report) will be opened in your default Internet browser.\n\n%hs\n\nDo you want to send us the above error report?</string>
@@ -497,7 +503,7 @@
     <string lang="en" key="WIPE_FINISHED">The content of the partition/device has been successfully erased.</string>
     <string lang="en" key="WIPE_FINISHED_DECOY_SYSTEM_PARTITION">The content of the partition where the original system (of which the hidden system is a clone) resided has been successfully erased.</string>
     <string lang="en" key="DECOY_OS_VERSION_WARNING">Please make sure the version of Windows you are going to install (on the wiped partition) is the same as the version of Windows you are currently running. This is required due to the fact that both systems will share a common boot partition.</string>
-    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' &gt; 'Add Mounted Volume to System Favorites').</string>
+    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' > 'Add Mounted Volume to System Favorites').</string>
     <string lang="be" key="SYSTEM_DECRYPTION_FINISHED">Сістэмны падзел/дыск паспяхова расшыфраваны.</string>
     <string lang="be" key="FORMAT_FINISHED_HELP">\n\nТом VeraCrypt створаны і гатовы да выкарыстання. Калі вы жадаеце стварыць яшчэ адзін том VeraCrypt, націсніце кнопку 'Далей'. Інакш націсніце 'Выйсці'.</string>
     <string lang="en" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nThe hidden VeraCrypt volume has been successfully created (the hidden operating system will reside within this hidden volume).\n\nClick Next to continue.</string>
@@ -561,6 +567,7 @@
     <string lang="be" key="MAX_HIDVOL_SIZE_KB">Найбольшы магчымы памер для гэтага ўтоенага тому - %.2f Кб</string>
     <string lang="be" key="MAX_HIDVOL_SIZE_MB">Найбольшы магчымы памер для гэтага ўтоенага тому - %.2f Мб</string>
     <string lang="en" key="MAX_HIDVOL_SIZE_GB">Maximum possible hidden volume size for this volume is %.2f GB.</string>
+    <string lang="en" key="MAX_HIDVOL_SIZE_TB">Maximum possible hidden volume size for this volume is %.2f TB.</string>
     <string lang="be" key="MOUNTED_NOPWCHANGE">Пакуль том змантаваны, змяняць пароль/ключавыя файлы гэтага тома немагчыма. Спачатку неабходна размантаваць том.</string>
     <string lang="be" key="MOUNTED_NO_PKCS5_PRF_CHANGE">Пакуль том змантаваны, змяняць алгарытм вылічэння ключа загалоўка гэтага тома немагчыма. Спачатку неабходна размантаваць том.</string>
     <string lang="be" key="MOUNT_BUTTON">Змантаваць</string>
@@ -591,12 +598,12 @@
     <string lang="en" key="SELECT_PKCS11_MODULE">Select PKCS #11 Library</string>
     <string lang="be" key="OUTOFMEMORY">Мала памяці</string>
     <string lang="en" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">IMPORTANT: We strongly recommend that inexperienced users create a VeraCrypt file container on the selected device/partition, instead of attempting to encrypt the entire device/partition.\n\nWhen you create a VeraCrypt file container (as opposed to encrypting a device or partition) there is, for example, no risk of destroying a large number of files. Note that a VeraCrypt file container (even though it contains a virtual encrypted disk) is actually just like any normal file. For more information, see the chapter Beginner's Tutorial in the VeraCrypt User Guide.\n\nAre you sure you want to encrypt the entire device/partition?</string>
-    <string lang="be" key="OVERWRITEPROMPT">УВАГА: Файл '%hs' ужо існуе!\n\nВАЖНА: VERACRYPT НЕ БУДЗЕ ШЫФРАВАЦЬ ГЭТЫ ФАЙЛ, ЁН ЯГО ВЫДАЛІЦЬ. Вы сапраўды жадаеце выдаліць гэты файл і замяніць яго новым кантэйнерам VeraCrypt?</string>
+    <string lang="be" key="OVERWRITEPROMPT">УВАГА: Файл '%s' ужо існуе!\n\nВАЖНА: VERACRYPT НЕ БУДЗЕ ШЫФРАВАЦЬ ГЭТЫ ФАЙЛ, ЁН ЯГО ВЫДАЛІЦЬ. Вы сапраўды жадаеце выдаліць гэты файл і замяніць яго новым кантэйнерам VeraCrypt?</string>
-    <string lang="be" key="OVERWRITEPROMPT_DEVICE">АСЦЯРОЖНА: УСЕ ДАДЗЕНЫЯ, ЯКІЯ УТРЫМОЎВАЕ  %s '%hs'%s, БУДУЦЬ ЗНІШЧАНЫЯ (А НЕ ЗАШЫФРАВАНЫЯ)!\n\nВы настойваеце на фарматаванні?</string>
+    <string lang="be" key="OVERWRITEPROMPT_DEVICE">АСЦЯРОЖНА: УСЕ ДАДЗЕНЫЯ, ЯКІЯ УТРЫМОЎВАЕ  %s '%s'%s, БУДУЦЬ ЗНІШЧАНЫЯ (А НЕ ЗАШЫФРАВАНЫЯ)!\n\nВы настойваеце на фарматаванні?</string>
-    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%s'%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting/decrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting/decrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting/decrypting, please make sure that you have backup copies of the files you want to encrypt/decrypt.\n\nDo you have such a backup?</string>
-    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%hs'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
+    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%s'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
     <string lang="en" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">WARNING: THE SELECTED PARTITION CONTAINS A LARGE AMOUNT OF DATA! Any files stored on the partition will be erased and lost (they will NOT be encrypted)!</string>
     <string lang="en" key="ERASE_FILES_BY_CREATING_VOLUME">Erase any files stored on the partition by creating a VeraCrypt volume within it</string>
     <string lang="be" key="PASSWORD">Пароль</string>
@@ -645,7 +652,7 @@
     <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
     <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
     <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 &gt; Organize &gt; 'Folder and search options' &gt; View).</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="SELECTED_PARTITION_ALREADY_INPLACE_ENC">The selected partition/device is already fully encrypted.\nHeader Flags = 0x%.8X</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="be" key="PREV">&lt; Назад</string>
     <string lang="be" key="RAWDEVICES">Немагчыма паказаць спіс усталяваных у сістэме raw-прылад.</string>
-    <string lang="be" key="READONLYPROMPT">Том '%hs' існуе і прызначаны толькі для чытання. Вы сапраўды жадаеце яго замяніць?</string>
+    <string lang="be" key="READONLYPROMPT">Том '%s' існуе і прызначаны толькі для чытання. Вы сапраўды жадаеце яго замяніць?</string>
     <string lang="be" key="SELECT_DEST_DIR">Абярыце тэчку прызначэння</string>
     <string lang="be" key="SELECT_KEYFILE">Абярыце ключавы файл</string>
     <string lang="be" key="SELECT_KEYFILE_PATH">Абярыце шлях пошуку ключавых файлаў. УВАГА: Запамінаецца толькі шлях, але не імёны файлаў.</string>
@@ -680,13 +687,13 @@
     <string lang="be" key="TEST_CIPHERTEXT_SIZE">Няслушная даўжыня тэставага зашыфраванага тэксту.</string>
     <string lang="be" key="TEST_KEY_SIZE">Няслушная даўжыня тэставага ключа.</string>
     <string lang="be" key="TEST_PLAINTEXT_SIZE">Няслушная даўжыня тэставага незашыфраванага тэксту.</string>
-    <string lang="be" key="TWO_LAYER_CASCADE_HELP">Два шыфра, якія паслядоўна аперуюць у рэжыме XTS. Кожны блок спачатку шыфруецца %hs (%d-бітны ключ), а затым %hs (%d-бітны ключ). Кожны шыфр ужывае свой уласны ключ. Усе ключы ўзаемна незалежныя.</string>
+    <string lang="be" key="TWO_LAYER_CASCADE_HELP">Два шыфра, якія паслядоўна аперуюць у рэжыме XTS. Кожны блок спачатку шыфруецца %s (%d-бітны ключ), а затым %s (%d-бітны ключ). Кожны шыфр ужывае свой уласны ключ. Усе ключы ўзаемна незалежныя.</string>
-    <string lang="be" key="THREE_LAYER_CASCADE_HELP">Тры шыфра, якія паслядоўна аперуюць у рэжыме XTS. Кожны блок спачатку шыфруецца %hs (%d-бітны ключ), затым %hs (%d-бітны ключ), і, нарэшце, %hs (%d-бітны ключ). Кожны шыфр ужывае свой уласны ключ. Усе ключы ўзаемна незалежныя.</string>
+    <string lang="be" key="THREE_LAYER_CASCADE_HELP">Тры шыфра, якія паслядоўна аперуюць у рэжыме XTS. Кожны блок спачатку шыфруецца %s (%d-бітны ключ), затым %s (%d-бітны ключ), і, нарэшце, %s (%d-бітны ключ). Кожны шыфр ужывае свой уласны ключ. Усе ключы ўзаемна незалежныя.</string>
     <string lang="en" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Note that, depending on the operating system configuration, these auto-run and auto-mount features may work only when the traveler disk files are created on a non-writable CD/DVD-like medium. Also note that this is not a bug in VeraCrypt (it is a limitation of Windows).</string>
     <string lang="en" key="TRAVELER_DISK_CREATED">VeraCrypt traveler disk has been successfully created.\n\nNote that you need administrator privileges to run VeraCrypt in portable mode. Also note that, after examining the registry file, it may be possible to tell that VeraCrypt was run on a Windows system even if it is run in portable mode.</string>
     <string lang="be" key="TC_TRAVELER_DISK">Пераносны дыск VeraCrypt</string>
     <string lang="be" key="TWOFISH_HELP">Аўтары: Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall і Niels Ferguson. Апублікаваны ў 1998 г. 256-бітны ключ, 128-бітны блок. Рэжым працы -- XTS. Twofish -- адзін з фіналістаў AES.</string>
-    <string lang="be" key="MORE_INFO_ABOUT">Дэталёва пра %hs</string>
+    <string lang="be" key="MORE_INFO_ABOUT">Дэталёва пра %s</string>
     <string lang="be" key="UNKNOWN">Невядома</string>
     <string lang="en" key="ERR_UNKNOWN">An unspecified or unknown error occurred (%d).</string>
     <string lang="be" key="UNMOUNTALL_LOCK_FAILED">Некаторыя тамы ўтрымоўваюць файлы ці тэчкі, што выкарыстоўваюцца прыкладаннямі ці сістэмай.\n\nПрадоўжыць размантаванне?</string>
@@ -706,7 +713,7 @@
     <string lang="be" key="WRONG_VOL_TYPE">VeraCrypt не можа змяніць пароль для чужога яму тома.</string>
     <string lang="be" key="SELECT_FREE_DRIVE">Абярыце са спісу вольную літару дыска.</string>
     <string lang="be" key="SELECT_A_MOUNTED_VOLUME">Абярыце ў спісе літар дыскаў змантаваны том.</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="be" key="CANT_CREATE_AUTORUN">Памылка: немагчыма стварыць autorun.inf</string>
     <string lang="be" key="ERR_PROCESS_KEYFILE">Памылка апрацоўкі ключавога файла.</string>
     <string lang="be" key="ERR_PROCESS_KEYFILE_PATH">Памылка апрацоўкі шляху ключавога файла.</string>
@@ -851,7 +858,7 @@
     <string lang="be" key="INSTALL_FAILED">Усталёўка не выкананая.</string>
     <string lang="be" key="UNINSTALL_FAILED">Выдаленне не выканана.</string>
     <string lang="be" key="DIST_PACKAGE_CORRUPTED">Гэты дыстрыбутыўны пакет пашкоджаны. Загрузіце яго ізноў (пажадана з афіцыйнага сайта VeraCrypt - https://veracrypt.codeplex.com).</string>
-    <string lang="be" key="CANNOT_WRITE_FILE_X">Немагчыма запісаць файл %hs</string>
+    <string lang="be" key="CANNOT_WRITE_FILE_X">Немагчыма запісаць файл %s</string>
     <string lang="be" key="EXTRACTING_VERB">Выманне</string>
     <string lang="be" key="CANNOT_READ_FROM_PACKAGE">Немагчыма прачытаць дадзеныя з дыстрыбутыва.</string>
     <string lang="be" key="CANT_VERIFY_PACKAGE_INTEGRITY">Немагчыма праверыць цэласнасць гэтага дыстрыбутыўнага пакета.</string>
@@ -860,8 +867,8 @@
     <string lang="be" key="INSTALL_OK">Праграма VeraCrypt паспяхова ўсталяваная.</string>
     <string lang="en" key="SETUP_UPDATE_OK">VeraCrypt has been successfully updated.</string>
     <string lang="en" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt has been successfully upgraded. However, before you can start using it, the computer must be restarted.\n\nDo you want to restart it now?</string>
-    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
+    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu > All programs > Accessories > System Tools > System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
-    <string lang="be" key="UNINSTALL_OK">Праграма VeraCrypt паспяхова выдаленая.\n\nНацісніце 'Гатова', каб выдаліць усталёўнік VeraCrypt і тэчку %hs. Тэчка не будзе выдаленая, калі ў ёй утрымоўваюцца якія-небудзь файлы, створаныя не ўсталёўнікам і не самой праграмай VeraCrypt.</string>
+    <string lang="be" key="UNINSTALL_OK">Праграма VeraCrypt паспяхова выдаленая.\n\nНацісніце 'Гатова', каб выдаліць усталёўнік VeraCrypt і тэчку %s. Тэчка не будзе выдаленая, калі ў ёй утрымоўваюцца якія-небудзь файлы, створаныя не ўсталёўнікам і не самой праграмай VeraCrypt.</string>
     <string lang="be" key="REMOVING_REG">Выдаленне запісаў VeraCrypt у рэестры</string>
     <string lang="be" key="ADDING_REG">Даданне элемента ў рэестр</string>
     <string lang="be" key="REMOVING_APPDATA">Выдаленне датычных праграмы дадзеных</string>
@@ -872,10 +879,10 @@
     <string lang="be" key="CREATING_SYS_RESTORE">Стварэнне пункта аднаўлення сістэмы</string>
     <string lang="be" key="FAILED_SYS_RESTORE">Памылка стварэння пункта аднаўлення сістэмы.</string>
     <string lang="en" key="INSTALLER_UPDATING_BOOT_LOADER">Updating boot loader</string>
-    <string lang="en" key="INSTALL_OF_FAILED">Failed to install '%hs'. %hs\nDo you want to continue installing?</string>
+    <string lang="en" key="INSTALL_OF_FAILED">Failed to install '%s'. %s\nDo you want to continue installing?</string>
-    <string lang="en" key="UNINSTALL_OF_FAILED">Failed to uninstall '%hs'. %hs\nDo you want to continue uninstalling?</string>
+    <string lang="en" key="UNINSTALL_OF_FAILED">Failed to uninstall '%s'. %s\nDo you want to continue uninstalling?</string>
     <string lang="be" key="INSTALL_COMPLETED">Усталёўка завершаная.</string>
-    <string lang="be" key="CANT_CREATE_FOLDER">Не атрымалася стварыць тэчку '%hs'</string>
+    <string lang="be" key="CANT_CREATE_FOLDER">Не атрымалася стварыць тэчку '%s'</string>
     <string lang="be" key="CLOSE_TC_FIRST">Немагчыма выгрузіць драйвер VeraCrypt.\n\nСпачатку зачыніце ўсе адчыненыя вокны VeraCrypt. Калі гэта не дапаможа, перазагрузіце Windows і паспрабуйце яшчэ раз.</string>
     <string lang="be" key="DISMOUNT_ALL_FIRST">Перш чым працягнуць усталёўку ці выдаленне VeraCrypt, трэба размантаваць усе 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>
@@ -921,14 +928,14 @@
     <string lang="en" key="SYS_FAVORITE_VOLUMES_SAVED">System favorite volumes saved.\n\nTo enable mounting of system favorite volumes when the system starts, please select 'Settings' &gt; 'System Favorite Volumes' &gt; 'Mount system favorite volumes when Windows starts'.</string>
     <string lang="en" key="FAVORITE_ADD_DRIVE_DEV_WARNING">The volume you are adding to favorites is neither a partition nor a dynamic volume. Therefore, VeraCrypt will be unable to mount this favorite volume if the device number changes.</string>
     <string lang="en" key="FAVORITE_ADD_PARTITION_TYPE_WARNING">The volume you are adding to favorites is a partition not recognized by Windows.\n\nVeraCrypt will be unable to mount this favorite volume if the device number changes. Please set the type of the partition to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then add the partition to favorites again.</string>
-    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings &gt; Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
+    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings > Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_NETWORK_PATH_ERR">A container stored in a remote filesystem shared over a network cannot be automatically mounted when its host device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, the volume hosted on the device cannot be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable the volume hosted on the device to be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_LABEL_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, no label can be assigned to it.</string>
     <string lang="en" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable VeraCrypt to assign a label to the partition.</string>
     <string lang="en" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Due to a Windows limitation, a container stored in a remote filesystem shared over a network cannot be mounted as a system favorite volume (however, it can be mounted as a non-system favorite volume when a user logs on).</string>
-    <string lang="be" key="ENTER_PASSWORD_FOR">Увядзіце пароль для %hs</string>
+    <string lang="be" key="ENTER_PASSWORD_FOR">Увядзіце пароль для %s</string>
     <string lang="en" key="ENTER_PASSWORD_FOR_LABEL">Enter password for '%s'</string>
     <string lang="en" key="ENTER_NORMAL_VOL_PASSWORD">Enter password for the normal/outer volume</string>
     <string lang="en" key="ENTER_HIDDEN_VOL_PASSWORD">Enter password for the hidden volume</string>
@@ -943,8 +950,8 @@
     <string lang="be" key="VOL_HEADER_BACKED_UP">Рэзервовая копія загалоўка тома паспяхова створаная.\n\nВАЖНА: Пры аднаўленні загалоўка з гэтай рэзервовай копіі таксама будзе адноўлены і бягучы пароль тома. Больш таго, калі для мантавання тома патрабуюцца ключавыя файлы, пасля аднаўлення загалоўка з копіі для мантавання тома спатрэбяцца тыя ж ключавыя файлы.\n\nУВАГА: Гэтую копію загалоўка тома можна выкарыстаць для аднаўлення загалоўка ТОЛЬКІ гэтага пэўнага тома. Калі ўжыць гэтую копію для аднаўлення загалоўка іншага тома, змантаваць том вы зможаце, але вам НЕ атрымаецца расшыфраваць ніякіх дадзеных, якія захоўваюцца ў гэтым томе (бо гэта зменіць яго майстар-ключ).</string>
     <string lang="be" key="VOL_HEADER_RESTORED">Загаловак тома паспяхова адноўлены.\n\nВАЖНА: Майце на ўвазе, што разам з загалоўкам таксама мог быць адноўлены і ранейшы пароль. Больш таго, калі на момант стварэння рэзервовай копіі для мантавання тома таксама патрабаваліся ключавыя файлы, гэтыя ж ключавыя файлы спатрэбяцца для мантавання дадзенага тома цяпер.</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) for the hidden volume.</string>
-    <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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</string>
+    <string lang="en" key="CONFIRM_VOL_HEADER_BAK">Are you sure you want to create volume header backup for %s?\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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</string>
-    <string lang="be" key="CONFIRM_VOL_HEADER_RESTORE">Вы сапраўды жадаеце аднавіць загаловак тома %hs?\n\nУВАГА: Пры аднаўленні загалоўка таксама будзе адноўлены пароль тома, які дзейнічаў на момант стварэння рэзервовай копіі. Больш таго, калі на момант стварэння рэзервовай копіі для мантавання тома таксама патрабаваліся ключавыя файлы, пасля аднаўлення загалоўка для мантавання дадзенага тома спатрэбяцца гэтыя ж ключавыя файлы.\n\nНацісніце 'Так', каб абраць файл з рэзервовай копіяй загалоўка.</string>
+    <string lang="be" key="CONFIRM_VOL_HEADER_RESTORE">Вы сапраўды жадаеце аднавіць загаловак тома %s?\n\nУВАГА: Пры аднаўленні загалоўка таксама будзе адноўлены пароль тома, які дзейнічаў на момант стварэння рэзервовай копіі. Больш таго, калі на момант стварэння рэзервовай копіі для мантавання тома таксама патрабаваліся ключавыя файлы, пасля аднаўлення загалоўка для мантавання дадзенага тома спатрэбяцца гэтыя ж ключавыя файлы.\n\nНацісніце 'Так', каб абраць файл з рэзервовай копіяй загалоўка.</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>
@@ -956,11 +963,13 @@
     <string lang="be" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">Вы спрабуеце зрабіць рэзервовую копію загалоўка сістэмнага падзелу/дыска. Гэта не дазволена. Аперацыі рэзервовага капіявання/узнаўлення, якія тычацца сістэмнага падзелу/дыску, можна выконваць толькі з дапамогай дыска ўзнаўлення VeraCrypt (Rescue Disk).\n\nСтварыць дыск узнаўлення VeraCrypt?</string>
     <string lang="be" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">Вы спрабуеце аднавіць з рэзервовай копіі загаловак віртуальнага тома VeraCrypt, але абралі сістэмны падзел/дыск. Гэта не дазволена. Аперацыі рэзервовага капіявання/узнаўлення, якія тычацца сістэмнага падзелу/дыску, можна выконваць толькі з дапамогай дыска ўзнаўлення VeraCrypt (Rescue Disk).\n\nСтварыць дыск узнаўлення VeraCrypt?</string>
     <string lang="be" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">Пасля націску OK абярыце імя файла для ISO-выявы новага дыска ўзнаўлення VeraCrypt (Rescue Disk) і месца, дзе яго трэба захаваць.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <string lang="be" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Каб праверыць дыск узнаўлення VeraCrypt, устаўце яго ў CD/DVD-назапашвальнік і націсніце OK.</string>
+    <string lang="be" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Каб праверыць дыск узнаўлення VeraCrypt, устаўце і націсніце OK.</string>
     <string lang="be" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">Дыск узнаўлення VeraCrypt паспяхова прайшоў праверку.</string>
     <string lang="be" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">Немагчыма праверыць правільнасць запісу дыска ўзнаўлення.\n\nКалі вы запісалі дыск узнаўлення, дастаньце CD/DVD з назапашвальніка і ўстаўце зноў; затым націсніце 'Далей', каб паўтарыць спробу. Калі гэта не дапаможа, паспрабуйце скарыстацца іншым ПЗ для запісу CD/DVD і/ці іншым CD/DVD.\n\nКалі вы спрабавалі праверыць дыск узнаўлення VeraCrypt, створаны з іншым майстар-ключом, паролем, 'соллю' і г.д., ведайце, што такі дыск узнаўлення не пройдзе гэтую праверку ніколі. Каб стварыць новы дыск узнаўлення, цалкам сумяшчальны з бягучай канфігурацыяй, абярыце меню 'Сістэма' &gt; 'Стварыць дыск узнаўлення'.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk image fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
     <string lang="be" key="ERROR_CREATING_RESCUE_DISK">Памылка стварэння дыска аварыйнага ўзнаўлення VeraCrypt.</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' &gt; '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 be used, because it was created for a different master key. You need to burn the newly generated Rescue Disk.</string>
@@ -989,8 +998,8 @@
     <string lang="en" key="DRIVE_LETTER_ITEM">Drive Letter:   </string>
     <string lang="be" key="UNSUPPORTED_CHARS_IN_PWD">Памылка! Пароль павінен утрымоўваць толькі знакі стандартнага набору ASCII.\n\nЗнакі не з набору ASCII могуць прывесці да немагчымасці мантавання тома пры змене налад у канфігурацыі сістэмы.\n\nДазваляецца выкарыстоўваць наступныя знакі:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4  5 6 7 8 9 : ; &lt; = &gt; ? @ 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="be" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">Увага! Пароль утрымоўвае не-ASCII знакі. Гэта можа прывесці да немагчымасці мантавання тома пры змене канфігурацыі сістэмы.\n\nВам варта замяніць усе не-ASCII знакі ў паролі на знакі ASCII. Для гэтага пстрыкніце на меню 'Тамы' -&gt; 'Змяніць пароль тома'.\n\nЗнакамі ASCII лічацца:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4  5 6 7 8 9 : ; &lt; = &gt; ? @ 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="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 change it (e.g., to '.tc').\n\nAre you sure you want to use the problematic file extension?</string>
+    <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 change it (e.g., to '.hc').\n\nAre you sure you want to use the problematic file extension?</string>
-    <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 container or change it (e.g., to '.tc') after you dismount the volume.</string>
+    <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 container or change it (e.g., to '.hc') after you dismount the volume.</string>
     <string lang="be" key="HOMEPAGE">Хатняя старонка</string>
     <string lang="be" key="LARGE_IDE_WARNING_XP">УВАГА: У сістэме не ўсталявана ніводнага пакета абнаўленняў (Service Pack) Windows. Калі ў Windows XP не ўсталяваны Service Pack 1 (ці навейшы), не варта выконваць запіс на дыскі IDE аб'ёмам больш 128 Гб, інакш магчыма пашкоджанне дадзеных (усё роўна, з'яўляюцца яны тамамі VeraCrypt ці не). Гэтае абмежаванне Windows, а не памылка ў VeraCrypt.</string>
     <string lang="be" key="LARGE_IDE_WARNING_2K">УВАГА: У сістэме не ўсталяваны пакет абнаўленняў Windows Service Pack 3 (ці навейшы). Калі ў Windows 2000 не ўсталяваны Service Pack 3 (ці навейшы), не варта выконваць запіс на дыскі IDE аб'ёмам больш 128 Гб, інакш магчыма пашкоджанне дадзеных (усё роўна, з'яўляюцца яны тамамі VeraCrypt ці не). Гэтае абмежаванне Windows, а не памылка ў VeraCrypt. Акрамя таго, можа запатрабавацца ўключыць у рэестры падтрымку 48-бітнага адрасавання LBA; падрабязнасці гл. на http://support.microsoft.com/kb/305098/EN-US</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="be" key="CHECKING_FS">Праверка файлавай сістэмы тома VeraCrypt, змантаванага як %s...</string>
-    <string lang="be" key="REPAIRING_FS">Спроба паправіць файлавую сістэму тома VeraCrypt, змантаванага як %hs...</string>
+    <string lang="be" key="REPAIRING_FS">Спроба паправіць файлавую сістэму тома VeraCrypt, змантаванага як %s...</string>
-    <string lang="be" key="WARN_CBC_MODE">УВАГА: Гэты том зашыфраваны ў рэжыме CBC. З меркаванняў бяспекі, рэжым CBC лічыцца нездавальняльным пачынальна з VeraCrypt 4.1.\n\nНастойліва рэкамендуем вам перанесці дадзеныя з гэтага тома VeraCrypt у новы том, створаны бягучай версіяй VeraCrypt. Пасля таго, як вы гэта зробіце, стары том варта надзейна сцерці ці знішчыць. Падрабязнасці гл. у гісторыі версій праграмы ў дакументацыі ці ў нататках да праграмы, якія распаўсюджваюцца разам з VeraCrypt 4.1 і навей.</string>
     <string lang="be" key="WARN_64_BIT_BLOCK_CIPHER">УВАГА: Гэты том зашыфраваны з выкарыстаннем састарэлага алгарытму.\n\nУсе алгарытмы шыфравання з 64-біт блокамі (напрыклад, Blowfish, CAST-128, Triple DES) вышлі з выкарыстання. У наступных версіях VeraCrypt мантаванне гэтага тома будзе магчыма, аднак ніякіх паляпшэнняў у рэалізацыі гэтых састарэлых алгарытмаў шыфравання не прадбачыцца. Рэкамендуем вам стварыць новы том VeraCrypt з шыфраваннем па алгарытму з 128-бітнымі блокамі (напрыклад, AES, Serpent, Twofish і інш.) і перанесці ўсе файлы з гэтага тома ў новы.</string>
     <string lang="be" key="SYS_AUTOMOUNT_DISABLED">Ваша сістэма не наладжаная на аўтамантаванне новых тамоў. Мантаванне тамоў VeraCrypt на аснове прылад можа стаць немагчымым. Каб уключыць аўтамантаванне, выканайце наступную каманду і перазагрузіце сістэму:\n\nmountvol.exe /E</string>
     <string lang="be" key="SYS_ASSIGN_DRIVE_LETTER">Перш чым працягнуць, прысвойце падзелу/прыладзе літару дыска ('Панэль кіравання' &gt; 'Адміністраванне' &gt; 'Кіраванне кампутарам' - 'Кіраванне дыскамі').\n\nЗаўвага: гэта патрабаванне аперацыйнай сістэмы.</string>
@@ -1069,7 +1077,7 @@
     <string lang="en" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt no longer supports encryption of the system partition/drive on Windows Vista with no Service Pack installed. Before upgrading VeraCrypt, please install Service Pack 1 or higher for Windows Vista.</string>
     <string lang="en" key="FEATURE_REQUIRES_INSTALLATION">Error: This feature requires VeraCrypt to be installed on the system (you are running VeraCrypt in portable mode).\n\nPlease install VeraCrypt and then try again.</string>
     <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="be" key="GPT_BOOT_DRIVE_UNSUPPORTED">Ваш сістэмны дыск мае табліцу падзелаў GUID (GPT). Пакуль падтрымліваюцца толькі дыскі з табліцай падзелаў MBR.</string>
+    <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</string>
     <string lang="be" key="TC_BOOT_LOADER_ALREADY_INSTALLED">АСЦЯРОЖНА: На сістэмным дыску ўжо ўсталяваны загрузнік VeraCrypt!\n\nМагчыма, у вашым кампутары ёсць іншая ўжо зашыфраваная сістэма.\n\nУВАГА: У ВЫПАДКУ ПРАЦЯГУ ШЫФРАВАННЯ БЯГУЧАЙ СІСТЭМЫ ЁСЦЬ ВЕРАГОДНАСЦЬ, ШТО ІНШЫЯ СІСТЭМЫ НЕ ЗМОГУЦЬ ЗАГРУЖАЦЦА, А ІХ ДАДЗЕНЫЯ СТАНУЦЬ НЕДАСТУПНЫМІ.\n\nВы сапраўды жадаеце працягнуць?</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' &gt; 'Restore original system loader') or Windows installation medium to replace the VeraCrypt Boot Loader with the Windows system loader.</string>
     <string lang="be" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">Зыходны сістэмны загрузнік не будзе захаваны на дыску ўзнаўлення (магчымы чыннік: няма файла з рэзервовай копіяй).</string>
@@ -1093,7 +1101,7 @@
     <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 medium (or using a service partition)?</string>
     <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 Hidden Volumes" in the VeraCrypt User's Guide.\n\nImportant: Before proceeding, please make sure you have read the section "Security Requirements and Precautions Pertaining to Hidden Volumes" in the VeraCrypt User's Guide.\n\n\nDoes the currently running operating system meet the above condition?</string>
     <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 from writing to the shared boot partition and from hibernating.\n\n\nDo you want to continue? If you select 'No', instructions for removing the extra boot partition will be displayed.</string>
-    <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' &gt; '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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
+    <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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
     <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="be" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">У дадзены момант гэты алгарытм для шыфравання сістэмы не падтрымліваецца.</string>
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
@@ -1108,8 +1116,8 @@
     <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 you do NOT have a real US keyboard.</string>
     <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 starts.\n\n- The VRD will contain a backup of the present content of the first drive track (which typically contains a system loader or boot manager) and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ISO image will be created in the location specified below.</string>
     <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">The Rescue Disk image has been created and stored in this file:\n%s\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>
+    <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%s\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>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">IMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software. If you do not have any CD/DVD recording software that can write the ISO disk image to a CD/DVD, click the link below to download such free software.\n\n</string>
     <string lang="en" key="LAUNCH_WIN_ISOBURN">Launch Microsoft Windows Disc Image Burner</string>
     <string lang="en" key="RESCUE_DISK_BURN_NO_CHECK_WARN">WARNING: If you already created a VeraCrypt Rescue Disk in the past, it cannot be reused for this system partition/drive because it was created for a different master key! Every time you encrypt a system partition/drive, you must create a new VeraCrypt Rescue Disk for it even if you use the same password.</string>
@@ -1247,7 +1255,7 @@
     <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 system (but not on the decoy system), the decoy system would contain a VeraCrypt driver and VeraCrypt applications whose version numbers are different from the version number of the VeraCrypt Boot Loader. Such a discrepancy might indicate that there is a hidden operating system on this computer.\n\n\nDo you want to continue?</string>
     <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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' &gt; '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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' > 'Create Rescue Disk').</string>
     <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' &gt; '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' &gt; 'Create Rescue Disk'.</string>
     <string lang="be" key="BOOT_LOADER_UPGRADE_FAILED">Памылка абнаўлення загрузніка VeraCrypt.</string>
@@ -1272,7 +1280,7 @@
     <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' &gt; '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>
@@ -1297,8 +1305,8 @@
     <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 system.</string>
     <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' &gt; 'Performance' and enable 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' &gt; 'Performance' and disable 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>
@@ -1372,6 +1380,39 @@
     <string lang="be" key="TB_PER_SEC">Тб/с</string>
     <string lang="be" key="PB_PER_SEC">Пб/с</string>
     <string lang="en" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.bg.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="bg" name="Български" en-name="Bulgarian" version="0.1.0" translators="Lachezar Gorchev" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="bg" key="IDC_BROWSE">Из&amp;бор...</control>
     <control lang="bg" key="IDC_DESKTOP_ICON">Добавяне на VeraCrypt икон на &amp;десктопа</control>
     <control lang="en" key="IDC_DONATE">Donate now...</control>
-    <control lang="bg" key="IDC_FILE_TYPE">Асоцииране на '.tc' файлови раз&amp;ширения с VeraCrypt</control>
+    <control lang="bg" key="IDC_FILE_TYPE">Асоцииране на '.hc' файлови раз&amp;ширения с VeraCrypt</control>
     <control lang="bg" key="IDC_OPEN_CONTAINING_FOLDER">&amp;Отваряне на целевата директория след приключване</control>
     <control lang="bg" key="IDC_PROG_GROUP">Добавяне на VeraCrypt в &amp;Start менюто</control>
     <control lang="bg" key="IDC_SYSTEM_RESTORE">Създаване на System &amp;Restore point</control>
@@ -37,6 +37,7 @@
     <control lang="bg" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Сваляне на софтуер за запис на CD/DVD</control>
     <control lang="bg" key="IDC_FILE_CONTAINER">Създаване на криптиран контейнер-файл</control>
     <control lang="bg" key="IDC_GB">&amp;GB</control>
+    <control lang="bg" key="IDC_TB">&amp;TB</control>
     <control lang="bg" key="IDC_HIDDEN_SYSENC_INFO_LINK">Повече информация</control>
     <control lang="bg" key="IDC_HIDDEN_VOL">Ск&amp;рит VeraCrypt том </control>
     <control lang="bg" key="IDC_HIDDEN_VOL_HELP">Повече информация за скрити томове</control>
@@ -44,6 +45,7 @@
     <control lang="bg" key="IDC_HIDVOL_WIZ_MODE_FULL">Нормален режим</control>
     <control lang="bg" key="IDC_KB">&amp;KB</control>
     <control lang="bg" key="IDC_KEYFILES_ENABLE">&amp;Ключ-файлове</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="bg" key="IDC_KEY_FILES">&amp;Ключ-файлове..</control>
     <control lang="bg" key="IDC_LINK_HASH_INFO">Информация за хеш алгоритми</control>
@@ -58,7 +60,8 @@
     <control lang="bg" key="IDC_NO_HISTORY">Историята да не &amp;се запазва</control>
     <control lang="bg" key="IDC_OPEN_OUTER_VOLUME">Отваряне на външен том</control>
     <control lang="bg" key="IDC_PAUSE">&amp;Пауза</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="bg" key="IDC_QUICKFORMAT">Бърз формат</control>
     <control lang="bg" key="IDC_SHOW_PASSWORD">Видима &amp;парола</control>
     <control lang="bg" key="IDC_SHOW_PASSWORD_SINGLE">Видима &amp;парола</control>
@@ -118,6 +121,7 @@
     <control lang="bg" key="IDC_CREATE">Създаване</control>
     <control lang="bg" key="IDC_CREATE_VOLUME">&amp;Създаване на том</control>
     <control lang="bg" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Да не се &amp;показват никакви текстове в екрана за pre-boot автентикация (с изключение на по-долу зададеното съобщение)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <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="bg" key="IDC_ENABLE_KEYFILES">Ключ-файлове</control>
     <control lang="bg" key="IDC_ENABLE_NEW_KEYFILES">Ключ-файлове</control>
@@ -132,6 +136,7 @@
     <control lang="en" key="IDC_FAVORITE_MOVE_UP">Move &amp;Up</control>
     <control lang="en" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Open &amp;Explorer window for selected volume when successfully mounted</control>
     <control lang="en" key="IDC_FAVORITE_REMOVE">&amp;Remove</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="en" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Global Settings</control>
     <control lang="en" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Display balloon tooltip after successful hot-key dismount</control>
     <control lang="en" key="IDC_HK_DISMOUNT_PLAY_SOUND">Play system notification sound after successful hot-key dismount</control>
@@ -189,7 +194,7 @@
     <control lang="bg" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="bg" key="IDD_PASSWORDCHANGE_DLG">Смяна на паролата или ключ-файловете</control>
     <control lang="bg" key="IDD_PASSWORD_DLG">Въведете парола за VeraCrypt тома</control>
-    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance Options</control>
+    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance and Driver Options</control>
     <control lang="bg" key="IDD_PREFERENCES_DLG">VeraCrypt - Предпочитания</control>
     <control lang="bg" key="IDD_SYSENC_SETTINGS">VeraCrypt - Настройки на системното криптиране</control>
     <control lang="en" key="IDD_TOKEN_PREFERENCES">VeraCrypt - Security Token Preferences</control>
@@ -235,7 +240,7 @@
     <control lang="bg" key="IDM_ONLINE_TUTORIAL">Напътствия за начинаещи</control>
     <control lang="en" key="IDM_ORGANIZE_FAVORITES">Organize Favorite Volumes...</control>
     <control lang="en" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organize System Favorite Volumes...</control>
-    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance...</control>
+    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance/Driver Configuration</control>
     <control lang="bg" key="IDM_PERMANENTLY_DECRYPT_SYS">Декриптиране на системния дял/устройство за постоянно</control>
     <control lang="bg" key="IDM_PREFERENCES">Предпочитания...</control>
     <control lang="bg" key="IDM_REFRESH_DRIVE_LETTERS">Опресняване на буквите за устройства</control>
@@ -256,6 +261,7 @@
     <control lang="bg" key="IDM_UNMOUNTALL">Демонтиране на всички монтирани томове</control>
     <control lang="bg" key="IDM_UNMOUNT_VOLUME">Демонтиране на том</control>
     <control lang="bg" key="IDM_VERIFY_RESCUE_DISK">Проверка на Спасителен Диск</control>
+    <control lang="en" key="IDM_VERIFY_RESCUE_DISK_ISO">Verify Rescue Disk Image</control>
     <control lang="bg" key="IDM_VERSION_HISTORY">История на версиите</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="bg" key="IDM_VOLUME_PROPERTIES">Свойства на тома</control>
@@ -365,7 +371,7 @@
     <control lang="en" key="IDT_SECURITY_TOKEN">Security token:</control>
     <control lang="bg" key="IDT_SORT_METHOD">Сортиране:</control>
     <control lang="en" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Please wait. This process may take a long time...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="bg" key="IDT_TEST_BLOCK_NUMBER">Номер на блок:</control>
     <control lang="bg" key="IDT_TEST_CIPHERTEXT">Шифрован текст (шестнадесетичен)</control>
     <control lang="bg" key="IDT_TEST_DATA_UNIT_NUMBER">Номер на единица данни (64-битов 16ичен, размера на единица данни е 512 байта)</control>
@@ -410,13 +416,13 @@
     <string lang="bg" key="CIPHER_TITLE">Опции за криптиране</string>
     <string lang="bg" key="CLEAN_WINMRU_FAILED">ВНИМАНИЕ: Неуспешен опит за изчистване на пътят до последно избрания том/ключ-файл (запомнен от селектора на файлове)!</string>
     <string lang="bg" key="COMPRESSION_NOT_SUPPORTED">Грешка: Томът е компресиран на ниво файлова система. VeraCrypt не поддържа компресирани контейнери (обърнете внимание на това, че компресията на криптирани данни е неефективна и излишна).\n\nМоля, изключете компресията за контейнера като следвате тези стъпки: 1) Натиснете десен бутон върху контейнера в Windows Explorer (не в VeraCrypt). 2) Изберете 'Properties'. 3) В диалога 'Properties', натиснете 'Advanced'. 4) В диалога 'Advanced Attributes', изключете опцията 'Compress contents to save disk space' и натиснете 'OK'. 5) В диалога 'Properties', натиснете 'OK'.</string>
-    <string lang="bg" key="CREATE_FAILED">Неуспешно създаване на том %hs</string>
+    <string lang="bg" key="CREATE_FAILED">Неуспешно създаване на том %s</string>
-    <string lang="bg" key="DEVICE_FREE_BYTES">Размера на %hs е %.2f байта</string>
+    <string lang="bg" key="DEVICE_FREE_BYTES">Размера на %s е %.2f байта</string>
-    <string lang="bg" key="DEVICE_FREE_KB">Размера на %hs е %.2f KB</string>
+    <string lang="bg" key="DEVICE_FREE_KB">Размера на %s е %.2f KB</string>
-    <string lang="bg" key="DEVICE_FREE_MB">Размера на %hs е %.2f MB</string>
+    <string lang="bg" key="DEVICE_FREE_MB">Размера на %s е %.2f MB</string>
-    <string lang="bg" key="DEVICE_FREE_GB">Размера на %hs е %.2f GB</string>
+    <string lang="bg" key="DEVICE_FREE_GB">Размера на %s е %.2f GB</string>
-    <string lang="bg" key="DEVICE_FREE_TB">Размера на %hs е %.2f TB</string>
+    <string lang="bg" key="DEVICE_FREE_TB">Размера на %s е %.2f TB</string>
-    <string lang="bg" key="DEVICE_FREE_PB">Размера на %hs е %.2f PB</string>
+    <string lang="bg" key="DEVICE_FREE_PB">Размера на %s е %.2f PB</string>
     <string lang="bg" key="DEVICE_IN_USE_FORMAT">ВНИМАНИЕ: Устройството в момента се използва!\n\nУстройството което ще се форматира в момента се използва от системата или от приложения. Форматирането му може да доведе до загуба на данни или нестабилност на системата.\n\nДа продължи ли форматирането?</string>
     <string lang="bg" key="DEVICE_IN_USE_INPLACE_ENC">Внимание: Този дял се използва от операционната система или от някое приложение. Трябва да затворите всички приложения които биха могли да използват дяла (включително и антивирусни програми).\n\nЖелаете ли да продължите?</string>
     <string lang="bg" key="FORMAT_CANT_DISMOUNT_FILESYS">Грешка: Устройството/дяла съдържа файлова система която не може да бъде демонтирана. Файловата система може да се използва от операционната система. Форматирането на устройството/дяла е мнго вероятно да причини повреда на данните и нестабилност на системата.\n\nЗа да разрешите този проблем, препоръчваме първо да изтриете дяла и след това да го създадете на ново без форматиране. За да направите това, следвайте тези стъпки: 1) Натиснете десен бутон върху иконата на 'Computer' (или 'My Computer') в 'Start Menu' и изберете 'Manage'. Трябва да се появи прозореца 'Computer Management'. 2) В прозореца 'Computer Management', изберете 'Storage' &gt; 'Disk Management'. 3) Натиснете десен бутон върху  дяла, който желаете да криптирате и изберете или 'Delete Partition', или 'Delete Volume', или 'Delete Logical Drive'. 4) Натиснете 'Yes'. Ако Windows пожелае да рестартирате компютъра, направете го. Тогава повторете стъпки 1 и 2 и продължете от стъпка 5. 5) Натиснете десен бутон върху зоната с неалокирано/свободно място и изберете или 'New Partition', или 'New Simple Volume', или 'New Logical Drive'. 6) Сега би трябвало да се появи прозорец 'New Partition Wizard' или 'New Simple Volume Wizard'; следвайте неговите инструкции. На страницата на помощника озоглавена 'Format Partition', изберете или 'Do not format this partition' или 'Do not format this volume'. В същия помощник, натиснете 'Next' и след това 'Finish'. 7) Имайте предвид, че пътят до устройството, който сте били избрали в VeraCrypt сега може да е грешен. За това, излезте от VeraCrypt помощника за създаване на томове (ако все още е стартиран) и след това го стартирайте отново. 8) Опитайте да криптирате устройството/дяла отново.\n\nАко VeraCrypt продължава да не успява да криптира устройството/дяла, можете да помислите за създаване на контейнер-файл вместо това.</string>
@@ -435,15 +441,15 @@
     <string lang="bg" key="INPLACE_ENC_INVALID_PATH">Грешка: VeraCrypt може да криптира на място само дял, динамичен том, или цяло системно устройство. Моля, уверете се, че зададеният път е валиден.</string>
     <string lang="bg" key="CANNOT_RESIZE_FILESYS">Грешка: Файловата система не може да бъде смалена (файловата система трябва да бъде смалена за да се освободи място за заглавната част на тома и заглавната част за бекъп).\n\nВъзможни причини и решения:\n\n- Няма достатъчно свободно място на тома. Моля, уверете се, че други приложения не записват по файловата система.\n\n- Повредена файлова система. Опитайте да я проверите и да поправите евентуални грешки (натиснете с десния бутон върху буквата на съответното устройство в списъка 'Computer', след това изберете Properties &gt; Tools &gt; 'Check Now', уверете се, че опцията 'Automatically fix file system errors' е избрана и натиснете Start).\n\nАко по-горните стъпки не помагат, моля, следвайте по-долните стъпки.</string>
     <string lang="bg" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Грешка: Няма достатъчно свободно място на тома и поради това файловата система не може да бъде смалена (файловата система трябва да бъде смалена за да се освободи място за заглавната част на тома и заглавната част за бекъп).\n\nМоля, изтрийте всички ненужни файлове и изпразнете кошчето за да се освободят поне 256 KB и опитайте отново. Имайте предвид, че поради проблем в Windows, количеството свободно място според Windows Explorer може да е невярно докато операционната система не се рестартира. Ако рестартиране на системата не помага, файловата система може да е повредена. Опитайте да я проверите и да поправите евентуални грешки (натиснете с десния бутон върху буквата на съответното устройство в списъка 'Computer', след това изберете Properties &gt; Tools &gt; 'Check Now', уверете се, че опцията 'Automatically fix file system errors' е избрана и натиснете Start).\n\nАко по-горните стъпки не помагат, моля, следвайте по-долните стъпки.</string>
-    <string lang="bg" key="DISK_FREE_BYTES">Свободното място на устройство %hs е %.2f байта.</string>
+    <string lang="bg" key="DISK_FREE_BYTES">Свободното място на устройство %s е %.2f байта.</string>
-    <string lang="bg" key="DISK_FREE_KB">Свободното място на устройство %hs е %.2f KB</string>
+    <string lang="bg" key="DISK_FREE_KB">Свободното място на устройство %s е %.2f KB</string>
-    <string lang="bg" key="DISK_FREE_MB">Свободното място на устройство %hs е %.2f MB</string>
+    <string lang="bg" key="DISK_FREE_MB">Свободното място на устройство %s е %.2f MB</string>
-    <string lang="bg" key="DISK_FREE_GB">Свободното място на устройство %hs е %.2f GB</string>
+    <string lang="bg" key="DISK_FREE_GB">Свободното място на устройство %s е %.2f GB</string>
-    <string lang="bg" key="DISK_FREE_TB">Свободното място на устройство %hs е %.2f TB</string>
+    <string lang="bg" key="DISK_FREE_TB">Свободното място на устройство %s е %.2f TB</string>
-    <string lang="bg" key="DISK_FREE_PB">Свободното място на устройство %hs е %.2f PB</string>
+    <string lang="bg" key="DISK_FREE_PB">Свободното място на устройство %s е %.2f PB</string>
     <string lang="bg" key="DRIVELETTERS">Няма налични букви за устройства.</string>
     <string lang="bg" key="DRIVER_NOT_FOUND">Грешка: VeraCrypt драйвера не е намерен!\n\nМоля копирайте файловете 'veracrypt.sys' и 'veracrypt-x64.sys' в директорията, където се намира главното VeraCrypt приложение (VeraCrypt.exe).</string>
-    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall; on Windows XP, select 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
+    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' > Computer > 'Uninstall or change a program' > VeraCrypt > Uninstall; on Windows XP, select 'Start Menu' > Settings > 'Control Panel' > 'Add Or Remove Programs' > VeraCrypt > Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
     <string lang="bg" key="ERR_CIPHER_INIT_FAILURE">Грешка: Неуспешна инициализация на шифъра.</string>
     <string lang="bg" key="ERR_CIPHER_INIT_WEAK_KEY">Грешка: Открит е слаб или потенциално слаб ключ. Ключът ще бъде отхвърлен. Моля, опитайте отново.</string>
     <string lang="bg" key="EXCEPTION_REPORT">Възникна критична грешка и VeraCrypt трябва да бъде спрян. Ако това е причинено от проблем в VeraCrypt, ние бихме желали да го поправим. За да ни помогнете, можете да ни изпратите автоматично генериран репорт за грешки съдържащ следните данни:\n\n- Версия на програмата\n- Версия на операционната система\n- Тип на процесора (CPU)\n- Име на VeraCrypt компонента\n- Контролна сума на VeraCrypt изпълнимия файл\n- Символно име на диалоговия прозорец\n- Категория на грешката\n- Адрес на грешката\n- VeraCrypt стек с извиквания\n\nАко изберете 'Да', следният адрес (който съдържа цялият репорт за грешка) ще бъде отворен във вашия Internet браузър (имайте предвид, че понякога това може да отнеме до 30 секунди).\n\n%hs\n\nЖелаете ли да изпратите по-горния репорт за грешка?</string>
@@ -497,7 +503,7 @@
     <string lang="bg" key="WIPE_FINISHED">Съдържанието на дяла/устройството беше изтрито успешно.</string>
     <string lang="bg" key="WIPE_FINISHED_DECOY_SYSTEM_PARTITION">Съдържанието на дяла, където оригиналната система (от която е клонирана скритата система) е разположена беше изтрит успешно.</string>
     <string lang="en" key="DECOY_OS_VERSION_WARNING">Please make sure the version of Windows you are going to install (on the wiped partition) is the same as the version of Windows you are currently running. This is required due to the fact that both systems will share a common boot partition.</string>
-    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' &gt; 'Add Mounted Volume to System Favorites').</string>
+    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' > 'Add Mounted Volume to System Favorites').</string>
     <string lang="bg" key="SYSTEM_DECRYPTION_FINISHED">Системният дял/устройство е декриптиран успешно.</string>
     <string lang="bg" key="FORMAT_FINISHED_HELP">\n\nVeraCrypt томът е създаден и е готов за употреба. За да създадете друг VeraCrypt том, натиснете Напред. В противен случай, натиснете Изход.</string>
     <string lang="bg" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nСкритият VeraCrypt том е създаден успешно (скритата операционна система ще се намира в този скрит том).\n\nНатиснете Напред за да продължите.</string>
@@ -561,6 +567,7 @@
     <string lang="bg" key="MAX_HIDVOL_SIZE_KB">Максималния възможен размер на скрития том за този том е %.2f KB.</string>
     <string lang="bg" key="MAX_HIDVOL_SIZE_MB">Максималния възможен размер на скрития том за този том е %.2f MB.</string>
     <string lang="bg" key="MAX_HIDVOL_SIZE_GB">Максималния възможен размер на скрития том за този том е %.2f GB.</string>
+    <string lang="bg" key="MAX_HIDVOL_SIZE_TB">Максималния възможен размер на скрития том за този том е %.2f TB.</string>
     <string lang="bg" key="MOUNTED_NOPWCHANGE">Паролата/ключ-файловете на тома не могат да бъдат сменяни докато тома е монтиран. Моля, най-напред демонтирайте тома.</string>
     <string lang="bg" key="MOUNTED_NO_PKCS5_PRF_CHANGE">Алгоритъмът за деривация на ключа на заглавната част не може да бъде сменян докато тома е монтиран. Моля, най-напред демонтирайте тома.</string>
     <string lang="bg" key="MOUNT_BUTTON">&amp;Монтиране</string>
@@ -591,12 +598,12 @@
     <string lang="bg" key="SELECT_PKCS11_MODULE">Избор на PKCS #11 библиотека</string>
     <string lang="bg" key="OUTOFMEMORY">Няма достатъчно памет</string>
     <string lang="en" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">IMPORTANT: We strongly recommend that inexperienced users create a VeraCrypt file container on the selected device/partition, instead of attempting to encrypt the entire device/partition.\n\nWhen you create a VeraCrypt file container (as opposed to encrypting a device or partition) there is, for example, no risk of destroying a large number of files. Note that a VeraCrypt file container (even though it contains a virtual encrypted disk) is actually just like any normal file. For more information, see the chapter Beginner's Tutorial in the VeraCrypt User Guide.\n\nAre you sure you want to encrypt the entire device/partition?</string>
-    <string lang="bg" key="OVERWRITEPROMPT">ВНИМАНИЕ: Файлът '%hs' вече съществува!\n\nВАЖНО: VERACRYPT НЯМА ДА КРИПТИРА ФАЙЛА, НО ЩЕ ГО ИЗТРИЕ. Сигурни ли сте, че желаете да изтриете файла и да го заместите с нов VeraCrypt контейнер?</string>
+    <string lang="bg" key="OVERWRITEPROMPT">ВНИМАНИЕ: Файлът '%s' вече съществува!\n\nВАЖНО: VERACRYPT НЯМА ДА КРИПТИРА ФАЙЛА, НО ЩЕ ГО ИЗТРИЕ. Сигурни ли сте, че желаете да изтриете файла и да го заместите с нов VeraCrypt контейнер?</string>
-    <string lang="bg" key="OVERWRITEPROMPT_DEVICE">ВНИМАНИЕ: ВСИЧКИ ФАЙЛОВЕ, КОИТО СЕ СЪДЪРЖАТ НА %s '%hs'%s ЩЕ БЪДАТ ИЗТРИТИ И ИЗГУБЕНИ (НЯМА ДА БЪДАТ КРИПТИРАНИ)!\n\nСигурни ли сте че желаете да продължите с форматирането?</string>
+    <string lang="bg" key="OVERWRITEPROMPT_DEVICE">ВНИМАНИЕ: ВСИЧКИ ФАЙЛОВЕ, КОИТО СЕ СЪДЪРЖАТ НА %s '%s'%s ЩЕ БЪДАТ ИЗТРИТИ И ИЗГУБЕНИ (НЯМА ДА БЪДАТ КРИПТИРАНИ)!\n\nСигурни ли сте че желаете да продължите с форматирането?</string>
-    <string lang="bg" key="NONSYS_INPLACE_ENC_CONFIRM">ВНИМАНИЕ: Няма да можете да монтирате тома или да достъпите файлове съхранени в него докато не е изцяло криптиран.\n\nСигурни ли сте, че желаете да стартирате криптирането на %s '%hs'%s?</string>
+    <string lang="bg" key="NONSYS_INPLACE_ENC_CONFIRM">ВНИМАНИЕ: Няма да можете да монтирате тома или да достъпите файлове съхранени в него докато не е изцяло криптиран.\n\nСигурни ли сте, че желаете да стартирате криптирането на %s '%s'%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="bg" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">ВНИМАНИЕ: Забележете, че ако захранването прекъсне внезапно докато се криптират на място съществуващите данни, или ако операционната система забие поради софтуерна грешка или хардуерна неизправност, докато VeraCrypt криптира на място съществуващи данни, части от данните ще бъдат повредени или изгубени. За това, преди да започнете криптиране, моля, уверете се, че имате бекъп копие на файловете, които желаете да криптирате.\n\nИмате ли такова бекъп копие?</string>
-    <string lang="bg" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">ВНИМАНИЕ: ВСЯКАКВИ ФАЙЛОВЕ СЪХРАНЯВАНИ В МОМЕНТА НА ДЯЛ '%hs'%s (Т.Е. НА ПЪРВИЯ ДЯЛ СЛЕД СИСТЕМНИЯ ДЯЛ) ЩЕ БЪДАТ ИЗТРИТИ И ИЗГУБЕНИ (НЯМА ДА БЪДАТ КРИПТИРАНИ)!\n\nСигурни ли сте, че желаете да продължите с форматирането?</string>
+    <string lang="bg" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">ВНИМАНИЕ: ВСЯКАКВИ ФАЙЛОВЕ СЪХРАНЯВАНИ В МОМЕНТА НА ДЯЛ '%s'%s (Т.Е. НА ПЪРВИЯ ДЯЛ СЛЕД СИСТЕМНИЯ ДЯЛ) ЩЕ БЪДАТ ИЗТРИТИ И ИЗГУБЕНИ (НЯМА ДА БЪДАТ КРИПТИРАНИ)!\n\nСигурни ли сте, че желаете да продължите с форматирането?</string>
     <string lang="bg" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">ВНИМАНИЕ: ИЗБРАНИЯТ ДЯЛ СЪДЪРЖА ГОЛЯМ ОБЕМ ДАННИ! Всякакви файлове съхранени на дяла ще бъдат изтрити и изгубени (няма да бъдат криптирани)!</string>
     <string lang="bg" key="ERASE_FILES_BY_CREATING_VOLUME">Изтриване на всякакви файлове съхранени на дяла чрез създаване на VeraCrypt том в него</string>
     <string lang="bg" key="PASSWORD">Парола</string>
@@ -645,7 +652,7 @@
     <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
     <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
     <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 &gt; Organize &gt; 'Folder and search options' &gt; View).</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="bg" key="HIDDEN_VOL_PROT_PASSWORD_US_KEYB_LAYOUT">Ако се опитвате да защитите скрит том съдържащ скрита система, моля, уверете се, че използвате стандартната US клавишна подредба, когато въвеждате паролата за скрития том. Това се изисква въпреки факта, че паролата трябва да бъде въведена в средата преди стартиране (преди да стартира Windows), където не-US Windows клавишна подредба не е достъпна.</string>
     <string lang="bg" key="FOUND_NO_PARTITION_W_DEFERRED_INPLACE_ENC">VeraCrypt не намира том, където има прекъснато несистемно криптиране и където заглавната част на тома може да бъде декриптирана с помощта на зададените парола и/или ключ-файл(ове).\n\nМоля, уверете се, че паролата и/или ключ-файла(овете) са правилни и че дялът/томът не се използва от системата или от приложение (включително антивирусен софтуер).</string>
     <string lang="en" key="SELECTED_PARTITION_ALREADY_INPLACE_ENC">The selected partition/device is already fully encrypted.\nHeader Flags = 0x%.8X</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="bg" key="PREV">&lt; &amp;Назад</string>
     <string lang="bg" key="RAWDEVICES">Не е възможно да се направи списък с устройствата инсталирани на вашата система!</string>
-    <string lang="bg" key="READONLYPROMPT">Томът '%hs' съществува, и е "само за четене". Сигурни ли сте, че желаете да го замените?</string>
+    <string lang="bg" key="READONLYPROMPT">Томът '%s' съществува, и е "само за четене". Сигурни ли сте, че желаете да го замените?</string>
     <string lang="bg" key="SELECT_DEST_DIR">Изберете целева директория</string>
     <string lang="bg" key="SELECT_KEYFILE">Изберете ключ-файл</string>
     <string lang="bg" key="SELECT_KEYFILE_PATH">Изберете път за търсене на ключ-файлове. ВНИМАНИЕ: Имайте предвид, че само пътят ще бъде запомнен, не и имената на файловете в него!</string>
@@ -680,13 +687,13 @@
     <string lang="bg" key="TEST_CIPHERTEXT_SIZE">Тестовият шифърен текст, който сте задали е твърде дълъг или твърде къс.</string>
     <string lang="bg" key="TEST_KEY_SIZE">Тестовият ключ, който сте задали е твърде дълъг или твърде къс.</string>
     <string lang="bg" key="TEST_PLAINTEXT_SIZE">Тестовият чист текст, който сте задали е твърде дълъг или твърде къс.</string>
-    <string lang="bg" key="TWO_LAYER_CASCADE_HELP">Два шифъра в каскадно действие в XTS режим. Всеки блок първо се криптира с %hs (%d-битов ключ) и след това с %hs (%d-битов ключ). Всеки шифър използва свой собствен ключ. Всички ключове са взаимно независими.</string>
+    <string lang="bg" key="TWO_LAYER_CASCADE_HELP">Два шифъра в каскадно действие в XTS режим. Всеки блок първо се криптира с %s (%d-битов ключ) и след това с %s (%d-битов ключ). Всеки шифър използва свой собствен ключ. Всички ключове са взаимно независими.</string>
-    <string lang="bg" key="THREE_LAYER_CASCADE_HELP">Три шифъра в каскадно действие в XTS режим. Всеки блок първо се криптира с %hs (%d-битов ключ), след това с %hs (%d-битов ключ) и най-накрая с %hs (%d-битов ключ). Всеки шифър използва свой собствен ключ. Всички ключове са взаимно независими.</string>
+    <string lang="bg" key="THREE_LAYER_CASCADE_HELP">Три шифъра в каскадно действие в XTS режим. Всеки блок първо се криптира с %s (%d-битов ключ), след това с %s (%d-битов ключ) и най-накрая с %s (%d-битов ключ). Всеки шифър използва свой собствен ключ. Всички ключове са взаимно независими.</string>
     <string lang="bg" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Забележете, че в зависимост от конфигурацията на операционната система, опциите авто-старт и авто-монтиране може да работят само когато файловете на пътния диск са създадени на незаписваем носител подобен на CD/DVD. Също така, забележете, че това не е проблем на VeraCrypt (това е ограничение на Windows).</string>
     <string lang="en" key="TRAVELER_DISK_CREATED">VeraCrypt traveler disk has been successfully created.\n\nNote that you need administrator privileges to run VeraCrypt in portable mode. Also note that, after examining the registry file, it may be possible to tell that VeraCrypt was run on a Windows system even if it is run in portable mode.</string>
     <string lang="bg" key="TC_TRAVELER_DISK">VeraCrypt пътен диск</string>
     <string lang="bg" key="TWOFISH_HELP">Разработен от Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall, and Niels Ferguson. Публикуван през 1998. 256-битов ключ, 128-битов блок. Режимът на работа е XTS. Twofish е един от финалистите на AES.</string>
-    <string lang="bg" key="MORE_INFO_ABOUT">Повече информация за %hs</string>
+    <string lang="bg" key="MORE_INFO_ABOUT">Повече информация за %s</string>
     <string lang="bg" key="UNKNOWN">Неизвестен</string>
     <string lang="en" key="ERR_UNKNOWN">An unspecified or unknown error occurred (%d).</string>
     <string lang="bg" key="UNMOUNTALL_LOCK_FAILED">Някои томове съдържат файлове или директории които се използват от приложения или от системата.\n\nДа се демонтират ли принудително?</string>
@@ -706,7 +713,7 @@
     <string lang="bg" key="WRONG_VOL_TYPE">VeraCrypt не може да смени паролата на чужд том.</string>
     <string lang="bg" key="SELECT_FREE_DRIVE">Моля изберете свободна буква от списъка.</string>
     <string lang="bg" key="SELECT_A_MOUNTED_VOLUME">Моля изберете монтиран том от списъка с букви на устройства.</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="bg" key="CANT_CREATE_AUTORUN">Грешка: Не може да се създаде autorun.inf</string>
     <string lang="bg" key="ERR_PROCESS_KEYFILE">Грешка при обработката на ключ-файл!</string>
     <string lang="bg" key="ERR_PROCESS_KEYFILE_PATH">Грешка при обработката на пътя на ключ-файл!</string>
@@ -851,7 +858,7 @@
     <string lang="bg" key="INSTALL_FAILED">Инсталацията неуспешна.</string>
     <string lang="bg" key="UNINSTALL_FAILED">Деинсталация неуспешна.</string>
     <string lang="bg" key="DIST_PACKAGE_CORRUPTED">Този пакет за дистрибуция е повреден. Моля, опитайте да го изтеглите отново (за предпочитане от официалния уебсайт на VeraCrypt - https://veracrypt.codeplex.com).</string>
-    <string lang="bg" key="CANNOT_WRITE_FILE_X">Не може да се запише файл %hs</string>
+    <string lang="bg" key="CANNOT_WRITE_FILE_X">Не може да се запише файл %s</string>
     <string lang="bg" key="EXTRACTING_VERB">Извличане</string>
     <string lang="bg" key="CANNOT_READ_FROM_PACKAGE">Не може да се чете от пакета.</string>
     <string lang="bg" key="CANT_VERIFY_PACKAGE_INTEGRITY">Не може да се провери целостта на този пакет за дистрибуция.</string>
@@ -860,8 +867,8 @@
     <string lang="bg" key="INSTALL_OK">VeraCrypt е инсталиран успешно.</string>
     <string lang="bg" key="SETUP_UPDATE_OK">VeraCrypt е обновен успешно.</string>
     <string lang="en" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt has been successfully upgraded. However, before you can start using it, the computer must be restarted.\n\nDo you want to restart it now?</string>
-    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
+    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu > All programs > Accessories > System Tools > System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
-    <string lang="bg" key="UNINSTALL_OK">VeraCrypt е деинсталиран успешно.\n\nНатиснете 'Край' за да премахнете VeraCrypt инсталатора и директорията %hs. Забележете, че директорията няма да бъде премахната ако съдържа някакви файлове, които не са били инсталирани от VeraCrypt инсталатора или създаден от VeraCrypt.</string>
+    <string lang="bg" key="UNINSTALL_OK">VeraCrypt е деинсталиран успешно.\n\nНатиснете 'Край' за да премахнете VeraCrypt инсталатора и директорията %s. Забележете, че директорията няма да бъде премахната ако съдържа някакви файлове, които не са били инсталирани от VeraCrypt инсталатора или създаден от VeraCrypt.</string>
     <string lang="bg" key="REMOVING_REG">Премахване на записите на VeraCrypt в регистрите</string>
     <string lang="bg" key="ADDING_REG">Добавяне на записи в регистрите</string>
     <string lang="bg" key="REMOVING_APPDATA">Премахване на данните специфични за приложението</string>
@@ -872,10 +879,10 @@
     <string lang="bg" key="CREATING_SYS_RESTORE">Създаване на System Restore point</string>
     <string lang="bg" key="FAILED_SYS_RESTORE">Неуспешно създаване на System Restore point!</string>
     <string lang="bg" key="INSTALLER_UPDATING_BOOT_LOADER">Обновяване на boot зареждащата програма</string>
-    <string lang="bg" key="INSTALL_OF_FAILED">Неуспешно инсталиране на '%hs'. %hs Желаете ли инсталацият да продължи?</string>
+    <string lang="bg" key="INSTALL_OF_FAILED">Неуспешно инсталиране на '%s'. %s Желаете ли инсталацият да продължи?</string>
-    <string lang="bg" key="UNINSTALL_OF_FAILED">Неуспешно деинсталиране на '%hs'. %hs Желаете ли инсталацият да продължи?</string>
+    <string lang="bg" key="UNINSTALL_OF_FAILED">Неуспешно деинсталиране на '%s'. %s Желаете ли инсталацият да продължи?</string>
     <string lang="bg" key="INSTALL_COMPLETED">Инсталацията е изпълнена.</string>
-    <string lang="bg" key="CANT_CREATE_FOLDER">Директория '%hs' не може да бъде създадена</string>
+    <string lang="bg" key="CANT_CREATE_FOLDER">Директория '%s' не може да бъде създадена</string>
     <string lang="bg" key="CLOSE_TC_FIRST">VeraCrypt драйвера не може да бъде спрян.\n\nМоля, най-напред затворете всички отворени VeraCrypt процорци. Ако това не помага, моля рестартирайте Windows и опитайте отново.</string>
     <string lang="bg" key="DISMOUNT_ALL_FIRST">Всички VeraCrypt томове трябва да бъдат демонтирани преди инсталиране или деинсталиране на 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>
@@ -921,14 +928,14 @@
     <string lang="en" key="SYS_FAVORITE_VOLUMES_SAVED">System favorite volumes saved.\n\nTo enable mounting of system favorite volumes when the system starts, please select 'Settings' &gt; 'System Favorite Volumes' &gt; 'Mount system favorite volumes when Windows starts'.</string>
     <string lang="en" key="FAVORITE_ADD_DRIVE_DEV_WARNING">The volume you are adding to favorites is neither a partition nor a dynamic volume. Therefore, VeraCrypt will be unable to mount this favorite volume if the device number changes.</string>
     <string lang="en" key="FAVORITE_ADD_PARTITION_TYPE_WARNING">The volume you are adding to favorites is a partition not recognized by Windows.\n\nVeraCrypt will be unable to mount this favorite volume if the device number changes. Please set the type of the partition to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then add the partition to favorites again.</string>
-    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings &gt; Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
+    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings > Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_NETWORK_PATH_ERR">A container stored in a remote filesystem shared over a network cannot be automatically mounted when its host device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, the volume hosted on the device cannot be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable the volume hosted on the device to be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_LABEL_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, no label can be assigned to it.</string>
     <string lang="en" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable VeraCrypt to assign a label to the partition.</string>
     <string lang="en" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Due to a Windows limitation, a container stored in a remote filesystem shared over a network cannot be mounted as a system favorite volume (however, it can be mounted as a non-system favorite volume when a user logs on).</string>
-    <string lang="bg" key="ENTER_PASSWORD_FOR">Въведете парола за %hs</string>
+    <string lang="bg" key="ENTER_PASSWORD_FOR">Въведете парола за %s</string>
     <string lang="en" key="ENTER_PASSWORD_FOR_LABEL">Enter password for '%s'</string>
     <string lang="bg" key="ENTER_NORMAL_VOL_PASSWORD">Въведете парола за нормалния/външния том</string>
     <string lang="bg" key="ENTER_HIDDEN_VOL_PASSWORD">Въведете парола за скрития том</string>
@@ -943,8 +950,8 @@
     <string lang="bg" key="VOL_HEADER_BACKED_UP">Архивно копие на заглавната част на тома е създадено успешно.\n\nВАЖНО: Възстановяването на заглавната част на тома с помощта на това архивно копие също ще възстанови текущата парола на тома. Освен това, ако ключ-файл(ове) е необходим за монтиране на тома, същият ключ-файл(ове) ще бъде необходим за монтиране на тома отново, когато заглавната част на тома бъде възстановена.\n\nВНИМАНИЕ: Това архивно копие на заглавна част на том може да бъде използвано за възстановяване на заглавната част САМО на този индивидуален том. Ако използвате това архивно копие на заглавна част за да възстановите заглавната част на друг том, ще можете да монтирате тома, но НЯМА да можете да декриптирате никакви данни съхранени в тома (защото ще промените неговия главен ключ).</string>
     <string lang="bg" key="VOL_HEADER_RESTORED">Заглавната част на тома е възстановена успешно.\n\nВАЖНО: Моля, забележете, че старата парола също така може да е била възстановена. Освен това, ако ключ-файл(ове) е бил необходим за монтиране на тома, когато архивното копие е било създадено, същият ключ-файл(ове) сега е необходим за монтиранена тома отново.</string>
     <string lang="bg" key="EXTERNAL_VOL_HEADER_BAK_FIRST_INFO">Поради съображения за сигурност, ще трябва да въведете правилната парола (и/или да предоставите правилните ключ-файлове) за тома.\n\nЗабележка: Ако тома съдържа скрит том, най-напред ще трябва да въведете правилната парола (и/или да предоставите правилните ключ-файлове) за външния том. След това, ако изберете да направите бекъп копие на заглавната част на скрития том, ще трябва да въведете правилната парола (и/или да предоставите правилните ключ-файлове) за скрития том.</string>
-    <string lang="bg" key="CONFIRM_VOL_HEADER_BAK">Сигурни ли сте, че желаете да напрвавите бекъп копие на заглавната част на тома  %hs?\n\nСлед като натиснете Да, ще бъдете попитани за име на бекъп файл за заглавната част на тома.\n\nЗабележка: Заглавните части и стандартния и на скрития том ще бъдат прекриптирани с нова сол и ще бъдат съхранени в бекъп файла. Ако в този том няма скрит том, зоната в бекъп файла запазена за заглавната част на скрития том ще бъде запълнена със случайни данни (за да се запази правдоподобната отказваемост). Когато се възстановява заглавна част на том от бекъп файл, ще трябва да въведете правилната парола (и/или да предоставите правилните ключ-файлове), които са били валидни, когато е бил създаден бекъп файла на заглавната часдт на тома. Паролата (и/или ключ-файловете) автоматично ще определят типа на заглавната част на тома, която трябва да се възстанови, т.е. стандартен или скрит (обърнете внимание на това, че VeraCrypt определя типа по метода проба и грешка).</string>
+    <string lang="bg" key="CONFIRM_VOL_HEADER_BAK">Сигурни ли сте, че желаете да напрвавите бекъп копие на заглавната част на тома  %s?\n\nСлед като натиснете Да, ще бъдете попитани за име на бекъп файл за заглавната част на тома.\n\nЗабележка: Заглавните части и стандартния и на скрития том ще бъдат прекриптирани с нова сол и ще бъдат съхранени в бекъп файла. Ако в този том няма скрит том, зоната в бекъп файла запазена за заглавната част на скрития том ще бъде запълнена със случайни данни (за да се запази правдоподобната отказваемост). Когато се възстановява заглавна част на том от бекъп файл, ще трябва да въведете правилната парола (и/или да предоставите правилните ключ-файлове), които са били валидни, когато е бил създаден бекъп файла на заглавната часдт на тома. Паролата (и/или ключ-файловете) автоматично ще определят типа на заглавната част на тома, която трябва да се възстанови, т.е. стандартен или скрит (обърнете внимание на това, че VeraCrypt определя типа по метода проба и грешка).</string>
-    <string lang="bg" key="CONFIRM_VOL_HEADER_RESTORE">Сигурни ли сте, че желаете да възстановите заглавната част на том %hs?\n\nВНИМАНИЕ: Възстановяването на заглавна част на том също така възстановява паролата на тома, която е била валидна, когато архивното копие е било създадено. Освен това, ако ключ-файл(ове) е бил необходим за монтиране на тома, когато архивното копие е било създадено, същият ключ-файл(ове) ще бъде необходим за монтиране на тома отново след като заглавната част на тома е възстановена.\n\nСлед като натиснете Да, ще изберете файла с архивното копие.</string>
+    <string lang="bg" key="CONFIRM_VOL_HEADER_RESTORE">Сигурни ли сте, че желаете да възстановите заглавната част на том %s?\n\nВНИМАНИЕ: Възстановяването на заглавна част на том също така възстановява паролата на тома, която е била валидна, когато архивното копие е било създадено. Освен това, ако ключ-файл(ове) е бил необходим за монтиране на тома, когато архивното копие е било създадено, същият ключ-файл(ове) ще бъде необходим за монтиране на тома отново след като заглавната част на тома е възстановена.\n\nСлед като натиснете Да, ще изберете файла с архивното копие.</string>
     <string lang="bg" key="DOES_VOLUME_CONTAIN_HIDDEN">Томът съдържа ли скрит том?</string>
     <string lang="bg" key="VOLUME_CONTAINS_HIDDEN">Томът съдържа скрит том</string>
     <string lang="bg" key="VOLUME_DOES_NOT_CONTAIN_HIDDEN">Томът не съдържа скрит том</string>
@@ -955,12 +962,14 @@
     <string lang="bg" key="VOLUME_HAS_NO_BACKUP_HEADER">В този том няма вградено бекъп копие на заглавната част на тома (имайте предвид, че само томове създадени от VeraCrypt 6.0 или по-късни версии съдържат вградено бекъп копие на заглавната част на тома).</string>
     <string lang="bg" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">Опитвате се да архивирате заглавната част на системен дял/устройство. Това не е позволено. Операциите на архивиране/възстановяване отнасящи се до системния дял/устройство могат да бъдат извършени само с помощта на VeraCrypt Спасителния Диск.\n\nЖелаете ли да създадете VeraCrypt Спасителен Диск?</string>
     <string lang="bg" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">Опитвате се да възстановите заглавната част на виртуален VeraCrypt том, но сте избрали системеният дял/устройство. Това не е позволено. Операциите на архивиране/възстановяване отнасящи се до системния дял/устройство могат да бъдат извършени само с помощта на VeraCrypt Спасителния Диск.\n\nЖелаете ли да създадете VeraCrypt Спасителен Диск?</string>
-    <string lang="bg" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">След като натиснете OK, ще изберете име на файл за ISO изображението на новия VeraCrypt Спасителен Диск и местоположението, където искате да го поставите.</string>
+    <string lang="bg" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">След като натиснете OK, ще изберете име на файл за изображението на новия VeraCrypt Спасителен Диск и местоположението, където искате да го поставите.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <string lang="bg" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Моля, поставете вашия VeraCrypt Спасителен Диск във вашето CD/DVD устройство и натиснете OK за да го проверите.</string>
+    <string lang="bg" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Моля, поставете вашия VeraCrypt Спасителен Диск и натиснете OK за да го проверите.</string>
     <string lang="bg" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">VeraCrypt Спасителният Диск е проверен успешно.</string>
     <string lang="bg" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">Не може да се провери дали Спасителният Диск е бил записан успешно.\n\nАко сте записали Спасителния Диск, моля извадете и поставете отново CD/DVD диска; след това опитайте отново. Ако това не помага, моля опитайте друг софтуер за записване на CD/DVD и/или друг CD/DVD носител.\n\nАко сте опитали да проверите VeraCrypt Спасителен Диск създаден за различен главен ключ, парола, сол, и др., моля, забележете, че такъв Спасителен Диск никога няма да успява на тази проверка. За да създадете нов Спасителен Диск напълно съвместим с текущата ви конфигурация, изберете 'Система' &gt; 'Създаване на Спасителен Диск'.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk image fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
     <string lang="bg" key="ERROR_CREATING_RESCUE_DISK">Грешка при създаването на VeraCrypt Спасителен Диск.</string>
     <string lang="bg" key="CANNOT_CREATE_RESCUE_DISK_ON_HIDDEN_OS">VeraCrypt Спасителен Диск не може да бъде създаден, когато е стартирана скрита операционна система.\n\nЗа да създадете VeraCrypt Спасителен Диск, стартирайте заблуждаващата операционна система и след това изберете 'Система' &gt; 'Създаване на Спасителен Диск'.</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 be used, because it was created for a different master key. You need to burn the newly generated Rescue Disk.</string>
@@ -989,8 +998,8 @@
     <string lang="bg" key="DRIVE_LETTER_ITEM">Буква:   </string>
     <string lang="bg" key="UNSUPPORTED_CHARS_IN_PWD">Грешка: Паролата трябва да съдържа само ASCII символи.\n\nНаличието на не-ASCII символи в паролата може да направи невъзможно монтирането на том, когато има промяна в системната конфигурация.\n\nРазрешени са следните символи:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="bg" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">Внимание: Паролата съдържа не-ASCII символи. Това може да направи невъзможно монтирането на том, когато има промяна в системната конфигурация.\n\nБи трябвало да замените всички не-ASCII символи в паролата с ASCII символи. За да направите това, изберете 'Томове' -&gt; 'Смяна на паролата на том'.\n\nСледните са  ASCII символи:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="bg" key="EXE_FILE_EXTENSION_CONFIRM">ВНИМАНИЕ: Силно препоръчваме да избягвате файлови разширения, които се използват за изпълними файлове (като .exe, .sys, или .dll) и други подобни проблематични файлови разширения. Използването на такива файлови разширения кара Windows и антивирусните програми да взаимодействат с контейнера, което е неблагоприятно за производителността на тома и също така може да създаде други сериозни проблеми.\n\nСилно препоръчваме да премахнете файловото разширение или да го смените (например на '.tc').\n\nСигурни ли сте, че желаете да използвате проблематичното файлово разширение?</string>
+    <string lang="bg" key="EXE_FILE_EXTENSION_CONFIRM">ВНИМАНИЕ: Силно препоръчваме да избягвате файлови разширения, които се използват за изпълними файлове (като .exe, .sys, или .dll) и други подобни проблематични файлови разширения. Използването на такива файлови разширения кара Windows и антивирусните програми да взаимодействат с контейнера, което е неблагоприятно за производителността на тома и също така може да създаде други сериозни проблеми.\n\nСилно препоръчваме да премахнете файловото разширение или да го смените (например на '.hc').\n\nСигурни ли сте, че желаете да използвате проблематичното файлово разширение?</string>
-    <string lang="bg" key="EXE_FILE_EXTENSION_MOUNT_WARNING">ВНИМАНИЕ: Този контейнер има файлово разширение, което се използва за изпълними файлове (като .exe, .sys, или .dll) или някое друг файлово разширение, което също е проблематично. Много е вероятно това да накара Windows и антивирусният софтуер да взаимодействат с контейнера, което ще окаже неблагоприятен ефект върху производителността на тома и също може да причини други сериозни проблеми.\n\nСилно препоръчваме да премахнете файловото разширение или да го смените (например на '.tc') след като демонтирате тома.</string>
+    <string lang="bg" key="EXE_FILE_EXTENSION_MOUNT_WARNING">ВНИМАНИЕ: Този контейнер има файлово разширение, което се използва за изпълними файлове (като .exe, .sys, или .dll) или някое друг файлово разширение, което също е проблематично. Много е вероятно това да накара Windows и антивирусният софтуер да взаимодействат с контейнера, което ще окаже неблагоприятен ефект върху производителността на тома и също може да причини други сериозни проблеми.\n\nСилно препоръчваме да премахнете файловото разширение или да го смените (например на '.hc') след като демонтирате тома.</string>
     <string lang="bg" key="HOMEPAGE">Начална страница</string>
     <string lang="bg" key="LARGE_IDE_WARNING_XP">ВНИМАНИЕ: Изглежда, че не сте прилагали никакъв Service Pack към вашата Windows инсталация. Не трябва да записвате върху IDE диск по-голям от 128 GB под Windows XP, към който не сте приложили Service Pack 1 или по-късен! Ако го направите, данните на диска (няма значение дали е VeraCrypt том или не) могат да се объркат. Забележете, че това е ограничение на Windows, а не бъг в VeraCrypt.</string>
     <string lang="bg" key="LARGE_IDE_WARNING_2K">ВНИМАНИЕ: Изглежда, че не сте приложили Service Pack 3 към вашата Windows инсталация. Не трябва да записвате върху IDE диск по-голям от 128 GB под Windows 2000, към който не сте приложили Service Pack 3 или по-късен! Ако го направите, данните на диска (няма значение дали е VeraCrypt том или не) могат да се объркат. Забележете, че това е ограничение на Windows, а не бъг в VeraCrypt.\n\nЗабележка: Също така, може да се наложи да разрешите поддръжката на 48-бит LBA в регистрите; за повече информация, погледнете http://support.microsoft.com/kb/305098/EN-US</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="bg" key="CHECKING_FS">Проверка на файловата система на VeraCrypt тома монтиран като %s...</string>
-    <string lang="bg" key="REPAIRING_FS">Опит да се поправи файловата система на VeraCrypt тома монтиран като %hs...</string>
+    <string lang="bg" key="REPAIRING_FS">Опит да се поправи файловата система на VeraCrypt тома монтиран като %s...</string>
-    <string lang="bg" key="WARN_CBC_MODE">Внимание: Този том е криптиран в CBC режим. Поради проблеми със сигурността, CBC режима се счита за остарял от VeraCrypt 4.1 насам.\n\nСилно препоръчваме да преместите данните от този VeraCrypt том в нов том, създаден с тази версия на VeraCrypt. След като направите това, би трябвало напълно да изтриете или унищожите стария том. За повече информация, моля погледнете Историята на версиите в документацията или бележките разпространявани с VeraCrypt 4.1 или по-късни.</string>
     <string lang="bg" key="WARN_64_BIT_BLOCK_CIPHER">Внимание: Този том е криптиран с остарял криптиращ алгоритъм.\n\nВсички криптиращи алгоритми с 64-битов блок (като Blowfish, CAST-128, или Triple DES) са остарели. Монтирането на този том с помощта на бъдещи версии на VeraCrypt ще бъде възможно. както и да е, няма да има бъдещи разширения в реализацията на тези остарели криптиращи алгоритми. Препоръчваме ви да създадете нов VeraCrypt том криптиран с криптиращ алгоритъм с 128-битов блок (като AES, Serpent, Twofish, и др.) и да преместите всички файлове от този том в новия том.</string>
     <string lang="bg" key="SYS_AUTOMOUNT_DISABLED">Вашата система не е конфигурирана за авто-монтиране на нови томове. Може да е невъзможно да се монтира VeraCrypt том, който е устройство. Авто-монтирането може да се разреши като се изпълни следната команда и се рестартира системата.\n\nmountvol.exe /E</string>
     <string lang="bg" key="SYS_ASSIGN_DRIVE_LETTER">Моля, задайте буква за дяла/устройството преди да продължите ('Control Panel' &gt; 'System and Maintenance' &gt; 'Administrative Tools' - 'Create and format hard disk partitions').\n\nЗабележете, че това е изискване на операционната система.</string>
@@ -1069,7 +1077,7 @@
     <string lang="en" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt no longer supports encryption of the system partition/drive on Windows Vista with no Service Pack installed. Before upgrading VeraCrypt, please install Service Pack 1 or higher for Windows Vista.</string>
     <string lang="en" key="FEATURE_REQUIRES_INSTALLATION">Error: This feature requires VeraCrypt to be installed on the system (you are running VeraCrypt in portable mode).\n\nPlease install VeraCrypt and then try again.</string>
     <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="bg" key="GPT_BOOT_DRIVE_UNSUPPORTED">Вашето системно устройство има GUID таблица на дяловете (GPT). За момента се поддържат само устройства с MBR таблица на дяловете.</string>
+    <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</string>
     <string lang="bg" key="TC_BOOT_LOADER_ALREADY_INSTALLED">ВНИМАНИЕ: VeraCrypt Boot Loader-ът вече е инсталиран на вашето системно устройство!\n\nВъзможно е друга система на вашия компютър да е вече криптирана.\n\nВНИМАНИЕ: ПРОДЪЛЖАВАНЕТО С КРИПТИРАНЕТО НА СТАРТИРАНАТА В МОМЕНТА СИСТЕМА МОЖЕ ДА НАПРАВИ НЕВЪЗМОЖНО СТАРТИРАНЕТО НА ДРУГА СИСТЕМА(И) И СЪОТВЕТНИТЕ ДАННИ НЕДОСТЪПНИ.\n\nСигурни ли сте, че желаете да продължите?</string>
     <string lang="bg" key="SYS_LOADER_RESTORE_FAILED">Неуспешен опит за възстановяване на оригиналния system loader.\n\nМоля, използвайте вашият VeraCrypt Спасителен Диск ('Repair Options' &gt; 'Restore original system loader') или Windows инсталационен носител за да подмените VeraCrypt зареждащата програма (Boot Loader) със Windows system loader.</string>
     <string lang="bg" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">Оригиналният system loader няма да бъде съхранен на Спасителния Диск (вероятна причина: липсващ архивен (backup) файл).</string>
@@ -1093,7 +1101,7 @@
     <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 medium (or using a service partition)?</string>
     <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 Hidden Volumes" in the VeraCrypt User's Guide.\n\nImportant: Before proceeding, please make sure you have read the section "Security Requirements and Precautions Pertaining to Hidden Volumes" in the VeraCrypt User's Guide.\n\n\nDoes the currently running operating system meet the above condition?</string>
     <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 from writing to the shared boot partition and from hibernating.\n\n\nDo you want to continue? If you select 'No', instructions for removing the extra boot partition will be displayed.</string>
-    <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' &gt; '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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
+    <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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
     <string lang="bg" key="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">Внимание: Има неразпределено пространство между системния дял и първия дял след него. След като създадете скритата операционна система, не трябва да създавате нови дялове в това неразпределено пространство. В противен случай, няма да бъде възможно да се стартира скритата операционна система (докато не изтриете такива новосъздадени дялове).</string>
     <string lang="bg" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">За момента този алгоритъм не се поддържа з системно криптиране.</string>
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
@@ -1108,8 +1116,8 @@
     <string lang="bg" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Бележка: Паролата трябва да бъде въведена в pre-boot средата (преди стартирането на Windows), където не-US Windows клавиатурна подредба не е достъпна. Поради това, паролата винаги трябва да бъде въвеждане, като се използва стандартн US клавиатурна подредба. Както и да е, важно е да знаете, че НЕ ви е необходима истинска US клавиатура. VeraCrypt автоматично се уверява в това, че можете безопасно да въведете паролата (точно сега и в pre-boot средата), дори ако НЯМАТЕ истинска истинска US клавиатура.</string>
     <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 starts.\n\n- The VRD will contain a backup of the present content of the first drive track (which typically contains a system loader or boot manager) and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ISO image will be created in the location specified below.</string>
     <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">The Rescue Disk image has been created and stored in this file:\n%s\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>
+    <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%s\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>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">IMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software. If you do not have any CD/DVD recording software that can write the ISO disk image to a CD/DVD, click the link below to download such free software.\n\n</string>
     <string lang="en" key="LAUNCH_WIN_ISOBURN">Launch Microsoft Windows Disc Image Burner</string>
     <string lang="bg" key="RESCUE_DISK_BURN_NO_CHECK_WARN">ВНИМАНИЕ: Ако вече сте създали VeraCrypt Спасителен Диск преди време, той не може да се преизползва за това системно устройство/дял, защото е създаден за различен главен ключ! Всеки път когато криптирате системно устройство/дял, трябва да създавате нов VeraCrypt Спасителен Диск за него дори ако използвате същата парола.</string>
@@ -1247,7 +1255,7 @@
     <string lang="bg" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">Ако ви се случат някои от вече описаните проблеми, декриптирайте дяла/устройството (ако е криптиран) и и опитайте да го криптирате отново, каот използвате не-каскаден криптиращ алгоритъм (т.е. 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 system (but not on the decoy system), the decoy system would contain a VeraCrypt driver and VeraCrypt applications whose version numbers are different from the version number of the VeraCrypt Boot Loader. Such a discrepancy might indicate that there is a hidden operating system on this computer.\n\n\nDo you want to continue?</string>
     <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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' &gt; '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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' > 'Create Rescue Disk').</string>
     <string lang="bg" key="BOOT_LOADER_UPGRADE_OK">VeraCrypt Boot Loader е обновен.\n\nСилно се препоръчва да създадете нов VeraCrypt Спасителен Диск (който ще съдържа новата версия на VeraCrypt Boot Loader) като изберете 'Система' &gt; 'Създаване на Спасителен Диск' след като рестартирате вашия компютър.</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' &gt; 'Create Rescue Disk'.</string>
     <string lang="bg" key="BOOT_LOADER_UPGRADE_FAILED">Неуспешен опит за обновяване на VeraCrypt Boot Loader.</string>
@@ -1272,7 +1280,7 @@
     <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' &gt; '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>
@@ -1297,8 +1305,8 @@
     <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 system.</string>
     <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' &gt; 'Performance' and enable 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' &gt; 'Performance' and disable 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>
@@ -1372,6 +1380,39 @@
     <string lang="bg" key="TB_PER_SEC">TB/s</string>
     <string lang="bg" key="PB_PER_SEC">PB/s</string>
     <string lang="en" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.ca.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="ca" name="Català" en-name="Catalan" version="0.1.0" translators="CESICAT, Centre de Seguretat de la Informació de Catalunya" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="ca" key="IDC_BROWSE">Exa&amp;minar...</control>
     <control lang="ca" key="IDC_DESKTOP_ICON">Afegir l'icona del VeraCrypt a l'&amp;escriptori</control>
     <control lang="en" key="IDC_DONATE">Donate now...</control>
-    <control lang="ca" key="IDC_FILE_TYPE">Associar l'&amp;extensió de fitxers .tc al VeraCrypt</control>
+    <control lang="ca" key="IDC_FILE_TYPE">Associar l'&amp;extensió de fitxers .hc al VeraCrypt</control>
     <control lang="ca" key="IDC_OPEN_CONTAINING_FOLDER">Obre la ubicació de destí en acabar</control>
     <control lang="ca" key="IDC_PROG_GROUP">Afegir el VeraCrypt al menú d'&amp;inici</control>
     <control lang="ca" key="IDC_SYSTEM_RESTORE">Crear un punt de &amp;restauració de sistema</control>
@@ -37,6 +37,7 @@
     <control lang="ca" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Descarregar un programa de gravació de CD/DVD</control>
     <control lang="ca" key="IDC_FILE_CONTAINER">Crear un contenidor de fitxers xifrats</control>
     <control lang="ca" key="IDC_GB">&amp;GB</control>
+    <control lang="ca" key="IDC_TB">&amp;TB</control>
     <control lang="ca" key="IDC_HIDDEN_SYSENC_INFO_LINK">Més informació</control>
     <control lang="ca" key="IDC_HIDDEN_VOL">Volum &amp;ocult</control>
     <control lang="ca" key="IDC_HIDDEN_VOL_HELP">Més informació sobre els volums ocults</control>
@@ -44,6 +45,7 @@
     <control lang="ca" key="IDC_HIDVOL_WIZ_MODE_FULL">Mètode normal</control>
     <control lang="ca" key="IDC_KB">&amp;KB</control>
     <control lang="ca" key="IDC_KEYFILES_ENABLE">&amp;Usar fitxers de claus</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="ca" key="IDC_KEY_FILES">Fitxers de &amp;claus...</control>
     <control lang="ca" key="IDC_LINK_HASH_INFO">Més informació</control>
@@ -58,7 +60,8 @@
     <control lang="ca" key="IDC_NO_HISTORY">&amp;No guardar l'historial</control>
     <control lang="ca" key="IDC_OPEN_OUTER_VOLUME">Obrir el volum extern</control>
     <control lang="ca" key="IDC_PAUSE">&amp;Pausar</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="ca" key="IDC_QUICKFORMAT">Format ràpid</control>
     <control lang="ca" key="IDC_SHOW_PASSWORD">&amp;Veure contrasenya</control>
     <control lang="ca" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Veure contrasenya</control>
@@ -118,6 +121,7 @@
     <control lang="ca" key="IDC_CREATE">Crear</control>
     <control lang="ca" key="IDC_CREATE_VOLUME">C&amp;rear un volum</control>
     <control lang="ca" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">No &amp;mostris cap text a la pantalla d'autenticació abans d'arrencar (excepte el missatge personalitzat de sota)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="ca" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerar les operacions de xifratge fent servir les instruccions del processador (si és possible)</control>
     <control lang="ca" key="IDC_ENABLE_KEYFILES">Utilitzar fitxers de claus</control>
     <control lang="ca" key="IDC_ENABLE_NEW_KEYFILES">Utilitzar fitxers de claus</control>
@@ -132,6 +136,7 @@
     <control lang="ca" key="IDC_FAVORITE_MOVE_UP">Moure &amp;amunt</control>
     <control lang="ca" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Obir una &amp;finestra del volum seleccionat quan es munti amb èxit</control>
     <control lang="ca" key="IDC_FAVORITE_REMOVE">&amp;Eliminar</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="ca" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Configuració global</control>
     <control lang="en" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Display balloon tooltip after successful hot-key dismount</control>
     <control lang="en" key="IDC_HK_DISMOUNT_PLAY_SOUND">Play system notification sound after successful hot-key dismount</control>
@@ -256,6 +261,7 @@
     <control lang="ca" key="IDM_UNMOUNTALL">Desmuntar tots els volums</control>
     <control lang="ca" key="IDM_UNMOUNT_VOLUME">Desmuntar el volum</control>
     <control lang="ca" key="IDM_VERIFY_RESCUE_DISK">Verificar el disc de recuperació</control>
+    <control lang="en" key="IDM_VERIFY_RESCUE_DISK_ISO">Verify Rescue Disk Image</control>
     <control lang="ca" key="IDM_VERSION_HISTORY">Historial de versions</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="ca" key="IDM_VOLUME_PROPERTIES">Propietats del volum</control>
@@ -365,7 +371,7 @@
     <control lang="ca" key="IDT_SECURITY_TOKEN">Testimoni de seguretat:</control>
     <control lang="ca" key="IDT_SORT_METHOD">Mètode d'ordenació:</control>
     <control lang="ca" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Si us plau, esperi. Aquest procés pot trigar molt de temps...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="ca" key="IDT_TEST_BLOCK_NUMBER">Número de bloc:</control>
     <control lang="ca" key="IDT_TEST_CIPHERTEXT">Text xifrat (hexadecimal)</control>
     <control lang="ca" key="IDT_TEST_DATA_UNIT_NUMBER">número de dades per unitat (La mida per a 64-bit hexadecimal és 512 bytes)</control>
@@ -410,13 +416,13 @@
     <string lang="ca" key="CIPHER_TITLE">Opcions de xifrat</string>
     <string lang="ca" key="CLEAN_WINMRU_FAILED">ATENCIÓ: No s'ha pogut netejar la ruta de l'últim volum/fitxer de claus seleccionat (arxivat pel selector de fitxers)!</string>
     <string lang="ca" key="COMPRESSION_NOT_SUPPORTED">Error: El contenidor està comprimit a nivell de sistema de fitxers. El VeraCrypt no suporta contenidors comprimits (tingui en compte que la compressió de dades xifrades és inefectiva i redundant).\n\nSi us plau, desactivi la compressió del contenidor seguint aquests passos:\n1) Faci clic amb el botó dret al contenidor amb l'Explorador de Windows (no al VeraCrypt)\n2)Seleccioni 'Propietats'.\n3)Seleccioni 'Opvions avançades' a la finestra de 'Propietats'\n4) Desactivi l'opvió 'Comprimir el contingut per estalviar espai de disc' a l'apartat 'Atributs avançats'\n5) Tanqui la finestra de propietats.</string>
-    <string lang="ca" key="CREATE_FAILED">Error al crear el volum  %hs</string>
+    <string lang="ca" key="CREATE_FAILED">Error al crear el volum  %s</string>
-    <string lang="ca" key="DEVICE_FREE_BYTES">%hs ocupa %.2f bytes</string>
+    <string lang="ca" key="DEVICE_FREE_BYTES">%s ocupa %.2f bytes</string>
-    <string lang="ca" key="DEVICE_FREE_KB">%hs ocupa %.2f KB</string>
+    <string lang="ca" key="DEVICE_FREE_KB">%s ocupa %.2f KB</string>
-    <string lang="ca" key="DEVICE_FREE_MB">%hs ocupa %.2f MB</string>
+    <string lang="ca" key="DEVICE_FREE_MB">%s ocupa %.2f MB</string>
-    <string lang="ca" key="DEVICE_FREE_GB">%hs ocupa %.2f GB</string>
+    <string lang="ca" key="DEVICE_FREE_GB">%s ocupa %.2f GB</string>
-    <string lang="ca" key="DEVICE_FREE_TB">%hs ocupa %.2f TB</string>
+    <string lang="ca" key="DEVICE_FREE_TB">%s ocupa %.2f TB</string>
-    <string lang="ca" key="DEVICE_FREE_PB">%hs ocupa %.2f PB</string>
+    <string lang="ca" key="DEVICE_FREE_PB">%s ocupa %.2f PB</string>
     <string lang="ca" key="DEVICE_IN_USE_FORMAT">ATENCIÓ: El disc/partició s'està utilitzant pel sistema operatiu o per una aplicació. Donar format al disc/partició pot causar la corrupció de dades i la inestabilitat del sistema.\n\nVol continuar?</string>
     <string lang="ca" key="DEVICE_IN_USE_INPLACE_ENC">ATENCIÓ: La partició s'està utilitzant pel sistema operatiu o per una aplicació. Hauria de tancar totes les aplicacions que puguin estar utilitzant la partició (incloent els antivirus).\n\nVol continuar?</string>
     <string lang="ca" key="FORMAT_CANT_DISMOUNT_FILESYS">Error: La unitat/partició conté un sistema de fitxers que no es pot desmuntar. El sistema de fitxers pot estar en ús pel sistema operatiu. Donar format a la unitat/partició causarà segurament la corrupció de les dades i la inestabilitat del sistema.\n\nPer arreglar aquest problema, és molt recomanable que primer elimini la partició i que la torni a crear sense donar-li format. Per fer-ho, segueixi aquests passos:\n1) Fer clic dret a 'El meu ordinador' al menú d'inici i seleccioni 'Administrar'.\n2) A la finestra d'administració del sistema, seleccionar 'Emmagatzematge' &gt; 'Administrador de discos'.\n3) Fer clic dret a la partició i seleccionar tant 'Esborrar partició' com 'Esborrar volum' com 'Esborrar unitat lògica'.\n4) Fer clic a 'Si'. Si el Windows suggereix reiniciar l'ordinador, fer-ho. Després repetir els passos 1 i 2 i continuar des del pas 5.\n5) Fer clic dret a l'espai sense assignar i seleccionar tant 'Nova partició' com 'Nou volum simple' com 'Nova unitat lògica'.\n6) Seguir les instruccions de l'assistent que apareixerà. Seleccionar l'opció 'No donar format a aquesta partició' o 'No donar format al volum'.\n7)Pot ser que la ruta que s'ha especificat al VeraCrypt ara estigui malament. S'ha de tancar l'assistent de creació de volums (si encara està engegat) i tornar-lo a iniciar.\n8) Provar de xifrar la partició/unitat un altre cop.\n\nSi el VeraCrypt falla repetidament alhora de xifrar la partició/unitat, potser haurà de considerar crear un contenidor de fitxers en comptes d'això.</string>
@@ -435,15 +441,15 @@
     <string lang="ca" key="INPLACE_ENC_INVALID_PATH">Error: El VeraCrypt només pot xifrar in situ una partició, un volum dinàmic o una unitat de sistema sencera.\n\n Si us plau, asseguri's que la ruta especificada és vàlida.</string>
     <string lang="ca" key="CANNOT_RESIZE_FILESYS">Error: no s'ha pogut reduïr el sistema de fitxers (és necessàris reduïr el sistema de fitxers per encabir-hi la capçalera i la còpia de seguretat de la capçalera).\n\nPossibles causes i solucions:\n\n- No hi ha prou espai al volum. Si us plau, asseguri's que no hi ha cap altre aplicació escrivint al sistema de fitxers.\n\n- Sistema de fitxers corrupte. Intenti comprovar i reparar els errors (clic dret a la lletra d'unitat corresponent a la llista dins 'El meu ordinador', seleccionar 'Propietats' &gt; 'Eines' &gt; 'Comprovar ara'. Asseguri's que l'opció 'Reparar automàticament els errors del sistema de fitxers' està activada.\n\nSi aquests passos no arreglen el problema, si us plau segueixi els passos següents.</string>
     <string lang="ca" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Error: No hi ha prou espai al volum i el sistema de fitxers no es pot reduïr (és necessàris reduïr el sistema de fitxers per encabir-hi la capçalera i la còpia de seguretat de la capçalera)\n\nSi us plau, esborri qualsevol fitxer redundant i buidi la paperera de reciclatge per deixar lliure almenys 256 KB d'espai i torni-ho a provar. Tingui en compte que degut a un problema del Windows, la quantitat d'espai lliure de la que informa l'explorador de Windows pot ser incorrecte fins que es reinicii el sistema. Si després de reiniciar el sistema el problema no s'ha solucionat, pot ser que el sistema de fitxers estigui corrupte. Intenti comprovar i reparar els errors (clic dret a la lletra d'unitat corresponent a la llista dins 'El meu ordinador', seleccionar 'Propietats' &gt; 'Eines' &gt; 'Comprovar ara'. Asseguri's que l'opció 'Reparar automàticament els errors del sistema de fitxers' està activada.\n\nSi aquests passos no arreglen el problema, si us plau segueixi els passos següents.</string>
-    <string lang="ca" key="DISK_FREE_BYTES">La unitat %hs té %.2f bytes lliures.</string>
+    <string lang="ca" key="DISK_FREE_BYTES">La unitat %s té %.2f bytes lliures.</string>
-    <string lang="ca" key="DISK_FREE_KB">La unitat %hs té %.2f KB lliures.</string>
+    <string lang="ca" key="DISK_FREE_KB">La unitat %s té %.2f KB lliures.</string>
-    <string lang="ca" key="DISK_FREE_MB">La unitat %hs té %.2f MB lliures.</string>
+    <string lang="ca" key="DISK_FREE_MB">La unitat %s té %.2f MB lliures.</string>
-    <string lang="ca" key="DISK_FREE_GB">La unitat %hs té %.2f GB lliures.</string>
+    <string lang="ca" key="DISK_FREE_GB">La unitat %s té %.2f GB lliures.</string>
-    <string lang="ca" key="DISK_FREE_TB">La unitat %hs té %.2f TB lliures.</string>
+    <string lang="ca" key="DISK_FREE_TB">La unitat %s té %.2f TB lliures.</string>
-    <string lang="ca" key="DISK_FREE_PB">La unitat %hs té %.2f PB lliures.</string>
+    <string lang="ca" key="DISK_FREE_PB">La unitat %s té %.2f PB lliures.</string>
     <string lang="ca" key="DRIVELETTERS">No s'han pogut obtenir les lletres d'unitat disponibles.</string>
     <string lang="ca" key="DRIVER_NOT_FOUND">Error: No s'ha pogut trobar el controlador VeraCrypt.\n\nSi us plau, copii els fitxers 'veracrypt.sys' i 'truecrypy-x64.sys' al directori on es trobi l'executable del VeraCrypt (VeraCrypt.exe).</string>
-    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall; on Windows XP, select 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
+    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' > Computer > 'Uninstall or change a program' > VeraCrypt > Uninstall; on Windows XP, select 'Start Menu' > Settings > 'Control Panel' > 'Add Or Remove Programs' > VeraCrypt > Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
     <string lang="ca" key="ERR_CIPHER_INIT_FAILURE">Error: No s'ha pogut inicialitzar el xifrat.</string>
     <string lang="ca" key="ERR_CIPHER_INIT_WEAK_KEY">Error: S'ha detectat una clau vulnerable o potencialment vulnerable. La clau s'ha descartat. Si us plau, torni-ho a provar.</string>
     <string lang="ca" key="EXCEPTION_REPORT">S'ha produït un error crític i el VeraCrypt s'ha de tancar. Si això s'ha degut a un error en el VeraCrypt, ens agradaria arreglar-lo. Per ajudar-nos, pot enviar un informe de l'error generat automàticament que conté la següent informació:\n\n- Versió del programa\n- Versió del sistema operatiu\n- Tipus de CPU\n- Nom del component VeraCrypt\n- Suma de verificació de l'executable\n- El nom simbòlic de la finestra de diàleg.\n- Direcció de l'error\n- Estat de la pila del VeraCrypt.\n\nSi fa clic a 'Si', la següent URL (que conté l'informe complet) s'obirarà al seu navegador per defecte.\n\n%hs\n\nVol enviar-nos aquest informa d'error?</string>
@@ -524,7 +530,7 @@
     <string lang="ca" key="HIDVOL_HOST_FILLING_HELP_SYSENC">S'ha creat el volum exterior i muntat a la unitat %hc:. Ara ha de de copiar alguns fitxers que semblin confidencials i que NO vulgui amagar en aquest volum exterior. Seran allà per qualsevol que l'obligui a revelar la contrasenya de la primera partició després de la partició de sisetma, on hi ha el volum exterior i l'ocult (que conté el sistema operatiu ocult). Podrà revelar la contrasenya del volum exterior i l'existència del volum ocult (i el sistema operatiu ocult) es mantindran en secret.\n\nIMPORTANT: Els fitxers que copii al volum exterior no poden ocupar més de %s. Si no és així, no hi haurà prou espai lliure al volum exterior pel volum ocult (i no serà possible continuar). Quan acabi de copiar els fitxers, faci clic a 'Següent' (no desmunti el volum).</string>
     <string lang="ca" key="HIDVOL_HOST_FILLING_HELP">El volum exterior s'ha creat amb èxit i s'ha muntat a la unitat %hc:. Ara hauria de copiar alguns fitxers que semblin confidencials i que NO vulgui amagar cap aquest volum exterior, no a l'ocult. Els fitxers que vulgui mantenir segurs els ha de guardar al volum ocult, que es crearà després Quan acabi de copiar, faci clic a 'Següent'. No desmunti el volum.\n\nNota: Després de fer clic a 'Següent, s'escannejarà el mapa de bits del clúster per determinar la mida d'espai lliure ininterromput més gran el final de la qual estigui alineada amb el final del volum. Aquesta àrea allotjarà el volum ocult. Per tant, limitarà la seva mida màxima. L'escanneig del mapa de bits del clúster assegura que no se sobreescriguin dades del volum ocult des del volum exterior.</string>
     <string lang="ca" key="HIDVOL_HOST_FILLING_TITLE">Contingut del volum ocult</string>
-    <string lang="ca" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nAls següents passos s'especificaran les opcions pel volum exterion (que contindrà el volum ocult que es crearà després). </string>
+    <string lang="ca" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nAls següents passos s'especificaran les opcions pel volum exterion (que contindrà el volum ocult que es crearà després).</string>
     <string lang="ca" key="HIDVOL_HOST_PRE_CIPHER_HELP_SYSENC">\n\nAls propers passos es crearà l'anomenat volum exterior a la primera partició després de la partició de sistema (com s'ha explicat als passos anteriors).</string>
     <string lang="ca" key="HIDVOL_HOST_PRE_CIPHER_TITLE">Volum exterior</string>
     <string lang="ca" key="HIDDEN_OS_PRE_CIPHER_HELP">Als passos següents, configurarà les opcions i contrasenyes pel volum ocult, que contindrà el sistema operatiu ocult.\n\nObservació: El mapa de bits del clúster ha estat escannejat per determinar la mida màxima del volum ocult, que s'ha determinat i confirmat que és més gran que la partició de sistema (cosa que ha de passar, ja que el contingut sencer de la partició de sistema s'ha de copiar al volum ocult). Això assegura que no se sobreescriguin dades del volum ocult des del volum exterior.</string>
@@ -561,6 +567,7 @@
     <string lang="ca" key="MAX_HIDVOL_SIZE_KB">El màxim que pot ocupar aquest volum és %.2f KB.</string>
     <string lang="ca" key="MAX_HIDVOL_SIZE_MB">El màxim que pot ocupar aquest volum és %.2f MB.</string>
     <string lang="ca" key="MAX_HIDVOL_SIZE_GB">El màxim que pot ocupar aquest volum és %.2f GB.</string>
+    <string lang="ca" key="MAX_HIDVOL_SIZE_TB">El màxim que pot ocupar aquest volum és %.2f TB.</string>
     <string lang="ca" key="MOUNTED_NOPWCHANGE">Les contrasenyes/fitxers de claus no es poden canviar amb el volum muntat. Si us plau, desmunti el volum abans.</string>
     <string lang="ca" key="MOUNTED_NO_PKCS5_PRF_CHANGE">L'algorisme de derivació de la clau de capçalera no es pot canviar mentre el volum estigui muntat. Si us plau, desmunti primer el volum.</string>
     <string lang="ca" key="MOUNT_BUTTON">&amp;Muntar</string>
@@ -591,12 +598,12 @@
     <string lang="ca" key="SELECT_PKCS11_MODULE">Seleccioni la bilioteca PKCS #11</string>
     <string lang="ca" key="OUTOFMEMORY">Sense memòria</string>
     <string lang="ca" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">IMPORTANT: És molt recomanable per als usuaris sense experiència crear un contenidor de fitxers Veracrypt dins el disc/partició seleccionat en compte de xifrar el disc/partició sencer.\n\nQuan es crea un contenidor de fitxers (al contrari que quan es xifra un disc o una partició) no hi ha, per exemple, risc de destruïr un gran número de fitxers. Per a més informació, consulti el capítol 'Tutorial per a principiants' a la guia d'usuari de TrueCrtpy.\n\nEstà segur que vol xifrar el disc/partició sencer?</string>
-    <string lang="ca" key="OVERWRITEPROMPT">ATENCIÓ: El fitxer '%hs' ja existeix!\n\nIMPORTANT: EL VERACRYPT NO XIFRARÀ EL FITXER, L'ESBORRARÀ. Està segur que vol esborrar el fitxer i substituïr-lo per un nou contenidor VeraCrypt?</string>
+    <string lang="ca" key="OVERWRITEPROMPT">ATENCIÓ: El fitxer '%s' ja existeix!\n\nIMPORTANT: EL VERACRYPT NO XIFRARÀ EL FITXER, L'ESBORRARÀ. Està segur que vol esborrar el fitxer i substituïr-lo per un nou contenidor VeraCrypt?</string>
-    <string lang="ca" key="OVERWRITEPROMPT_DEVICE">ATENCIÓ: TOTS ELS FITXERS QUE HI HAGI A (%s) '%hs'%s S'ESBORRARAN (NO ES XIFRARAN)!\n\nSegur que vol seguir amb el formateig?</string>
+    <string lang="ca" key="OVERWRITEPROMPT_DEVICE">ATENCIÓ: TOTS ELS FITXERS QUE HI HAGI A (%s) '%s'%s S'ESBORRARAN (NO ES XIFRARAN)!\n\nSegur que vol seguir amb el formateig?</string>
-    <string lang="ca" key="NONSYS_INPLACE_ENC_CONFIRM">ATENCIÓ: No serà posible muntar ni accedir a cap fitxer del volum mentre no estigui xifrat completament.\n\nSegur que vol xifrar (%s) '%hs'%s?</string>
+    <string lang="ca" key="NONSYS_INPLACE_ENC_CONFIRM">ATENCIÓ: No serà posible muntar ni accedir a cap fitxer del volum mentre no estigui xifrat completament.\n\nSegur que vol xifrar (%s) '%s'%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="ca" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">ATENCIÓ: Tingui en compte que si el subministrament d'energia s'interromp  o si el sistema operatiu falla degut a un error mentre s'està xifrat les dades in situ, algunes parts de les dades es corrompran o perdran. Per tant, abans de començar a xifrar, asseguri's que té còpies de seguretat dels fitxers que vol xifrar. Té una còpia de seguretat?</string>
-    <string lang="ca" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">PRECAUCIÓ: TOTS ELS FITXERS EMMAGATZEMATS DINS DE LA PARTICIÓ '%hs'%s (LA PRIMERA DESPRÉS DE LA PARTICIÓ DE SISTEMA) S'ESBORRARAN I ES PERDRAN (NO ES XIFRARAN)\n\nVol continuar donant format a la partició?</string>
+    <string lang="ca" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">PRECAUCIÓ: TOTS ELS FITXERS EMMAGATZEMATS DINS DE LA PARTICIÓ '%s'%s (LA PRIMERA DESPRÉS DE LA PARTICIÓ DE SISTEMA) S'ESBORRARAN I ES PERDRAN (NO ES XIFRARAN)\n\nVol continuar donant format a la partició?</string>
     <string lang="ca" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">ATENCIÓ: LA PARTICIÓ SELECCIONADA CONTÉ MOLTES DADES! Es perdran tots els fitxers dins la partició (NO es xifraran)!</string>
     <string lang="ca" key="ERASE_FILES_BY_CREATING_VOLUME">Esborrar tots els fitxers guardats a la partició creant-hi un volum a dins</string>
     <string lang="ca" key="PASSWORD">Contrasenya</string>
@@ -645,7 +652,7 @@
     <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
     <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
     <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 &gt; Organize &gt; 'Folder and search options' &gt; View).</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="ca" key="HIDDEN_VOL_PROT_PASSWORD_US_KEYB_LAYOUT">Si està intentant protegir un volum ocult que conté un sistema ocult, si us plau asseguri's d'utilitzar la disposició de teclat estàndard als EUA quan escrigui la contrasenya pel volum ocult. Això és necessari degut al fet que la contrasenya s'ha d'escriuer en un entor de prearrencada (abans d'engegar el Windows) on només hi ha aquesta disposició de teclat disponible.</string>
     <string lang="ca" key="FOUND_NO_PARTITION_W_DEFERRED_INPLACE_ENC">No s'ha trobat cap volum que hagués interromput el xifrat i que es pugui desxifrar amb la contrasenya i/o fitxer(s) de claus que ha introduït.\n\nSi us plau asseguri's que aquestes dades són correctes i que la partició/volum no s'està utilitzant pel sistema o per alguna aplicació (incloent l'antivirus)</string>
     <string lang="en" key="SELECTED_PARTITION_ALREADY_INPLACE_ENC">The selected partition/device is already fully encrypted.\nHeader Flags = 0x%.8X</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="ca" key="PREV">&lt; &amp;Anterior</string>
     <string lang="ca" key="RAWDEVICES">No s'ha pogut llistar els dispositius en brut instal·lats al sistema!</string>
-    <string lang="ca" key="READONLYPROMPT">El volum '%hs' ja existeix i està en mode només lectura. Està segur que el vol substituïr?</string>
+    <string lang="ca" key="READONLYPROMPT">El volum '%s' ja existeix i està en mode només lectura. Està segur que el vol substituïr?</string>
     <string lang="ca" key="SELECT_DEST_DIR">Seleccioni la ubicació de destí</string>
     <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>
@@ -680,13 +687,13 @@
     <string lang="ca" key="TEST_CIPHERTEXT_SIZE">El text xifrat de prova és massa llarg o massa curt.</string>
     <string lang="ca" key="TEST_KEY_SIZE">La clau de prova és massa llarga o massa curta.</string>
     <string lang="ca" key="TEST_PLAINTEXT_SIZE">El text pla de prova és massa llarg o massa curt.</string>
-    <string lang="ca" key="TWO_LAYER_CASCADE_HELP">Dos xifrats en cascada treballant en mode XTS. Cada bloc es xifra primer amb %hs (clau de %d bits) i després amb %hs (clau de %d bits). Cada xifrat utilitza la seva pròpia clau. Les claus són independents entre si.</string>
+    <string lang="ca" key="TWO_LAYER_CASCADE_HELP">Dos xifrats en cascada treballant en mode XTS. Cada bloc es xifra primer amb %s (clau de %d bits) i després amb %s (clau de %d bits). Cada xifrat utilitza la seva pròpia clau. Les claus són independents entre si.</string>
-    <string lang="ca" key="THREE_LAYER_CASCADE_HELP">Tres xifrats en cascada treballant en mode XTS. Cada bloc es xifra primer amb %hs (clau de %d bits), després amb %hs (clau de %d bits) i finalment amb %hs (clau de %d bits). Cada xifrat utilitza la seva pròpia clau. Les claus són independents entre si.</string>
+    <string lang="ca" key="THREE_LAYER_CASCADE_HELP">Tres xifrats en cascada treballant en mode XTS. Cada bloc es xifra primer amb %s (clau de %d bits), després amb %s (clau de %d bits) i finalment amb %s (clau de %d bits). Cada xifrat utilitza la seva pròpia clau. Les claus són independents entre si.</string>
     <string lang="ca" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Tingui en compte que, depenent de la configuració del sistema operatiu, pot ser que les opcions d'automuntatge i d'autoarrencada només funcionin si el disc de viatge es crea en un mitjà de només lectura coma ra un CD o DVD. Això no és un error al VeraCrypt (és una limitació del Windows).</string>
     <string lang="ca" key="TRAVELER_DISK_CREATED">S'ha creat un disc de viatge VeraCrypt amb èxit.\n\nRecordi que és necessari tenir privilegis d'administrador per executar el VeraCrypt en mode portable. Tingui en compte també que, després d'examinar el fitxer de registres, és possible saber que el VeraCrypt s'ha executat en un sistema Windows encara que s'executi en mode portable.</string>
     <string lang="ca" key="TC_TRAVELER_DISK">Disc de viatge VeraCrypt</string>
     <string lang="ca" key="TWOFISH_HELP">Dissenyat per Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall i Niels Ferguson. 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="MORE_INFO_ABOUT">Més informació sobre %hs</string>
+    <string lang="ca" key="MORE_INFO_ABOUT">Més informació sobre %s</string>
     <string lang="ca" key="UNKNOWN">Desconegut</string>
     <string lang="ca" key="ERR_UNKNOWN">S'ha produït un error desconegut o no especificat(%d).</string>
     <string lang="ca" key="UNMOUNTALL_LOCK_FAILED">Alguns volums contenen fitxers o directoris que estan sent utilitzats per aplicacions o pel sistema.\n\nVol forçar el desmuntatge?</string>
@@ -851,7 +858,7 @@
     <string lang="ca" key="INSTALL_FAILED">La instal·lació ha fallat.</string>
     <string lang="ca" key="UNINSTALL_FAILED">La desinstal·lació ha fallat.</string>
     <string lang="ca" key="DIST_PACKAGE_CORRUPTED">Aquest paquet de distribució està malmès. Si us plau, torni'l a descarregar (preferentment des del lloc web oficial del VeraCrypt, a https://veracrypt.codeplex.com).</string>
-    <string lang="ca" key="CANNOT_WRITE_FILE_X">No s'ha pogut escriure el fitxer %hs</string>
+    <string lang="ca" key="CANNOT_WRITE_FILE_X">No s'ha pogut escriure el fitxer %s</string>
     <string lang="ca" key="EXTRACTING_VERB">Extraient</string>
     <string lang="ca" key="CANNOT_READ_FROM_PACKAGE">No s'han pogut llegir dades del paquet.</string>
     <string lang="ca" key="CANT_VERIFY_PACKAGE_INTEGRITY">No s'ha pogut verificat la integritat d'aquest paquet de distribució.</string>
@@ -860,8 +867,8 @@
     <string lang="ca" key="INSTALL_OK">S'ha instal·lat el VeraCrypt amb èxit.</string>
     <string lang="ca" key="SETUP_UPDATE_OK">S'ha actualitzat el VeraCrypt amb èxit.</string>
     <string lang="en" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt has been successfully upgraded. However, before you can start using it, the computer must be restarted.\n\nDo you want to restart it now?</string>
-    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
+    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu > All programs > Accessories > System Tools > System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
-    <string lang="ca" key="UNINSTALL_OK">El VeraCrypt s'ha desinstal·lat amb èxit.\n\nFaci clic a 'Acabar' per eliminar l'instal·lador del VeraCrypt i el directori %hs. Tingui en compte que el directori no s'esborrarà si conté fitxers que no hagi instal·lat o creat el VeraCrypt.</string>
+    <string lang="ca" key="UNINSTALL_OK">El VeraCrypt s'ha desinstal·lat amb èxit.\n\nFaci clic a 'Acabar' per eliminar l'instal·lador del VeraCrypt i el directori %s. Tingui en compte que el directori no s'esborrarà si conté fitxers que no hagi instal·lat o creat el VeraCrypt.</string>
     <string lang="ca" key="REMOVING_REG">Eliminant les entrades al registre del TruCrypt</string>
     <string lang="ca" key="ADDING_REG">Afegint l'entrada al registre</string>
     <string lang="ca" key="REMOVING_APPDATA">Eliminant les dades de l'aplicació</string>
@@ -872,10 +879,10 @@
     <string lang="ca" key="CREATING_SYS_RESTORE">Creant un punt de restauració del sistema</string>
     <string lang="ca" key="FAILED_SYS_RESTORE">No s'ha pogut crear un punt de restauració del sistema!</string>
     <string lang="ca" key="INSTALLER_UPDATING_BOOT_LOADER">Actualitzant el gestor d'arranc</string>
-    <string lang="ca" key="INSTALL_OF_FAILED">No s'ha pogut instal·lar '%hs'. %hs\nVol seguir amb la instal·lació?</string>
+    <string lang="ca" key="INSTALL_OF_FAILED">No s'ha pogut instal·lar '%s'. %s\nVol seguir amb la instal·lació?</string>
-    <string lang="ca" key="UNINSTALL_OF_FAILED">No s'ha pogut desinstal·lar '%hs'. %hs\nVol seguir amb la desinstal·lació?</string>
+    <string lang="ca" key="UNINSTALL_OF_FAILED">No s'ha pogut desinstal·lar '%s'. %s\nVol seguir amb la desinstal·lació?</string>
     <string lang="ca" key="INSTALL_COMPLETED">Instal·lació finalitzada.</string>
-    <string lang="ca" key="CANT_CREATE_FOLDER">No s'ha pogut crear el directori '%hs'</string>
+    <string lang="ca" key="CANT_CREATE_FOLDER">No s'ha pogut crear el directori '%s'</string>
     <string lang="ca" key="CLOSE_TC_FIRST">No s'ha pogut desmuntar el controlador de dispositius del VeraCrypt.\n\nSi us plau, tenqui abans totes les finestres del VeraCrypt. Si això no funciona, reinicii el Windows i torni-ho a provar.</string>
     <string lang="ca" key="DISMOUNT_ALL_FIRST">S'han de desmuntar tots els volums VeraCrypt abans d'instal·lar o desinstal·lar el programa.</string>
     <string lang="ca" key="UNINSTALL_OLD_VERSION_FIRST">Actualment hi ha una versió obsoleta del VeraCrypt instal·lada al sistema. És necessari desinstal·lar-la abans de poder instal·lar aquesta versió més nova del VeraCrypt.\n\nDesprés de tancar aquest missatge es llançarà el desinstal·lador de la versió antiga. Recordi que no es desxifrarà cap volum quan es desinstal·li el VeraCrypt. Després de desinstal·lar la versió antiga del VeraCrypt, torni a executar la instal·lació de la nova versió.</string>
@@ -928,7 +935,7 @@
     <string lang="ca" key="FAVORITE_LABEL_DEVICE_PATH_ERR">El dispositiu que es mostra a continuació no és ni una partició ni un volum dinàmic. Per tant, no se li pot assignar una etiqueta.</string>
     <string lang="ca" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Si us plau, estableixi el tipus de la partició que es mostra a continuació a un que pugui reconeixer el Windows (utilitzi la comanda 'SETID' de l'eina de 'diskpart' de Windows). Després, esborri la partició als favorits i torni-la a afegir. Això permetrà al VeraCrypt assignar-li una etiqueta.</string>
     <string lang="ca" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Degut a una limitació del Windows, un contenidor emmagatzemat en un sistema de fitxers remot compartit per xarxa no es pot muntar com a volum favorit del sistema (no obstant, si que es pot muntar com un volum favorit normal quan l'usuari inicia la sessió).</string>
-    <string lang="ca" key="ENTER_PASSWORD_FOR">Introdueixi la contrassenya per a %hs</string>
+    <string lang="ca" key="ENTER_PASSWORD_FOR">Introdueixi la contrassenya per a %s</string>
     <string lang="ca" key="ENTER_PASSWORD_FOR_LABEL">Introdueixi la contrassenya per a '%s'</string>
     <string lang="ca" key="ENTER_NORMAL_VOL_PASSWORD">Introdueixi la contrasenya del volum normal/exterior</string>
     <string lang="ca" key="ENTER_HIDDEN_VOL_PASSWORD">Introdueixi la contrasenya del volum ocult</string>
@@ -943,8 +950,8 @@
     <string lang="ca" key="VOL_HEADER_BACKED_UP">S'ha creat amb èxit la còpia de seguretat de la capçalera.\n\nIMPORTANT: Restaurar la capçalera utilitzant aquesta còpia de seguretat també restaurarà la contrasenya actual. D'altre banda, si es necessiten fitxers de claus per muntar el volum, seràn necessàris els mateixos fitxers de claus per muntar el volum quan es restauri la capçalera.\n\nATENCIÓ: Aquesta còpia de seguretat de la capçalera NOMÉS es pot utilitzar per restaurar la capçalera d'aquest volum en particular. Si utilitza aquesta còpia de seguretat per restaurar la capçalera d'un volum diferent, podrà muntar el volum, però NO serà possible desxifrar-ne el contingut que hi hagi emmagatzemat (ja que s'haurà canviat la clau mestra).</string>
     <string lang="ca" key="VOL_HEADER_RESTORED">S'ha restaurat la capçalera del volum.\n\nIMPORTANT: Si us plau, recordi que també s'ha restaurat l'antiga contrasenya. A més, si era necessari algun fitxer de claus per muntar el volum quan es va crear, ara tornaran a ser-ho.</string>
     <string lang="ca" key="EXTERNAL_VOL_HEADER_BAK_FIRST_INFO">Per motius de seguretat, haurà d'introduïr la contrasenya correcte (i/o proporcionar els fitxers de claus correctes) pel volum.\n\nNota: Si el volum conté un volum ocult, primer haurà d'introduïr la contrasenya correcte (i/o proporcionar els fitxers de claus correctes) pel volum exterior. Posteriorment, si vol fer una còpia de seguretat de la capçalera del volum ocult, haurà d'introduïr la contrasenya correcte (i/o proporcionar els fitxers de claus correctes) pel volum ocult.</string>
-    <string lang="ca" key="CONFIRM_VOL_HEADER_BAK">Segur que vol crear una còpia de seguretat de la capçalera de %hs?\n\nQuan faci clic a 'Si', se li demanarà un nom de fitxer per la còpia de seguretat de la capçalera.\n\nNota: Tan les capçaleres del volum normal com les del volum ocult es tornen a xifrar i es guarden a la còpia de seguretat. Si no hi ha cap volum ocult a dins d'aquest volum, l'àrea reservada a la capçalera del volum ocult dins la còpia de seguretat s'omplirà amb dades aleatòries. Quan es restauri la capçalera des de la còpia de seguretat, s'haurà de proporcionar la contrasenya correcte (i/o els fitxers de claus) que fós vàlida quan es va crear la còpia de seguretat de la capçalera. La contrasenya (i/o els fitxers de claus) determinaran automàticament quina capçalera es restaurarà, si la del volum normal o l'oclt (el VeraCrypt en determina el tipus fent servir el mètode d'assaig i error).</string>
+    <string lang="ca" key="CONFIRM_VOL_HEADER_BAK">Segur que vol crear una còpia de seguretat de la capçalera de %s?\n\nQuan faci clic a 'Si', se li demanarà un nom de fitxer per la còpia de seguretat de la capçalera.\n\nNota: Tan les capçaleres del volum normal com les del volum ocult es tornen a xifrar i es guarden a la còpia de seguretat. Si no hi ha cap volum ocult a dins d'aquest volum, l'àrea reservada a la capçalera del volum ocult dins la còpia de seguretat s'omplirà amb dades aleatòries. Quan es restauri la capçalera des de la còpia de seguretat, s'haurà de proporcionar la contrasenya correcte (i/o els fitxers de claus) que fós vàlida quan es va crear la còpia de seguretat de la capçalera. La contrasenya (i/o els fitxers de claus) determinaran automàticament quina capçalera es restaurarà, si la del volum normal o l'oclt (el VeraCrypt en determina el tipus fent servir el mètode d'assaig i error).</string>
-    <string lang="ca" key="CONFIRM_VOL_HEADER_RESTORE">Segur que vol restaurar la capçalera del volum %hs?\n\nATENCIÓ: Restaurar la capçalera d'un volum també restaura la contrasenya que era vàlida quan es va crear la còpia. A més, el(s) fitxer(s) de claus que eren necessaris quan es va fer la còpia de seguretat seran els necessaris per muntar el volum quan es restauri la capçalera.\n\nDesprés de fer clic a 'Si', haurà de seleccionar el fitxer de còpia de seguretat de la capçalera.</string>
+    <string lang="ca" key="CONFIRM_VOL_HEADER_RESTORE">Segur que vol restaurar la capçalera del volum %s?\n\nATENCIÓ: Restaurar la capçalera d'un volum també restaura la contrasenya que era vàlida quan es va crear la còpia. A més, el(s) fitxer(s) de claus que eren necessaris quan es va fer la còpia de seguretat seran els necessaris per muntar el volum quan es restauri la capçalera.\n\nDesprés de fer clic a 'Si', haurà de seleccionar el fitxer de còpia de seguretat de la capçalera.</string>
     <string lang="ca" key="DOES_VOLUME_CONTAIN_HIDDEN">El volum conté un volum ocult?</string>
     <string lang="ca" key="VOLUME_CONTAINS_HIDDEN">El volum conté un volum ocult</string>
     <string lang="ca" key="VOLUME_DOES_NOT_CONTAIN_HIDDEN">El volum no conté cap volum ocult</string>
@@ -955,12 +962,14 @@
     <string lang="ca" key="VOLUME_HAS_NO_BACKUP_HEADER">No hi ha una còpia de seguretat inclosa en aquest volum (tingui en compte que només els volums creats amb un VeraCrypt 6.0 o superiro tenen aquestes còpies).</string>
     <string lang="ca" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">Està intentant fer una còpia de seguretat de la partició/unitat de sistema. Això no està permés. Les operacions de còpia de seguretat i restauració de les particions/unitats de sistema només es poden realitzar a través dels discos de recuperació del VeraCrypt.\n\nVol crear un disc de recuperació?</string>
     <string lang="ca" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">Està intentant restaurar una còpia de seguretat de la partició/unitat de sistema. Això no està permés. Les operacions de còpia de seguretat i restauració de les particions/unitats de sistema només es poden realitzar a través dels discos de recuperació del VeraCrypt.\n\nVol crear un disc de recuperació?</string>
-    <string lang="ca" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">Després de fer clic a 'OK', haurà de seleccionar un nom de fitxer per el nou fitxer ISO del disc de recuperació i la ubicació on vol guardar-lo.</string>
+    <string lang="ca" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">Després de fer clic a 'OK', haurà de seleccionar un nom de fitxer per el nou fitxer del disc de recuperació i la ubicació on vol guardar-lo.</string>
-    <string lang="ca" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">S'ha creat la imatge del disc de recuperació i s'ha guardat a:\n%hs\n\nAra ha de gravar la imatge a un CD o DVD.\nIMPORTANT: Tingui en compte que el fitxer s'ha de gravar a un CD/DVD com a imatge ISO (no com un fitxer individual).\n\nDesprés de gravar el disc de recuperació, seleccioni 'Sistema' &gt; 'Verificar el disc de recuperació' per verificar que s'ha gravat correctament.</string>
+    <string lang="ca" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">S'ha creat la imatge del disc de recuperació i s'ha guardat a:\n%s\n\nAra ha de gravar la imatge a un CD o DVD.\nIMPORTANT: Tingui en compte que el fitxer s'ha de gravar a un CD/DVD com a imatge ISO (no com un fitxer individual).\n\nDesprés de gravar el disc de recuperació, seleccioni 'Sistema' &gt; 'Verificar el disc de recuperació' per verificar que s'ha gravat correctament.</string>
-    <string lang="ca" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">S'ha creat la imatge del disc de recuperació i s'ha guardat a:\n%hs\n\nAra ha de gravar la imatge a un CD o DVD.\n\nVol executar el gravador d'imatges de disc de Microsoft Windows?\n\nDesprés de gravar el disc de recuperació, seleccioni 'Sistema' &gt; 'Verificar el disc de recuperació' per verificar que s'ha gravat correctament.</string>
+    <string lang="ca" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">S'ha creat la imatge del disc de recuperació i s'ha guardat a:\n%s\n\nAra ha de gravar la imatge a un CD o DVD.\n\nVol executar el gravador d'imatges de disc de Microsoft Windows?\n\nDesprés de gravar el disc de recuperació, seleccioni 'Sistema' &gt; 'Verificar el disc de recuperació' per verificar que s'ha gravat correctament.</string>
-    <string lang="ca" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Si us plau, introdueixi el disc de recuperació del VeraCrypt a la unitat de CD/DVD i faci clic a 'OK' per verificar-lo.</string>
+    <string lang="ca" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Si us plau, introdueixi el disc de recuperació del VeraCrypt i faci clic a 'OK' per verificar-lo.</string>
     <string lang="ca" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">S'ha verificat el disc de recuperació del VeraCrypt amb èxit.</string>
     <string lang="ca" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">No s'ha pogut verificar que el disc de recuperació s'hagi gravat correctament.\n\nSi ha gravat el disc de recuperació, si us plau expulsi el CD/DVD de l'unitat i torni'l a posar; torni a provar la verificació. Si això no soluciona el problema, intenti gravar el disc de recuperació amb un altre programa o a un altre tipus de mitjà.\n\nSi està intentant verificar un disc de recuperació que s'ha creat amb una clau mestra, contrasenya, etc. diferent aquesta verificació sempre fallarà. Per a crear un nou disc de recuperació completament compatible amb la configuració actual, seleccioni 'Sistema' &gt; 'Crear un disc de recuperació'.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk image fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
     <string lang="ca" key="ERROR_CREATING_RESCUE_DISK">Error al crear un disc de recuperació VeraCrypt.</string>
     <string lang="ca" key="CANNOT_CREATE_RESCUE_DISK_ON_HIDDEN_OS">No es pot crear un disc de recuperació mentre s'està executant un sistema operatiu ocult\n\nPer crear un disc de recuperació, engegui el sistema operatiu esquer i faci clic a 'Sistema' &gt; 'Crear un disc de recuperació'.</string>
     <string lang="ca" key="RESCUE_DISK_CHECK_FAILED">No s'ha pogut verificar que el disc de recuperació s'hagi gravat correctament.\n\nSi ha gravat el disc de recuperació, si us plau expulsi el CD/DVD de l'unitat i torni'l a posar; torni a provar la verificació. Si això no soluciona el problema, intenti gravar el disc de recuperació en un altre tipus de mitjà%s.\n\nSi encara no ha gravat el disc de recuperació, faci-ho ara i després faci clic a 'Següent'.\n\nSi està intentant verificar un disc de recuperació creat abans d'engegar aquest assistent tingui en compte que aquest disc no serà usable, ja que es va crear amb una clau mestra diferent. És necessari gravar el disc de recuperació nou.</string>
@@ -989,8 +998,8 @@
     <string lang="ca" key="DRIVE_LETTER_ITEM">Lletra d'unitat:   </string>
     <string lang="ca" key="UNSUPPORTED_CHARS_IN_PWD">Error: La contrasenya només pot contenir caràcters ASCII.\n\nEls caràcters fora d'ASCII poden causar que el volum sigui impossible de muntar quan canvii la configuració del sistema.\n\nEls següents caràcters són vàlids:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="ca" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">ATENCIÓ: La contrasenya només pot contenir caràcters ASCII.\n\nEls caràcters fora d'ASCII poden causar que el volum sigui impossible de muntar quan canvii la configuració del sistema.\n\nHa de sustituïr tots els caràcters fora d'ASCII de la contrasenya per caràcters ASCII. Per fer-ho, faci clic a 'Volums' -&gt; 'Canviar la contrasenya del volum'.\n\nEls següents caràcters són vàlids:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="ca" key="EXE_FILE_EXTENSION_CONFIRM">ATENCIÓ: És molt recomanable evitar les extensions de fitxer que utilitzen els executables (.exe, .sys o .dll) i d'altres extensions problemàtiques similars. Utilitzar aquest tipus d'extensions provoca que el Windows i els programes antivirus monitoritzin el contenidor, cosa que afecta el rendiment del volum i pot causar d'altres problemes greus.\n\nÉs molt recomanable que elimini l'extensió del fitxer o la canvii (per exemple, a .tc).\n\nSegur que vol utilitzar aquest tipus d'extensió problemàtica?</string>
+    <string lang="ca" key="EXE_FILE_EXTENSION_CONFIRM">ATENCIÓ: És molt recomanable evitar les extensions de fitxer que utilitzen els executables (.exe, .sys o .dll) i d'altres extensions problemàtiques similars. Utilitzar aquest tipus d'extensions provoca que el Windows i els programes antivirus monitoritzin el contenidor, cosa que afecta el rendiment del volum i pot causar d'altres problemes greus.\n\nÉs molt recomanable que elimini l'extensió del fitxer o la canvii (per exemple, a .hc).\n\nSegur que vol utilitzar aquest tipus d'extensió problemàtica?</string>
-    <string lang="ca" key="EXE_FILE_EXTENSION_MOUNT_WARNING">ATENCIÓ: Aquest contenidor té una extensió de fitxer que utilitzen els executables (.exe, .sys o .dll) i d'altres extensions problemàtiques similars. Utilitzar aquest tipus d'extensions provoca que el Windows i els programes antivirus monitoritzin el contenidor, cosa que afecta el rendiment del volum i pot causar d'altres problemes greus. És molt recomanable que elimini l'extensió del fitxer o la canvii (per exemple, a .tc) després de desmuntar el volum.</string>
+    <string lang="ca" key="EXE_FILE_EXTENSION_MOUNT_WARNING">ATENCIÓ: Aquest contenidor té una extensió de fitxer que utilitzen els executables (.exe, .sys o .dll) i d'altres extensions problemàtiques similars. Utilitzar aquest tipus d'extensions provoca que el Windows i els programes antivirus monitoritzin el contenidor, cosa que afecta el rendiment del volum i pot causar d'altres problemes greus. És molt recomanable que elimini l'extensió del fitxer o la canvii (per exemple, a .hc) després de desmuntar el volum.</string>
     <string lang="ca" key="HOMEPAGE">Pàgina principal</string>
     <string lang="ca" key="LARGE_IDE_WARNING_XP">ATENCIÓ: Sembla que no ha aplicat cap Service Pack a la instal·lació de Windows. No podrà escriure en discos IDE més grans de 128 GB amb el Windows XP si no aplica el Service Pack 1 o superior! Si ho fa, les dades al disc (sense importar si és un volum VeraCrypt o no) es poden corrompre. Això és una limitació del Windows, no un error al VeraCrypt.</string>
     <string lang="ca" key="LARGE_IDE_WARNING_2K">ATENCIÓ: Sembla que no ha aplicat el Service Pack 3 a la instal·lació de Windows. No podrà escriure en discos IDE més grans de 128 GB amb el Windows 2000 si no aplica el Service Pack 3 o superior! Si ho fa, les dades al disc (sense importar si és un volum VeraCrypt o no) es poden corrompre. Això és una limitació del Windows, no un error al VeraCrypt.\n\nNota: també pot ser necessari habilitar el suport LBA 48-bit al registre; per a més informació, visiti http://support.microsoft.com/kb/305098/EN-US</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="ca" key="CHECKING_FS">Comprovant el sistema de fitxers del volum VeraCrypt muntat com %s...</string>
-    <string lang="ca" key="REPAIRING_FS">Intentant reparar el sistema de fitxers del volum VeraCrypt muntat com %hs...</string>
+    <string lang="ca" key="REPAIRING_FS">Intentant reparar el sistema de fitxers del volum VeraCrypt muntat com %s...</string>
-    <string lang="ca" key="WARN_CBC_MODE">ATENCIÓ: Aquest volum està xifrat en mode CBC. Per problemes de seguretat, el mode CBC s'ha descontinuat des del VeraCrypt 4.1\n\nÉs molt recomanable que mogui les dades des d'aquest volum cap aun altre creat amb aquesta versió del VeraCrypt. Després de fer-ho, hauria d'esborrar de manera segura el volum antic. Per a més informació, si us plau consulti l'historial de versions a la documentació o a les notes de la versió distribuïdes amb el VeraCrypt 4.1 o posterior.</string>
     <string lang="ca" key="WARN_64_BIT_BLOCK_CIPHER">ATENCIÓ: Aquest volum està xifrat amb un algorisme de xifrat antic.\n\nTots els algorismes de xifrat de blocs de 64 bits (Blowfish, CAST-128, Triple DES, etc.) estan descontinuats. Serà possible muntar aquest volum utilitzant versions posteriors del VeraCrypt. No obstant, no hi haurà més millores a les implementacions d'aquests algorismes de xifrats. És molt recomanable crear un nou volum xifrat amb un algorisme de blocs de 128 bits (AES, Serpent, Tworfish, etc.) i moure tots els fitxers des del volum antic al nou.</string>
     <string lang="ca" key="SYS_AUTOMOUNT_DISABLED">El sistema no està configurat per muntar automàticament els nous volums. Pot ser impossible muntar els volums de dispositiu. El muntatge automàtic es pot activar executant la següent comanda i reiniciant el sistema.\n\nmountvol.exe /E</string>
     <string lang="ca" key="SYS_ASSIGN_DRIVE_LETTER">Si us plau, assigni una lletra d'unitat a la partició/dispositiu abans de continuar ('Eines administratives' - 'Crear i donar format a les particions de disc').\n\nAixò és un requeriment del sistema operatiu.</string>
@@ -1069,7 +1077,7 @@
     <string lang="ca" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">El VeraCrypt ja no suporta el xifrat d'una partició/unitat de sistema amb Windows Vista sense Service Pack. Abans d'actualitzar el VeraCrypt, si us plau instal·li el Service Pack 1 o superiro pel Windows Vista.</string>
     <string lang="ca" key="FEATURE_REQUIRES_INSTALLATION">Error: Aquesta característica requereix instal·lar el VeraCrypt al sistema (està utilitzant el TrueCrypy en mode portable).\n\nSi us plau, instal·li el VeraCrypt i torni-ho a provar.</string>
     <string lang="ca" key="WINDOWS_NOT_ON_BOOT_DRIVE_ERROR">ATENCIÓ: Sembla que el Windows no està instal·lat a la unitat que l'arranca. Això no està suportat.\n\nNomés hauria de continuar si està segur que el Windows està instal·lat a la unitat que l'arranca.\n\nVol continuar?</string>
-    <string lang="ca" key="GPT_BOOT_DRIVE_UNSUPPORTED">La seva unitat de sistema té una taula de particions GUID (GTP). Actualment, només es suporten unitats amb una taula de particions MBR.</string>
+    <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</string>
     <string lang="ca" key="TC_BOOT_LOADER_ALREADY_INSTALLED">PRECAUCIÓ: El gestor d'arranc del VeraCrypt ja està instal·lat a la seva unitat de sistema!\n\nÉs possible que un altre sistema en aquest ordinador ja estigui xifrat.\n\nATENCIÓ: SEGUIR AMB EL XIFRATGE DEL SISTEMA OPERATIU ACTUAL POT OCASIONAR QUE D'ALTRES SISTEMES NO PUGUIN ENGEGAR I QUE ES PERDIN LES SEVES DADES.\n\nSegur que vol continuar?</string>
     <string lang="ca" key="SYS_LOADER_RESTORE_FAILED">No s'ha pogut restaurar el carregador de sistema original.\n\nSi us plau, utilitzi el seu disc de recuperació ('Repair Options' &gt; 'Restore original system loader) o el mitjà d'instal·lació de Windows per reemplaçar el gestor d'arranc pel carregador de sistema de Windows.</string>
     <string lang="ca" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">El carregador del sistema original no s'ha pogut guardar al disc de recuperació (causa probable: no hi ha còpia de seguretat)</string>
@@ -1108,8 +1116,8 @@
     <string lang="ca" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Nota: 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. Tanmateix, és important remarcar que NO és necessari un teclat real dels EUA. El VeraCrypt s'assegura que pugui escriure la contrasenya de manera segura (ara i a l'entorn de prearrencada) encara que no tingui un teclat real dels EUA.</string>
     <string lang="ca" key="RESCUE_DISK_INFO">Abans de poder xifrar la partició/unitat ha de crear un disc de recuperació del TrueCrypr, que té les següents funcions:\n\n- Si el gestor d'arranc, la clau mestra o altres dades crítiques es malmeten, el disc de recuperació li permet restaurar-les (tot i que haurà d'introduïr la contrasenya correcta).\n\n- Si el Windows no pot arrencar, el disc de recuperació permet desxifrar la partició/unitat abans que arranqui el Windows.\n\n- El disc de recuperació conté una còpia de seguretat de la primera pista de la unitat (que normalment conté el gestor d'arranc o el carregador del sistema) i permet restaurar-lo si és necessari.\n\nLa imatge ISO del fitxer de recuperació es crearà a la ubicació especificada a sota.</string>
     <string lang="ca" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">Quan faci clic a 'Ok' es llançarà el gravador d'imatges ISO de Microsoft Windows. Si us plau, utilitzi'l per gravar la imatge iso del disc de recuperació a un CD o DVD.\n\nDesprés de fer-ho, torni a l'assistent de creació de volums de VeraCrypt i segueixi les instruccions.</string>
-    <string lang="ca" key="RESCUE_DISK_BURN_INFO">La imatge del disc de recuperació s'ha creat i guardat al fitxer \n%hs\n\nAra és necessàri gravar-la a un CD o DVD.\n\n%lsDesprés de gravar el disc de recuperació faci clic a 'Següent' per verificar que s'ha gravat correctament.</string>
+    <string lang="ca" key="RESCUE_DISK_BURN_INFO">La imatge del disc de recuperació s'ha creat i guardat al fitxer \n%s\n\nAra és necessàri gravar-la a un CD o DVD.\n\n%lsDesprés de gravar el disc de recuperació faci clic a 'Següent' per verificar que s'ha gravat correctament.</string>
-    <string lang="ca" key="RESCUE_DISK_BURN_INFO_NO_CHECK">La imatge del disc de recuperació s'ha creat i guardat al fitxer \n%hs\n\nAra és necessàri gravar-la a un CD o DVD o guardar-la en un lloc segur per utiltizar-la més tard.\n\n%lsFaci clic a 'Següent' per verificar que s'ha gravat correctament.</string>
+    <string lang="ca" key="RESCUE_DISK_BURN_INFO_NO_CHECK">La imatge del disc de recuperació s'ha creat i guardat al fitxer \n%s\n\nAra és necessàri gravar-la a un CD o DVD o guardar-la en un lloc segur per utiltizar-la més tard.\n\n%lsFaci clic a 'Següent' per verificar que s'ha gravat correctament.</string>
     <string lang="ca" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">nIMPORTANT: Tingui en compte que el fitxer s'ha de gravar a un CD/DVD com a imatge ISO (no com un fitxer individual). Per informar-se sobre com fer això, consulti la documentació de l'aplicació per gravar CD/DVD. Si no té cap aplicació per gravar-lo, faci cli al link següent per descarregar-ne de programari lliure.\n\n</string>
     <string lang="ca" key="LAUNCH_WIN_ISOBURN">Engega el gravador de discos de Microsoft Windows</string>
     <string lang="ca" key="RESCUE_DISK_BURN_NO_CHECK_WARN">ATENCIÓ: Si ja havia creat un disc de recuperació, aquest no es pot reutilitzar per aquesta partició/unitat de sistema ja que s'ha creat per a una clau mestre diferent! Cada cop que xifri la partició/unitat de sistema haurà de crear un nou disc de recuperació per ella encara que utilitzi la mateixa contrasenya.</string>
@@ -1372,6 +1380,39 @@
     <string lang="ca" key="TB_PER_SEC">TB/s</string>
     <string lang="ca" key="PB_PER_SEC">PB/s</string>
     <string lang="ca" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.cs.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="cs" name="Čeština" en-name="Czech" version="1.0.0" translators="Vítek Moser" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="cs" key="IDC_BROWSE">P&amp;rocházet…</control>
     <control lang="cs" key="IDC_DESKTOP_ICON">Přidat ikonu VeraCrypt na p&amp;lochu</control>
     <control lang="cs" key="IDC_DONATE">Podpořte nás...</control>
-    <control lang="cs" key="IDC_FILE_TYPE">Asociovat pří&amp;ponu .tc s programem VeraCrypt</control>
+    <control lang="cs" key="IDC_FILE_TYPE">Asociovat pří&amp;ponu .hc s programem VeraCrypt</control>
     <control lang="cs" key="IDC_OPEN_CONTAINING_FOLDER">&amp;Otevřít cílovou složku po dokončení</control>
     <control lang="cs" key="IDC_PROG_GROUP">Přidat VeraCrypt do &amp;Start menu</control>
     <control lang="cs" key="IDC_SYSTEM_RESTORE">Vytvořit bod o&amp;bnovení</control>
@@ -37,6 +37,7 @@
     <control lang="cs" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Stáhnout software pro vypalování CD/DVD</control>
     <control lang="cs" key="IDC_FILE_CONTAINER">Vytvořit zašifrovaný souborový svazek</control>
     <control lang="cs" key="IDC_GB">&amp;GB</control>
+    <control lang="cs" key="IDC_TB">&amp;TB</control>
     <control lang="cs" key="IDC_HIDDEN_SYSENC_INFO_LINK">Více informací</control>
     <control lang="cs" key="IDC_HIDDEN_VOL">S&amp;krytý svazek VeraCrypt</control>
     <control lang="cs" key="IDC_HIDDEN_VOL_HELP">Více informací o skrytých svazcích</control>
@@ -44,6 +45,7 @@
     <control lang="cs" key="IDC_HIDVOL_WIZ_MODE_FULL">Normální mód</control>
     <control lang="cs" key="IDC_KB">&amp;KB</control>
     <control lang="cs" key="IDC_KEYFILES_ENABLE">&amp;Použít souborové klíče</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="cs" key="IDC_KEY_FILES">Souborové &amp;klíče…</control>
     <control lang="cs" key="IDC_LINK_HASH_INFO">Informace o hash. algoritmech</control>
@@ -58,7 +60,8 @@
     <control lang="cs" key="IDC_NO_HISTORY">Neukládat &amp;historii</control>
     <control lang="cs" key="IDC_OPEN_OUTER_VOLUME">Otevřít vnější svazek</control>
     <control lang="cs" key="IDC_PAUSE">&amp;Pauza</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="cs" key="IDC_QUICKFORMAT">Rychle zformátovat</control>
     <control lang="cs" key="IDC_SHOW_PASSWORD">&amp;Ukázat heslo</control>
     <control lang="cs" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Zobrazit heslo</control>
@@ -118,6 +121,7 @@
     <control lang="cs" key="IDC_CREATE">Vytvořit</control>
     <control lang="cs" key="IDC_CREATE_VOLUME">V&amp;ytvořit svazek</control>
     <control lang="cs" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">&amp;Nezobrazovat žádné texty na před-bootovací autentifikační obrazovce (kromě volitelného textu níže)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="cs" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Urychlit AES šifrování/dešifrování použitím AES instrukcí procesoru (jsou-li k dispozici)</control>
     <control lang="cs" key="IDC_ENABLE_KEYFILES">Použít soubor. klíče</control>
     <control lang="cs" key="IDC_ENABLE_NEW_KEYFILES">Použít soubor. klíče</control>
@@ -132,6 +136,7 @@
     <control lang="cs" key="IDC_FAVORITE_MOVE_UP">Posunout &amp;nahoru</control>
     <control lang="cs" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Otevřít okno p&amp;růzkumníka pro vybraný svazek, dojde-li k úspěšnému připojení</control>
     <control lang="cs" key="IDC_FAVORITE_REMOVE">&amp;Odstranit</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="cs" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Globální nastavení</control>
     <control lang="cs" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Zobrazit bublinovou nápovědu po úspěšném odpojení</control>
     <control lang="cs" key="IDC_HK_DISMOUNT_PLAY_SOUND">Přehrát zvuk systémové notifikace po úspěšném odpojení</control>
@@ -256,6 +261,7 @@
     <control lang="cs" key="IDM_UNMOUNTALL">Odpojit všechny připojené svazky</control>
     <control lang="cs" key="IDM_UNMOUNT_VOLUME">Odpojit svazek</control>
     <control lang="cs" key="IDM_VERIFY_RESCUE_DISK">Ověřit záchranný disk</control>
+    <control lang="en" key="IDM_VERIFY_RESCUE_DISK_ISO">Verify Rescue Disk Image</control>
     <control lang="cs" key="IDM_VERSION_HISTORY">Historie verzí</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="cs" key="IDM_VOLUME_PROPERTIES">Vlastnosti svazku</control>
@@ -365,7 +371,7 @@
     <control lang="cs" key="IDT_SECURITY_TOKEN">Bezpečnostní token:</control>
     <control lang="cs" key="IDT_SORT_METHOD">Metoda třídění:</control>
     <control lang="cs" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Čekejte prosím. Tento proces může trvat delší dobu...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="cs" key="IDT_TEST_BLOCK_NUMBER">Číslo bloku:</control>
     <control lang="cs" key="IDT_TEST_CIPHERTEXT">Šifrovaný text (hexadecimálně)</control>
     <control lang="cs" key="IDT_TEST_DATA_UNIT_NUMBER">Číslo datové jednotky (64-bit hexadecimálně, velikost datové jednotky je 512 bajtů)</control>
@@ -410,13 +416,13 @@
     <string lang="cs" key="CIPHER_TITLE">Předvolby šifrování</string>
     <string lang="cs" key="CLEAN_WINMRU_FAILED">UPOZORNĚNÍ: Nepodařilo se vyčistit cestu naposledy vybraného svazku/souborového klíče (zapamatované při výběru souboru)!</string>
     <string lang="cs" key="COMPRESSION_NOT_SUPPORTED">Chyba: Souborový svazek byl zkomprimován na úrovni systému souborů. VeraCrypt nepodporuje zkomprimované souborové svazky (poznámka: komprese zašifrovaných dat je neefektivní a zbytečná).\n\nVypněte, prosím, kompresi pro souborový svazek dle následujících kroků: 1) Klikněte pravým tlačítkem myši na souborový svazek v Průzkumníku Windows (ne v programu VeraCrypt). 2) Vyberte 'Vlastnosti'. 3) V dialogovém okně 'Vlastnosti' klikněte 'Upřesnit'. 4) V dialogovém okně 'Upřesnit atributy', zrušte volbu 'Komprimovat obsah a šetřit tak místo na disku' a klikněte 'OK'. 5) V dialogovém okně 'Vlastnosti' klikněte 'OK'.</string>
-    <string lang="cs" key="CREATE_FAILED">Vytvoření svazku %hs selhalo</string>
+    <string lang="cs" key="CREATE_FAILED">Vytvoření svazku %s selhalo</string>
-    <string lang="cs" key="DEVICE_FREE_BYTES">Velikost %hs je %.2f bajtů</string>
+    <string lang="cs" key="DEVICE_FREE_BYTES">Velikost %s je %.2f bajtů</string>
-    <string lang="cs" key="DEVICE_FREE_KB">Velikost %hs je %.2f KB</string>
+    <string lang="cs" key="DEVICE_FREE_KB">Velikost %s je %.2f KB</string>
-    <string lang="cs" key="DEVICE_FREE_MB">Velikost %hs je %.2f MB</string>
+    <string lang="cs" key="DEVICE_FREE_MB">Velikost %s je %.2f MB</string>
-    <string lang="cs" key="DEVICE_FREE_GB">Velikost %hs je %.2f GB</string>
+    <string lang="cs" key="DEVICE_FREE_GB">Velikost %s je %.2f GB</string>
-    <string lang="cs" key="DEVICE_FREE_TB">Velikost %hs je %.2f TB</string>
+    <string lang="cs" key="DEVICE_FREE_TB">Velikost %s je %.2f TB</string>
-    <string lang="cs" key="DEVICE_FREE_PB">Velikost %hs je %.2f PB</string>
+    <string lang="cs" key="DEVICE_FREE_PB">Velikost %s je %.2f PB</string>
     <string lang="cs" key="DEVICE_IN_USE_FORMAT">VAROVÁNÍ: Zařízení/oddíl je používán operačním systémem nebo aplikacemi. Formátování zařízení/oddílu může způsobit poškození dat nebo systémovou nestabilitu.\n\nPokračovat?</string>
     <string lang="cs" key="DEVICE_IN_USE_INPLACE_ENC">Varování: Oddíl je právě používán operačním systémem nebo aplikacemi. Měli byste zavřít všechny aplikace, které by mohly oddíl používat (včetně antivirového programu).\n\nPokračovat?</string>
     <string lang="cs" key="FORMAT_CANT_DISMOUNT_FILESYS">Chyba: Zařízení/oddíl obsahuje souborový systém, který nelze připojit. Systém souborů může být používán operačním systémem. Formátování zařízení/oddílu by pravděpodobně způsobilo poškození dat a systémovou nestabilitu.\n\nPro vyřešení tohoto problému doporučujeme nejdříve smazat oddíl a poté ho znovu vytvořit bez formátování. Postupujte následovně: 1) Pravý-klik myši na ikonu 'Počítač' (nebo 'Tento počítač') ve 'Start' menu a vyberte 'Spravovat'. Objeví se okno 'Správa počítače'. 2) V okně 'Správa počítače' vyberte 'Uložení' &gt; 'Správa disků'. 3) Pravý-klik myši na oddíl, který chcete zašifrovat a vyberte buď 'Smazat oddíl' nebo 'Smazat svazek' nebo 'Smazat logický disk'. 4) Klikněte 'Ano'. Pokud se Windows zeptají na restart počítače, učiňte tak. Poté zopakujte kroky 1 a 2 a pokračujte od kroku 5. 5) Pravý-klik na nealokované/volné místo a vyberte buď 'Nový oddíl' nebo 'Nový obyčejný svazek' nebo 'Nový logický disk'. 6) Objeví se okno 'Průvodce vytvořením nového oddílu' nebo 'Průvodce nového jednoduchého svazku'; následujte jejich instrukce. Na stránce průvodce nazvané 'Zformátovat oddíl' vyberte buď 'Neformátovat tento oddíl' nebo 'Neformátovat tento svazek'. Ve stejném průvodci klikněte 'Další' a poté 'Dokončit'. 7) Cesta k zařízení, kterou jste vybrali v programu VeraCrypt může být nyní špatně. Ukončete proto průvodce vytvořením oddílu VeraCrypt (pokud stále běží) a spusťte ho znovu. 8) Zkuste zašifrovat zařízení/oddíl znovu.\n\nPokud VeraCrypt opakovaně selhává při šifrování zařízení/oddílu, zvažte místo toho vytvoření souborového svazku.</string>
@@ -435,12 +441,12 @@
     <string lang="cs" key="INPLACE_ENC_INVALID_PATH">Chyba: VeraCrypt může za běhu zašifrovat jen oddíl, dynamický svazek nebo celý systémový disk. Ujistěte se, že zadaná cesta je planá.</string>
     <string lang="cs" key="CANNOT_RESIZE_FILESYS">Chyba: Systém souborů nelze zmenšit (systém souborů musí být zmenšen, aby se vytvořilo místo pro hlavičku svazku a záložní hlavičku).\n\nMožné příčiny a řešení:\n\n- Málo volného místa na svazku. Ujistěte se, že žádná další aplikace nezapisuje do systému souborů.\n\n- Poškozený systém souborů. Zkuste jej zkontrolovat a opravte chyby (klikněte na dané písmeno disku pravým tlačítkem myši v seznamu, vyberte Vlastnosti &gt; Nástroje &gt; 'Zkontrolovat', a ujistěte se, že jste vybrali volbu 'Automaticky opravovat chyby systému souborů' a klikněte na Start).\n\nPokud výše uvedené kroky nepomohly, následujte kroky uvedené níže.</string>
     <string lang="cs" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Chyba: Na svazku není dostatek volného místa a systém souborů tak nemůže být zmenšen (systém souborů musí být zmenšen, aby se vytvořilo místo pro záložní hlavičku svazku).\n\nSmažte všechny zbytečné soubory a vyprázdněte koš, aby zbylo aspoň 256 KB volného místa a pak to zkuste znovu. Kvůli problému Windows se může stát, že Windows Explorer vám ukáže jinou hodnotu volného místa, dokud se systém nerestartuje. Pokud restart systému nepomůže, systém souborů může být poškozený. Zkuste jej zkontrolovat a opravit případné chyby (klikněte na dané písmeno disku pravým tlačítkem myši v seznamu, vyberte Vlastnosti &gt; Nástroje &gt; 'Zkontrolovat', a ujistěte se, že jste vybrali volbu 'Automaticky opravovat chyby systému souborů' a klikněte na Start).\n\nPokud kroky uvedené výše nepomohly, pokračujte kroky uvedenými níže.</string>
-    <string lang="cs" key="DISK_FREE_BYTES">Volné místo na disku %hs je %.2f bytů.</string>
+    <string lang="cs" key="DISK_FREE_BYTES">Volné místo na disku %s je %.2f bytů.</string>
-    <string lang="cs" key="DISK_FREE_KB">Volné místo na disku %hs je %.2f KB</string>
+    <string lang="cs" key="DISK_FREE_KB">Volné místo na disku %s je %.2f KB</string>
-    <string lang="cs" key="DISK_FREE_MB">Volné místo na disku %hs je %.2f MB</string>
+    <string lang="cs" key="DISK_FREE_MB">Volné místo na disku %s je %.2f MB</string>
-    <string lang="cs" key="DISK_FREE_GB">Volné místo na disku %hs je %.2f GB</string>
+    <string lang="cs" key="DISK_FREE_GB">Volné místo na disku %s je %.2f GB</string>
-    <string lang="cs" key="DISK_FREE_TB">Volné místo na disku %hs je %.2f TB</string>
+    <string lang="cs" key="DISK_FREE_TB">Volné místo na disku %s je %.2f TB</string>
-    <string lang="cs" key="DISK_FREE_PB">Volné místo na disku %hs je %.2f PB</string>
+    <string lang="cs" key="DISK_FREE_PB">Volné místo na disku %s je %.2f PB</string>
     <string lang="cs" key="DRIVELETTERS">Nelze získat volná písmena disků.</string>
     <string lang="cs" key="DRIVER_NOT_FOUND">Chyba: Ovladač VeraCrypt nebyl nalezen.\n\nZkopírujte soubory 'veracrypt.sys' a 'veracrypt-x64.sys' do adresáře, kde je umístěna hlavní aplikace VeraCrypt (VeraCrypt.exe).</string>
     <string lang="cs" key="DRIVER_VERSION">Chyba: Aktuálně je spuštěna nekompatibilní verze ovladače VeraCrypt.\n\nPokud se snažíte spustit VeraCrypt v cestovním módu (např. bez instalace) a máte přitom již nainstalovanou jinou verzi VeraCryptu, musíte ji nejprve odinstalovat (nebo aktualizovat pomocí VeraCrypt instalátoru). Pro odinstalaci následujte tyto kroky: Na Windows Vista nebo novější vyberte 'Menu Start' &gt; Počítač &gt; 'Odinstalovat nebo změnit program' &gt; VeraCrypt &gt; Odinstalace; na Windows XP, vyberte 'Menu Start' &gt; Nastavení &gt; 'Ovládací panely' &gt; 'Přidat nebo odebrat programy' &gt; VeraCrypt &gt; Odstranit.\n\nVelmi podobně, pokud se snažíte spustit VeraCrypt v cestovním módu (např. bez instalace) a jiná verze programu VeraCrypt již běží v cestovním módu, musíte nejprve restartovat systém a pak spustit pouze tuto novou verzi.</string>
@@ -524,7 +530,7 @@
     <string lang="cs" key="HIDVOL_HOST_FILLING_HELP_SYSENC">Vnější svazek byl vytvořen a připojen jako disk %hc:. Do tohoto vnějšího svazku byste nyní měli nakopírovat nějaká citlivě vypadající soubory, které ve skutečnosti NECHCETE skrýt. Budou tam umístěny pro kohokoliv, kdo by vás nutil prozradit heslo k prvnímu oddílu za oddílem s operačním systémem, kde budou umístěny jak vnější svazek, tak skrytý svazek (obsahující skrytý operační systém). Budete moci odhalit heslo pro tento vnější svazek a existence skrytého svazku (a skrytého operačního systému) zůstane utajena.\n\nDŮLEŽITÉ: Soubory, které nakopírujete do vnějšího svazku, by neměly zabírat více než %s. Jinak by nemusel být k dispozici dostatek volného místa na vnějším svazku pro skrytý svazek (a nebudete moci pokračovat). Jakmile dokončíte kopírování, klikněte na Další (neodpojujte svazek).</string>
     <string lang="cs" key="HIDVOL_HOST_FILLING_HELP">Vnější svazek byl úspěšně vytvořen a připojen jako jednotka %hc:. Do tohoto svazku byste nyní měli nakopírovat nějaké citlivě-vypadající soubory, které ve skutečnosti NECHCETE skrýt. Soubory tam budou uloženy pro kohokoliv, kdo by Vás nutil odhalit heslo. Odhalíte jen heslo pro tento vnější svazek, ne pro skrytý. Soubory, o které Vám jde ve skutečnosti, budou uloženy ve skrytém svazku, který se vytvoří později. Jakmile data dokopírujete, klikněte Další. Svazek neodpojujte.\n\nPoznámka: Až kliknete Další, clusterová bitmapa vnějšího svazku bude oskenována pro určení velikosti nepřerušené oblasti volného místa, jehož konec se nachází na konci svazku. Tato oblast bude obsahovat skrytý svazek, takže tím omezí svou maximální možnou velikost. Skenování clusterové bitmapy zajistí, že žádná data na vnějším svazku nebudou přepsána vnějším svazkem.</string>
     <string lang="cs" key="HIDVOL_HOST_FILLING_TITLE">Obsah vnějšího svazku</string>
-    <string lang="cs" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nV dalším kroku zadáte volby pro vnější svazek (uvnitř kterého bude později vytvořen skrytý svazek). </string>
+    <string lang="cs" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nV dalším kroku zadáte volby pro vnější svazek (uvnitř kterého bude později vytvořen skrytý svazek).</string>
     <string lang="cs" key="HIDVOL_HOST_PRE_CIPHER_HELP_SYSENC">\n\nV dalších krocích vytvoříte tzv. externí svazek VeraCrypt uvnitř prvního oddílu za systémovým oddílem (jak bylo vysvětleno v jednom z předchozích kroků).</string>
     <string lang="cs" key="HIDVOL_HOST_PRE_CIPHER_TITLE">Vnější svazek</string>
     <string lang="cs" key="HIDDEN_OS_PRE_CIPHER_HELP">V následujících krocích zadáte volby a heslo pro skrytý svazek, který bude obsahovat skrytý operační systém.\n\nPoznámka: Clusterová bitmapa vnějšího svazku byla oskenována, aby se zjistila velikost nepřerušovaného volného místa, jehož konec bude uspořádán s koncem vnějšího svazku. V této oblasti bude umístěn skrytý svazek, omezuje tedy jeho maximální možnou velikost. Maximální možná velikost skrytého svazku byla vypočtena a potvrzena tak, že musí být větší, než velikost systémového oddílu (což je nutné, protože celý obsah systémového oddílu bude muset být zkopírován na skrytý svazek). Tím se zajistí, že žádná data, která jsou aktuálně uložena na vnějším svazku, nebudou přepsána daty zapsanými do oblasti skrytého svazku.</string>
@@ -561,6 +567,7 @@
     <string lang="cs" key="MAX_HIDVOL_SIZE_KB">Maximální možná velikost skrytého svazku pro tento svazek je %.2f KB.</string>
     <string lang="cs" key="MAX_HIDVOL_SIZE_MB">Maximální možná velikost skrytého svazku pro tento svazek je %.2f MB.</string>
     <string lang="cs" key="MAX_HIDVOL_SIZE_GB">Maximální možná velikost skrytého svazku pro tento svazek je %.2f GB.</string>
+    <string lang="cs" key="MAX_HIDVOL_SIZE_TB">Maximální možná velikost skrytého svazku pro tento svazek je %.2f TB.</string>
     <string lang="cs" key="MOUNTED_NOPWCHANGE">Heslo/souborový klíč svazku nemůže být změněn během jeho připojení. Svazek nejdříve odpojte.</string>
     <string lang="cs" key="MOUNTED_NO_PKCS5_PRF_CHANGE">Derivační algoritmus pro klíč hlavičky nemůže být změněn během připojování svazku. Svazek nejdříve odpojte.</string>
     <string lang="cs" key="MOUNT_BUTTON">&amp;Připojit</string>
@@ -591,12 +598,12 @@
     <string lang="cs" key="SELECT_PKCS11_MODULE">Vybrat knihovnu PKCS #11</string>
     <string lang="cs" key="OUTOFMEMORY">Nedostatek paměti</string>
     <string lang="cs" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">DŮLEŽITÉ: Důrazně doporučujeme, aby nezkušení uživatelé vytvořili souborový svazek VeraCrypt na vybraném zařízení/oddílu, místo zašifrování celého zařízení/oddílu.\n\nPokud vytvoříte souborový svazek VeraCrypt (oproti zašifrování zařízení nebo oddílu), neriskujete například ztrátu velkého množství souborů. Souborový svazek VeraCrypt (ačkoliv obsahuje virtuální zašifrovaný disk) se chová je ve skutečnosti jako obyčejný soubor. Pro více informací viz kapitola Návod pro začátečníky v uživatelské příručce VeraCryptu.\n\nJste si jisti, že chcete zašifrovat celé zařízení/oddíl?</string>
-    <string lang="cs" key="OVERWRITEPROMPT">VAROVÁNÍ: Soubor '%hs' již existuje!\n\nDŮLEŽITÉ: VERACRYPT TENTO SOUBOR NEZAŠIFRUJE, ALE SMAŽE HO. Jste si jisti, že chcete tento soubor smazat a nahradit ho novým souborovým svazkem VeraCrypt?</string>
+    <string lang="cs" key="OVERWRITEPROMPT">VAROVÁNÍ: Soubor '%s' již existuje!\n\nDŮLEŽITÉ: VERACRYPT TENTO SOUBOR NEZAŠIFRUJE, ALE SMAŽE HO. Jste si jisti, že chcete tento soubor smazat a nahradit ho novým souborovým svazkem VeraCrypt?</string>
-    <string lang="cs" key="OVERWRITEPROMPT_DEVICE">VAROVÁNÍ: VŠECHNY SOUBORY, KTERÉ JSOU MOMENTÁLNĚ ULOŽENY NA VÁMI VYBRANÉM %s '%hs'%s BUDOU VYMAZÁNY A ZTRACENY (NEBUDOU ZAŠIFROVÁNY)!\n\nJste si jisti, že chcete pokračovat s formátováním?</string>
+    <string lang="cs" key="OVERWRITEPROMPT_DEVICE">VAROVÁNÍ: VŠECHNY SOUBORY, KTERÉ JSOU MOMENTÁLNĚ ULOŽENY NA VÁMI VYBRANÉM %s '%s'%s BUDOU VYMAZÁNY A ZTRACENY (NEBUDOU ZAŠIFROVÁNY)!\n\nJste si jisti, že chcete pokračovat s formátováním?</string>
-    <string lang="cs" key="NONSYS_INPLACE_ENC_CONFIRM">VAROVÁNÍ: Nebudete moci na svazek přistoupit ani přistupovat k souborům na něm do té doby, než bude plně zašifrován.\n\nJste si jisti, že chcete začít zašifrovávat vybraný %s '%hs'%s?</string>
+    <string lang="cs" key="NONSYS_INPLACE_ENC_CONFIRM">VAROVÁNÍ: Nebudete moci na svazek přistoupit ani přistupovat k souborům na něm do té doby, než bude plně zašifrován.\n\nJste si jisti, že chcete začít zašifrovávat vybraný %s '%s'%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="cs" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">VAROVÁNÍ: Pokud dojde při šifrování dat za běhu k náhlému výpadku proudu, nebo pokud systém spadne kvůli softwarové chybě nebo hardwarovému selhání, část dat bude poškozena nebo ztracena. Než začnete zašifrovávat, ujistěte se, že máte záložní kopie souborů, které chcete zašifrovat.\n\nMáte takovou zálohu?</string>
-    <string lang="cs" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">VAROVÁNÍ: JAKÉKOLIV SOUBORY ULOŽENÉ NA ODDÍLU '%hs'%s (NAPŘ. NA PRVNÍM ODDÍLU ZA SYSTÉMOVÝM ODDÍLEM) BUDOU VYMAZÁNA A ZTRACENA (NEBUDOU ZAŠIFROVÁNA)!\n\nJste si jisti, že chcete pokračovat ve formátování?</string>
+    <string lang="cs" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">VAROVÁNÍ: JAKÉKOLIV SOUBORY ULOŽENÉ NA ODDÍLU '%s'%s (NAPŘ. NA PRVNÍM ODDÍLU ZA SYSTÉMOVÝM ODDÍLEM) BUDOU VYMAZÁNA A ZTRACENA (NEBUDOU ZAŠIFROVÁNA)!\n\nJste si jisti, že chcete pokračovat ve formátování?</string>
     <string lang="cs" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">VAROVÁNÍ: VYBRANÝ ODDÍL OBSAHUJE VELKÉ MNOŽSTVÍ DAT! Všechny soubory uložené na tomto oddílu budou smazány a ztraceny (NEBUDOU zašifrovány)!</string>
     <string lang="cs" key="ERASE_FILES_BY_CREATING_VOLUME">Smaž všechny soubory uložené na oddílu tím, že se uvnitř vytvoří svazek VeraCrypt</string>
     <string lang="cs" key="PASSWORD">Heslo</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="cs" key="PREV">&lt; &amp;Zpět</string>
     <string lang="cs" key="RAWDEVICES">Seznam základních zařízení instalovaných na vašem systému nemohl být vytvořen!</string>
-    <string lang="cs" key="READONLYPROMPT">Svazek '%hs' již existuje a je jen pro čtení. Jste si jistí, že ho chcete nahradit?</string>
+    <string lang="cs" key="READONLYPROMPT">Svazek '%s' již existuje a je jen pro čtení. Jste si jistí, že ho chcete nahradit?</string>
     <string lang="cs" key="SELECT_DEST_DIR">Vyberte cílový adresář</string>
     <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>
@@ -680,13 +687,13 @@
     <string lang="cs" key="TEST_CIPHERTEXT_SIZE">Testovací šifrovaný text, který jste zadali, je příliš dlouhý nebo krátký.</string>
     <string lang="cs" key="TEST_KEY_SIZE">Testovací klíč, který jste zadali, je příliš dlouhý nebo krátký.</string>
     <string lang="cs" key="TEST_PLAINTEXT_SIZE">Testovací čistý text, který jste zadali, je příliš dlouhý nebo krátký.</string>
-    <string lang="cs" key="TWO_LAYER_CASCADE_HELP">Dvě šifry v kaskádě operující v LRW módu. Každý blok je nejprve zašifrován s %hs (%d-bitový klíč) a poté s %hs (%d-bitový klíč). Každá šifra používá svůj vlastní klíč. Všechny klíče jsou vzájemně nezávislé.</string>
+    <string lang="cs" key="TWO_LAYER_CASCADE_HELP">Dvě šifry v kaskádě operující v LRW módu. Každý blok je nejprve zašifrován s %s (%d-bitový klíč) a poté s %s (%d-bitový klíč). Každá šifra používá svůj vlastní klíč. Všechny klíče jsou vzájemně nezávislé.</string>
-    <string lang="cs" key="THREE_LAYER_CASCADE_HELP">Tři šifry v kaskádě operující v módu LRW. Každý blok je nejprve zašifrován s %hs (%d-bitový klíč) a poté s %hs (%d-bitový klíč) a nakonec s %hs (%d-bitový klíč). Každá šifra používá svůj vlastní klíč. Všechny klíče jsou vzájemně nezávislé.</string>
+    <string lang="cs" key="THREE_LAYER_CASCADE_HELP">Tři šifry v kaskádě operující v módu LRW. Každý blok je nejprve zašifrován s %s (%d-bitový klíč) a poté s %s (%d-bitový klíč) a nakonec s %s (%d-bitový klíč). Každá šifra používá svůj vlastní klíč. Všechny klíče jsou vzájemně nezávislé.</string>
     <string lang="cs" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Podle konfigurace operačního systému můžou tyto funkce pro automatické spuštění a automatické připojení fungovat pouze pokud jsou data cestovních disků vytvořena na nezapisovatelném CD/DVD médiu. Toto není chyba v VeraCryptu (jde o omezení Windows).</string>
     <string lang="cs" key="TRAVELER_DISK_CREATED">Cestovní disk VeraCrypt byl úspěšně vytvořen.\n\nPro spuštění VeraCryptu v přenosném módu potřebujete administrátorská oprávnění. Měli byste také vědět, že prozkoumáním registrů se dá zjistit, že byl VeraCrypt spuštěn na systému Windows, i když běžel v přenosném módu.</string>
     <string lang="cs" key="TC_TRAVELER_DISK">Cestovní disk VeraCrypt</string>
     <string lang="cs" key="TWOFISH_HELP">Navrhnuta Brucem Schneierem, Johnem Kelseyem, Dougem Whitingem, Davidem Wagnerem, Chrisem Hallem a Nielsem Fergusonem. Zveřejněna v roce 1998. 256-bitový klíč, 128-bitové bloky. Operační mód je XTS. Twofish byla jedním z finalistů AES.</string>
-    <string lang="cs" key="MORE_INFO_ABOUT">Více informací o %hs</string>
+    <string lang="cs" key="MORE_INFO_ABOUT">Více informací o %s</string>
     <string lang="cs" key="UNKNOWN">Neznámý</string>
     <string lang="cs" key="ERR_UNKNOWN">Nastala nespecifikovaná nebo neznámá chyba (%d).</string>
     <string lang="cs" key="UNMOUNTALL_LOCK_FAILED">Některé svazky obsahují soubory nebo adresáře používané aplikacemi nebo systémem.\n\nVynutit odpojení?</string>
@@ -851,7 +858,7 @@
     <string lang="cs" key="INSTALL_FAILED">Instalace selhala.</string>
     <string lang="cs" key="UNINSTALL_FAILED">Odinstalace selhala.</string>
     <string lang="cs" key="DIST_PACKAGE_CORRUPTED">Distribuční balíček je poškozený. Stáhněte jej prosím znovu (nejlépe z oficiálních stránek programu VeraCrypt na adrese https://veracrypt.codeplex.com).</string>
-    <string lang="cs" key="CANNOT_WRITE_FILE_X">Nelze zapsat soubor %hs</string>
+    <string lang="cs" key="CANNOT_WRITE_FILE_X">Nelze zapsat soubor %s</string>
     <string lang="cs" key="EXTRACTING_VERB">Rozbalení</string>
     <string lang="cs" key="CANNOT_READ_FROM_PACKAGE">Nelze přečíst data z balíčku.</string>
     <string lang="cs" key="CANT_VERIFY_PACKAGE_INTEGRITY">Nelze ověřit integritu tohoto distribučního balíčku.</string>
@@ -861,7 +868,7 @@
     <string lang="cs" key="SETUP_UPDATE_OK">VeraCrypt byl úspěšně aktualizován.</string>
     <string lang="cs" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt byl aktualizován na novější verzi. Před použitím musí být váš počítač restartován.\n\nChcete ho nyní restartovat?</string>
     <string lang="cs" key="SYS_ENC_UPGRADE_FAILED">Aktualizace VeraCryptu selhala!\n\nDŮLEŽITÉ: Před tím, než vypnete nebo restartujete systém, doporučujeme vám použít systémový bod obnovy (nabídka Start &gt; Všechny programy &gt; Příslušenství &gt; Systémové nástroje &gt; Obnovení systému) pro obnovení systému do bodu nazvaného 'VeraCrypt instalace'. Pokud není bod obnovení k dispozici, měli byste znovu zkusit instalaci originální nebo nové verze VeraCryptu ještě před tím, než vypnete nebo restartujete systém.</string>
-    <string lang="cs" key="UNINSTALL_OK">VeraCrypt byl úspěšně odinstalován.\n\nKlikněte 'Dokončit' pro odstranění instalátoru VeraCrypt a složky %hs. Složka nebude odstraněna, pokud obsahuje jakékoliv soubory, které nebyly nainstalovány instalátorem nebo programem VeraCrypt.</string>
+    <string lang="cs" key="UNINSTALL_OK">VeraCrypt byl úspěšně odinstalován.\n\nKlikněte 'Dokončit' pro odstranění instalátoru VeraCrypt a složky %s. Složka nebude odstraněna, pokud obsahuje jakékoliv soubory, které nebyly nainstalovány instalátorem nebo programem VeraCrypt.</string>
     <string lang="cs" key="REMOVING_REG">Odstraňuji záznamy v registrech o programu VeraCrypt</string>
     <string lang="cs" key="ADDING_REG">Přidávám záznamy do registru</string>
     <string lang="cs" key="REMOVING_APPDATA">Odstraňuji specifická data aplikace</string>
@@ -872,10 +879,10 @@
     <string lang="cs" key="CREATING_SYS_RESTORE">Vytvářím bod obnovení</string>
     <string lang="cs" key="FAILED_SYS_RESTORE">Bod obnovení se nepodařilo vytvořit!</string>
     <string lang="cs" key="INSTALLER_UPDATING_BOOT_LOADER">Aktualizuji bootovací zavaděč</string>
-    <string lang="cs" key="INSTALL_OF_FAILED">Instalace '%hs' selhala. %hs Chcete pokračovat v instalaci?</string>
+    <string lang="cs" key="INSTALL_OF_FAILED">Instalace '%s' selhala. %s Chcete pokračovat v instalaci?</string>
-    <string lang="cs" key="UNINSTALL_OF_FAILED">Odinstalace '%hs' selhala. %hs Chcete pokračovat v odinstalaci?</string>
+    <string lang="cs" key="UNINSTALL_OF_FAILED">Odinstalace '%s' selhala. %s Chcete pokračovat v odinstalaci?</string>
     <string lang="cs" key="INSTALL_COMPLETED">Instalace dokončena.</string>
-    <string lang="cs" key="CANT_CREATE_FOLDER">Složka '%hs' nemohla být vytvořena</string>
+    <string lang="cs" key="CANT_CREATE_FOLDER">Složka '%s' nemohla být vytvořena</string>
     <string lang="cs" key="CLOSE_TC_FIRST">Ovladač zařízení VeraCrypt nemůže být odstraněn.\n\nZavřete prosím nejdříve všechny okna VeraCrypt. Pokud to nepomůže, restartujte prosím Windows a zkuste to znovu.</string>
     <string lang="cs" key="DISMOUNT_ALL_FIRST">Všechny svazky VeraCrypt musí být odpojeny před instalací nebo odinstalací programu VeraCrypt.</string>
     <string lang="cs" key="UNINSTALL_OLD_VERSION_FIRST">Na tomto systému je aktuálně nainstalována zastaralá verze VeraCryptu. Před instalací nové verze musí být nejprve odinstalována.\n\nJakmile zavřete tento dialog, spustí se odinstalátor staré verze. Při odinstalaci VeraCryptu nedojde k dešifrování žádného svazku. Po odinstalaci staré verze VeraCryptu spusťte znovu instalátor nové verze.</string>
@@ -928,7 +935,7 @@
     <string lang="cs" key="FAVORITE_LABEL_DEVICE_PATH_ERR">Zařízení zobrazené níže není ani oddíl ani dynamický svazek. Proto mu nemůže být přidělena žádná jmenovka.</string>
     <string lang="cs" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Zadejte takový typ oddílu, který Windows rozpoznají (použijte příkaz SETID v nástroji 'diskpart' ve Windows). Pak odstraňte oddíl z oblíbených a přidejte jej znovu. Tím bude moci VeraCryptu přiřadit oddílu jmenovku.</string>
     <string lang="cs" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Kvůli omezení Windows nemůže být souborový svazek, který je uložen ve vzdáleném systému souborů - sdílen po síti, připojen jako oblíbený systémový svazek (ale může být připojen jako nesystémový oblíbený svazek, když se uživatel přihlásí).</string>
-    <string lang="cs" key="ENTER_PASSWORD_FOR">Zadejte heslo pro %hs</string>
+    <string lang="cs" key="ENTER_PASSWORD_FOR">Zadejte heslo pro %s</string>
     <string lang="cs" key="ENTER_PASSWORD_FOR_LABEL">Zadejte heslo pro '%s'</string>
     <string lang="cs" key="ENTER_NORMAL_VOL_PASSWORD">Zadejte heslo pro normální/vnější svazek</string>
     <string lang="cs" key="ENTER_HIDDEN_VOL_PASSWORD">Zadejte heslo pro skrytý svazek</string>
@@ -943,8 +950,8 @@
     <string lang="cs" key="VOL_HEADER_BACKED_UP">Záloha hlavičky svazku byla úspěšně vytvořena.\n\nDŮLEŽITÉ: Obnovením hlavičky svazku s použitím této zálohy se také obnoví aktuální heslo pro svazek. Navíc, pokud je/jsou potřeba souborový klíč(e) pro připojení svazku, ten samý souborový klíč/e bude potřeba pro připojení svazku znovu, až bude hlavička opět vytvořena.\n\nVAROVÁNÍ: Tato záloha hlavičky svazku může být použita k obnovení JEN tohoto svazku. Pokud použijete tuto zálohu hlavičky k obnovení hlavičky jiného svazku, budete moci svazek připojit, ale NEBUDETE schopni dešifrovat jakákoliv data uložená na svazku (protože změníte jeho hlavní klíč).</string>
     <string lang="cs" key="VOL_HEADER_RESTORED">Hlavička svazku byla úspěšně obnovena.\n\nDŮLEŽITÉ: Staré heslo mohlo být obnoveno také. Navíc, pokud byl v době zálohy potřeba k připojení svazku souborový klíč(e), stejný souborový klíč(e) bude nyní potřeba opětnému připojení svazku.</string>
     <string lang="cs" key="EXTERNAL_VOL_HEADER_BAK_FIRST_INFO">Z bezpečnostních důvodů musíte zadat ke svazku správné heslo (a dodat správné souborové klíče).\n\nPoznámka: Pokud svazek obsahuje skrytý svazek, budete muset nejdříve zadat správné heslo (a dodat správné souborové klíče) k vnějšímu svazku. Pak, pokud zvolíte zazálohovat hlavičku skrytého svazku, budete muset zadat správné heslo (a dodat správné souborové klíče) ke skrytému svazku.</string>
-    <string lang="cs" key="CONFIRM_VOL_HEADER_BAK">Jste si jisti, že chcete vytvořit zálohu hlavičky svazku pro %hs?\n\nJakmile kliknete na Ano, zadejte jméno souboru pro zálohu hlavičky.\n\nPoznámka: Hlavičky jak standardních, tak skrytých svazků budou pře-šifrovány použitím nového řetězce a uloženy v záložním souboru. Pokud se uvnitř tohoto svazku nenachází žádný skrytý svazek, místo určené pro hlavičku skrytého svazku v záložním souboru bude vyplněno náhodnými daty (k zachování hodnověrnosti popření). Při obnově hlavičky svazku ze záložního souboru budete muset zadat správné heslo (a dodat správné souborové klíče), které bylo platné při vytvoření zálohy hlavičky svazku. Heslo (a souborové klíče) automaticky určí, jaký typ hlavičky svazku se má obnovit, např. standardní nebo skrytý (VeraCrypt zjistí typ pomocí metody pokusu a omylu).</string>
+    <string lang="cs" key="CONFIRM_VOL_HEADER_BAK">Jste si jisti, že chcete vytvořit zálohu hlavičky svazku pro %s?\n\nJakmile kliknete na Ano, zadejte jméno souboru pro zálohu hlavičky.\n\nPoznámka: Hlavičky jak standardních, tak skrytých svazků budou pře-šifrovány použitím nového řetězce a uloženy v záložním souboru. Pokud se uvnitř tohoto svazku nenachází žádný skrytý svazek, místo určené pro hlavičku skrytého svazku v záložním souboru bude vyplněno náhodnými daty (k zachování hodnověrnosti popření). Při obnově hlavičky svazku ze záložního souboru budete muset zadat správné heslo (a dodat správné souborové klíče), které bylo platné při vytvoření zálohy hlavičky svazku. Heslo (a souborové klíče) automaticky určí, jaký typ hlavičky svazku se má obnovit, např. standardní nebo skrytý (VeraCrypt zjistí typ pomocí metody pokusu a omylu).</string>
-    <string lang="cs" key="CONFIRM_VOL_HEADER_RESTORE">Opravdu chcete obnovit hlavičku svazku pro %hs?\n\nUPOZORNĚNÍ: Obnovením hlavičky svazku obnovíte také jeho heslo, které bylo platné v době vytvoření zálohy. Pokud byl potřeba souborový klíč(e) k připojení svazku v době vytvoření zálohy, stejný souborový klíč(e) bude potřeba k opětovnému připojení svazku po obnovení hlavičky svazku.\n\nJakmile kliknete Ano, zvolte záložní soubor hlavičky.</string>
+    <string lang="cs" key="CONFIRM_VOL_HEADER_RESTORE">Opravdu chcete obnovit hlavičku svazku pro %s?\n\nUPOZORNĚNÍ: Obnovením hlavičky svazku obnovíte také jeho heslo, které bylo platné v době vytvoření zálohy. Pokud byl potřeba souborový klíč(e) k připojení svazku v době vytvoření zálohy, stejný souborový klíč(e) bude potřeba k opětovnému připojení svazku po obnovení hlavičky svazku.\n\nJakmile kliknete Ano, zvolte záložní soubor hlavičky.</string>
     <string lang="cs" key="DOES_VOLUME_CONTAIN_HIDDEN">Obsahuje svazek skrytý svazek?</string>
     <string lang="cs" key="VOLUME_CONTAINS_HIDDEN">Svazek obsahuje skrytý svazek</string>
     <string lang="cs" key="VOLUME_DOES_NOT_CONTAIN_HIDDEN">Svazek neobsahuje skrytý svazek</string>
@@ -956,11 +963,13 @@
     <string lang="cs" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">Pokoušíte se zazálohovat hlavičku systémového oddílu/disku. To není povoleno. Zálohovací/obnovovací operace týkající se systémového oddílu/disku mohou být provedeny pouze s použitím Záchranného disku VeraCrypt.\n\nChcete vytvořit Záchranný disk VeraCrypt?</string>
     <string lang="cs" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">Pokoušíte se obnovit hlavičku virtuálního svazku VeraCrypt, ale vybrali jste systémový oddíl/disk. To není povoleno. Zálohovací/obnovovací operace týkající se systémového oddílu/disku mohou být provedeny pouze s použitím Záchranného disku VeraCrypt.\n\nChcete vytvořit Záchranný disk VeraCrypt?</string>
     <string lang="cs" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">Po kliknutí na OK zvolíte soubor pro nový obraz Záchranného disku VeraCrypt a místo, kam ho chcete uložit.</string>
-    <string lang="cs" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">Obraz Záchranného disku byl vytvořen a uložen v tomto souboru:\n%hs\n\nNyní musíte vypálit obraz Záchranného disku na CD nebo DVD.\n\nDŮLEŽÍTÉ: Soubor musí být na CD/DVD zapsán jako obraz disku (ne jako samostatný soubor). Pro více informací, viz dokumentace k vašemu CD/DVD vypalovacímu softwaru.\n\nAž Záchranný disk vypálíte, vyberte 'Systém' &gt; 'Ověřit záchranný disk', abyste zjistili, zda byl správně vypálen.</string>
+    <string lang="cs" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">Obraz Záchranného disku byl vytvořen a uložen v tomto souboru:\n%s\n\nNyní musíte vypálit obraz Záchranného disku na CD nebo DVD.\n\nDŮLEŽÍTÉ: Soubor musí být na CD/DVD zapsán jako obraz disku (ne jako samostatný soubor). Pro více informací, viz dokumentace k vašemu CD/DVD vypalovacímu softwaru.\n\nAž Záchranný disk vypálíte, vyberte 'Systém' &gt; 'Ověřit záchranný disk', abyste zjistili, zda byl správně vypálen.</string>
-    <string lang="cs" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">Obraz Záchranného disku byl vytvořen a uložen v tomto souboru:\n%hs\n\nNyní musíte vypálit obraz Záchranného disku na CD nebo DVD.\n\nChcete nyní spustit program Microsoft Windows Disc Image Burner?\n\nPoznámka: Až Záchranný disk vypálíte, vyberte 'Systém' &gt; 'Ověřit záchranný disk', abyste zjistili, zda byl správně vypálen.</string>
+    <string lang="cs" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">Obraz Záchranného disku byl vytvořen a uložen v tomto souboru:\n%s\n\nNyní musíte vypálit obraz Záchranného disku na CD nebo DVD.\n\nChcete nyní spustit program Microsoft Windows Disc Image Burner?\n\nPoznámka: Až Záchranný disk vypálíte, vyberte 'Systém' &gt; 'Ověřit záchranný disk', abyste zjistili, zda byl správně vypálen.</string>
-    <string lang="cs" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Vložte, prosím, Záchranný disk VeraCrypt do vaší CD/DVD mechaniky a klikněte OK pro jeho ověření.</string>
+    <string lang="cs" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Vložte, prosím, Záchranný disk VeraCrypt a klikněte OK pro jeho ověření.</string>
     <string lang="cs" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">Záchranný disk VeraCrypt byl úspěšně ověřen.</string>
     <string lang="cs" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">Nelze ověřit, zda byl Záchranný disk správně vypálen.\n\nPokud jste Záchranný disk vypálili, vložte ho prosím znovu do CD/DVD mechaniky a zkuste to znovu. Pokud to nepomůže, zkuste jiný vypalovací software a/nebo médium.\n\nPokusíte-li se ověřit Záchranný disk VeraCrypt vytvořený pro jiný hlavní klíč, heslo apod., mějte na vědomí, že takovéto ověřování Záchranného disku selže vždy. Pro vytvoření nového Záchranného disku, který je plně kompatibilní s aktuální konfigurací, vyberte 'Systém' &gt; 'Vytvořit Záchranný disk'.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk image fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
     <string lang="cs" key="ERROR_CREATING_RESCUE_DISK">Chyba při vytváření Záchranného disku VeraCrypt.</string>
     <string lang="cs" key="CANNOT_CREATE_RESCUE_DISK_ON_HIDDEN_OS">Záchranný disk VeraCrypt nemůže být vytvořen, pokud běží skrytý operační systém.\n\nPro vytvoření Záchranného disku VeraCrypt nabootujte klamný operační systém a vyberte 'Systém' &gt; 'Vytvořit Záchranný disk'.</string>
     <string lang="cs" key="RESCUE_DISK_CHECK_FAILED">Nelze ověřit, zda byl Záchranný disk správně vypálen.\n\nPokud jste Záchranný disk vypálili, vysuňte a znovu vložte CD/DVD; pak klikněte na Další a zkuste to znovu. Pokud to nepomůže, zkuste prosím jiné médium%s.\n\nPokud jste Záchranný disk ještě nevypálili, učiňte tak a klikněte na Další.\n\nPokud jste se pokusili ověřit VeraCrypt záchranný disk, který byl vytvořen ještě před tím, než jste spustili tohoto průvodce, vězte, že takový Záchranný disk nemůže být použit, protože byl vytvořen pro jiný hlavní klíč. Musíte vypálit nově vygenerovaný Záchranný disk.</string>
@@ -989,8 +998,8 @@
     <string lang="cs" key="DRIVE_LETTER_ITEM">Písmeno jednotky:   </string>
     <string lang="cs" key="UNSUPPORTED_CHARS_IN_PWD">Chyba: Heslo musí obsahovat jen ASCII znaky.\n\nNe-ASCII znaky v hesle mohou způsobit nemožnost připojení svazku při změně vaší systémové konfigurace.\n\nPovoleny jsou následující znaky:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4  5 6 7 8 9 : ; &lt; = &gt; ? @ 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="cs" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">Upozornění: Heslo obsahuje ne-ASCII znaky. To může způsobit nemožnost připojení svazku při změně vaší systémové konfigurace.\n\nMěli byste zaměnit všechny ne-ASCII znaky v hesle za ASCII znaky. Klikněte 'Svazky' -&gt; 'Změnit heslo svazku'.\n\nToto jsou ASCII znaky:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4  5 6 7 8 9 : ; &lt; = &gt; ? @ 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="cs" key="EXE_FILE_EXTENSION_CONFIRM">VAROVÁNÍ: Důrazně doporučujeme, abyste se vyhnuli souborům s příponami spustitelných souborů (např. .exe, .sys, nebo .dll) a ostatním stejně problematickým příponám. Použití takovýchto přípon způsobuje, že Windows a antivirové programy ruší souborový svazek, což nepříznivě ovlivňuje výkonnost svazku a může také způsobit další závažné problémy.\n\nDůrazně doporučujeme, abyste příponu odstranili nebo ji změnili (například na '.tc').\n\nJste si jisti, že chcete použít problematickou příponu souboru?</string>
+    <string lang="cs" key="EXE_FILE_EXTENSION_CONFIRM">VAROVÁNÍ: Důrazně doporučujeme, abyste se vyhnuli souborům s příponami spustitelných souborů (např. .exe, .sys, nebo .dll) a ostatním stejně problematickým příponám. Použití takovýchto přípon způsobuje, že Windows a antivirové programy ruší souborový svazek, což nepříznivě ovlivňuje výkonnost svazku a může také způsobit další závažné problémy.\n\nDůrazně doporučujeme, abyste příponu odstranili nebo ji změnili (například na '.hc').\n\nJste si jisti, že chcete použít problematickou příponu souboru?</string>
-    <string lang="cs" key="EXE_FILE_EXTENSION_MOUNT_WARNING">VAROVÁNÍ: Tento souborový svazek má příponu souborů, které se používají jako spustitelné (např. .exe, .sys, or .dll) nebo má jinou problematickou příponu. Velmi pravděpodobně to způsobí, že Windows a antivirové programy budou rušit souborový svazek, což nepříznivě ovlivní výkonnost svazku a může také způsobit další závažné problémy.\n\nDůrazně doporučujeme, abyste příponu svazku po odpojení odstranili nebo ji změnili (např. na '.tc').</string>
+    <string lang="cs" key="EXE_FILE_EXTENSION_MOUNT_WARNING">VAROVÁNÍ: Tento souborový svazek má příponu souborů, které se používají jako spustitelné (např. .exe, .sys, or .dll) nebo má jinou problematickou příponu. Velmi pravděpodobně to způsobí, že Windows a antivirové programy budou rušit souborový svazek, což nepříznivě ovlivní výkonnost svazku a může také způsobit další závažné problémy.\n\nDůrazně doporučujeme, abyste příponu svazku po odpojení odstranili nebo ji změnili (např. na '.hc').</string>
     <string lang="cs" key="HOMEPAGE">Domovská stránka</string>
     <string lang="cs" key="LARGE_IDE_WARNING_XP">UPOZORNĚNÍ: Zdá se, že jste nenainstalovali žádný Service Pack ve vaší instalaci Windows. Neměli byst zapisovat na IDE disky větší než 128 GB v systému Windows XP, ve kterém jste nenainstalovali Service Pack 1 nebo novější! Pokud tak učiníte, data na disku (bez ohledu na to, zda jde o svazek VeraCrypt nebo ne) se mohou poškodit. Jde o omezení Windows, ne chyba programu VeraCrypt.</string>
     <string lang="cs" key="LARGE_IDE_WARNING_2K">UPOZORNĚNÍ: Zdá se, že jste nenainstalovali Service Pack 3 nebo novější ve vaší instalaci Windows. Neměli byste zapisovat na disky větší než 128 GB v systému Windows 2000, ve kterém jste nenainstalovali Service Pack 3 nebo novější! Pokud tak učiníte, data na disku (bez ohledu na to, zda jde o svazek VeraCrypt nebo ne) se mohou poškodit. Jde o omezení Windows, ne chyba programu VeraCrypt.\n\nPoznámka: Možná také bude potřeba zapnout podporu 48-bit LBA v registrech; pro více informací viz http://support.microsoft.com/kb/305098/EN-US</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="cs" key="CHECKING_FS">Kontroluji systém souborů na svazku VeraCrypt připojeném jako %s…</string>
-    <string lang="cs" key="REPAIRING_FS">Pokouším se opravit souborový systém na svazku VeraCrypt připojeném jako %hs…</string>
+    <string lang="cs" key="REPAIRING_FS">Pokouším se opravit souborový systém na svazku VeraCrypt připojeném jako %s…</string>
-    <string lang="cs" key="WARN_CBC_MODE">Varování: Tento svazek je zašifrován v CBC módu. Kvůli bezpečnostním pravidlům je CBC mód nepoužíván od verze VeraCrypt 4.1.\n\nDůrazně doporučujeme, abyste přesunuli data z tohoto svazku VeraCrypt do nového svazku vytvořeného touto verzí programu VeraCrypt. Jakmile tak učiníte, měli byste bezpečně smazat nebo odstranit starý svazek. Pro více informací viz Historie verzí v dokumentaci nebo poznámkách vydaných k programu VeraCrypt verze 4.1 a novější.</string>
     <string lang="cs" key="WARN_64_BIT_BLOCK_CIPHER">Varování: Tento svazek je zašifrováno odkazovaným šifrovacím algoritmem.\n\nVšechny 64-bit-blokové šifrovací algoritmy (např. Blowfish, CAST-128 nebo Triple DES) jsou neschválené. Tento svazek bude možné připojit použitím budoucí verze programu VeraCrypt. Nicméně nebudou žádná další vylepšení těchto odkazovaných šifrovacích algoritmů. Doporučujeme vám vytvořit nový VeraCrypt svazek zašifrovaný 128-bit-blokovým šifrovacím algoritmem (např. AES, Serpent, Twofish, apod.) a přesuňte všechny souboru z tohoto svazku do nového.</string>
     <string lang="cs" key="SYS_AUTOMOUNT_DISABLED">Váš systém není nakonfigurován k autom. připojení nových svazků. Může se stát, že svazky VeraCrypt umístěné na zařízeních nebude možné připojit. Autom. připojení může být povoleno spuštěním následujícího příkazu a restartování systému.\n\nmountvol.exe /E</string>
     <string lang="cs" key="SYS_ASSIGN_DRIVE_LETTER">Přiřaďte prosím písmeno jednotky oddílu/zařízení než budete pokračovat ('Ovládací panely' &gt; 'Systém a údržba' &gt; 'Administrativní nástroje' - 'Vytvořit a formátovat oddíly pevného disku').\n\nJde o požadavek operačního systému.</string>
@@ -1069,7 +1077,7 @@
     <string lang="cs" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt na Windows Vista, kde není nainstalován žádný Service Pack, již nepodporuje šifrování systémových oddílů/disků. Před aktualizací VeraCryptu si prosím nainstalujte Service Pack 1 nebo vyšší.</string>
     <string lang="cs" key="FEATURE_REQUIRES_INSTALLATION">Chyba: Tato vlastnost vyžaduje, aby byl VeraCrypt nainstalován na vašem systému (aktuálně běží VeraCrypt v přenosném módu).\n\nNainstalujte, prosím, VeraCrypt, a pak to zkuste znovu.</string>
     <string lang="cs" key="WINDOWS_NOT_ON_BOOT_DRIVE_ERROR">VAROVÁNÍ: Zdá se, že Windows nejsou nainstalovány na stejném disku, jako odkud se spouští. To není podporováno.\n\nMěli byste pokračovat pouze tehdy, pokud jste si jisti, že Windows jsou nainstalovány na disku, odkud bootují.\n\nChcete pokračovat?</string>
-    <string lang="cs" key="GPT_BOOT_DRIVE_UNSUPPORTED">Váš systémový disk obsahuje GUID tabulku oddílů (GPT). Momentálně jsou podporovány jen disky s MBR tabulkou oddílů.</string>
+    <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</string>
     <string lang="cs" key="TC_BOOT_LOADER_ALREADY_INSTALLED">VAROVÁNÍ: Bootovací zavaděč VeraCryptu je již na vašem systémovém disku nainstalován!\n\nJe možné, že jiný systém na vašem počítači je již zašifrován.\n\nVAROVÁNÍ: BUDETE-LI POKRAČOVAT V ŠIFROVÁNÍ NYNÍ BĚŽÍCÍHO SYTÉMU, OSTATNÍ SYSTÉM NEMUSÍ POTÉ NABĚHNOUT A JEJICH DATA MOHOU BÝT NEPŘÍSTUPNÁ.\n\nJste si jisti, že chcete pokračovat?</string>
     <string lang="cs" key="SYS_LOADER_RESTORE_FAILED">Obnovení původního systémového zavaděče selhalo.\n\nPoužijte prosím váš Záchranný disk VeraCrypt ('Volby opravy' &gt; 'Obnovit původní systémový zavaděč') nebo instalační médium Windows a nahraďte bootovací zavaděč VeraCryptu systémovým zavaděčem Windows.</string>
     <string lang="cs" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">Původní systémový zavaděč nebude uložen na Záchranném disku (pravděpodobná příčina: chybějící záložní soubor).</string>
@@ -1108,8 +1116,8 @@
     <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 (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.\n\n- VRD bude obsahovat přesnou zálohu obsahu první stopy na disku (která obvykle obsahuje systémový zavaděč nebo bootovacího manažera) a budete ji moci tím pádem obnovit.\n\nObraz disku Záchranného disku VeraCrypt v místě uvedeném níže.</string>
     <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">Obraz záchranného disku byl vytvořen a uložen do tohoto souboru:\n%s\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>
+    <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%s\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>
     <string lang="cs" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">DŮLEŽITÉ: Soubor musí být na CD/DVD zapsán jako obraz disku (ne jako jeden soubor). Pro více informací viz dokumentace k vašemu softwaru pro vypalování CD/DVD. Pokud nevlastníte žádný CD/DVD vypalovací software, který umí zapisovat ISO obrazy disku na CD/DVD, klikněte níže na odkaz pro stažení softwaru zadarmo.\n\n</string>
     <string lang="cs" key="LAUNCH_WIN_ISOBURN">Spustit Microsoft Windows Disc Image Burner</string>
     <string lang="cs" key="RESCUE_DISK_BURN_NO_CHECK_WARN">VAROVÁNÍ: Pokud jste Záchranný disk VeraCrypt vytvořili již v minulosti, nemůže být znovu použit pro tento systémový oddíl/disk, protože byl vytvořen pro odlišný hlavní klíč! Pokaždé když zašifrujete systémový oddíl/disk, musíte pro něj vytvořit nový Záchranný disk VeraCrypt, i když použijete stejné heslo.</string>
@@ -1130,6 +1138,7 @@
     <string lang="cs" key="WIPE_MODE_1_RAND">1-stopý (náhodná data)</string>
     <string lang="cs" key="WIPE_MODE_3_DOD_5220">3-stopý (US DoD 5220.22-M)</string>
     <string lang="cs" key="WIPE_MODE_7_DOD_5220">7-stopý (US DoD 5220.22-M)</string>
+    <string lang="cs" key="WIPE_MODE_35_GUTMANN">35-stopý ("Gutmann")</string>
     <string lang="cs" key="WIPE_MODE_256">256-stopý</string>
     <string lang="cs" key="SYS_MULTI_BOOT_MODE_TITLE">Počet operačních systémů</string>
     <string lang="cs" key="MULTI_BOOT_FOR_ADVANCED_ONLY">VAROVÁNÍ: Nezkušení uživatelé by se nikdy neměli pokoušet zašifrovat Windows ve vícesystémové bootovací konfiguraci.\n\nPokračovat?</string>
@@ -1371,6 +1380,39 @@
     <string lang="cs" key="TB_PER_SEC">TB/s</string>
     <string lang="cs" key="PB_PER_SEC">PB/s</string>
     <string lang="cs" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.da.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="da" name="Dansk" en-name="Danish" version="0.1.0" translators="Lasse Bond" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="da" key="IDC_BROWSE">Gen&amp;nemse...</control>
     <control lang="da" key="IDC_DESKTOP_ICON">Tilføj VeraCrypt ikon til &amp;skrivebord</control>
     <control lang="en" key="IDC_DONATE">Donate now...</control>
-    <control lang="da" key="IDC_FILE_TYPE">Registrer .tc fil &amp;endelser som VeraCrypt</control>
+    <control lang="da" key="IDC_FILE_TYPE">Registrer .hc fil &amp;endelser som VeraCrypt</control>
     <control lang="da" key="IDC_OPEN_CONTAINING_FOLDER">&amp;Åben destinationsmappen efter afslutning</control>
     <control lang="da" key="IDC_PROG_GROUP">Tilføj VeraCrypt til &amp;Start menu</control>
     <control lang="da" key="IDC_SYSTEM_RESTORE">Opret system &amp;gendannelsespunkt</control>
@@ -37,6 +37,7 @@
     <control lang="da" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Download CD/DVD brænde software</control>
     <control lang="en" key="IDC_FILE_CONTAINER">Create an encrypted file container</control>
     <control lang="en" key="IDC_GB">&amp;GB</control>
+    <control lang="en" key="IDC_TB">&amp;TB</control>
     <control lang="da" key="IDC_HIDDEN_SYSENC_INFO_LINK">Mere information</control>
     <control lang="da" key="IDC_HIDDEN_VOL">Sk&amp;jult VeraCrypt bind </control>
     <control lang="da" key="IDC_HIDDEN_VOL_HELP">Mere information om skjulte bind</control>
@@ -44,6 +45,7 @@
     <control lang="da" key="IDC_HIDVOL_WIZ_MODE_FULL">Normal tilstand</control>
     <control lang="da" key="IDC_KB">&amp;KB</control>
     <control lang="da" key="IDC_KEYFILES_ENABLE">Brug nøglef&amp;iler</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="da" key="IDC_KEY_FILES">Nøglefiler..</control>
     <control lang="da" key="IDC_LINK_HASH_INFO">Information om hakke algoritmer</control>
@@ -58,7 +60,8 @@
     <control lang="da" key="IDC_NO_HISTORY">Gem aldrig hi&amp;storik</control>
     <control lang="da" key="IDC_OPEN_OUTER_VOLUME">Åben Ydre Bind</control>
     <control lang="da" key="IDC_PAUSE">&amp;Pause</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="da" key="IDC_QUICKFORMAT">Ekspres Formatering</control>
     <control lang="da" key="IDC_SHOW_PASSWORD">&amp;Vis kodeord</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Display password</control>
@@ -118,6 +121,7 @@
     <control lang="da" key="IDC_CREATE">Opret</control>
     <control lang="da" key="IDC_CREATE_VOLUME">&amp;Opret Bind</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <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="da" key="IDC_ENABLE_KEYFILES">Brug nøglef&amp;iler</control>
     <control lang="da" key="IDC_ENABLE_NEW_KEYFILES">Brug nøglef&amp;iler</control>
@@ -132,6 +136,7 @@
     <control lang="en" key="IDC_FAVORITE_MOVE_UP">Move &amp;Up</control>
     <control lang="en" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Open &amp;Explorer window for selected volume when successfully mounted</control>
     <control lang="en" key="IDC_FAVORITE_REMOVE">&amp;Remove</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="en" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Global Settings</control>
     <control lang="en" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Display balloon tooltip after successful hot-key dismount</control>
     <control lang="en" key="IDC_HK_DISMOUNT_PLAY_SOUND">Play system notification sound after successful hot-key dismount</control>
@@ -189,7 +194,7 @@
     <control lang="da" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="da" key="IDD_PASSWORDCHANGE_DLG">Ændre Kodeord eller Nøglefiler</control>
     <control lang="da" key="IDD_PASSWORD_DLG">Indtast VeraCrypt Bind kodeord</control>
-    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance Options</control>
+    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance and Driver Options</control>
     <control lang="da" key="IDD_PREFERENCES_DLG">VeraCrypt - Præferencer</control>
     <control lang="en" key="IDD_SYSENC_SETTINGS">VeraCrypt - System Encryption Settings</control>
     <control lang="en" key="IDD_TOKEN_PREFERENCES">VeraCrypt - Security Token Preferences</control>
@@ -235,7 +240,7 @@
     <control lang="da" key="IDM_ONLINE_TUTORIAL">Begyndervejledning</control>
     <control lang="en" key="IDM_ORGANIZE_FAVORITES">Organize Favorite Volumes...</control>
     <control lang="en" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organize System Favorite Volumes...</control>
-    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance...</control>
+    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance/Driver Configuration</control>
     <control lang="da" key="IDM_PERMANENTLY_DECRYPT_SYS">Dekrypter System Partition/Drev Permanent</control>
     <control lang="da" key="IDM_PREFERENCES">Præferencer...</control>
     <control lang="da" key="IDM_REFRESH_DRIVE_LETTERS">Opdater drev bogstaver</control>
@@ -256,6 +261,7 @@
     <control lang="da" key="IDM_UNMOUNTALL">Afbryd alle tilsluttede Bind</control>
     <control lang="da" key="IDM_UNMOUNT_VOLUME">Afbryd Bind</control>
     <control lang="da" key="IDM_VERIFY_RESCUE_DISK">Kontroller Nødhjælps Disk</control>
+    <control lang="en" key="IDM_VERIFY_RESCUE_DISK_ISO">Verify Rescue Disk Image</control>
     <control lang="da" key="IDM_VERSION_HISTORY">Versions Historik</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="da" key="IDM_VOLUME_PROPERTIES">Bind Egenskaber</control>
@@ -365,7 +371,7 @@
     <control lang="en" key="IDT_SECURITY_TOKEN">Security token:</control>
     <control lang="da" key="IDT_SORT_METHOD">Sorterings Metode:</control>
     <control lang="en" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Please wait. This process may take a long time...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="da" key="IDT_TEST_BLOCK_NUMBER">Blok nummer:</control>
     <control lang="da" key="IDT_TEST_CIPHERTEXT">Ciffer tekst (hexadecimal)</control>
     <control lang="da" key="IDT_TEST_DATA_UNIT_NUMBER">Data enheds nummer (64-bit hexadecimal, data enheds størrelsen er 512 bytes)</control>
@@ -410,13 +416,13 @@
     <string lang="da" key="CIPHER_TITLE">Krypterings Funktioner</string>
     <string lang="da" key="CLEAN_WINMRU_FAILED">ADVARSEL: Kunne ikke slette stien til det senest valgte bind/nøglefil (historik af filgennemsyn)!</string>
     <string lang="da" key="COMPRESSION_NOT_SUPPORTED">Fejl: Beholderen er blevet komprimeret ved filsystem niveau. VeraCrypt understøtter ikke komprimerede beholdere (Bemærk: Komprimering at krypterede data er ueffektivt og overflødig).\n\nSlå venligst komprimering af denne beholder fra ved at følge disse trin: 1) Højreklik på denne beholder i Windows Stifinder (ikke i VeraCrypt). 2) Vælg 'Egenskaber'. 3) I 'Egenskaber' dialog boks, klik 'Avanceret'. 4) I 'Advancede Attributter' dialog boks, slå funktionen 'Komprimer indhold for at spare diskplads' fra og klik 'OK'. 5) I 'Egenskaber' dialog boks, Klik 'OK'.</string>
-    <string lang="da" key="CREATE_FAILED">Fejl i oprettelsen af bind %hs</string>
+    <string lang="da" key="CREATE_FAILED">Fejl i oprettelsen af bind %s</string>
-    <string lang="da" key="DEVICE_FREE_BYTES">Størrelsen af %hs er %.2f bytes</string>
+    <string lang="da" key="DEVICE_FREE_BYTES">Størrelsen af %s er %.2f bytes</string>
-    <string lang="da" key="DEVICE_FREE_KB">Størrelsen af %hs er %.2f KB</string>
+    <string lang="da" key="DEVICE_FREE_KB">Størrelsen af %s er %.2f KB</string>
-    <string lang="da" key="DEVICE_FREE_MB">Størrelsen af %hs er %.2f MB</string>
+    <string lang="da" key="DEVICE_FREE_MB">Størrelsen af %s er %.2f MB</string>
-    <string lang="en" key="DEVICE_FREE_GB">Size of %hs is %.2f GB</string>
+    <string lang="en" key="DEVICE_FREE_GB">Size of %s is %.2f GB</string>
-    <string lang="en" key="DEVICE_FREE_TB">Size of %hs is %.2f TB</string>
+    <string lang="en" key="DEVICE_FREE_TB">Size of %s is %.2f TB</string>
-    <string lang="en" key="DEVICE_FREE_PB">Size of %hs is %.2f PB</string>
+    <string lang="en" key="DEVICE_FREE_PB">Size of %s is %.2f PB</string>
     <string lang="da" key="DEVICE_IN_USE_FORMAT">ADVARSEL: Enhed/partition er i brug af operativsystem eller andre applikationer. Formatering af enhed/partition kan medføre data korruption og system ustabilitet.\n\nFortsæt?</string>
     <string lang="en" key="DEVICE_IN_USE_INPLACE_ENC">Warning: The partition is in use by the operating system or applications. You should close any applications that might be using the partition (including antivirus software).\n\nContinue?</string>
     <string lang="da" key="FORMAT_CANT_DISMOUNT_FILESYS">Fejl: Enhed/partition indeholder et filsystem som ikke kunne afbrydes. Filsystemet kan være i brug af operativsystem. Formatering af enhed/partition vil sandsynligvis medføre data korruption og system ustabilitet.\n\nFor at løse dette problem, anbefaler vi at du først sletter paritionen og så genopretter den uden formatering. For at gøre dette, følg disse trin: 1) Højreklik på 'Computer' (eller 'Denne computer') ikonet i 'Start Menuen' og vælg and select 'Administrer'. Vinduet 'Computeradministration' bør da komme frem. 2) I vinduet 'Computeradministration', vælg 'Lager' &gt; 'Diskhåndtering'. 3) Højreklik på den partition du vil kryptere og vælg enten 'slet partition', eller 'slet bind', eller 'slet logisk drev'. 4) Klik 'Ja'. Hvis Windows beder dig om at genstarte computeren, gør dette. Gentag da trin 1 og 2 og fortsæt fra trin 5. 5) Højreklik på området for tildelt/ledig disk plads og vælg enten 'Ny Partition', eller 'Nyt Simpelt Bind', eller 'Nyt logisk drev'. 6) 'Ny Partition hjælp' eller 'Nyt Simpelt Bind hjælp' vinduet burde komme frem nu; følg instruktionerne. På hjælpesiden benævnt 'Formater Partition', vælg enten 'formater ikke denne partition' eller 'formater ikke dette bind'. I samme hjælp, klik 'Næste' og så 'Afslut'. 7) Bemærk at enhedsstien du har valgt i VeraCrypt måske er forkert nu. Derfor, gå ud af VeraCrypt Bind Oprettelseshjælp (hvis den stadig er åben) og så start den igen. 8) Prøv at kryptere enhed/partition igen.\n\nHvis VeraCrypt gentagne gange giver fejl ved kryptering af enhed/partition, måtte du måske overveje at oprette en fil-beholder istedet.</string>
@@ -435,15 +441,15 @@
     <string lang="en" key="INPLACE_ENC_INVALID_PATH">Error: VeraCrypt can in-place encrypt only a partition, a dynamic volume, or an entire system drive. Please make sure the specified path is valid.</string>
     <string lang="en" key="CANNOT_RESIZE_FILESYS">Error: Cannot shrink the filesystem (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPossible causes and solutions:\n\n- Not enough free space on the volume. Please make sure no other application is writing to the filesystem.\n\n- Corrupted file system. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
     <string lang="en" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Error: There is not enough free space on the volume and so the filesystem cannot be shrunk (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPlease delete any redundant files and empty the Recycle Bin so as to free at least 256 KB of space and then try again. Note that due to a Windows issue, the amount of free space reported by the Windows Explorer may be incorrect until the operating system is restarted. If restarting the system does not help, the file system may be corrupted. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
-    <string lang="da" key="DISK_FREE_BYTES">Den ledige plads på drevet %hs er %.2f bytes.</string>
+    <string lang="da" key="DISK_FREE_BYTES">Den ledige plads på drevet %s er %.2f bytes.</string>
-    <string lang="en" key="DISK_FREE_KB">Free space on drive %hs is %.2f KB</string>
+    <string lang="en" key="DISK_FREE_KB">Free space on drive %s is %.2f KB</string>
-    <string lang="en" key="DISK_FREE_MB">Free space on drive %hs is %.2f MB</string>
+    <string lang="en" key="DISK_FREE_MB">Free space on drive %s is %.2f MB</string>
-    <string lang="en" key="DISK_FREE_GB">Free space on drive %hs is %.2f GB</string>
+    <string lang="en" key="DISK_FREE_GB">Free space on drive %s is %.2f GB</string>
-    <string lang="en" key="DISK_FREE_TB">Free space on drive %hs is %.2f TB</string>
+    <string lang="en" key="DISK_FREE_TB">Free space on drive %s is %.2f TB</string>
-    <string lang="en" key="DISK_FREE_PB">Free space on drive %hs is %.2f PB</string>
+    <string lang="en" key="DISK_FREE_PB">Free space on drive %s is %.2f PB</string>
     <string lang="da" key="DRIVELETTERS">Kunne ikke finde ledige drev bogstaver.</string>
     <string lang="da" key="DRIVER_NOT_FOUND">Fejl: VeraCrypt driver er ikke fundet.\n\nKopier venligst filerne 'veracrypt.sys' og 'veracrypt-x64.sys' til biblioteket hvor VeraCrypt hovedprogrammet (VeraCrypt.exe) er placeret.</string>
-    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall; on Windows XP, select 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
+    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' > Computer > 'Uninstall or change a program' > VeraCrypt > Uninstall; on Windows XP, select 'Start Menu' > Settings > 'Control Panel' > 'Add Or Remove Programs' > VeraCrypt > Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
     <string lang="da" key="ERR_CIPHER_INIT_FAILURE">Fejl: Ciffer initialiseringsfejl.</string>
     <string lang="da" key="ERR_CIPHER_INIT_WEAK_KEY">Fejl: En svag eller potientiel svag nøgle er detekteret. Nøglen vil blive afvist. Prøv venligst igen.</string>
     <string lang="en" key="EXCEPTION_REPORT">A critical error has occurred and VeraCrypt must be terminated. If this is caused by a bug in VeraCrypt, we would like to fix it. To help us, you can send us an automatically generated error report containing the following items:\n\n- Program version\n- Operating system version\n- Type of CPU\n- VeraCrypt component name\n- Checksum of VeraCrypt executable\n- Symbolic name of dialog window\n- Error category\n- Error address\n- VeraCrypt call stack\n\nIf you select 'Yes', the following URL (which contains the entire error report) will be opened in your default Internet browser.\n\n%hs\n\nDo you want to send us the above error report?</string>
@@ -497,7 +503,7 @@
     <string lang="en" key="WIPE_FINISHED">The content of the partition/device has been successfully erased.</string>
     <string lang="en" key="WIPE_FINISHED_DECOY_SYSTEM_PARTITION">The content of the partition where the original system (of which the hidden system is a clone) resided has been successfully erased.</string>
     <string lang="en" key="DECOY_OS_VERSION_WARNING">Please make sure the version of Windows you are going to install (on the wiped partition) is the same as the version of Windows you are currently running. This is required due to the fact that both systems will share a common boot partition.</string>
-    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' &gt; 'Add Mounted Volume to System Favorites').</string>
+    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' > 'Add Mounted Volume to System Favorites').</string>
     <string lang="da" key="SYSTEM_DECRYPTION_FINISHED">System partitionen/drevet er dekrypteret med succes.</string>
     <string lang="da" key="FORMAT_FINISHED_HELP">\n\nVeraCrypt bindet er oprettet og klar til brug. Hvis du ønsker at oprette et andet VeraCrypt bind, klik Næste. Ellers, klik Afslut.</string>
     <string lang="en" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nThe hidden VeraCrypt volume has been successfully created (the hidden operating system will reside within this hidden volume).\n\nClick Next to continue.</string>
@@ -524,7 +530,7 @@
     <string lang="da" key="HIDVOL_HOST_FILLING_HELP_SYSENC">Det ydre bind er blevet oprettet og tilsluttet som drev %hc:. Til dette ydre bind bør du nu kopiere nogle følsomt udseende filer som du egentlig IKKE ønsker at skjule. De vil være der for dem der eventuelt afpresser dig til at afsløre kodeordet for den første partition bag system partitionen, hvor både det ydre og skjulte bind (indeholdende det skjulte operativsystem) vil være placeret. Du vil kunne afsløre kodeordet for dette ydre bind, og eksistensen af det skjulte bind (og det skjulte operativsystem) vil fortsat være hemmeligt.\n\nVIGTIGT: Filerne du kopierer til det ydre bind bør ikke optage mere plads end %s. Ellers er der muligvis ikke nok ledig plads i det ydre bind for det skjulte bind (og du vil ikke være i stand til at fortsætte). Efter du har afsluttet din kopiering, klik Næste (afbryd ikke bindet).</string>
     <string lang="da" key="HIDVOL_HOST_FILLING_HELP">Ydre Bind er oprettet med succes og tilsluttet som drev %hc:. Til dette bind bør du nu kopiere nogle filer over der ser følsomme ud, men som du egentlig ikke ønsker at skjule. Filerne vil så være der hvis nogen aftvinger dig dit kodeord. Du afslører da kun kodeordet for det ydre bind, ikke for det skjulte. De filer du virkelig bekymrer dig om vil være i det skjulte bind, som bliver oprettet senere. Når du er færdig med at kopiere, klik Næste. Afslut ikke bindet.\n\nBemærk: Når du har klikket på Næste, vil klynge bitmap til det ydre bind blive skannet for at afgøre størrelsen af uafbrudt fri plads hvis slutning ligger udenfor slutningen af bindet. Dette område vil indeholde det skjulte bind, så det vil begrænse den maksimale størrelse. Klynge bitmap skanning sikrer at ingen data på det ydre bind overskrives af det skjulte bind.</string>
     <string lang="da" key="HIDVOL_HOST_FILLING_TITLE">Ydre bind indeholder</string>
-    <string lang="da" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nI de næste trin indstiller du valgmuligheder for det ydre bind (hvori det skjulte bind vil blive oprettet senere). </string>
+    <string lang="da" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nI de næste trin indstiller du valgmuligheder for det ydre bind (hvori det skjulte bind vil blive oprettet senere).</string>
     <string lang="da" key="HIDVOL_HOST_PRE_CIPHER_HELP_SYSENC">\n\nI de næste trin, vil du oprette et såkaldt ydre VeraCrypt bind indeni den første partition bag system partition (som blev forklaret i en af de tidligere trin).</string>
     <string lang="da" key="HIDVOL_HOST_PRE_CIPHER_TITLE">Ydre bind</string>
     <string lang="en" key="HIDDEN_OS_PRE_CIPHER_HELP">In the following steps, you will set the options and password for the hidden volume, which will contain the hidden operating system.\n\nRemark: The cluster bitmap of the outer volume has been scanned in order to determine the size of uninterrupted area of free space whose end is aligned with the end of the outer volume. This area will accommodate the hidden volume, so it limits its maximum possible size. The maximum possible size of the hidden volume has been determined and confirmed to be greater than the size of the system partition (which is required, because the entire content of the system partition will need to be copied to the hidden volume). This ensures that no data currently stored on the outer volume will be overwritten by data written to the area of the hidden volume.</string>
@@ -561,6 +567,7 @@
     <string lang="da" key="MAX_HIDVOL_SIZE_KB">Den maksimale skjulte bind størrelse for dette bind er %.2f KB.</string>
     <string lang="da" key="MAX_HIDVOL_SIZE_MB">Den maksimale skjulte bind størrelse for dette bind er %.2f MB.</string>
     <string lang="en" key="MAX_HIDVOL_SIZE_GB">Maximum possible hidden volume size for this volume is %.2f GB.</string>
+    <string lang="en" key="MAX_HIDVOL_SIZE_TB">Maximum possible hidden volume size for this volume is %.2f TB.</string>
     <string lang="da" key="MOUNTED_NOPWCHANGE">Bind kodeord/nøglefiler kan ikke ændres mens bindet er tilsluttet. Afbryd venligst bindet først.</string>
     <string lang="da" key="MOUNTED_NO_PKCS5_PRF_CHANGE">Etiketnøgle oprindelses algoritmen kan ikke ændres mens bindet er tilsluttet. Afbryd venligst bindet først.</string>
     <string lang="da" key="MOUNT_BUTTON">&amp;Tilslut</string>
@@ -591,12 +598,12 @@
     <string lang="en" key="SELECT_PKCS11_MODULE">Select PKCS #11 Library</string>
     <string lang="da" key="OUTOFMEMORY">Ikke mere hukommelse</string>
     <string lang="en" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">IMPORTANT: We strongly recommend that inexperienced users create a VeraCrypt file container on the selected device/partition, instead of attempting to encrypt the entire device/partition.\n\nWhen you create a VeraCrypt file container (as opposed to encrypting a device or partition) there is, for example, no risk of destroying a large number of files. Note that a VeraCrypt file container (even though it contains a virtual encrypted disk) is actually just like any normal file. For more information, see the chapter Beginner's Tutorial in the VeraCrypt User Guide.\n\nAre you sure you want to encrypt the entire device/partition?</string>
-    <string lang="da" key="OVERWRITEPROMPT">ADVARSEL: Filen '%hs' eksisterer allerede!\n\nVIGTIGT: VERACRYPT KRYPTERER IKKE FILEN, MEN VIL SLETTE DEN. Er du sikker på du vil slette filen og erstatte den med en ny VeraCrypt beholder?</string>
+    <string lang="da" key="OVERWRITEPROMPT">ADVARSEL: Filen '%s' eksisterer allerede!\n\nVIGTIGT: VERACRYPT KRYPTERER IKKE FILEN, MEN VIL SLETTE DEN. Er du sikker på du vil slette filen og erstatte den med en ny VeraCrypt beholder?</string>
-    <string lang="da" key="OVERWRITEPROMPT_DEVICE">ADVARSEL: ALLE NUVÆRENDE FILER GEMT PÅ DET VALGTE %s '%hs'%s VIL BLIVE SLETTET OG TABT (DE BLIVER IKKE KRYPTERET)!\n\nEr du sikker på du ønsker at fortsætte med formatering?</string>
+    <string lang="da" key="OVERWRITEPROMPT_DEVICE">ADVARSEL: ALLE NUVÆRENDE FILER GEMT PÅ DET VALGTE %s '%s'%s VIL BLIVE SLETTET OG TABT (DE BLIVER IKKE KRYPTERET)!\n\nEr du sikker på du ønsker at fortsætte med formatering?</string>
-    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%s'%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting/decrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting/decrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting/decrypting, please make sure that you have backup copies of the files you want to encrypt/decrypt.\n\nDo you have such a backup?</string>
-    <string lang="da" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">FORSIGTIG: ALLE NUVÆRENDE GEMTE FILER PÅ PARTITIONEN '%hs'%s (F.EKS. PÅ DEN FØRSTE PARTITION BAG SYSTEM PARTITIONEN) VIL BLIVE SLETTET OG TABT (DE VIL IKKE BLIVE KRYPTERET)!\n\nEr du sikker på du ønsker at fortsætte med formattering?</string>
+    <string lang="da" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">FORSIGTIG: ALLE NUVÆRENDE GEMTE FILER PÅ PARTITIONEN '%s'%s (F.EKS. PÅ DEN FØRSTE PARTITION BAG SYSTEM PARTITIONEN) VIL BLIVE SLETTET OG TABT (DE VIL IKKE BLIVE KRYPTERET)!\n\nEr du sikker på du ønsker at fortsætte med formattering?</string>
     <string lang="en" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">WARNING: THE SELECTED PARTITION CONTAINS A LARGE AMOUNT OF DATA! Any files stored on the partition will be erased and lost (they will NOT be encrypted)!</string>
     <string lang="en" key="ERASE_FILES_BY_CREATING_VOLUME">Erase any files stored on the partition by creating a VeraCrypt volume within it</string>
     <string lang="da" key="PASSWORD">Kodeord</string>
@@ -645,7 +652,7 @@
     <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
     <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
     <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 &gt; Organize &gt; 'Folder and search options' &gt; View).</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="SELECTED_PARTITION_ALREADY_INPLACE_ENC">The selected partition/device is already fully encrypted.\nHeader Flags = 0x%.8X</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="da" key="PREV">&lt; &amp;Tilbage</string>
     <string lang="da" key="RAWDEVICES">Ude af stand til at vise de rå enheder der er installeret på dit system!</string>
-    <string lang="da" key="READONLYPROMPT">Bindet '%hs' eksisterer, og er læs-kun. Er du sikker på du vil erstatte det?</string>
+    <string lang="da" key="READONLYPROMPT">Bindet '%s' eksisterer, og er læs-kun. Er du sikker på du vil erstatte det?</string>
     <string lang="da" key="SELECT_DEST_DIR">Vælg destinationsmappe</string>
     <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>
@@ -680,13 +687,13 @@
     <string lang="da" key="TEST_CIPHERTEXT_SIZE">Testen ciffertekst du har angivet er for lang eller kort.</string>
     <string lang="da" key="TEST_KEY_SIZE">Testen nøgle du har angivet er for lang eller kort.</string>
     <string lang="da" key="TEST_PLAINTEXT_SIZE">Testen ren tekst du har angivet er for lang eller kort.</string>
-    <string lang="da" key="TWO_LAYER_CASCADE_HELP">To cifre i kaskade funktion i XTS tilstand. Hver blok bliver først krypteret med %hs (%d-bit nøgle) og så med %hs (%d-bit nøgle). Hvert ciffer bruger dets egen nøgle. Alle nøgler er indbyrdes uafhængige.</string>
+    <string lang="da" key="TWO_LAYER_CASCADE_HELP">To cifre i kaskade funktion i XTS tilstand. Hver blok bliver først krypteret med %s (%d-bit nøgle) og så med %s (%d-bit nøgle). Hvert ciffer bruger dets egen nøgle. Alle nøgler er indbyrdes uafhængige.</string>
-    <string lang="da" key="THREE_LAYER_CASCADE_HELP">Tre cifre i kaskade funktion i XTS tilstand. Hver blok bliver først krypteret med %hs (%d-bit nøgle), og så med %hs (%d-bit nøgle), og tilsidst med %hs (%d-bit nøgle). Hvert ciffer bruger dets egen nøgle. Alle nøgler er indbyrdes uafhængige.</string>
+    <string lang="da" key="THREE_LAYER_CASCADE_HELP">Tre cifre i kaskade funktion i XTS tilstand. Hver blok bliver først krypteret med %s (%d-bit nøgle), og så med %s (%d-bit nøgle), og tilsidst med %s (%d-bit nøgle). Hvert ciffer bruger dets egen nøgle. Alle nøgler er indbyrdes uafhængige.</string>
     <string lang="en" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Note that, depending on the operating system configuration, these auto-run and auto-mount features may work only when the traveler disk files are created on a non-writable CD/DVD-like medium. Also note that this is not a bug in VeraCrypt (it is a limitation of Windows).</string>
     <string lang="en" key="TRAVELER_DISK_CREATED">VeraCrypt traveler disk has been successfully created.\n\nNote that you need administrator privileges to run VeraCrypt in portable mode. Also note that, after examining the registry file, it may be possible to tell that VeraCrypt was run on a Windows system even if it is run in portable mode.</string>
     <string lang="da" key="TC_TRAVELER_DISK">VeraCrypt Rejse Disk</string>
     <string lang="da" key="TWOFISH_HELP">Designet af Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall, og Niels Ferguson. Udgivet i 1998. 256-bit nøgle, 128-bit blok. Drift tilstand er XTS. Twofish var en af AES finalisterne.</string>
-    <string lang="da" key="MORE_INFO_ABOUT">Mere information på %hs</string>
+    <string lang="da" key="MORE_INFO_ABOUT">Mere information på %s</string>
     <string lang="da" key="UNKNOWN">Ukendt</string>
     <string lang="en" key="ERR_UNKNOWN">An unspecified or unknown error occurred (%d).</string>
     <string lang="da" key="UNMOUNTALL_LOCK_FAILED">Nogle bind indeholder filer eller mapper som bliver brugt af andre programmer eller systemet.\n\nGennemtving afbrydelse?</string>
@@ -706,7 +713,7 @@
     <string lang="da" key="WRONG_VOL_TYPE">VeraCrypt kan ikke ændre kodeord for et fremmed bind.</string>
     <string lang="da" key="SELECT_FREE_DRIVE">Vælg venligst et ledigt drev bogstav fra listen.</string>
     <string lang="da" key="SELECT_A_MOUNTED_VOLUME">Vælg venligst et tilsluttet bind i drev bogstav listen.</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="da" key="CANT_CREATE_AUTORUN">Fejl: Kan ikke oprette autorun.inf</string>
     <string lang="da" key="ERR_PROCESS_KEYFILE">Fejl under bearbejdning af nøglefil!</string>
     <string lang="da" key="ERR_PROCESS_KEYFILE_PATH">Fejl under bearbejdning af nøglefil sti!</string>
@@ -851,7 +858,7 @@
     <string lang="da" key="INSTALL_FAILED">Fejl under installation.</string>
     <string lang="da" key="UNINSTALL_FAILED">Fejl under afinstallation.</string>
     <string lang="da" key="DIST_PACKAGE_CORRUPTED">Denne distributions pakke er beskadiget. Prøv venligst at downloade den igen (helst fra det officielle VeraCrypt websted på https://veracrypt.codeplex.com).</string>
-    <string lang="da" key="CANNOT_WRITE_FILE_X">Kan ikke skrive fil %hs</string>
+    <string lang="da" key="CANNOT_WRITE_FILE_X">Kan ikke skrive fil %s</string>
     <string lang="da" key="EXTRACTING_VERB">Udpakker</string>
     <string lang="da" key="CANNOT_READ_FROM_PACKAGE">Kan ikke læse data fra pakken.</string>
     <string lang="da" key="CANT_VERIFY_PACKAGE_INTEGRITY">Kan ikke kontrollere integriteten på denne distributions pakke.</string>
@@ -860,8 +867,8 @@
     <string lang="da" key="INSTALL_OK">VeraCrypt er installeret med succes.</string>
     <string lang="en" key="SETUP_UPDATE_OK">VeraCrypt has been successfully updated.</string>
     <string lang="en" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt has been successfully upgraded. However, before you can start using it, the computer must be restarted.\n\nDo you want to restart it now?</string>
-    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
+    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu > All programs > Accessories > System Tools > System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
-    <string lang="da" key="UNINSTALL_OK">VeraCrypt er afinstalleret med succes.\n\nKlik 'Afslut' for at fjerne VeraCrypt installer og mappen %hs. Bemærk at mappen ikke vil blive fjernet hvis den indeholder filer der blev installeret af VeraCrypt installer eller blev oprettet af VeraCrypt.</string>
+    <string lang="da" key="UNINSTALL_OK">VeraCrypt er afinstalleret med succes.\n\nKlik 'Afslut' for at fjerne VeraCrypt installer og mappen %s. Bemærk at mappen ikke vil blive fjernet hvis den indeholder filer der blev installeret af VeraCrypt installer eller blev oprettet af VeraCrypt.</string>
     <string lang="da" key="REMOVING_REG">Fjerner VeraCrypt i registreringsdatabasen</string>
     <string lang="da" key="ADDING_REG">Tilføjer i registreringsdatabasen</string>
     <string lang="da" key="REMOVING_APPDATA">Fjerner applikations-specifikke data</string>
@@ -872,10 +879,10 @@
     <string lang="da" key="CREATING_SYS_RESTORE">Opretter system gendannelsespunkt</string>
     <string lang="da" key="FAILED_SYS_RESTORE">Oprettelse af system gendannelsespunkt mislykket!</string>
     <string lang="da" key="INSTALLER_UPDATING_BOOT_LOADER">Opdaterer boot loader</string>
-    <string lang="da" key="INSTALL_OF_FAILED">Kunne ikke installere '%hs'. %hs Ønsker du at fortsætte installationen?</string>
+    <string lang="da" key="INSTALL_OF_FAILED">Kunne ikke installere '%s'. %s Ønsker du at fortsætte installationen?</string>
-    <string lang="da" key="UNINSTALL_OF_FAILED">Kunne ikke afinstallere '%hs'. %hs Ønsker du at fortsætte afinstallationen?</string>
+    <string lang="da" key="UNINSTALL_OF_FAILED">Kunne ikke afinstallere '%s'. %s Ønsker du at fortsætte afinstallationen?</string>
     <string lang="da" key="INSTALL_COMPLETED">Installationen fuldført.</string>
-    <string lang="da" key="CANT_CREATE_FOLDER">Mappen '%hs' kunne ikke oprettes</string>
+    <string lang="da" key="CANT_CREATE_FOLDER">Mappen '%s' kunne ikke oprettes</string>
     <string lang="da" key="CLOSE_TC_FIRST">VeraCrypt enhedsdriveren kan ikke frakobles.\n\nLuk venligst alle åbne VeraCrypt vinduer først. Hvis dette ikke hjælper, genstart venligst Windows og prøv igen.</string>
     <string lang="da" key="DISMOUNT_ALL_FIRST">Alle VeraCrypt bind skal afbrydes inden installation eller afinstallation af 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>
@@ -921,14 +928,14 @@
     <string lang="en" key="SYS_FAVORITE_VOLUMES_SAVED">System favorite volumes saved.\n\nTo enable mounting of system favorite volumes when the system starts, please select 'Settings' &gt; 'System Favorite Volumes' &gt; 'Mount system favorite volumes when Windows starts'.</string>
     <string lang="en" key="FAVORITE_ADD_DRIVE_DEV_WARNING">The volume you are adding to favorites is neither a partition nor a dynamic volume. Therefore, VeraCrypt will be unable to mount this favorite volume if the device number changes.</string>
     <string lang="en" key="FAVORITE_ADD_PARTITION_TYPE_WARNING">The volume you are adding to favorites is a partition not recognized by Windows.\n\nVeraCrypt will be unable to mount this favorite volume if the device number changes. Please set the type of the partition to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then add the partition to favorites again.</string>
-    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings &gt; Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
+    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings > Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_NETWORK_PATH_ERR">A container stored in a remote filesystem shared over a network cannot be automatically mounted when its host device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, the volume hosted on the device cannot be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable the volume hosted on the device to be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_LABEL_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, no label can be assigned to it.</string>
     <string lang="en" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable VeraCrypt to assign a label to the partition.</string>
     <string lang="en" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Due to a Windows limitation, a container stored in a remote filesystem shared over a network cannot be mounted as a system favorite volume (however, it can be mounted as a non-system favorite volume when a user logs on).</string>
-    <string lang="da" key="ENTER_PASSWORD_FOR">Skriv kodeord til %hs</string>
+    <string lang="da" key="ENTER_PASSWORD_FOR">Skriv kodeord til %s</string>
     <string lang="en" key="ENTER_PASSWORD_FOR_LABEL">Enter password for '%s'</string>
     <string lang="da" key="ENTER_NORMAL_VOL_PASSWORD">Indtast kodeord for det normale/ydre bind</string>
     <string lang="da" key="ENTER_HIDDEN_VOL_PASSWORD">Indtast kodeord for det skjulte bind</string>
@@ -943,8 +950,8 @@
     <string lang="da" key="VOL_HEADER_BACKED_UP">Backup af bind etiket er udført med succes.\n\nVIGTIGT: Gendannelse af bind etiket med dette backup vil også gendanne det nuværende binds kodeord. Derudover, hvis nøglefil(er) er nødvendige for at tilslutte bindet, vil de samme nøglefil(er) være nødvendige for at tilslutte bindet igen når bind etiketten gendannes.\n\nADVARSEL: Denne backup af bind etiket kan KUN bruges til at gendanne etiket for dette bestemte bind. Hvis du bruger denne etiket backup til at gendanne en etiket for et andet bind, vil du kunne tilslutte bindet, men du vil ikke være i stand til at dekryptere nogen data på bindet (fordi du vil ændre dets hovednøgle).</string>
     <string lang="da" key="VOL_HEADER_RESTORED">Bindets etiket er blevet gendannet med succes.\n\nVIGTIGT: Bemærk venligst at et gammelt kodeord også kan være gendannet. Derudover, hvis nøglefil(er) var nødvendig til at tilslutte bindet da backup var lavet, vil de samme nøglefil(er) nu være nødvendige for at tilslutte bindet igen.</string>
     <string lang="da" key="EXTERNAL_VOL_HEADER_BAK_FIRST_INFO">Af sikkerheds årsager, vil du være nødt til at indtaste det korrekte kodeord (og/eller tilføje de korrekte nøglefiler) til bindet.\n\nBemærk: Hvis bindet indeholder et skjult bind, vil du være nødt til at indtaste det korrekte kodeord (og/eller tilføje de korrekte nøglefiler) for det ydre bind først. Bagefter, hvis du ønsker at lave back up af etiketten på det skjulte bind, vil du være nødt til at indtaste det korrekte kodeord (og/eller tilføje de korrekte nøglefiler) for det skjulte bind.</string>
-    <string lang="da" key="CONFIRM_VOL_HEADER_BAK">Er du sikker på du ønsker at oprette bind etiket backup for %hs?\n\nEfter du har klikket Ja, vil du blive spurgt om et filnavn for etiket backup.\n\nBemærk: Både standard og det skjulte binds etiketter vil blive gen-krypteret ved brug af en ny pulje og gemt i backup filen. Hvis der ikke er noget skjult bind i dette bind, bliver området reserveret for det skjulte binds etiket i backup filen udfyldt med tilfældig data (for at bevare den troværdige benægtelse). Ved gendannelse af en bind etiket fra backup filen, vil du være nødt til at indtaste det korrekte kodeord (og/eller tilføje de korrekte nøglefiler) som var gældende da bind etiket backuppen blev oprettet. Kodeordet (og/eller nøglefiler) vil også automatisk bestemme typen af bind etiketten der skal gendannes, dvs. standard eller skjult (bemærk at VeraCrypt bestemmer typen gennem en proces med prøver og fejl).</string>
+    <string lang="da" key="CONFIRM_VOL_HEADER_BAK">Er du sikker på du ønsker at oprette bind etiket backup for %s?\n\nEfter du har klikket Ja, vil du blive spurgt om et filnavn for etiket backup.\n\nBemærk: Både standard og det skjulte binds etiketter vil blive gen-krypteret ved brug af en ny pulje og gemt i backup filen. Hvis der ikke er noget skjult bind i dette bind, bliver området reserveret for det skjulte binds etiket i backup filen udfyldt med tilfældig data (for at bevare den troværdige benægtelse). Ved gendannelse af en bind etiket fra backup filen, vil du være nødt til at indtaste det korrekte kodeord (og/eller tilføje de korrekte nøglefiler) som var gældende da bind etiket backuppen blev oprettet. Kodeordet (og/eller nøglefiler) vil også automatisk bestemme typen af bind etiketten der skal gendannes, dvs. standard eller skjult (bemærk at VeraCrypt bestemmer typen gennem en proces med prøver og fejl).</string>
-    <string lang="da" key="CONFIRM_VOL_HEADER_RESTORE">Er du sikker på du ønsker at gendanne bind etiketten for %hs?\n\nADVARSEL: Gendannelse af bind etiketter gendanner også det bind kodeord der var gældende da backup blev foretaget. Ydermere, hvis nøglefil(er) var påkrævet for at tilslutte bindet da backup blev foretaget, vil de samme nøglefiler være nødvendige for at tilslutte bindet igen efter bind etiketten er gendannet.\n\nEfter du har klikket Ja, kan du vælge backup etiket filen.</string>
+    <string lang="da" key="CONFIRM_VOL_HEADER_RESTORE">Er du sikker på du ønsker at gendanne bind etiketten for %s?\n\nADVARSEL: Gendannelse af bind etiketter gendanner også det bind kodeord der var gældende da backup blev foretaget. Ydermere, hvis nøglefil(er) var påkrævet for at tilslutte bindet da backup blev foretaget, vil de samme nøglefiler være nødvendige for at tilslutte bindet igen efter bind etiketten er gendannet.\n\nEfter du har klikket Ja, kan du vælge backup etiket filen.</string>
     <string lang="da" key="DOES_VOLUME_CONTAIN_HIDDEN">Indeholder bindet et skjult bind?</string>
     <string lang="da" key="VOLUME_CONTAINS_HIDDEN">Bindet indeholder et skjult bind</string>
     <string lang="da" key="VOLUME_DOES_NOT_CONTAIN_HIDDEN">Bindet indeholder ikke et skjult bind</string>
@@ -955,12 +962,14 @@
     <string lang="da" key="VOLUME_HAS_NO_BACKUP_HEADER">Der er ingen backup etiket indbygget i dette bind (bemærk at kun bind oprettet med VeraCrypt 6.0 eller senere indeholder indbyggede backup etiketter).</string>
     <string lang="da" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">Du forsøger at lave backup af etiket for system partition/drevet. Dette er ikke tilladt. Backup/gendan funktioner angående system partition/drev kan kun udføres ved hjælp af VeraCrypt Nødhjælps Disk.\n\nØnsker du at oprette en VeraCrypt Nødhjælps Disk?</string>
     <string lang="da" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">Du forsøger at gendanne en etiket for et virtuelt VeraCrypt bind men du valgte system partition/drev. Dette er ikke tilladt. Backup/gendan funktioner angående system partition/drev kan kun udføres ved hjælp af VeraCrypt Nødhjælps Disk.\n\nØnsker du at oprette en VeraCrypt Nødhjælps Disk?</string>
-    <string lang="da" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">Efter du har klikket OK, skal du vælge et filnavn til det nye VeraCrypt Nødhjælps Disk ISO billede og placeringen hvor du ønsker at placere det.</string>
+    <string lang="da" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">Efter du har klikket OK, skal du vælge et filnavn til det nye VeraCrypt Nødhjælps Disk billede og placeringen hvor du ønsker at placere det.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <string lang="da" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Indsæt venligst din VeraCrypt Nødhjælps Disk i dit CD/DVD drev og klik på OK for at kontrollere den.</string>
+    <string lang="da" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Indsæt venligst din VeraCrypt Nødhjælps Disk og klik på OK for at kontrollere den.</string>
     <string lang="da" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">VeraCrypt Nødhjælps Disk er blevet kontrolleret med succes.</string>
     <string lang="da" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">Kan ikke kontrollere at Nødhjælps Disk er blevet korrekt brændt.\n\nHvis du har brændt Nødhjælps Disk, vær venlig at tage CD/DVD ud og sætte den i igen; prøv så igen. Hvis dette ikke hjælper, prøv venligst en anden CD/DVD optager software og/eller medie.\n\nHvis du forsøgte at kontrollere en VeraCrypt Nødhjælps Disk oprettet med en anden hovednøgle, kodeord, salt, osv., bemærk venligst at en sådan Nødhjælps Disk altid vil fejle denne kontrol. For at oprette en ny Nødhjælps Disk der er fuld ud kompatibel med din nuværende konfiguration, vælg 'System' &gt; 'Opret Nødhjælps Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk image fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
     <string lang="da" key="ERROR_CREATING_RESCUE_DISK">Fejl i oprettelsen af VeraCrypt Nødhjælps Disk.</string>
     <string lang="da" key="CANNOT_CREATE_RESCUE_DISK_ON_HIDDEN_OS">VeraCrypt Nødhjælps Disk kan ikke oprettes når et skjult operativsystem kører.\n\nFor at oprette en VeraCrypt Nødhjælps Disk, boot op på aflednings operativsystemet og vælg så 'System' &gt; 'Opret Nødhjælps 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 be used, because it was created for a different master key. You need to burn the newly generated Rescue Disk.</string>
@@ -989,8 +998,8 @@
     <string lang="en" key="DRIVE_LETTER_ITEM">Drive Letter:   </string>
     <string lang="da" key="UNSUPPORTED_CHARS_IN_PWD">Fejl: Kodeord må kun indeholde ASCII karakterer.\n\nIkke-ASCII karakterer i kodeord kan forårsage at bindet vil være umuligt at tilslutte når dine system indstillinger ændres.\n\nFølgende karakterer kan anvendes:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="da" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">Advarsel: Kodeord indeholder ikke-ASCII karakterer. Dettekan forårsage at bindet vil være umuligt at tilslutte når dine system indstillinger ændres.\n\nDu bør udskifte alle ikke-ASCII karakterer i kodeordet med ASCII. For at gøre dette klik 'Bind' -&gt; 'Ændre Bind Kodeord'.\n\nFølgende er ASCII karakterer:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="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 change it (e.g., to '.tc').\n\nAre you sure you want to use the problematic file extension?</string>
+    <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 change it (e.g., to '.hc').\n\nAre you sure you want to use the problematic file extension?</string>
-    <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 container or change it (e.g., to '.tc') after you dismount the volume.</string>
+    <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 container or change it (e.g., to '.hc') after you dismount the volume.</string>
     <string lang="da" key="HOMEPAGE">Hjemmeside</string>
     <string lang="da" key="LARGE_IDE_WARNING_XP">ADVARSEL: Tilsyneladende har du ikke Service Packs i din Windows XP installation. Du bør ikke gemme på IDE diske større end 128 GB under Windows XP hvor du ikke har tilføjet Service Pack 1 eller nyere! Hvis du gør, vil data på disken (uanset om det er et VeraCrypt bind eller ej) blive ødelagt. Bemærk at dette er en begrænsning i Windows, ikke en fejl i VeraCrypt.</string>
     <string lang="da" key="LARGE_IDE_WARNING_2K">ADVARSEL: Tilsyneladende har du ikke Service Pack 3 eller nyere i din Windows installation. Du bør ikke gemme på IDE diske større end 128 GB under Windows 2000 hvor du ikke har tilføjet Service Pack 3 eller nyere! Hvis du gør, vil data på disken (uanset om det er et VeraCrypt bind eller ej) blive ødelagt. Bemærk at dette er en begrænsning i Windows, ikke en begræsning i VeraCrypt.\n\nBemærk: Måske er det også nødvendigt at aktivere 48-bit LBA support i registreringsdatabasen; for mere information, se http://support.microsoft.com/kb/305098/EN-US</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="da" key="CHECKING_FS">Kontrollerer fil systemet på VeraCrypt bindet tilsluttet som %s...</string>
-    <string lang="da" key="REPAIRING_FS">Prøver at reparere filsystemet på det VeraCrypt bind der er tilsluttet som %hs.</string>
+    <string lang="da" key="REPAIRING_FS">Prøver at reparere filsystemet på det VeraCrypt bind der er tilsluttet som %s.</string>
-    <string lang="da" key="WARN_CBC_MODE">Advarsel: Dette bind er krypteret i CBC tilstand. Pga. sikkerhedsproblemer, er CBC tilstand blevet nedvurderet siden VeraCrypt 4.1.\n\nVi anbefaler kraftigt at du flytter data fra dette VeraCrypt bind til et nyt bind oprettet med denne version af VeraCrypt. Efter du har gjort dette, bør du slette eller destruere det gamle bind sikkert. For mere information, se venligst Version History i dokumentationen eller udgivelsesnoterne distribueret med VeraCrypt 4.1 eller senere.</string>
     <string lang="da" key="WARN_64_BIT_BLOCK_CIPHER">Advarsel: Dette bind er krypteret med en ældre algoritme.\n\nAlle 64-bit-blok krypterings algoritmer (f.eks., Blowfish, CAST-128, eller Triple DES) foretrækkes ikke. Det vil være muligt at tilslutte disse bind med fremtidige versioner af VeraCrypt. Dog vil der fremover ikke komme flere forbedringer til udførelsen af disse ældre krypterings algoritmer. Vi anbefaler at du opretter et nyt VeraCrypt bind krypteret med 128-bit-blok krypterings algorithmer (f.eks., AES, Serpent, Twofish, osv.) og at du flytter alle filer til dette nye bind.</string>
     <string lang="da" key="SYS_AUTOMOUNT_DISABLED">Dit system er ikke konfigureret til automatisk at tilslutte nye bind. Det kan være umuligt at tilslutte enhedsbaserede VeraCrypt bind. Automatisk tilslutning kan konfigureres ved at køre denne kommando og genstarte systemet.\n\nmountvol.exe /E</string>
     <string lang="da" key="SYS_ASSIGN_DRIVE_LETTER">Tildel venligst et drev bogstav til partitionen/enheden før du fortsætter ('Kontrolpanel' &gt; 'Ydelse og Vedligeholdelse' &gt; 'Administration' - 'Computeradministration / Diskhåndtering').\n\nBemærk at dette er afhængig af det anvendte operativsystem.</string>
@@ -1069,7 +1077,7 @@
     <string lang="en" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt no longer supports encryption of the system partition/drive on Windows Vista with no Service Pack installed. Before upgrading VeraCrypt, please install Service Pack 1 or higher for Windows Vista.</string>
     <string lang="en" key="FEATURE_REQUIRES_INSTALLATION">Error: This feature requires VeraCrypt to be installed on the system (you are running VeraCrypt in portable mode).\n\nPlease install VeraCrypt and then try again.</string>
     <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="da" key="GPT_BOOT_DRIVE_UNSUPPORTED">Dit system drev har en GUID partitions tabel (GPT). For tiden er kun drev med en MBR partitions tabel supporteret.</string>
+    <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</string>
     <string lang="da" key="TC_BOOT_LOADER_ALREADY_INSTALLED">FORSIGTIG: VeraCrypt Boot Loader er allerede installeret på dit system drev!\n\nDet er muligt at et andet system på din computer allerede er krypteret.\n\nADVARSEL: FORTSÆTTELSE MED KRYPTERING AF DET NUVÆRENDE KØRENDE SYSTEM VIL KUNNE GØRE ANDRE SYSTEMER UMULIGE AT STARTE OG RELATERET DATA UTILGÆNGELIGT.\n\nEr du sikker på du ønsker at fortsætte?</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' &gt; 'Restore original system loader') or Windows installation medium to replace the VeraCrypt Boot Loader with the Windows system loader.</string>
     <string lang="da" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">Den originale system loader kan ikke gemmes på Nødhjælps Disk (mulig årsag: manglende backup fil).</string>
@@ -1093,7 +1101,7 @@
     <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 medium (or using a service partition)?</string>
     <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 Hidden Volumes" in the VeraCrypt User's Guide.\n\nImportant: Before proceeding, please make sure you have read the section "Security Requirements and Precautions Pertaining to Hidden Volumes" in the VeraCrypt User's Guide.\n\n\nDoes the currently running operating system meet the above condition?</string>
     <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 from writing to the shared boot partition and from hibernating.\n\n\nDo you want to continue? If you select 'No', instructions for removing the extra boot partition will be displayed.</string>
-    <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' &gt; '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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
+    <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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
     <string lang="da" key="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">Advarsel: Der er uallokeret område mellem system partition og den første partition bag den. Efter du har oprettet det skjulte operativsystem, må du ikke oprette nogle nye partitioner i det uallokerede område. Ellers vil det skjulte operativsystem være umuligt at boote (indtil du sletter sådanne nyoprettede partitioner).</string>
     <string lang="da" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Denne algoritme er for tiden ikke supporteret til system kryptering.</string>
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
@@ -1108,8 +1116,8 @@
     <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 (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 starts.\n\n- The VRD will contain a backup of the present content of the first drive track (which typically contains a system loader or boot manager) and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ISO image will be created in the location specified below.</string>
     <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">The Rescue Disk image has been created and stored in this file:\n%s\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>
+    <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%s\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>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">IMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software. If you do not have any CD/DVD recording software that can write the ISO disk image to a CD/DVD, click the link below to download such free software.\n\n</string>
     <string lang="en" key="LAUNCH_WIN_ISOBURN">Launch Microsoft Windows Disc Image Burner</string>
     <string lang="da" key="RESCUE_DISK_BURN_NO_CHECK_WARN">ADVARSEL: Hvis du allerede har oprettet en VeraCrypt Nødhjælps Disk tidligere, kan den ikke genbruges til denne system partition/drev fordi den blev oprettet med en anden hoved nøgle! Hver gang du krypterer en system partition/drev, skal du oprette en ny VeraCrypt Nødhjælps Disk for den, selv om du anvender samme kodeord.</string>
@@ -1247,7 +1255,7 @@
     <string lang="da" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">Hvis du oplever nogle af de tidligere beskrevne problemer, dekrypter partition/drev (hvis det er krypteret) og prøv så at kryptere det igen ved brug af en ikke-kaskade krypterings algorithme (f.eks. 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 system (but not on the decoy system), the decoy system would contain a VeraCrypt driver and VeraCrypt applications whose version numbers are different from the version number of the VeraCrypt Boot Loader. Such a discrepancy might indicate that there is a hidden operating system on this computer.\n\n\nDo you want to continue?</string>
     <string lang="da" key="UPDATE_TC_IN_HIDDEN_OS_TOO">Versions nummeret på den VeraCrypt Boot Loader der bootede dette operativsystem er forskellig fra det versions nummer på den VeraCrypt driver (og VeraCrypt applikationer) der er installeret på dette system.\n\nDu bør køre VeraCrypt installering (med det samme versions nummer som VeraCrypt Boot Loader) for at opdatere VeraCrypt på dette operativsystem.</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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' &gt; '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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' > 'Create Rescue Disk').</string>
     <string lang="da" key="BOOT_LOADER_UPGRADE_OK">VeraCrypt Boot Loader er blevet opgraderet.\n\nDet anbefales kraftigt at du opretter en ny VeraCrypt Nødhjælps Disk (som vil indeholde den nye version af VeraCrypt Boot Loader) ved at vælge 'System' &gt; 'Opret Nødhjælps Disk' efter du har genstartet din computer.</string>
     <string lang="da" key="BOOT_LOADER_UPGRADE_OK_HIDDEN_OS">VeraCrypt Boot Loader er blevet opgraderet.\n\nDet anbefales kraftigt at du booter aflednings operativsystemet og så opretter en ny VeraCrypt Nødhjælps Disk (som vil indeholde den nye version af VeraCrypt Boot Loader) ved at vælge 'System' &gt; 'Opret Nødhjælps Disk'.</string>
     <string lang="da" key="BOOT_LOADER_UPGRADE_FAILED">Fejl i opgradering af VeraCrypt Boot Loader.</string>
@@ -1272,7 +1280,7 @@
     <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' &gt; '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>
@@ -1297,8 +1305,8 @@
     <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 system.</string>
     <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' &gt; 'Performance' and enable 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' &gt; 'Performance' and disable 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>
@@ -1372,6 +1380,39 @@
     <string lang="da" key="TB_PER_SEC">TB/s</string>
     <string lang="da" key="PB_PER_SEC">PB/s</string>
     <string lang="en" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.el.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="el" name="Ελληνικά" en-name="Greek" version="0.1.0" translators="Βασίλης Κοσμίδης" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="el" key="IDC_BROWSE">Αναζή&amp;τηση...</control>
     <control lang="el" key="IDC_DESKTOP_ICON">Προσθήκη VeraCrypt στην ε&amp;πιφάνεια εργασίας</control>
     <control lang="en" key="IDC_DONATE">Donate now...</control>
-    <control lang="el" key="IDC_FILE_TYPE">Συσχέτιση της &amp;επέκτασης αρχείων .tc με το VeraCrypt</control>
+    <control lang="el" key="IDC_FILE_TYPE">Συσχέτιση της &amp;επέκτασης αρχείων .hc με το VeraCrypt</control>
     <control lang="el" key="IDC_OPEN_CONTAINING_FOLDER">Ά&amp;νοιγμα του τόπου προορισμού με τη λήξη</control>
     <control lang="el" key="IDC_PROG_GROUP">Προσθήκη του VeraCrypt στο μεν&amp;ού Έναρξη</control>
     <control lang="el" key="IDC_SYSTEM_RESTORE">Δημιουργία σημείου επα&amp;ναφοράς συστήματος</control>
@@ -37,13 +37,15 @@
     <control lang="el" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Κατέβασμα λογισμικού εγγραφής CD/DVD</control>
     <control lang="en" key="IDC_FILE_CONTAINER">Create an encrypted file container</control>
     <control lang="en" key="IDC_GB">&amp;GB</control>
+    <control lang="en" key="IDC_TB">&amp;TB</control>
     <control lang="en" key="IDC_HIDDEN_SYSENC_INFO_LINK">More information</control>
-    <control lang="el" key="IDC_HIDDEN_VOL">Κρυ&amp;φός τόμος VeraCrypt</control>
+    <control lang="el" key="IDC_HIDDEN_VOL">Κρυ&amp;φός τόμος VeraCrypt </control>
     <control lang="el" key="IDC_HIDDEN_VOL_HELP">Περισσότερες πληροφορίες για κρυφούς τόμους</control>
     <control lang="el" key="IDC_HIDVOL_WIZ_MODE_DIRECT">Άμεση μέθοδος</control>
     <control lang="el" key="IDC_HIDVOL_WIZ_MODE_FULL">Κανονική μέθοδος</control>
     <control lang="el" key="IDC_KB">&amp;KB</control>
     <control lang="el" key="IDC_KEYFILES_ENABLE">Χ&amp;ρήση αρχ.-κλειδιού</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="el" key="IDC_KEY_FILES">Αρ&amp;χεία-κλειδιά</control>
     <control lang="el" key="IDC_LINK_HASH_INFO">Πληροφορίες για αλγόριθμους hash</control>
@@ -58,7 +60,8 @@
     <control lang="el" key="IDC_NO_HISTORY">Όχι απο&amp;θήκευση ιστορικού</control>
     <control lang="el" key="IDC_OPEN_OUTER_VOLUME">Άνοιγμα εξωτερ. τόμου</control>
     <control lang="el" key="IDC_PAUSE">&amp;Παύση</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="el" key="IDC_QUICKFORMAT">Γρήγορη διαμόρφωση</control>
     <control lang="el" key="IDC_SHOW_PASSWORD">Εμφάνιση &amp;κωδικού</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Display password</control>
@@ -71,13 +74,13 @@
     <control lang="el" key="IDC_SYS_PARTITION">Κρυπτογράφηση του διαμερίσματος των Windows</control>
     <control lang="el" key="IDC_WHOLE_SYS_DRIVE">Κρυπτογράφηση ολόκληρου του οδηγού</control>
     <control lang="el" key="IDD_VOL_CREATION_WIZARD_DLG">Οδηγός δημιουργίας τόμου VeraCrypt</control>
-    <control lang="el" key="IDT_CLUSTER">Ομάδα</control>
+    <control lang="el" key="IDT_CLUSTER">Ομάδα </control>
     <control lang="el" key="IDT_COLLECTING_RANDOM_DATA_NOTE">ΣΗΜΑΝΤΙΚΟ: Κινήστε το ποντίκι όσο πιο τυχαία γίνεται μέσα σε αυτό το παράθυρο. Όσο περισσότερο, τόσο καλύτερα. Αυτό αυξάνει σημαντικά την κρυπτογραφική ικανότητα των κλειδιών κρυπτογράφησης. Κατόπιν πιέστε Επόμενο για να συνεχίσετε.</control>
     <control lang="el" key="IDT_CONFIRM">&amp;Επιβεβαίωση:</control>
     <control lang="el" key="IDT_DONE">Ολ/θηκε</control>
     <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="el" key="IDT_ENCRYPTION_ALGO">Αλγόριθμος κρυπτογράφησης</control>
-    <control lang="el" key="IDT_FILESYSTEM">Σύστημα αρχείων</control>
+    <control lang="el" key="IDT_FILESYSTEM">Σύστημα αρχείων </control>
     <control lang="el" key="IDT_FILE_CONTAINER">Δημιουργεί έναν εικονικό κρυπτογραφημένο δίσκο μέσα σε ένα αρχείο. Συνίσταται για μη έμπειρους χρήστες.</control>
     <control lang="el" key="IDT_FORMAT_OPTIONS">Επιλογές</control>
     <control lang="el" key="IDT_HASH_ALGO">Αλγόριθμος hash</control>
@@ -118,6 +121,7 @@
     <control lang="el" key="IDC_CREATE">Δημιουργία</control>
     <control lang="el" key="IDC_CREATE_VOLUME">&amp;Δημιουργία τόμου</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <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="el" key="IDC_ENABLE_KEYFILES">Χρήση αρχ.-κλειδιών</control>
     <control lang="el" key="IDC_ENABLE_NEW_KEYFILES">Χρήση αρχ.-κλειδιών</control>
@@ -132,11 +136,12 @@
     <control lang="en" key="IDC_FAVORITE_MOVE_UP">Move &amp;Up</control>
     <control lang="en" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Open &amp;Explorer window for selected volume when successfully mounted</control>
     <control lang="en" key="IDC_FAVORITE_REMOVE">&amp;Remove</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="en" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Global Settings</control>
     <control lang="en" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Display balloon tooltip after successful hot-key dismount</control>
     <control lang="en" key="IDC_HK_DISMOUNT_PLAY_SOUND">Play system notification sound after successful hot-key dismount</control>
     <control lang="el" key="IDC_HK_MOD_ALT">Alt</control>
-    <control lang="en" key="IDC_HK_MOD_CTRL">Ctrl</control>
+    <control lang="el" key="IDC_HK_MOD_CTRL">Ctrl</control>
     <control lang="el" key="IDC_HK_MOD_SHIFT">Shift</control>
     <control lang="el" key="IDC_HK_MOD_WIN">Win</control>
     <control lang="el" key="IDC_HOTKEY_ASSIGN">Καθορισμός</control>
@@ -189,7 +194,7 @@
     <control lang="el" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="el" key="IDD_PASSWORDCHANGE_DLG">Αλλαγή κωδικού ή αρχείων-κλειδιών</control>
     <control lang="el" key="IDD_PASSWORD_DLG">Εισαγωγή κωδικού τόμου VeraCrypt</control>
-    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance Options</control>
+    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance and Driver Options</control>
     <control lang="el" key="IDD_PREFERENCES_DLG">VeraCrypt - Επιλογές</control>
     <control lang="en" key="IDD_SYSENC_SETTINGS">VeraCrypt - System Encryption Settings</control>
     <control lang="en" key="IDD_TOKEN_PREFERENCES">VeraCrypt - Security Token Preferences</control>
@@ -235,7 +240,7 @@
     <control lang="el" key="IDM_ONLINE_TUTORIAL">Οδηγός αρχαρίων</control>
     <control lang="en" key="IDM_ORGANIZE_FAVORITES">Organize Favorite Volumes...</control>
     <control lang="en" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organize System Favorite Volumes...</control>
-    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance...</control>
+    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance/Driver Configuration</control>
     <control lang="el" key="IDM_PERMANENTLY_DECRYPT_SYS">Μόνιμη αποκρυπτογράφηση διαμερίσματος/οδηγού συστήματος</control>
     <control lang="el" key="IDM_PREFERENCES">Επιλογές...</control>
     <control lang="el" key="IDM_REFRESH_DRIVE_LETTERS">Επανέλεγχος γραμμάτων οδηγών</control>
@@ -256,6 +261,7 @@
     <control lang="el" key="IDM_UNMOUNTALL">Εκφόρτωση όλων των φορτωμένων τόμων</control>
     <control lang="el" key="IDM_UNMOUNT_VOLUME">Εκφόρτωση τόμων</control>
     <control lang="el" key="IDM_VERIFY_RESCUE_DISK">Επαλήθευση Δίσκου Ασφαλείας</control>
+    <control lang="en" key="IDM_VERIFY_RESCUE_DISK_ISO">Verify Rescue Disk Image</control>
     <control lang="el" key="IDM_VERSION_HISTORY">Ιστορικό εκδόσεων</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="el" key="IDM_VOLUME_PROPERTIES">Ιδιότητες τόμου</control>
@@ -289,7 +295,7 @@
     <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="el" key="IDT_PKCS5_PRF">PKCS-5 PRF:</control>
-    <control lang="en" key="IDT_NEW_PKCS5_PRF">PKCS-5 PRF:</control>
+    <control lang="el" key="IDT_NEW_PKCS5_PRF">PKCS-5 PRF:</control>
     <control lang="el" key="IDT_PW_CACHE_OPTIONS">Cache κωδικού</control>
     <control lang="en" key="IDT_SECURITY_OPTIONS">Security Options</control>
     <control lang="el" key="IDT_TASKBAR_ICON">Εργασία VeraCrypt στο παρασκήνιο</control>
@@ -365,7 +371,7 @@
     <control lang="en" key="IDT_SECURITY_TOKEN">Security token:</control>
     <control lang="el" key="IDT_SORT_METHOD">Μέθοδος ταξινόμησης:</control>
     <control lang="en" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Please wait. This process may take a long time...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="el" key="IDT_TEST_BLOCK_NUMBER">Αριθμός μπλοκ:</control>
     <control lang="el" key="IDT_TEST_CIPHERTEXT">Κρυπτοκείμενο (δεκαεξαδικό)</control>
     <control lang="el" key="IDT_TEST_DATA_UNIT_NUMBER">Αριθμός μονάδων δεδομένων(64-bit 16δικό, μέγεθος μονάδας δεδομένων 512 bytes)</control>
@@ -379,7 +385,7 @@
     <control lang="el" key="MENU_TOOLS">Ερ&amp;γαλεία</control>
     <control lang="en" key="MENU_SETTINGS">Settin&amp;gs</control>
     <control lang="el" key="MENU_HELP">&amp;Βοήθεια</control>
-    <control lang="el" key="MENU_WEBSITE">Ισ&amp;τοτόπος</control>
+    <control lang="el" key="MENU_WEBSITE">   Ισ&amp;τοτόπος   </control>
     <!-- Strings -->
     <string lang="el" key="ABOUTBOX">&amp;Περί...</string>
     <string lang="el" key="ACCESSMODEFAIL">Το χαρακτηριστικό "μόνο για ανάγνωση" στον παλιό τόμο σας δεν άλλαξε. Παρακαλώ ελέγξτε τις ρυθμίσεις προσβασιμότητας του αρχείου.</string>
@@ -410,13 +416,13 @@
     <string lang="el" key="CIPHER_TITLE">Επιλογές κρυπτογράφησης</string>
     <string lang="el" key="CLEAN_WINMRU_FAILED">ΠΡΟΣΟΧΗ: Αποτυχία καθαρισμού διαδρομής του τελευταίου τόμου/αρχείου-κλειδιού που επιλέχθηκε (καταγεγραμμένου από τον επιλογέα αρχείων)!</string>
     <string lang="el" key="COMPRESSION_NOT_SUPPORTED">Σφάλμα: Το αρχείο-τόμος έχει συμπιεστεί στο επίπεδο του συστήματος αρχείων. Το VeraCrypt δεν υποστηρίζει συμπιεσμένα αρχεία-τόμους (σημειωτέον ότι η συμπίεση κρυπτογραφημένων δεδομένων είναι αναποτελεσματική και περιττή).\n\nΠαρακαλώ απενεργοποιήστε τη συμπίεση για το αρχείο-τόμο ακολουθώντας τα εξής: 1) Κάντε δεξί κλικ στο αρχείο-τόμο στον Windows Explorer (όχι στο VeraCrypt). 2) Επιλέξτε "Ιδιότητες". 3) Επιλέξτε "Για προχωρημένους" και απενεργοποιήστε την επιλογή "Συμπίεση περιεχομένων για εξοικονόμηση χώρου στο δίσκο".</string>
-    <string lang="el" key="CREATE_FAILED">Αποτυχία δημιουργίας τόμου %hs</string>
+    <string lang="el" key="CREATE_FAILED">Αποτυχία δημιουργίας τόμου %s</string>
-    <string lang="el" key="DEVICE_FREE_BYTES">Μέγεθος %hs %.2f bytes</string>
+    <string lang="el" key="DEVICE_FREE_BYTES">Μέγεθος %s %.2f bytes</string>
-    <string lang="el" key="DEVICE_FREE_KB">Μέγεθος %hs %.2f KB</string>
+    <string lang="el" key="DEVICE_FREE_KB">Μέγεθος %s %.2f KB</string>
-    <string lang="el" key="DEVICE_FREE_MB">Μέγεθος %hs %.2f MB</string>
+    <string lang="el" key="DEVICE_FREE_MB">Μέγεθος %s %.2f MB</string>
-    <string lang="en" key="DEVICE_FREE_GB">Size of %hs is %.2f GB</string>
+    <string lang="en" key="DEVICE_FREE_GB">Size of %s is %.2f GB</string>
-    <string lang="en" key="DEVICE_FREE_TB">Size of %hs is %.2f TB</string>
+    <string lang="en" key="DEVICE_FREE_TB">Size of %s is %.2f TB</string>
-    <string lang="en" key="DEVICE_FREE_PB">Size of %hs is %.2f PB</string>
+    <string lang="en" key="DEVICE_FREE_PB">Size of %s is %.2f PB</string>
     <string lang="el" key="DEVICE_IN_USE_FORMAT">ΠΡΟΣΟΧΗ: Η συσκευή/διαμέρισμα είναι σε χρήση από το λειτουργικό σύστημα ή εφαρμογές. Η διαμόρφωση της μπορεί να προκαλέσει απώλεια δεδομένων και αστάθεια συστήματος.\n\nΣυνέχεια;</string>
     <string lang="en" key="DEVICE_IN_USE_INPLACE_ENC">Warning: The partition is in use by the operating system or applications. You should close any applications that might be using the partition (including antivirus software).\n\nContinue?</string>
     <string lang="el" key="FORMAT_CANT_DISMOUNT_FILESYS">Σφάλμα: Η συσκευή/διαμέρισμα περιέχει ένα σύστημα αρχείων που δεν μπόρεσε να εκφορτωθεί. Το σύστημα αρχείων μπορεί να είναι σε χρήση από το λειτουργικό σύστημα. Η διαμόρφωση της συσκευής/διαμερίσματος πιθανότατα θα προκαλέσει απώλεια δεδομένων και αστάθεια συστήματος.\n\nΓια να επιλύσετε το πρόβλημα προτείνουμε να διαγράψετε πρώτα το διαμέρισμα και να το ξαναδημιουργήσετε χωρίς διαμόρφωση.</string>
@@ -433,17 +439,17 @@
     <string lang="en" key="INPLACE_ENC_ALTERNATIVE_STEPS">To encrypt the data on this partition, please follow these steps:\n\n1) Create a VeraCrypt volume on an empty partition/device and then mount it.\n\n2) Copy all files from the partition that you originally wanted to encrypt to the mounted VeraCrypt volume (that has been created and mounted in step 1). That way, you will create a VeraCrypt-encrypted backup of the data.\n\n3) Create a VeraCrypt volume on the partition that you originally wanted to encrypt and make sure that (in the VeraCrypt wizard) you choose the option "Create encrypted volume and format it" (instead of the option "Encrypt partition in place"). Note that all data stored on the partition will be erased. After the volume is created, mount it.\n\n4) Copy all files from the mounted backup VeraCrypt volume (created and mounted in step 1) to the mounted VeraCrypt volume that has been created (and mounted) in step 3.\n\nAfter you complete these steps, the data will be encrypted and, in addition, there will be an encrypted backup of the data.</string>
     <string lang="en" key="RAW_DEV_NOT_SUPPORTED_FOR_INPLACE_ENC">VeraCrypt can in-place encrypt only a partition, a dynamic volume, or an entire system drive.\n\nIf you want to create an encrypted VeraCrypt volume within the selected non-system device, choose the option "Create encrypted volume and format it" (instead of the option "Encrypt partition in place").</string>
     <string lang="en" key="INPLACE_ENC_INVALID_PATH">Error: VeraCrypt can in-place encrypt only a partition, a dynamic volume, or an entire system drive. Please make sure the specified path is valid.</string>
-    <string lang="en" key="CANNOT_RESIZE_FILESYS">Error: Cannot shrink the filesystem (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPossible causes and solutions:\n\n- Not enough free space on the volume. Please make sure no other application is writing to the filesystem.\n\n- Corrupted file system. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
+    <string lang="en" key="CANNOT_RESIZE_FILESYS">Error: Cannot shrink the filesystem (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPossible causes and solutions:\n\n- Not enough free space on the volume. Please make sure no other application is writing to the filesystem.\n\n- Corrupted file system. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties > Tools > 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
-    <string lang="en" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Error: There is not enough free space on the volume and so the filesystem cannot be shrunk (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPlease delete any redundant files and empty the Recycle Bin so as to free at least 256 KB of space and then try again. Note that due to a Windows issue, the amount of free space reported by the Windows Explorer may be incorrect until the operating system is restarted. If restarting the system does not help, the file system may be corrupted. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
+    <string lang="en" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Error: There is not enough free space on the volume and so the filesystem cannot be shrunk (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPlease delete any redundant files and empty the Recycle Bin so as to free at least 256 KB of space and then try again. Note that due to a Windows issue, the amount of free space reported by the Windows Explorer may be incorrect until the operating system is restarted. If restarting the system does not help, the file system may be corrupted. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties > Tools > 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
-    <string lang="el" key="DISK_FREE_BYTES">Ο ελεύθερος χώρος στον οδηγό %hs είναι %.2f bytes.</string>
+    <string lang="el" key="DISK_FREE_BYTES">Ο ελεύθερος χώρος στον οδηγό %s είναι %.2f bytes.</string>
-    <string lang="en" key="DISK_FREE_KB">Free space on drive %hs is %.2f KB</string>
+    <string lang="en" key="DISK_FREE_KB">Free space on drive %s is %.2f KB</string>
-    <string lang="en" key="DISK_FREE_MB">Free space on drive %hs is %.2f MB</string>
+    <string lang="en" key="DISK_FREE_MB">Free space on drive %s is %.2f MB</string>
-    <string lang="en" key="DISK_FREE_GB">Free space on drive %hs is %.2f GB</string>
+    <string lang="en" key="DISK_FREE_GB">Free space on drive %s is %.2f GB</string>
-    <string lang="en" key="DISK_FREE_TB">Free space on drive %hs is %.2f TB</string>
+    <string lang="en" key="DISK_FREE_TB">Free space on drive %s is %.2f TB</string>
-    <string lang="en" key="DISK_FREE_PB">Free space on drive %hs is %.2f PB</string>
+    <string lang="en" key="DISK_FREE_PB">Free space on drive %s is %.2f PB</string>
     <string lang="el" key="DRIVELETTERS">Δεν μπόρεσαν να ανακτηθούν τα διαθέσιμα γράμματα οδηγών.</string>
     <string lang="el" key="DRIVER_NOT_FOUND">Σφάλμα: Δε βρέθηκε ο οδηγός VeraCrypt.\n\nΠαρακαλώ αντιγράψτε τα αρχεία 'veracrypt.sys' και 'veracrypt-x64.sys' στο φάκελο που βρίσκεται η εφαρμογή (το VeraCrypt.exe).</string>
-    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall; on Windows XP, select 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
+    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' > Computer > 'Uninstall or change a program' > VeraCrypt > Uninstall; on Windows XP, select 'Start Menu' > Settings > 'Control Panel' > 'Add Or Remove Programs' > VeraCrypt > Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
     <string lang="el" key="ERR_CIPHER_INIT_FAILURE">Σφάλμα: Αποτυχία αρχικοποιήσης κρυπτογράφου.</string>
     <string lang="el" key="ERR_CIPHER_INIT_WEAK_KEY">Σφάλμα: Ένα αδύναμο κλειδί ανιχνεύτηκε. Το κλειδί θα απορριφθεί. Παρακαλώ δοκιμαστε ξανά.</string>
     <string lang="en" key="EXCEPTION_REPORT">A critical error has occurred and VeraCrypt must be terminated. If this is caused by a bug in VeraCrypt, we would like to fix it. To help us, you can send us an automatically generated error report containing the following items:\n\n- Program version\n- Operating system version\n- Type of CPU\n- VeraCrypt component name\n- Checksum of VeraCrypt executable\n- Symbolic name of dialog window\n- Error category\n- Error address\n- VeraCrypt call stack\n\nIf you select 'Yes', the following URL (which contains the entire error report) will be opened in your default Internet browser.\n\n%hs\n\nDo you want to send us the above error report?</string>
@@ -497,7 +503,7 @@
     <string lang="en" key="WIPE_FINISHED">The content of the partition/device has been successfully erased.</string>
     <string lang="en" key="WIPE_FINISHED_DECOY_SYSTEM_PARTITION">The content of the partition where the original system (of which the hidden system is a clone) resided has been successfully erased.</string>
     <string lang="en" key="DECOY_OS_VERSION_WARNING">Please make sure the version of Windows you are going to install (on the wiped partition) is the same as the version of Windows you are currently running. This is required due to the fact that both systems will share a common boot partition.</string>
-    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' &gt; 'Add Mounted Volume to System Favorites').</string>
+    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' > 'Add Mounted Volume to System Favorites').</string>
     <string lang="el" key="SYSTEM_DECRYPTION_FINISHED">Το διαμέρισμα/συσκευή του συστήματος αποκρυπτογραφήθηκε επιτυχώς.</string>
     <string lang="el" key="FORMAT_FINISHED_HELP">\n\nΟ τόμος VeraCrypt δημιουργήθηκε και είναι έτοιμος για χρήση. Αν θέλετε να δημιουργήσετε κι άλλον τόμο πιέστε "Επόμενο", αλλιώς "Έξοδος".</string>
     <string lang="en" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nThe hidden VeraCrypt volume has been successfully created (the hidden operating system will reside within this hidden volume).\n\nClick Next to continue.</string>
@@ -561,6 +567,7 @@
     <string lang="el" key="MAX_HIDVOL_SIZE_KB">Το μέγιστο δυνατό μέγεθος κρυφού τόμου για αυτόν τον τόμο είναι %.2fKB.</string>
     <string lang="el" key="MAX_HIDVOL_SIZE_MB">Το μέγιστο δυνατό μέγεθος κρυφού τόμου για αυτόν τον τόμο είναι %.2f MB.</string>
     <string lang="en" key="MAX_HIDVOL_SIZE_GB">Maximum possible hidden volume size for this volume is %.2f GB.</string>
+    <string lang="en" key="MAX_HIDVOL_SIZE_TB">Maximum possible hidden volume size for this volume is %.2f TB.</string>
     <string lang="el" key="MOUNTED_NOPWCHANGE">Ο κωδικός/αρχεία-κλειδιά του τόμου δεν μπορούν να αλλαχθούν όσο αυτός είναι φορτωμένος. Παρακαλώ εκφορτώστε πρώτα τον τόμο.</string>
     <string lang="el" key="MOUNTED_NO_PKCS5_PRF_CHANGE">Ο αλγόριθμος του κλειδιού δημιουργίας header δεν μπορεί να αλλαχθεί όσο ο τόμος είναι φορτωμένος. Παρακαλώ εκφορτώστε πρώτα τον τόμο.</string>
     <string lang="el" key="MOUNT_BUTTON">&amp;Φόρτωση</string>
@@ -591,12 +598,12 @@
     <string lang="en" key="SELECT_PKCS11_MODULE">Select PKCS #11 Library</string>
     <string lang="el" key="OUTOFMEMORY">Η μνήμη εξαντλήθηκε</string>
     <string lang="en" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">IMPORTANT: We strongly recommend that inexperienced users create a VeraCrypt file container on the selected device/partition, instead of attempting to encrypt the entire device/partition.\n\nWhen you create a VeraCrypt file container (as opposed to encrypting a device or partition) there is, for example, no risk of destroying a large number of files. Note that a VeraCrypt file container (even though it contains a virtual encrypted disk) is actually just like any normal file. For more information, see the chapter Beginner's Tutorial in the VeraCrypt User Guide.\n\nAre you sure you want to encrypt the entire device/partition?</string>
-    <string lang="el" key="OVERWRITEPROMPT">ΠΡΟΣΟΧΗ: Το αρχείο '%hs' ήδη υπάρχει!\n\nΣΗΜΑΝΤΙΚΟ: ΤΟ VERACRYPT ΔΕ ΘΑ ΚΡΥΠΤΟΓΡΑΦΗΣΕΙ ΤΟ ΑΡΧΕΙΟ ΑΛΛΑ ΘΑ ΤΟ ΔΙΑΓΡΑΨΕΙ. Είστε σίγουρος ότι θέλετε να διαγράψετε το αρχείο και να το αντικαταστήσετε με ένα νέο αρχείο-τόμο VeraCrypt;</string>
+    <string lang="el" key="OVERWRITEPROMPT">ΠΡΟΣΟΧΗ: Το αρχείο '%s' ήδη υπάρχει!\n\nΣΗΜΑΝΤΙΚΟ: ΤΟ VERACRYPT ΔΕ ΘΑ ΚΡΥΠΤΟΓΡΑΦΗΣΕΙ ΤΟ ΑΡΧΕΙΟ ΑΛΛΑ ΘΑ ΤΟ ΔΙΑΓΡΑΨΕΙ. Είστε σίγουρος ότι θέλετε να διαγράψετε το αρχείο και να το αντικαταστήσετε με ένα νέο αρχείο-τόμο VeraCrypt;</string>
-    <string lang="el" key="OVERWRITEPROMPT_DEVICE">ΠΡΟΣΟΧΗ: ΟΛΑ ΤΑ ΑΠΟΘΗΚΕΥΜΕΝΑ ΑΡΧΕΙΑ ΣΤΟ ΕΠΙΛΕΓΜΕΝΟ %s '%hs'%s ΘΑ ΔΙΑΓΡΑΦΟΥΝ (ΔΕ ΘΑ ΚΡΥΠΤΟΓΡΑΦΗΘΟΥΝ)!\n\nΕίστε σίγουρος ότι θέλετε να συνεχίσετε τη διαμόρφωση;</string>
+    <string lang="el" key="OVERWRITEPROMPT_DEVICE">ΠΡΟΣΟΧΗ: ΟΛΑ ΤΑ ΑΠΟΘΗΚΕΥΜΕΝΑ ΑΡΧΕΙΑ ΣΤΟ ΕΠΙΛΕΓΜΕΝΟ %s '%s'%s ΘΑ ΔΙΑΓΡΑΦΟΥΝ (ΔΕ ΘΑ ΚΡΥΠΤΟΓΡΑΦΗΘΟΥΝ)!\n\nΕίστε σίγουρος ότι θέλετε να συνεχίσετε τη διαμόρφωση;</string>
-    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%s'%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting/decrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting/decrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting/decrypting, please make sure that you have backup copies of the files you want to encrypt/decrypt.\n\nDo you have such a backup?</string>
-    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%hs'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
+    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%s'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
     <string lang="en" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">WARNING: THE SELECTED PARTITION CONTAINS A LARGE AMOUNT OF DATA! Any files stored on the partition will be erased and lost (they will NOT be encrypted)!</string>
     <string lang="en" key="ERASE_FILES_BY_CREATING_VOLUME">Erase any files stored on the partition by creating a VeraCrypt volume within it</string>
     <string lang="el" key="PASSWORD">Κωδικός</string>
@@ -612,8 +619,8 @@
     <string lang="el" key="KEYFILE_CHANGED">Τα αρχεία-κλειδιά προστέθηκαν/αφαιρέθηκαν επιτυχώς.</string>
     <string lang="en" key="KEYFILE_EXPORTED">Keyfile exported.</string>
     <string lang="el" key="PKCS5_PRF_CHANGED">Ο αλγόριθμος του κλειδιού δημιουργίας header ορίσθηκε επιτυχώς.</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 will need to select one of them in the next step.</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 volume is found, you will need to select one of them in the next step.</string>
-    <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_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 consisting of 20 or more characters (the longer, the better). The maximum possible length is 64 characters.</string>
     <string lang="el" key="PASSWORD_HIDDENVOL_HELP">Παρακαλώ επιλέξτε κωδικό για τον κρυφό τόμο. </string>
@@ -645,9 +652,9 @@
     <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
     <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
     <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 &gt; Organize &gt; 'Folder and search options' &gt; View).</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="el" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nΣημείωση: Αν προσπαθείτε να φορτώσετε ένα διαμέρισμα ενός κρυπτογραφημένου οδηγού συστήματος χωρίς προ-εκκίνησης έλεγχο αυθεντικότητας ή να φορτώσετε το κρυπτογραφημένο διαμέρισμα συστήματος ενός λειτουργικού συστήματος που δεν τρέχει, μπορείτε να το κάνετε επιλέγοντας 'Σύστημα' &gt; 'Φόρτωση χωρίς προ-εκκίνησης έλεγχο αυθεντικότητας'.</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="el" key="PREV">&lt; &amp;Πίσω</string>
     <string lang="el" key="RAWDEVICES">Αδυναμία παράθεσης των εγκατεστημένων στο σύστημα σας αδιαμόρφωτων συσκευών!</string>
-    <string lang="el" key="READONLYPROMPT">Ο τόμος '%hs' υπάρχει και είναι μόνο για ανάγνωση. Είστε σίγουρος ότι θέλετε να τον αντικαταστήσετε;</string>
+    <string lang="el" key="READONLYPROMPT">Ο τόμος '%s' υπάρχει και είναι μόνο για ανάγνωση. Είστε σίγουρος ότι θέλετε να τον αντικαταστήσετε;</string>
     <string lang="el" key="SELECT_DEST_DIR">Επιλέξτε φάκελο προορισμού</string>
     <string lang="el" key="SELECT_KEYFILE">Επιλέξτε αρχείο-κλειδί</string>
     <string lang="el" key="SELECT_KEYFILE_PATH">Επιλέξτε διαδρομή αναζήτησης αρχείου-κλειδιού. ΠΡΟΣΟΧΗ: Μόνο η διαδρομή θα απομνημονευθεί, όχι τα αρχεία!</string>
@@ -680,13 +687,13 @@
     <string lang="el" key="TEST_CIPHERTEXT_SIZE">Το δοκιμαστικό κρυπτοκείμενο που παρείχατε είναι πολύ μεγάλο ή πολύ μικρό.</string>
     <string lang="el" key="TEST_KEY_SIZE">Το δοκιμαστικό κλειδί που παρείχατε είναι πολύ μεγάλο ή πολύ μικρό.</string>
     <string lang="el" key="TEST_PLAINTEXT_SIZE">Το δοκιμαστικό απλό κείμενο που παρείχατε είναι πολύ μεγάλο ή πολύ μικρό.</string>
-    <string lang="el" key="TWO_LAYER_CASCADE_HELP">Δύο κρυπτογράφοι σε σειρά, λειτουργούντες σε κατάσταση XTS. Κάθε μπλοκ πρώτα κρυπτογραφείται με %hs (%d-bit κλειδί) και μετά με %hs (%d-bit κλειδί). Κάθε κρυπτογράφος χρησιμοποιεί το δικό του κλειδί. Όλα τα κλειδιά είναι μεταξύ τους ανεξάρτητα.</string>
+    <string lang="el" key="TWO_LAYER_CASCADE_HELP">Δύο κρυπτογράφοι σε σειρά, λειτουργούντες σε κατάσταση XTS. Κάθε μπλοκ πρώτα κρυπτογραφείται με %s (%d-bit κλειδί) και μετά με %s (%d-bit κλειδί). Κάθε κρυπτογράφος χρησιμοποιεί το δικό του κλειδί. Όλα τα κλειδιά είναι μεταξύ τους ανεξάρτητα.</string>
-    <string lang="el" key="THREE_LAYER_CASCADE_HELP">Τρεις κρυπτογράφοι σε σειρά, λειτουργούντες σε κατάσταση XTS. Κάθε μπλοκ πρώτα κρυπτογραφείται με %hs (%d-bit κλειδί), μετά με %hs (%d-bit κλειδί) και τελικά με %hs (%d-bit κλειδί). Κάθε κρυπτογράφος χρησιμοποιεί το δικό του κλειδί. Όλα τα κλειδιά είναι μεταξύ τους ανεξάρτητα.</string>
+    <string lang="el" key="THREE_LAYER_CASCADE_HELP">Τρεις κρυπτογράφοι σε σειρά, λειτουργούντες σε κατάσταση XTS. Κάθε μπλοκ πρώτα κρυπτογραφείται με %s (%d-bit κλειδί), μετά με %s (%d-bit κλειδί) και τελικά με %s (%d-bit κλειδί). Κάθε κρυπτογράφος χρησιμοποιεί το δικό του κλειδί. Όλα τα κλειδιά είναι μεταξύ τους ανεξάρτητα.</string>
     <string lang="en" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Note that, depending on the operating system configuration, these auto-run and auto-mount features may work only when the traveler disk files are created on a non-writable CD/DVD-like medium. Also note that this is not a bug in VeraCrypt (it is a limitation of Windows).</string>
     <string lang="en" key="TRAVELER_DISK_CREATED">VeraCrypt traveler disk has been successfully created.\n\nNote that you need administrator privileges to run VeraCrypt in portable mode. Also note that, after examining the registry file, it may be possible to tell that VeraCrypt was run on a Windows system even if it is run in portable mode.</string>
     <string lang="el" key="TC_TRAVELER_DISK">Φορητός δίσκος VeraCrypt</string>
     <string lang="el" key="TWOFISH_HELP">Σχεδιάστηκε από τους Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall και Niels Ferguson. Δημοσιεύτηκε το 1998. Κλειδί 256-bit, μπλοκ 128-bit. Κατάσταση λειτουργίας XTS. Ο Twofish ήταν ένας από τους φιναλίστ του AES.</string>
-    <string lang="el" key="MORE_INFO_ABOUT">Περισσότερες πληροφορίες στο %hs</string>
+    <string lang="el" key="MORE_INFO_ABOUT">Περισσότερες πληροφορίες στο %s</string>
     <string lang="el" key="UNKNOWN">Άγνωστο</string>
     <string lang="en" key="ERR_UNKNOWN">An unspecified or unknown error occurred (%d).</string>
     <string lang="el" key="UNMOUNTALL_LOCK_FAILED">Ορισμένοι τόμοι περιέχουν αρχεία ή φακέλους που χρησιμοποιούνται από εφαρμογές ή το σύστημα.\n\nΕξαναγκασμός εκφόρτωσης;</string>
@@ -706,7 +713,7 @@
     <string lang="el" key="WRONG_VOL_TYPE">Το VeraCrypt δεν μπορεί να αλλάξει κωδικούς τόμων άλλου τύπου.</string>
     <string lang="el" key="SELECT_FREE_DRIVE">Παρακαλώ επιλέξτε ένα γράμμα οδηγού από τη λίστα.</string>
     <string lang="el" key="SELECT_A_MOUNTED_VOLUME">Παρακαλώ επιλέξτε έναν φορτωμένο τόμο στη λίστα γραμμάτων οδηγών.</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="el" key="CANT_CREATE_AUTORUN">Σφάλμα: Αδύνατη η δημιουργία του autorun.inf</string>
     <string lang="el" key="ERR_PROCESS_KEYFILE">Σφάλμα κατά την επεξεργασία του αρχείου-κλειδιού!</string>
     <string lang="el" key="ERR_PROCESS_KEYFILE_PATH">Σφάλμα κατά την επεξεργασία της διαδρομής του αρχείου-κλειδιού!</string>
@@ -728,7 +735,7 @@
     <string lang="el" key="FORMAT_NTFS_FAILED">Τα Windows απέτυχαν στη διαμόρφωση του τόμου σε NTFS.\n\nΠαρακαλώ επιλέξτε έναν διαφορετικό τύπο συστήματος αρχείων (αν είναι δυνατόν) και προσπαθήστε ξανά. Εναλλακτικά θα μπορούσατε να αφήσετε τον τόμο αδιαμόρφωτο (επιλέξτε "Κανένα" ως σύστημα αρχείων), βγείτε από αυτόν τον Οδηγό, φορτώστε τον τόμο και κατόπιν χρησιμοποιείστε ένα εργαλείο είτε του συστήματος είτε ενός τρίτου κατασκευαστή για να διαμορφώσετε τον φορτωμένο τόμο (ο τόμος θα παραμείνει κρυπτογραφημένος).</string>
     <string lang="el" key="FORMAT_NTFS_FAILED_ASK_FAT">Τα Windows απέτυχαν στη διαμόρφωση του τόμου σε NTFS.\n\nΘέλετε να τον διαμορφώσετε σε FAT;</string>
     <string lang="el" key="DEFAULT">Εξ'ορισμού</string>
-    <string lang="en" key="PARTITION_LOWER_CASE">partition</string>
+    <string lang="el" key="PARTITION_LOWER_CASE">διαμέρισμα</string>
     <string lang="el" key="PARTITION_UPPER_CASE">ΔΙΑΜΕΡΙΣΜΑ</string>
     <string lang="el" key="DEVICE">Συσκευή</string>
     <string lang="en" key="DEVICE_LOWER_CASE">device</string>
@@ -764,7 +771,7 @@
     <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_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="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="el" key="CANT_DISMOUNT_OUTER_VOL">Σφάλμα: Αδυναμία εκφόρτωσης του εξωτερικού τόμου!\n\nΟ τόμος δεν μπορεί να εκφορτωθεί αν περιέχει αρχεία ή φακέλους σε χρήση.\n\nΠαρακαλώ κλείστε κάθε πρόγραμμα που μπορεί να χρησιμοποιεί αρχεία ή φακέλους του τόμου και επιλέξτε "Επανάληψη".</string>
     <string lang="el" key="CANT_GET_OUTER_VOL_INFO">Σφάλμα: Αδυναμία ανάκτησης πληροφοριών για τον εξωτερικό τόμο! Η δημιουργία του τόμου δεν μπορεί να συνεχιστεί.</string>
@@ -851,7 +858,7 @@
     <string lang="el" key="INSTALL_FAILED">Η εγκατάσταση απέτυχε.</string>
     <string lang="el" key="UNINSTALL_FAILED">Η απεγκατάσταση απέτυχε.</string>
     <string lang="el" key="DIST_PACKAGE_CORRUPTED">Αυτό το πακέτο εγκατάστασης είναι φθαρμένο. Παρακαλώ δοκιμάστε να το κατεβάσετε ξανά (κατά προτίμηση από τον ιστοχώρο του VeraCrypt στη https://veracrypt.codeplex.com).</string>
-    <string lang="el" key="CANNOT_WRITE_FILE_X">Αδυναμία εγγραφής αρχείου %hs</string>
+    <string lang="el" key="CANNOT_WRITE_FILE_X">Αδυναμία εγγραφής αρχείου %s</string>
     <string lang="el" key="EXTRACTING_VERB">Εξαγωγή</string>
     <string lang="el" key="CANNOT_READ_FROM_PACKAGE">Αδυναμία ανάγνωσης δεδομένων από το πακέτο.</string>
     <string lang="el" key="CANT_VERIFY_PACKAGE_INTEGRITY">Αδυναμία επαλήθευσης της ακεραιότητας του πακέτου διανομής.</string>
@@ -860,8 +867,8 @@
     <string lang="el" key="INSTALL_OK">Το VeraCrypt εγκαταστάθηκε επιτυχώς.</string>
     <string lang="en" key="SETUP_UPDATE_OK">VeraCrypt has been successfully updated.</string>
     <string lang="en" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt has been successfully upgraded. However, before you can start using it, the computer must be restarted.\n\nDo you want to restart it now?</string>
-    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
+    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu > All programs > Accessories > System Tools > System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
-    <string lang="el" key="UNINSTALL_OK">Το VeraCrypt απεγκαταστάθηκε επιτυχώς.\n\nΕπιλέξτε "Τέλος" για να απομακρύνετε το αρχείο εγκατάστασης του VeraCrypt και το φάκελο %hs. Σημειώστε ότι ο φάκελος δε θα απομακρυνθεί αν περιέχει αρχεία που δεν εγκαταστάθηκαν ή δημιουργήθηκαν από το VeraCrypt.</string>
+    <string lang="el" key="UNINSTALL_OK">Το VeraCrypt απεγκαταστάθηκε επιτυχώς.\n\nΕπιλέξτε "Τέλος" για να απομακρύνετε το αρχείο εγκατάστασης του VeraCrypt και το φάκελο %s. Σημειώστε ότι ο φάκελος δε θα απομακρυνθεί αν περιέχει αρχεία που δεν εγκαταστάθηκαν ή δημιουργήθηκαν από το VeraCrypt.</string>
     <string lang="el" key="REMOVING_REG">Απομάκρυνση καταχωρήσεων μητρώου του VeraCrypt...</string>
     <string lang="el" key="ADDING_REG">Προσθήκη καταχωρήσεων μητρώου...</string>
     <string lang="el" key="REMOVING_APPDATA">Απομάκρυνση δεδομένων εφαρμογής...</string>
@@ -872,10 +879,10 @@
     <string lang="el" key="CREATING_SYS_RESTORE">Δημιουργία σημείου επαναφοράς συστήματος...</string>
     <string lang="el" key="FAILED_SYS_RESTORE">Αποτυχία δημιουργίας σημείου επαναφοράς συστήματος!</string>
     <string lang="en" key="INSTALLER_UPDATING_BOOT_LOADER">Updating boot loader</string>
-    <string lang="el" key="INSTALL_OF_FAILED">Αποτυχία εγκατάστασης του '%hs'. %hs Θέλετε να συνεχίσετε την εγκατάσταση;</string>
+    <string lang="el" key="INSTALL_OF_FAILED">Αποτυχία εγκατάστασης του '%s'. %s Θέλετε να συνεχίσετε την εγκατάσταση;</string>
-    <string lang="el" key="UNINSTALL_OF_FAILED">Αποτυχία απεγκατάστασης του '%hs'. %hs Θέλετε να συνεχίσετε την απεγκατάσταση;</string>
+    <string lang="el" key="UNINSTALL_OF_FAILED">Αποτυχία απεγκατάστασης του '%s'. %s Θέλετε να συνεχίσετε την απεγκατάσταση;</string>
     <string lang="el" key="INSTALL_COMPLETED">Η εγκατάσταση ολοκληρώθηκε.</string>
-    <string lang="el" key="CANT_CREATE_FOLDER">Ο φάκελος '%hs' δεν μπόρεσε να δημιουργηθεί</string>
+    <string lang="el" key="CANT_CREATE_FOLDER">Ο φάκελος '%s' δεν μπόρεσε να δημιουργηθεί</string>
     <string lang="el" key="CLOSE_TC_FIRST">Ο οδηγός συσκευής του VeraCrypt δεν μπόρεσε να εκφορτωθεί.\n\nΠαρακαλώ κλείστε πρώτα όλα τα ανοιχτά παράθυρα του VeraCrypt. Αν αυτό δε βοηθήσει, επανεκκινήστε τα Windows και δοκιμάστε ξανά.</string>
     <string lang="el" key="DISMOUNT_ALL_FIRST">Όλοι οι τόμοι VeraCrypt πρέπει να εκφορτωθούν πριν την εγκατάσταση ή απεγκατάσταση του 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>
@@ -918,17 +925,17 @@
     <string lang="el" key="PROGRESS_STATUS_FINISHED">Ολοκληρώθηκε</string>
     <string lang="en" key="PROGRESS_STATUS_ERROR">Error</string>
     <string lang="en" key="FAVORITE_DISCONNECTED_DEV">Device disconnected</string>
-    <string lang="en" key="SYS_FAVORITE_VOLUMES_SAVED">System favorite volumes saved.\n\nTo enable mounting of system favorite volumes when the system starts, please select 'Settings' &gt; 'System Favorite Volumes' &gt; 'Mount system favorite volumes when Windows starts'.</string>
+    <string lang="en" key="SYS_FAVORITE_VOLUMES_SAVED">System favorite volumes saved.\n\nTo enable mounting of system favorite volumes when the system starts, please select 'Settings' > 'System Favorite Volumes' > 'Mount system favorite volumes when Windows starts'.</string>
     <string lang="en" key="FAVORITE_ADD_DRIVE_DEV_WARNING">The volume you are adding to favorites is neither a partition nor a dynamic volume. Therefore, VeraCrypt will be unable to mount this favorite volume if the device number changes.</string>
     <string lang="en" key="FAVORITE_ADD_PARTITION_TYPE_WARNING">The volume you are adding to favorites is a partition not recognized by Windows.\n\nVeraCrypt will be unable to mount this favorite volume if the device number changes. Please set the type of the partition to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then add the partition to favorites again.</string>
-    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings &gt; Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
+    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings > Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_NETWORK_PATH_ERR">A container stored in a remote filesystem shared over a network cannot be automatically mounted when its host device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, the volume hosted on the device cannot be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable the volume hosted on the device to be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_LABEL_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, no label can be assigned to it.</string>
     <string lang="en" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable VeraCrypt to assign a label to the partition.</string>
     <string lang="en" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Due to a Windows limitation, a container stored in a remote filesystem shared over a network cannot be mounted as a system favorite volume (however, it can be mounted as a non-system favorite volume when a user logs on).</string>
-    <string lang="el" key="ENTER_PASSWORD_FOR">Εισάγετε κωδικό για το %hs</string>
+    <string lang="el" key="ENTER_PASSWORD_FOR">Εισάγετε κωδικό για το %s</string>
     <string lang="en" key="ENTER_PASSWORD_FOR_LABEL">Enter password for '%s'</string>
     <string lang="en" key="ENTER_NORMAL_VOL_PASSWORD">Enter password for the normal/outer volume</string>
     <string lang="en" key="ENTER_HIDDEN_VOL_PASSWORD">Enter password for the hidden volume</string>
@@ -939,12 +946,12 @@
     <string lang="en" key="KEYFILE_EMPTY_BASE_NAME">Please enter a name for the keyfile(s) to be generated</string>
     <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' &gt; 'Restore Volume Header'.</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="el" key="VOL_HEADER_BACKED_UP">Το αντίγραφο ασφαλείας του header του τόμου δημιουργήθηκε επιτυχώς.\n\nΣΗΜΑΝΤΙΚΟ: Η επαναφορά του header με αυτό το αντίγραφο θα επαναφέρει επίσης και τον κωδικό του τόμου. Επιπλέον αν χρειάζονται αρχεία-κλειδιά για να φορτωθεί ο τόμος, τα ίδια αρχεία-κλειδιά θα είναι απαραίτητα για να φορτώσετε τον τόμο ξανά όταν ανακτηθεί το header.\n\nΠΡΟΣΟΧΗ: Αυτό το αντίγραφο ασφαλείας του header μπορεί να χρησιμοποιηθεί για την επαναφορά του header ΜΟΝΟ αυτού του συγκεκριμένου τόμου. Αν το χρησιμοποιήσετε σε άλλο τόμο, θα μπορείτε να φορτώσετε τον τόμο, αλλά ΔΕΝ θα μπορείτε να αποκρυπτογραφήσετε τα δεδομένα του (γιατί θα αλλάξετε το βασικό κλειδί του).</string>
     <string lang="el" key="VOL_HEADER_RESTORED">Το header του τόμου ανακτήθηκε με επιτυχία.\n\nΣΗΜΑΝΤΙΚΟ: Παρακαλώ σημειώστε ότι κάποιος παλιός κωδικός μπορεί επίσης να ανακτήθηκε. Επιπλέον αν χρειάζονταν αρχεία-κλειδιά για να φορτωθεί ο τόμος όταν δημιουργήθηκε το αντίγραφο ασφαλείας, τα ίδια αρχεία-κλειδιά είναι τώρα απαραίτητα για να φορτώσετε τον τόμο ξανά.</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) for the hidden volume.</string>
-    <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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</string>
+    <string lang="en" key="CONFIRM_VOL_HEADER_BAK">Are you sure you want to create volume header backup for %s?\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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</string>
-    <string lang="el" key="CONFIRM_VOL_HEADER_RESTORE">Είστε σίγουρος ότι θέλετε να επαναφέρετε το header τόμου του %hs;\n\nΠΡΟΣΟΧΗ: Η επαναφορά του header επαναφέρει επίσης και τον κωδικό του τόμου που ήταν έγκυρος όταν δημιουργήθηκε το αντίγραφο ασφαλείας. Επιπλέον αν χρειάζονταν αρχεία-κλειδιά για να φορτωθεί ο τόμος όταν δημιουργήθηκε το αντίγραφο ασφαλείας, τα ίδια αρχεία-κλειδιά θα είναι απαραίτητα για να φορτώσετε τον τόμο ξανά αφού ανακτηθεί το header.\n\nΑφού επιλέξετε "Ναι" θα επιλέξετε το αρχείο του αντιγράφου ασφαλείας του header.</string>
+    <string lang="el" key="CONFIRM_VOL_HEADER_RESTORE">Είστε σίγουρος ότι θέλετε να επαναφέρετε το header τόμου του %s;\n\nΠΡΟΣΟΧΗ: Η επαναφορά του header επαναφέρει επίσης και τον κωδικό του τόμου που ήταν έγκυρος όταν δημιουργήθηκε το αντίγραφο ασφαλείας. Επιπλέον αν χρειάζονταν αρχεία-κλειδιά για να φορτωθεί ο τόμος όταν δημιουργήθηκε το αντίγραφο ασφαλείας, τα ίδια αρχεία-κλειδιά θα είναι απαραίτητα για να φορτώσετε τον τόμο ξανά αφού ανακτηθεί το header.\n\nΑφού επιλέξετε "Ναι" θα επιλέξετε το αρχείο του αντιγράφου ασφαλείας του header.</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>
@@ -956,13 +963,15 @@
     <string lang="el" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">Επιχειρείτε να δημιουργήσετε αντίγραφο ασφαλείας του header του διαμερίσματος/συσκευής του συστήματος. Αυτό δεν επιτρέπεται. Λειτουργίες δημιουργίας/ανάκτησης αντιγράφων ασφαλείας που αφορούν στο διαμέρισμα/συσκευή του συστήματος μπορούν να πραγματοποιηθούν μόνο με τη χρήση του Δίσκου Ασφαλείας VeraCrypt.\n\nΘέλετε να δημιουργήσετε ένα Δίσκο Ασφαλείας;</string>
     <string lang="el" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">Επιχειρείτε να ανακτήσετε το header ενός εικονικού τόμου VeraCrypt αλλά επιλέξατε το διαμέρισμα/συσκευή του συστήματος. Αυτό δεν επιτρέπεται. Λειτουργίες δημιουργίας/ανάκτησης αντιγράφων ασφαλείας που αφορούν στο διαμέρισμα/συσκευή του συστήματος μπορούν να πραγματοποιηθούν μόνο με τη χρήση του Δίσκου Ασφαλείας VeraCrypt.\n\nΘέλετε να δημιουργήσετε ένα Δίσκο Ασφαλείας;</string>
     <string lang="el" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">Αφού πιέσετε ΟΚ, θα επιλέξετε ένα όνομα για την εικόνα ISO του νέου Δίσκου Ασφαλείας VeraCrypt και την τοποθεσία που θέλετε να την τοποθετήσετε.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <string lang="el" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Παρακαλώ εισάγετε το Δίσκο Ασφαλείας VeraCrypt στον οδηγό CD/DVD και πιέστε ΟΚ για να τον επαληθεύσετε.</string>
+    <string lang="el" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Παρακαλώ εισάγετε το Ασφαλείας VeraCrypt πιέστε ΟΚ για να τον επαληθεύσετε.</string>
     <string lang="el" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">Ο Δίσκος Ασφαλείας VeraCrypt επαληθεύτηκε επιτυχώς.</string>
     <string lang="el" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">Αδύνατη η επαλήθευση εγγραφής του Δίσκου Ασφαλείας.\n\nΑν τον έχετε εγγράψει παρακαλώ εξάγετε και εισάγετε το CD/DVD και δοκιμάστε ξανά. Αν αυτό δε βοηθήσει δοκιμάστε άλλο λογισμικό εγγραφής CD/DVD και/ή άλλο μέσο.\n\nΑν επιχειρήσατε να επαληθεύσετε ένα Δίσκο Ασφαλέιας δημιουργημένο για διαφορετικό βασικό κλειδί, κωδικό κλπ, σημειώστε ότι ένας τέτοιος Δίσκος θα αποτυγχάνει πάντα στην επαλήθευση. Για να δημιουργήσετε ένα νέο Δίσκο πλήρως συμβατό με τις τρέχουσες ρυθμίσεις σας επιλέξτε 'Σύστημα' &gt; 'Δημιουργία Δίσκου Ασφαλείας'.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk image fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
     <string lang="el" key="ERROR_CREATING_RESCUE_DISK">Σφάλμα δημιουργίας Δίσκου Ασφαλείας VeraCrypt.</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' &gt; 'Create 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 be used, because it was created for a different master key. You need to burn the newly generated Rescue Disk.</string>
     <string lang="en" key="RESCUE_DISK_CHECK_FAILED_SENTENCE_APPENDIX"> and/or other CD/DVD recording software</string>
     <string lang="en" key="SYSTEM_FAVORITES_DLG_TITLE">VeraCrypt - System Favorite Volumes</string>
@@ -989,8 +998,8 @@
     <string lang="en" key="DRIVE_LETTER_ITEM">Drive Letter:   </string>
     <string lang="el" key="UNSUPPORTED_CHARS_IN_PWD">Σφάλμα: Ο κωδικός πρέπει να περιέχει μόνο χαρακτήρες ASCII.\n\nΜη-ASCII χαρακτήρες στον κωδικό μπορεί να προκαλέσουν αδυναμία φόρτωσης του τόμου όταν αλλάξουν οι ρυθμίσεις του συστήματος σας.\n\nΟι επόμενοι χαρακτήρες επιτρέπονται:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="el" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">Προειδοποίηση: Ο κωδικός περιέχει χαρακτήρες μη-ASCII.\n\nΑυτό μπορεί να προκαλέσει αδυναμία φόρτωσης του τόμου όταν αλλάξουν οι ρυθμίσεις του συστήματος σας.\n\nΘα πρέπει να αλλάξετε όλους τους μη-ASCII χαρακτήρες με χαρακτήρες ASCII όπως τους παρακάτω:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="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 change it (e.g., to '.tc').\n\nAre you sure you want to use the problematic file extension?</string>
+    <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 change it (e.g., to '.hc').\n\nAre you sure you want to use the problematic file extension?</string>
-    <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 container or change it (e.g., to '.tc') after you dismount the volume.</string>
+    <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 container or change it (e.g., to '.hc') after you dismount the volume.</string>
     <string lang="el" key="HOMEPAGE">Ιστοτόπος</string>
     <string lang="el" key="LARGE_IDE_WARNING_XP">ΠΡΟΣΟΧΗ: Φαίνεται ότι δεν έχετε εφαρμόσει κανένα Service Pack στα Windows σας. Δε θα πρέπει να γράψετε σε δίσκους IDE μεγαλύτερους από 128 GB στα Windows XP χωρίς τουλάχιστον Service Pack 1! Αν το κάνετε, δεδομένα του δίσκου (άσχετα αν είναι τόμου VeraCrypt) μπορεί να αλλοιωθούν. Σημειώστε ότι αυτός είναι ένας περιορισμός των Windows, όχι ελάττωμα του VeraCrypt.</string>
     <string lang="el" key="LARGE_IDE_WARNING_2K">ΠΡΟΣΟΧΗ: Φαίνεται ότι δεν έχετε εφαρμόσει τουλάχιστον το Service Pack 3 στα Windows σας. Δε θα πρέπει να γράψετε σε δίσκους IDE μεγαλύτερους από 128 GB στα Windows 2000 χωρίς τουλάχιστον Service Pack 3! Αν το κάνετε, δεδομένα του δίσκου (άσχετα αν είναι τόμου VeraCrypt) μπορεί να αλλοιωθούν. Σημειώστε ότι αυτός είναι ένας περιορισμός των Windows, όχι ελάττωμα του VeraCrypt.\n\nΣημείωση: Ισως χρειαστεί να ενεργοποιήσετε την υποστήριξη 48-bit LBA στο μητρώο. Περισσότερες πληροφορίες στη http://support.microsoft.com/kb/305098/EN-US</string>
@@ -1026,19 +1035,19 @@
     <string lang="el" key="CONFIRM_NO_FORCED_AUTODISMOUNT">ΠΡΟΣΟΧΗ: Αν αυτή η δυνατότητα απενεργοποιηθεί, οι τόμοι που περιέχουν ανοιχτά αρχεία/φακέλους δε θα μπορούν να εκφορτωθούν.\n\nΕίστε σίγουρος ότι θέλετε να απενεργοποιήσετε αυτή τη δυνατότητα;</string>
     <string lang="el" key="WARN_PREF_AUTO_DISMOUNT">ΠΡΟΣΟΧΗ: Τόμοι που περιέχουν ανοιχτά αρχεία/φακέλους ΔΕ θα αυτοεκφορτωθούν.\n\nΓια να το αποφύγετε αυτό ενεργοποιήστε την ακόλουθη επιλογή σε αυτό το παράθυρο διαλόγου:"Ακόμα και αν ο τόμος περιέχει ανοιχτά αρχεία/φακέλους"</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="el" key="SYSTEM_ENCRYPTION_RESUME_PROMPT">Έχετε προγραμματίσει τη διαδικασία κρυπτογράφησης ή αποκρυπτογράφησης του διαμερίσματος/συσκευής του συστήματος. Η διαδικασία δεν ολοκληρώθηκε ακόμα.\n\nΘέλετε να εκκινήσετε (συνεχίσετε) τη διαδικασία τώρα;</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' &gt; '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' &gt; 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window.</string>
     <string lang="el" key="SYSTEM_ENCRYPTION_SCHEDULED_BUT_PBA_FAILED">Έχετε προγραμματίσει τη διαδικασία κρυπτογράφησης ή αποκρυπτογράφησης του διαμερίσματος/συσκευής του συστήματος. Ωστόσο ο προ-εκκίνησης έλεγχος απέτυχε (ή παρακάμφθηκε).\n\nΣημείωση: Αν αποκρυπτογραφήσατε το διαμέρισμα/συσκευή του συστήματος στο προ-εκκίνησης περιβάλλον, ίσως χρειαστεί να τερματίσετε τη διαδικασία επιλέγοντας 'Σύστημα' &gt; 'Μόνιμη αποκρυπτογράφηση διαμερίσματος/οδηγού συστήματος' από την μπάρα μενού του κύριου παραθύρου του VeraCrypt.</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 VeraCrypt in the Preferences).\n\nAre you sure you want VeraCrypt to exit?</string>
     <string lang="el" key="CONFIRM_EXIT_UNIVERSAL">Έξοδος;</string>
     <string lang="el" key="CHOOSE_ENCRYPT_OR_DECRYPT">Το VeraCrypt δεν έχει αρκετές πληροφορίες για να προσδιορίσει αν θα κρυπτογραφήσει ή θα αποκρυπτογραφήσει.</string>
     <string lang="el" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">Το VeraCrypt δεν έχει επαρκείς πληροφορίες για να καθορίσει αν θα κρυπτογραφήσει ή θα αποκρυπτογραφήσει.\n\nΣημείωση: Αν αποκρυπτογραφήσατε το διαμέρισμα/συσκευή του συστήματος στο προ-εκκίνησης περιβάλλον, ίσως χρειαστεί να τερματίσετε τη διαδικασία επιλέγοντας Αποκρυπτογράφηση.</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' &gt; 'Resume Interrupted Process'.\n3) Select 'Decrypt'.</string>
-    <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' &gt; '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' &gt; 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window.</string>
     <string lang="el" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Θέλετε να διακόψετε και αναβάλετε τη διαδικασία κρυπτογράφησης του διαμερίσματος/συσκευής του συστήματος;\n\nΣημείωση: Μπορείτε να επαναφέρετε τη διαδικασία η οποία θα συνεχιστεί από το σημείο που σταμάτησε. Μπορείτε να το κάνετε αυτό επιλέγοντας 'Σύστημα' &gt; 'Επαναφορά σταματημένης διαδικασίας' από την μπάρα μενού του βασικού παράθυρου του VeraCrypt. Αν θέλετε να τερματίσετε μόνιμα ή να αντιστρέψετε τη διαδικασία κρυπτογράφησης, επιλέξτε 'Σύστημα' &gt; 'Μόνιμη αποκρυπτογράφηση διαμερίσματος/συσκευής συστήματος'.</string>
     <string lang="el" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Θέλετε να διακόψετε και αναβάλετε τη διαδικασία αποκρυπτογράφησης του διαμερίσματος/συσκευής του συστήματος;\n\nΣημείωση: Μπορείτε να επαναφέρετε τη διαδικασία η οποία θα συνεχιστεί από το σημείο που σταμάτησε. Μπορείτε να το κάνετε αυτό επιλέγοντας 'Σύστημα' &gt; 'Επαναφορά σταματημένης διαδικασίας' από την μπάρα μενού του βασικού παράθυρου του VeraCrypt. Αν θέλετε να αντιστρέψετε τη διαδικασία αποκρυπτογράφησης (και να ξεκινήσετε την κρυπτογράφηση), επιλέξτε 'Σύστημα' &gt; 'Κρυπτογράφηση διαμερίσματος/συσκευής συστήματος'.</string>
     <string lang="el" key="FAILED_TO_INTERRUPT_SYSTEM_ENCRYPTION">Σφάλμα: Αποτυχία διακοπής διαδικασίας κρυπτογράφησης/αποκρυπτογράφησης του διαμερίσματος/συσκευής του συστήματος.</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="el" key="CHECKING_FS">Έλεγχος του συστήματος αρχείων στον τόμο VeraCrypt που φορτώθηκε ως %s...</string>
-    <string lang="el" key="REPAIRING_FS">Προσπάθεια επιδιόρθωσης συστήματος αρχείων στον τόμο VeraCrypt που φορτώθηκε ως %hs...</string>
+    <string lang="el" key="REPAIRING_FS">Προσπάθεια επιδιόρθωσης συστήματος αρχείων στον τόμο VeraCrypt που φορτώθηκε ως %s...</string>
-    <string lang="el" key="WARN_CBC_MODE">Προσοχή: Αυτός ο τόμος είναι κρυπτογραφημένος σε CBC. Για λόγους ασφαλείας, η κατάσταση CBC έχει απορριφθεί από την έκδοση VeraCrypt 4.1 και μετά.\n\nΣυνιστούμε να μεταφέρετε τα δεδομένα από αυτό τον τόμο VeraCrypt σε ένα νέο τόμο δημιουργημένο με αυτήν την έκδοση του VeraCrypt. Στη συνέχεια θα πρέπει να διαγράψετε ή καταστρέψετε ασφαλώς τον παλιό τόμο. Για περισσότερες πληροφορίες παρακαλώ δείτε το Ιστορικό Εκδόσεων ή τις Επισημάνσεις Έκδοσης του VeraCrypt 4.1 και μετά.</string>
     <string lang="el" key="WARN_64_BIT_BLOCK_CIPHER">Προσοχή: Αυτός ο τόμος έχει κρυπτογραφηθεί με παλαιό κρυπτογράφο.\n\nΌλοι οι κρυπτογράφοι 64-bit-μπλοκ (π.χ. Blowfish, CAST-128, ή Triple DES) δε συνίστανται. Θα υπάρχει δυνατότητα φόρτωσης αυτού του τόμου χρησιμοποιώντας μελλοντικές εκδόσεις του VeraCrypt, όμως δε θα υπάρξει περαιτέρω βελτίωση αυτών των κρυπτογράφων. Συνιστούμε τη δημιουργία νέου τόμου VeraCrypt κρυπτογραφημένου με κρυπτογράφο 128-bit-μπλοκ (π.χ. AES, Serpent, Twofish, κλπ.) και τη μεταφορά όλων των αρχείων αυτού του τόμου στο νέο.</string>
     <string lang="el" key="SYS_AUTOMOUNT_DISABLED">Το σύστημα σας δεν έχει ρυθμιστεί να αυτοφορτώνει νέους τόμους. Μπορεί να είναι αδύνατο να φορτωθούν τόμοι-συσκευές του VeraCrypt. Η αυτοφόρτωση μπορεί να ενεργοποιηθεί εκτελώντας την ακόλουθη εντολή και κάνοντας επανεκκίνηση.\n\nmountvol.exe /E</string>
     <string lang="el" key="SYS_ASSIGN_DRIVE_LETTER">Παρακαλώ ορίστε ένα γράμμα οδηγού για το διαμέρισμα/συσκευή πριν συνεχίσετε ("Πίνακας Ελέγχου" &gt; "Επιδόσεις και Συντήρηση" &gt; "Εργαλεία Διαχείρισης" &gt; "Διαχείριση Υπολογιστή" &gt; "Διαχείριση Δίσκων").\n\nΣημειώστε ότι αυτό είναι μια απαίτηση του λειτουργικού συστήματος.</string>
@@ -1069,9 +1077,9 @@
     <string lang="en" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt no longer supports encryption of the system partition/drive on Windows Vista with no Service Pack installed. Before upgrading VeraCrypt, please install Service Pack 1 or higher for Windows Vista.</string>
     <string lang="en" key="FEATURE_REQUIRES_INSTALLATION">Error: This feature requires VeraCrypt to be installed on the system (you are running VeraCrypt in portable mode).\n\nPlease install VeraCrypt and then try again.</string>
     <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="el" key="GPT_BOOT_DRIVE_UNSUPPORTED">Ο οδηγός του συστήματος σας έχει GUID κατάλογο διαμερισμάτων (GPT). Προς το παρόν, μόνο οδηγοί με MBR κατάλογο διαμερισμάτων υποστηρίζονται.</string>
+    <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</string>
     <string lang="el" key="TC_BOOT_LOADER_ALREADY_INSTALLED">ΠΡΟΣΟΧΗ: Ο Εκκινητής VeraCrypt είναι ήδη εγκατεστημένος στον οδηγό του συστήματος σας!\n\nΕίναι πιθανόν ένα άλλο σύστημα στον υπολογιστή σας να είναι ήδη κρυπτογραφημένο.\n\nΠΡΟΣΟΧΗ: Η ΚΡΥΠΤΟΓΡΑΦΗΣΗ ΤΟΥ ΤΡΕΧΟΝΤΟΣ ΣΥΣΤΗΜΑΤΟΣ ΜΠΟΡΕΙ ΝΑ ΚΑΝΕΙ ΑΛΛΑ ΣΥΣΤΗΜΑΤΑ ΑΔΥΝΑΤΑ ΝΑ ΕΚΚΙΝΗΣΟΥΝ ΚΑΙ ΣΧΕΤΙΚΑ ΔΕΔΟΜΕΝΑ ΜΗ ΠΡΟΣΒΑΣΙΜΑ.\n\nΕίστε σίγουρος ότι θέλετε να συνεχίσετε;</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' &gt; '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="el" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">Ο αυθεντικός εκκινητής συστήματος δε θα αποθηκευτεί στο Δίσκο Ασφαλείας (πιθανόν λόγω απουσίας αρχείου αντιγράφου ασφαλείας).</string>
     <string lang="el" key="ERROR_MBR_PROTECTED">Αποτυχία εγγραφής τομέα MBR.\n\nΤο BIOS σας μπορεί να είναι ρυθμισμένο να τον προστατεύει. Ελέγξτε τις ρυθμίσεις του BIOS (πιέστε F2, Delete ή Esc, αφού ανοίξετε τον υπολογιστή σας) για προστασία MBR/Antivirus.</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 reinstall VeraCrypt and to take measures to avoid access to this machine by untrusted entities.</string>
@@ -1093,7 +1101,7 @@
     <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 medium (or using a service partition)?</string>
     <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 Hidden Volumes" in the VeraCrypt User's Guide.\n\nImportant: Before proceeding, please make sure you have read the section "Security Requirements and Precautions Pertaining to Hidden Volumes" in the VeraCrypt User's Guide.\n\n\nDoes the currently running operating system meet the above condition?</string>
     <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 from writing to the shared boot partition and from hibernating.\n\n\nDo you want to continue? If you select 'No', instructions for removing the extra boot partition will be displayed.</string>
-    <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' &gt; '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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
+    <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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
     <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="el" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Αυτός ο αλγόριθμος προς το παρόν δεν υποστηρίζεται για κρυπτογράφηση συστήματος.</string>
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
@@ -1108,8 +1116,8 @@
     <string lang="el" 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 (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 starts.\n\n- The VRD will contain a backup of the present content of the first drive track (which typically contains a system loader or boot manager) and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ISO image will be created in the location specified below.</string>
     <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">The Rescue Disk image has been created and stored in this file:\n%s\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>
+    <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%s\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>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">IMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software. If you do not have any CD/DVD recording software that can write the ISO disk image to a CD/DVD, click the link below to download such free software.\n\n</string>
     <string lang="en" key="LAUNCH_WIN_ISOBURN">Launch Microsoft Windows Disc Image Burner</string>
     <string lang="en" key="RESCUE_DISK_BURN_NO_CHECK_WARN">WARNING: If you already created a VeraCrypt Rescue Disk in the past, it cannot be reused for this system partition/drive because it was created for a different master key! Every time you encrypt a system partition/drive, you must create a new VeraCrypt Rescue Disk for it even if you use the same password.</string>
@@ -1127,10 +1135,11 @@
     <string lang="en" key="CONFIRM_WIPE_START_DECOY_SYS_PARTITION">The entire content of the partition where the original system resides will be erased.\n\nNote: The entire content of the partition that is to be erased has been copied to this hidden system partition.</string>
     <string lang="en" key="WIPE_MODE_WARN">WARNING: Note that when you choose e.g. the 3-pass wipe mode, the time necessary to encrypt the partition/drive will be up to 4 times longer. Likewise, if you choose the 35-pass wipe mode, it will be up to 36 times longer (it might even take several weeks).\n\nHowever, please note that wiping will NOT be performed after the partition/drive is fully encrypted. When the partition/drive is fully encrypted, no unencrypted data is written to it. Any data being written to it is first encrypted on the fly in memory and only then is the (encrypted) data written to the disk (so the performance will NOT be affected).\n\nAre you sure you want to use the wipe mode?</string>
     <string lang="el" key="WIPE_MODE_NONE">Κανένα (γρηγορότερο)</string>
-    <string lang="en" key="WIPE_MODE_1_RAND">1-pass (random data)</string>
+    <string lang="el" key="WIPE_MODE_1_RAND">1 πέρασμα (τυχαία δεδομένα)</string>
     <string lang="el" key="WIPE_MODE_3_DOD_5220">3 περάσματα (US DoD 5220.22-M)</string>
     <string lang="el" key="WIPE_MODE_7_DOD_5220">7 περάσματα (US DoD 5220.22-M)</string>
-    <string lang="en" key="WIPE_MODE_256">256-pass</string>
+    <string lang="el" key="WIPE_MODE_35_GUTMANN">35 περάσματα ("Gutmann")</string>
+    <string lang="el" key="WIPE_MODE_256">256 περάσματα</string>
     <string lang="el" key="SYS_MULTI_BOOT_MODE_TITLE">Αριθμός λειτουργικών συστημάτων</string>
     <string lang="el" key="MULTI_BOOT_FOR_ADVANCED_ONLY">ΠΡΟΣΟΧΗ: Άπειροι χρήστες δεν πρέπει να επιχειρούν να κρυπτογραφήσουν τα Windows σε διαμορφώσεις πολλαπλής εκκίνησης.\n\nΣυνέχεια;</string>
     <string lang="en" key="HIDDEN_OS_MULTI_BOOT">When creating/using a hidden operating system, VeraCrypt supports multi-boot configurations only when the following conditions are met:\n\n- The currently running operating system must be installed on the boot drive, which must not contain any other operating systems.\n\n- Operating systems installed on other drives must not use any boot loader residing on the drive on which the currently running operating system is installed.\n\nAre the above conditions met?</string>
@@ -1195,11 +1204,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 F2 or Delete (as soon as you see a BIOS start-up screen), and wait until a BIOS configuration screen appears. If no BIOS configuration screen appears, restart (reset) the computer again and start pressing F2 or Delete repeatedly as soon as you restart (reset) the computer. When a BIOS configuration screen appears, configure your BIOS to boot from the CD/DVD drive first (for information on how to do so, please refer to the documentation for your BIOS/motherboard or contact your computer vendor's technical support team for assistance). Then restart your computer. The VeraCrypt Rescue Disk screen should appear now. Note: In the VeraCrypt Rescue Disk screen, you can select 'Repair Options' by pressing F8 on your keyboard.\n\n\n</string>
     <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' &gt; 'Restore VeraCrypt Boot Loader'. Then press 'Y' to confirm the action, remove the Rescue Disk from your CD/DVD drive and restart your computer.\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'. Then press 'Y' to confirm the action, remove the Rescue Disk from your CD/DVD drive and restart your computer.\n\n</string>
-    <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' &gt; 'Restore key data'. Then enter your password, press 'Y' to confirm the action, remove the Rescue Disk from your CD/DVD drive, and restart your computer.\n\n</string>
+    <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 password, press 'Y' to confirm the action, remove the Rescue Disk from your CD/DVD drive, and restart your computer.\n\n</string>
     <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' &gt; '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_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 connect your system drive as a secondary or external drive to another computer and then boot the operating system installed on the computer. After you boot a system, run VeraCrypt, click 'Select Device', select the affected system partition, click 'OK', select 'System' &gt; 'Mount Without Pre-Boot Authentication', enter your pre-boot authentication password and click 'OK'. The partition will be mounted as a regular VeraCrypt volume (data will be on-the-fly decrypted/encrypted in RAM on access, as usual).\n\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 connect your system drive as a secondary or external drive to another computer and then boot the operating system installed on the computer. After you boot a system, run VeraCrypt, click 'Select Device', select the affected system partition, click 'OK', select 'System' > 'Mount Without Pre-Boot Authentication', enter your pre-boot authentication password and click 'OK'. The partition will be mounted as a regular VeraCrypt volume (data will be on-the-fly decrypted/encrypted in RAM on access, as usual).\n\n\n</string>
     <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>
@@ -1231,7 +1240,7 @@
     <string lang="el" key="SYSTEM_ENCRYPTION_IN_PROGRESS_ELSEWHERE">Μια διεργασία του Οδηγου Δημιουργίας Τόμου τρέχει τώρα στο σύστημα και διενεργεί ή προετοιμάζει κρυπτογράφηση/αποκρυπτογράφηση του διαμερίσματος/οδηγού του συστήματος. Πριν συνεχίσετε, παρακαλώ περιμένετε να τελειώσει ή κλείστε τον. Αν δεν μπορείτε να τον κλείσετε, παρακαλώ κάντε επανεκκίνηση πριν συνεχίσετε.</string>
     <string lang="el" key="SYSTEM_ENCRYPTION_NOT_COMPLETED">Η διαδικασία κρυπτογράφησης ή αποκρυπτογράφησης του διαμερίσματος/οδηγού του συστήματος δεν έχει ολοκληρωθεί. Παρακαλώ περιμένετε να ολοκληρωθεί πριν συνεχίσετε.</string>
     <string lang="el" key="ERR_ENCRYPTION_NOT_COMPLETED">Σφάλμα: Η διαδικασία κρυπτογράφησης του διαμερίσματος/οδηγού δεν ολοκληρώθηκε. Πρέπει πρώτα να ολοκληρωθεί.</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' &gt; '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' &gt; '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' &gt; 'Change Password' from the menu bar of the main VeraCrypt window.\n\nTo set the header key derivation algorithm, boot the hidden operating system and then select 'System' &gt; 'Set Header Key Derivation Algorithm'.</string>
     <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' &gt; 'Permanently Decrypt System Partition/Drive' from the menu bar of the main VeraCrypt window.</string>
     <string lang="el" key="ERR_PARAMETER_INCORRECT">Σφάλμα: Λάθος/άκυρη παράμετρος.</string>
@@ -1246,9 +1255,9 @@
     <string lang="el" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">Αν αντιμετωπίσετε κάποιο από τα προαναφερθέντα προβλήματα, αποκρυπτογραφήστε το διαμέρισμα/οδηγό (αν είναι κρυπτογραφημένο) και δοκιμάστε να το κρυπτογραφήσετε χρησιμοποιώντας έναν όχι σε σειρά αλγόριθμο κρυπτογράφησης (π.χ. 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 system (but not on the decoy system), the decoy system would contain a VeraCrypt driver and VeraCrypt applications whose version numbers are different from the version number of the VeraCrypt Boot Loader. Such a discrepancy might indicate that there is a hidden operating system on this computer.\n\n\nDo you want to continue?</string>
     <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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' &gt; '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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' > 'Create Rescue Disk').</string>
     <string lang="el" key="BOOT_LOADER_UPGRADE_OK">Ο Εκκινητής VeraCrypt αναβαθμίστηκε.\n\nΣυνίσταται να δημιουργήσετε ένα νέο Δίσκο Ασφαλείας VeraCrypt (ο οποίος θα περιέχει τη νέα έκδοση του Εκκινητή VeraCrypt) επιλέγοντας 'Σύστημα' &gt; 'Δημιουργία Δίσκου Ασφαλείας' αφού επανεκκίνησετε τον υπολογιστή σας.</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' &gt; 'Create Rescue Disk'.</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="el" key="BOOT_LOADER_UPGRADE_FAILED">Αποτυχία αναβάθμισης Εκκινητή VeraCrypt.</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="el" key="HIDDEN_SECTOR_DETECTION_FAILED_PREVIOUSLY">ΠΡΟΣΟΧΗ: Φαίνεται ότι το VeraCrypt ήδη προσπάθησε να εντοπίσει κρυφούς τομείς σ'αυτόν τον οδηγό του συστήματος. Αν συναντήσατε προβλήματα κατά την προηγούμενη διαδικασία εντοπισμού, μπορείτε να τα αποφύγετε παρακάμπτοντας τον εντοπισμό κρυφών τομέων τώρα. Σημειώστε ότι αν το κάνετε αυτό, το VeraCrypt θα χρησιμοποιήσει το μέγεθος που αναφέρθηκε από το λειτουργικό σύστημα (που μπορεί να είναι μικρότερο από το πραγματικό μέγεθος του οδηγού).\n\nΣημειώστε ότι αυτό το πρόβλημα δεν προκαλείται από το VeraCrypt.</string>
@@ -1261,8 +1270,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 automatically by clicking 'Auto-Detect Library' (only the Windows system directory will be searched).</string>
     <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' &gt; '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' &gt; '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 the library (e.g. in the folder where the software for the token/card is installed).</string>
     <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>
@@ -1271,13 +1280,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' &gt; '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 File' or 'Select Device' and select the volume.\n2) Select 'Volumes' &gt; 'Change Volume Password'.\n3) Enter the current password for the volume.\n4) Change the keyboard layout to English (US) by clicking the Language bar icon in the Windows taskbar and selecting 'EN  English (United States)'.\n5) In VeraCrypt, in the field for the new password, type the pre-boot authentication password.\n6) Confirm the new password by retyping it in the confirmation field and click 'OK'.\nWARNING: Please keep in mind that if you follow these steps, the volume password will always have to be typed using the US keyboard layout (which is automatically ensured only in the pre-boot environment).</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 File' or 'Select Device' and select the volume.\n2) Select 'Volumes' > 'Change Volume Password'.\n3) Enter the current password for the volume.\n4) Change the keyboard layout to English (US) by clicking the Language bar icon in the Windows taskbar and selecting 'EN  English (United States)'.\n5) In VeraCrypt, in the field for the new password, type the pre-boot authentication password.\n6) Confirm the new password by retyping it in the confirmation field and click 'OK'.\nWARNING: Please keep in mind that if you follow these steps, the volume password will always have to be typed using the US keyboard layout (which is automatically ensured only in the pre-boot environment).</string>
     <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 the drive letter list in the main VeraCrypt application window.</string>
     <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 the 'Dismount All' function, 'Auto-Dismount' functions, 'Dismount All' hot keys, etc.</string>
@@ -1296,8 +1305,8 @@
     <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 system.</string>
     <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' &gt; 'Performance' and enable 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' &gt; 'Performance' and disable 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>
@@ -1371,6 +1380,39 @@
     <string lang="el" key="TB_PER_SEC">TB/s</string>
     <string lang="el" key="PB_PER_SEC">PB/s</string>
     <string lang="en" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.es.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="es" name="Español" en-name="Spanish" version="1.0.0" translators="Juan Antonio Auñón Ochando" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="es" key="IDC_BROWSE">Exa&amp;minar...</control>
     <control lang="es" key="IDC_DESKTOP_ICON">Añadir icono de VeraCrypt al e&amp;scritorio</control>
     <control lang="es" key="IDC_DONATE">Donar ahora...</control>
-    <control lang="es" key="IDC_FILE_TYPE">Asociar los archivos .tc &amp;con VeraCrypt</control>
+    <control lang="es" key="IDC_FILE_TYPE">Asociar los archivos .hc &amp;con VeraCrypt</control>
     <control lang="es" key="IDC_OPEN_CONTAINING_FOLDER">&amp;Abrir ubicación de destino al terminar</control>
     <control lang="es" key="IDC_PROG_GROUP">Añadir VeraCrypt al Menú &amp;Inicio</control>
     <control lang="es" key="IDC_SYSTEM_RESTORE">Crear Punto de &amp;Restauración de Sistema</control>
@@ -37,13 +37,15 @@
     <control lang="es" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Descargar software de grabación de CD/DVD</control>
     <control lang="es" key="IDC_FILE_CONTAINER">Crear un contenedor de archivos cifrado</control>
     <control lang="es" key="IDC_GB">&amp;GB</control>
+    <control lang="es" key="IDC_TB">&amp;TB</control>
     <control lang="es" key="IDC_HIDDEN_SYSENC_INFO_LINK">Más información</control>
-    <control lang="es" key="IDC_HIDDEN_VOL">Volumen VeraCrypt o&amp;culto</control>
+    <control lang="es" key="IDC_HIDDEN_VOL">Volumen VeraCrypt o&amp;culto </control>
     <control lang="es" key="IDC_HIDDEN_VOL_HELP">Más información acerca de volúmenes ocultos</control>
     <control lang="es" key="IDC_HIDVOL_WIZ_MODE_DIRECT">Modo Directo</control>
     <control lang="es" key="IDC_HIDVOL_WIZ_MODE_FULL">Modo Normal</control>
     <control lang="es" key="IDC_KB">&amp;KB</control>
     <control lang="es" key="IDC_KEYFILES_ENABLE">U&amp;sar archivo-llave</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="es" key="IDC_KEY_FILES">A&amp;rchivos-llave</control>
     <control lang="es" key="IDC_LINK_HASH_INFO">Información de algoritmos hash</control>
@@ -58,9 +60,10 @@
     <control lang="es" key="IDC_NO_HISTORY">No &amp;guardar nunca historial</control>
     <control lang="es" key="IDC_OPEN_OUTER_VOLUME">Abrir Volumen Externo</control>
     <control lang="es" key="IDC_PAUSE">&amp;Pausa</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="es" key="IDC_QUICKFORMAT">Formato Rápido</control>
-    <control lang="es" key="IDC_SHOW_PASSWORD">&amp;Mostrar contraseña </control>
+    <control lang="es" key="IDC_SHOW_PASSWORD">&amp;Mostrar contraseña</control>
     <control lang="es" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Mostrar contraseña</control>
     <control lang="en" key="IDC_SHOW_PIM">&amp;Display PIM</control>
     <control lang="es" key="IDC_SINGLE_BOOT">Arranque simple</control>
@@ -74,7 +77,7 @@
     <control lang="es" key="IDT_CLUSTER">Cluster </control>
     <control lang="es" key="IDT_COLLECTING_RANDOM_DATA_NOTE">IMPORTANTE: Mueva el ratón al azar todo lo posible dentro de esta ventana. Cuanto más lo mueva, mejor. Esto incrementa significativamente la fuerza criptográfica de las claves de cifrado. Luego presione Siguiente para continuar.</control>
     <control lang="es" key="IDT_CONFIRM">&amp;Confirmar:</control>
-    <control lang="es" key="IDT_DONE">Hecho </control>
+    <control lang="es" key="IDT_DONE">Hecho</control>
     <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="es" key="IDT_ENCRYPTION_ALGO">Algoritmo de Cifrado</control>
     <control lang="es" key="IDT_FILESYSTEM">Sistema de archivos. </control>
@@ -82,7 +85,7 @@
     <control lang="es" key="IDT_FORMAT_OPTIONS">Opciones</control>
     <control lang="es" key="IDT_HASH_ALGO">Algoritmo Hash</control>
     <control lang="es" key="IDT_HEADER_KEY">Clave Cabecera: </control>
-    <control lang="es" key="IDT_LEFT">Quedan </control>
+    <control lang="es" key="IDT_LEFT">Quedan</control>
     <control lang="es" key="IDT_MASTER_KEY">Clave Maestra: </control>
     <control lang="es" key="IDT_MULTI_BOOT">Seleccione esta opción si hay dos o más sistemas operativos instalados en este ordenador.\n\nPor ejemplo:\n- Windows XP y Windows XP\n- Windows XP y Windows Vista\n- Windows y Mac OS X\n- Windows y Linux\n- Windows, Linux y Mac OS X</control>
     <control lang="es" key="IDT_NON_SYS_DEVICE">Cifra una partición en cualquier unidad interna o externa (ej: unidad flash). Opcionalmente, crea un volúmen oculto.</control>
@@ -94,7 +97,7 @@
     <control lang="es" key="IDT_PROGRESS">Progreso:</control>
     <control lang="es" key="IDT_RANDOM_POOL">Pool Aleatorio: </control>
     <control lang="es" key="IDT_SINGLE_BOOT">Seleccione esta opción si hay solo un sistema operativo instalado en este ordenador (aunque tenga varios usuarios).</control>
-    <control lang="es" key="IDT_SPEED">Velocidad </control>
+    <control lang="es" key="IDT_SPEED">Velocidad</control>
     <control lang="es" key="IDT_STATUS">Estado</control>
     <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>
@@ -118,6 +121,7 @@
     <control lang="es" key="IDC_CREATE">Crear</control>
     <control lang="es" key="IDC_CREATE_VOLUME">&amp;Crear Volumen</control>
     <control lang="es" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">No mo&amp;strar texto en la pantalla de autenticación de pre-arranque (excepto el siguiente mensaje)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="es" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Acelerar cifrado/descifrado AES usando instrucciones AES del procesador (si es posible)</control>
     <control lang="es" key="IDC_ENABLE_KEYFILES">Usar Archivo-llave</control>
     <control lang="es" key="IDC_ENABLE_NEW_KEYFILES">Usar Archivo-llave</control>
@@ -132,9 +136,10 @@
     <control lang="es" key="IDC_FAVORITE_MOVE_UP">Mover arri&amp;ba</control>
     <control lang="es" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Abrir en el &amp;explorador el volumen seleccionado cuando sea montado con éxito</control>
     <control lang="es" key="IDC_FAVORITE_REMOVE">Elimina&amp;r</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="es" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Configuración global</control>
     <control lang="es" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Mostrar mensaje emergente tras desmontar con éxito usando atajos de teclado</control>
-    <control lang="es" key="IDC_HK_DISMOUNT_PLAY_SOUND">Reproducir notificación sonora tras desmontar con éxito usando atajos de teclado </control>
+    <control lang="es" key="IDC_HK_DISMOUNT_PLAY_SOUND">Reproducir notificación sonora tras desmontar con éxito usando atajos de teclado</control>
     <control lang="es" key="IDC_HK_MOD_ALT">Alt</control>
     <control lang="es" key="IDC_HK_MOD_CTRL">Ctrl</control>
     <control lang="es" key="IDC_HK_MOD_SHIFT">Mayus.</control>
@@ -189,7 +194,7 @@
     <control lang="es" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="es" key="IDD_PASSWORDCHANGE_DLG">Cambiar contraseña o archivo-llave</control>
     <control lang="es" key="IDD_PASSWORD_DLG">Introducir Contraseña de Volumen VeraCrypt</control>
-    <control lang="es" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Opciones de Rendimiento</control>
+    <control lang="es" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Opciones de Rendimiento y controladores</control>
     <control lang="es" key="IDD_PREFERENCES_DLG">VeraCrypt - Preferencias</control>
     <control lang="es" key="IDD_SYSENC_SETTINGS">VeraCrypt - Opciones de cifrado del sistema</control>
     <control lang="es" key="IDD_TOKEN_PREFERENCES">VeraCrypt - Preferencias de token de seguridad</control>
@@ -235,7 +240,7 @@
     <control lang="es" key="IDM_ONLINE_TUTORIAL">Tutorial del principiante</control>
     <control lang="es" key="IDM_ORGANIZE_FAVORITES">Organizar Volúmenes Favoritos</control>
     <control lang="es" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organizar Volúmenes Favoritos del Sistema</control>
-    <control lang="es" key="IDM_PERFORMANCE_SETTINGS">Rendimiento</control>
+    <control lang="es" key="IDM_PERFORMANCE_SETTINGS">Rendimiento/Configuración del controlador</control>
     <control lang="es" key="IDM_PERMANENTLY_DECRYPT_SYS">Descifrar Permanentemente la Partición/Unidad del Sistema</control>
     <control lang="es" key="IDM_PREFERENCES">Preferencias</control>
     <control lang="es" key="IDM_REFRESH_DRIVE_LETTERS">Actualizar Letras de Unidad</control>
@@ -256,6 +261,7 @@
     <control lang="es" key="IDM_UNMOUNTALL">Desmontar Todos los Volúmenes Montados</control>
     <control lang="es" key="IDM_UNMOUNT_VOLUME">Desmontar Volumen</control>
     <control lang="es" key="IDM_VERIFY_RESCUE_DISK">Verificar Disco de Rescate</control>
+    <control lang="en" key="IDM_VERIFY_RESCUE_DISK_ISO">Verify Rescue Disk Image</control>
     <control lang="es" key="IDM_VERSION_HISTORY">Historial de Versiones</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="es" key="IDM_VOLUME_PROPERTIES">Propiedades de Volumen</control>
@@ -274,7 +280,7 @@
     <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="es" key="IDT_DRIVER_OPTIONS">Configuración del controlador</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>
@@ -289,12 +295,12 @@
     <control lang="es" key="IDT_PARALLELIZATION_OPTIONS">Paralelización basada en hilos</control>
     <control lang="es" key="IDT_PKCS11_LIB_PATH">Ruta de Librería PKCS #11</control>
     <control lang="es" key="IDT_PKCS5_PRF">PKCS-5 PRF:</control>
-    <control lang="en" key="IDT_NEW_PKCS5_PRF">PKCS-5 PRF:</control>
+    <control lang="es" key="IDT_NEW_PKCS5_PRF">PKCS-5 PRF:</control>
     <control lang="es" key="IDT_PW_CACHE_OPTIONS">Caché de Contraseñas</control>
     <control lang="es" key="IDT_SECURITY_OPTIONS">Opciones de seguridad</control>
     <control lang="es" key="IDT_TASKBAR_ICON">VeraCrypt en Segundo Plano</control>
     <control lang="es" key="IDT_TRAVELER_MOUNT">Volumen VeraCrypt a montar (relativo a raíz del disco viajero):</control>
-    <control lang="es" key="IDT_TRAVEL_INSERTION">Tras la inserción del disco viajero:</control>
+    <control lang="es" key="IDT_TRAVEL_INSERTION">Tras la inserción del disco viajero: </control>
     <control lang="es" key="IDT_TRAVEL_ROOT">Crear archivos del disco viajero en (directorio raíz del disco viajero):</control>
     <control lang="es" key="IDT_VOLUME">Volumen</control>
     <control lang="es" key="IDT_WINDOWS_RELATED_SETTING">Windows</control>
@@ -365,7 +371,7 @@
     <control lang="es" key="IDT_SECURITY_TOKEN">Token de seguridad:</control>
     <control lang="es" key="IDT_SORT_METHOD">Orden:</control>
     <control lang="es" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Por favor espere. Este proceso puede llevar mucho tiempo...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="es" key="IDT_TEST_BLOCK_NUMBER">Número de bloque:</control>
     <control lang="es" key="IDT_TEST_CIPHERTEXT">Texto cifrado (hexadecimal)</control>
     <control lang="es" key="IDT_TEST_DATA_UNIT_NUMBER">Datos de la unidad (64-bit hexadecimal, tamaño de la unidad de datos es 512 bytes)</control>
@@ -379,7 +385,7 @@
     <control lang="es" key="MENU_TOOLS">&amp;Herramientas</control>
     <control lang="es" key="MENU_SETTINGS">Confi&amp;guración</control>
     <control lang="es" key="MENU_HELP">A&amp;yuda</control>
-    <control lang="es" key="MENU_WEBSITE">Página &amp;Web</control>
+    <control lang="es" key="MENU_WEBSITE">   Página &amp;Web   </control>
     <!-- Strings -->
     <string lang="es" key="ABOUTBOX">&amp;Acerca de...</string>
     <string lang="es" key="ACCESSMODEFAIL">No se ha podido cambiar el atributo 'sólo lectura' de su antiguo volumen. Compruebe los permisos de acceso del archivo.</string>
@@ -410,13 +416,13 @@
     <string lang="es" key="CIPHER_TITLE">Opciones de cifrado</string>
     <string lang="es" key="CLEAN_WINMRU_FAILED">AVISO: ¡Fallo al borrar la ruta del último volumen/archivo-clave seleccionado (almacenado por el selector de archivos)!</string>
     <string lang="es" key="COMPRESSION_NOT_SUPPORTED">Error: El contenedor ha sido comprimido a nivel del sistema de archivos. VeraCrypt no soporta contenedores comprimidos (la compresión de información cifrada es redundante e inefectiva).\n\nDeshabilite la compresión del contenedor siguiendo estos pasos:\n1) Click derecho en el contenedor desde el explorador de Windows (no desde VeraCrypt).\n2) Seleccione 'Propiedades'.\n3) En la ventana de 'Propiedades', click en 'Opciones Avanzadas'.\n4) En la ventana 'Atributos avanzados', desactive la opción 'Comprimir contenido para ahorrar espacio en disco' y haga click en 'Aceptar'.\n5) En 'Propiedades', click en 'Aceptar'.</string>
-    <string lang="es" key="CREATE_FAILED">Falló la creación del volumen %hs</string>
+    <string lang="es" key="CREATE_FAILED">Falló la creación del volumen %s</string>
-    <string lang="es" key="DEVICE_FREE_BYTES">El tamaño de %hs es %.2f bytes</string>
+    <string lang="es" key="DEVICE_FREE_BYTES">El tamaño de %s es %.2f bytes</string>
-    <string lang="es" key="DEVICE_FREE_KB">El tamaño de %hs es %.2f KB</string>
+    <string lang="es" key="DEVICE_FREE_KB">El tamaño de %s es %.2f KB</string>
-    <string lang="es" key="DEVICE_FREE_MB">El tamaño de %hs es %.2f MB</string>
+    <string lang="es" key="DEVICE_FREE_MB">El tamaño de %s es %.2f MB</string>
-    <string lang="es" key="DEVICE_FREE_GB">El tamaño de %hs es %.2f GB</string>
+    <string lang="es" key="DEVICE_FREE_GB">El tamaño de %s es %.2f GB</string>
-    <string lang="es" key="DEVICE_FREE_TB">El tamaño de %hs es %.2f TB</string>
+    <string lang="es" key="DEVICE_FREE_TB">El tamaño de %s es %.2f TB</string>
-    <string lang="es" key="DEVICE_FREE_PB">El tamaño de %hs es %.2f PB</string>
+    <string lang="es" key="DEVICE_FREE_PB">El tamaño de %s es %.2f PB</string>
     <string lang="es" key="DEVICE_IN_USE_FORMAT">AVISO: El dispositivo/partición está siendo utilizado por el sistema operativo o una aplicación. Formatear el dispositivo/partición puede causar corrupción de datos e inestabilidad del sistema.\n\n¿Continuar?</string>
     <string lang="es" key="DEVICE_IN_USE_INPLACE_ENC">Aviso: La partición está siendo usada por el sistema operativo o una aplicación. Debería cerrar cualquier aplicación que pueda estar usando la partición (incluyendo antivirus).\n\n¿Continuar?</string>
     <string lang="es" key="FORMAT_CANT_DISMOUNT_FILESYS">Error: El dispositivo/partición contiene un sistema de archivos que no puede ser desmontado. El sistema de archivos puede estar en uso por el sistema operativo. Formatear el dispositivo/partición muy probablemente causará corrupción de datos e inestabilidad del sistema.\n\nPara solucionarlo, recomendamos que primero borre la partición y luego la vuelva a crear sin formatearla. Para hacerlo siga estos pasos:\n1) Click derecho en 'Mi PC' o 'Equipo' en el 'Menú inicio' y seleccione 'Administrar'. Aparecerá la ventana 'Administración de equipos'.\n2) En dicha ventana, seleccione 'Almacenamiento' &gt; 'Administración de discos'.\n3) Click derecho en la partición que desea cifrar y seleccione 'Borrar la partición', 'Borrar Volumen' o 'Borrar unidad lógica'.\n4) Click en 'Aceptar'. Si Windows pregunta si quiere reiniciar el ordenador, hágalo. Entonces repita los pasos 1 y 2 y continúe desde el paso 5. 5)\nClick derecho en el área no asignada/espacio libre y seleccione 'Partición nueva', 'Volumen simple nuevo' o 'Unidad lógica nueva'.\n6) El 'Asistente de partición nueva' o 'Asistente de volumen simple nuevo' deberá aparecer; siga las instrucciones. Cuando en el asistente indique 'Formatear Partición', seleccione 'No formatear esta partición' o 'No formatear este volumen'. En el mismo asistente, click en 'Siguiente' y despues en 'Finalizar'.\n7) La ruta del dispositivo seleccinado en VeraCrypt podría ser incorrecta ahora. Por tanto, salga del Asistente de Creación de Volúmenes VeraCrypt (si aún está en ejecución) y ábralo de nuevo.\n8) Intente cifrar nuevamente el dispositivo/partición.\n\nSi VeraCrypt falla repetidamente al cifrar el dispositivo/partición, considere crear un contenedor de archivos en su lugar.</string>
@@ -435,12 +441,12 @@
     <string lang="es" key="INPLACE_ENC_INVALID_PATH">Error: VeraCrypt sólo puede cifrar conservando datos una partición, un volumen dinámico, o la unidad del sistema entera. Por favor asegúrese de que la ruta especificada es válida.</string>
     <string lang="es" key="CANNOT_RESIZE_FILESYS">Error: No se puede comprimir el sistema de archivos (el sistema de archivos necesita ser comprimido para crear espacio para la cabecera del volumen y su copia de seguridad).\n\nPosibles causas y soluciones:\n\n- No hay suficiente espacio libre en el volumen. Asegúrese de que no hay ninguna otra aplicación escribiendo en el sistema de archivos.\n\n- Sistema de archivos corrupto. Intente comprobarlo y corregir los errores (click derecho en la letra de unidad correspondiente en 'Equipo', seleccione Propiedades &gt; Herramientas &gt; 'Comprobar ahora', asegúrese de que la opción 'Reparar automáticamente errores en el sistema de archivos' está activada y click en Iniciar).\n\nSi esto no funciona, siga los pasos que aparecen más abajo.</string>
     <string lang="es" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Error: No hay suficiente espacio libre en el volumen por lo que el sistema de archivos no puede ser comprimido (el sistema de archivos necesita ser comprimido para crear espacio para la cabecera del volumen y su copia de seguridad).\n\nElimine cualquier archivo innecesario y vacíe la Papelera de Reciclaje para liberar al menos 256 KB e inténtelo de nuevo. Tenga en cuenta que debido a una característica de Windows, la cantidad de espacio libre reportada por el explorador de Windows podría ser incorrecta hasta que el sistema operativo se reinicie. Si reiniciar el sistema no ayuda, el sistema de archivos podría estar corrupto. Intente comprobarlo y corregir cualquier error (click derecho en la letra de unidad correspondiente en 'Equipo', seleccione Propiedades &gt; Herramientas &gt; 'Comprobar ahora', asegúrese de que la opción 'Reparar automáticamente errores en el sistema de archivos' está activada y click en Iniciar).\n\nSi esto no funciona, siga los pasos que aparecen más abajo.</string>
-    <string lang="es" key="DISK_FREE_BYTES">El espacio libre en la unidad %hs es %.2f bytes.</string>
+    <string lang="es" key="DISK_FREE_BYTES">El espacio libre en la unidad %s es %.2f bytes.</string>
-    <string lang="es" key="DISK_FREE_KB">El espacio libre en la unidad %hs es %.2f KB</string>
+    <string lang="es" key="DISK_FREE_KB">El espacio libre en la unidad %s es %.2f KB</string>
-    <string lang="es" key="DISK_FREE_MB">El espacio libre en la unidad %hs es %.2f MB</string>
+    <string lang="es" key="DISK_FREE_MB">El espacio libre en la unidad %s es %.2f MB</string>
-    <string lang="es" key="DISK_FREE_GB">El espacio libre en la unidad %hs es %.2f GB</string>
+    <string lang="es" key="DISK_FREE_GB">El espacio libre en la unidad %s es %.2f GB</string>
-    <string lang="es" key="DISK_FREE_TB">El espacio libre en la unidad %hs es %.2f TB</string>
+    <string lang="es" key="DISK_FREE_TB">El espacio libre en la unidad %s es %.2f TB</string>
-    <string lang="es" key="DISK_FREE_PB">El espacio libre en la unidad %hs es %.2f PB</string>
+    <string lang="es" key="DISK_FREE_PB">El espacio libre en la unidad %s es %.2f PB</string>
     <string lang="es" key="DRIVELETTERS">No se han podido obtener letras de unidad disponibles.</string>
     <string lang="es" key="DRIVER_NOT_FOUND">Error: No se ha encontrado el controlador de VeraCrypt.\n\nCopie los archivos 'veracrypt.sys' y 'veracrypt-x64.sys' al directorio donde está ubicada la aplicación principal (VeraCrypt.exe).</string>
     <string lang="es" key="DRIVER_VERSION">Error: Se está ejecutando una versión incompatible del controlador VeraCrypt.\n\nSi está intentando ejecutar VeraCrypt en modo portable (p.e. sin instalarlo) y ya hay instalada una versión diferente de VeraCrypt, debe desinstalar dicha versión primero (o actualizarla usando el instalador de VeraCrypt). Para desinstalarla, siga estos pasos: En Windows Vista o posterior, seleccione 'Menú Inicio' &gt; Equipo &gt; 'Desinstalar o cambiar un programa' &gt; VeraCrypt &gt; Desinstalar; en Windows XP, seleccione 'Menú Inicio' &gt; Panel de control &gt; 'Agregar o quitar programas' &gt; VeraCrypt &gt; Quitar.\n\nDel mismo modo, si está intentando ejecutar VeraCrypt en modo portable (p.e. sin instalarlo) y hay una versión diferente de VeraCrypt ejecutándose en modo portable, debe reiniciar el sistema primero y ejecutar únicamente esta nueva versión.</string>
@@ -458,7 +464,7 @@
     <string lang="es" key="SYSTEM_CRASH_ANALYSIS_INFO">Después de pulsar Aceptar, VeraCrypt analizará el fallo del sistema. Esto podría durar varios minutos.</string>
     <string lang="es" key="DEBUGGER_NOT_FOUND">Asegúrese de que la variable de entorno 'PATH' incluye la ruta a 'kd.exe' (Depurador del Núcleo).</string>
     <string lang="es" key="SYSTEM_CRASH_NO_VERACRYPT">Parece que lo más probable es que VeraCrypt no causara el fallo del sistema. Hay muchas razones potenciales por las que el sistema podría haber fallado (por ejemplo, un componente hardware defectuoso, un error en un controlador de dispositivo, etc.)</string>
-    <string lang="es" key="SYSTEM_CRASH_UPDATE_DRIVER">Los resultados del análisis indican que actualizar el siguiente controlador podría resolver este problema:</string>
+    <string lang="es" key="SYSTEM_CRASH_UPDATE_DRIVER">Los resultados del análisis indican que actualizar el siguiente controlador podría resolver este problema: </string>
     <string lang="es" key="SYSTEM_CRASH_REPORT">Para ayudarnos a determinar si hay un error (bug) en VeraCrypt o no, puede enviarnos un informe de errores generado automáticamente conteniendo los siguientes datos:\n\n- Versión del programa\n- Versión del sistema operativo\n- Tipo de CPU\n- Categoría del error\n- Nombre y versión del controlador\n- Pila de llamadas del sistema\n\nSi selecciona 'Sí', la siguiente URL (que contiene el informe completo del error) se abrirá en su explorador de Internet predeterminado.</string>
     <string lang="es" key="ASK_SEND_ERROR_REPORT">¿Desea enviarnos dicho informe de errores?</string>
     <string lang="es" key="ENCRYPT">&amp;Cifrar</string>
@@ -477,7 +483,7 @@
     <string lang="es" key="FILE_OPEN_FAILED">No se pudo abrir el archivo.</string>
     <string lang="es" key="FILE_TITLE">Ubicación del volumen</string>
     <string lang="es" key="FILESYS_PAGE_TITLE">Archivos grandes</string>
-    <string lang="es" key="FILESYS_PAGE_HELP_QUESTION">¿Tiene intención de almacenar archivos de más de 4 GB en este volumen VeraCrypt? </string>
+    <string lang="es" key="FILESYS_PAGE_HELP_QUESTION">¿Tiene intención de almacenar archivos de más de 4 GB en este volumen VeraCrypt?</string>
     <string lang="es" key="FILESYS_PAGE_HELP_EXPLANATION">Dependiendo de su elección, VeraCrypt elegirá un sistema de archivos adecuado para el volumen VeraCrypt (pero lo podrá cambiar en el siguiente paso).</string>
     <string lang="es" key="FILESYS_PAGE_HELP_EXPLANATION_HIDVOL">Como ud. está creando un volumen externo, debería considerar elegir 'No'. Si elige 'Sí', el sistema de archivos por defecto será NTFS, que no es tan adecuado como FAT para volúmenes externos (p.e., el máximo tamaño posible para el volumen oculto será mayor si el volumen externo es FAT). Normalmente, FAT es predeterminado para ambos volúmenes (por eso los volúmenes FAT no son sospechosos). Sin embargo, si el usuario planea almacenar archivos mayores de 4 GB (no permitidos en ese sistema de archivos), entonces FAT no será predeterminado.</string>
     <string lang="es" key="FILESYS_PAGE_HELP_EXPLANATION_HIDVOL_CONFIRM">¿Seguro que desea elegir 'Sí'?</string>
@@ -561,6 +567,7 @@
     <string lang="es" key="MAX_HIDVOL_SIZE_KB">El tamaño máximo posible de volumen oculto para este volumen es %.2f KB.</string>
     <string lang="es" key="MAX_HIDVOL_SIZE_MB">El tamaño máximo posible de volumen oculto para este volumen es %.2f MB.</string>
     <string lang="es" key="MAX_HIDVOL_SIZE_GB">El tamaño máximo posible de volumen oculto para este volumen es %.2f GB.</string>
+    <string lang="es" key="MAX_HIDVOL_SIZE_TB">El tamaño máximo posible de volumen oculto para este volumen es %.2f TB.</string>
     <string lang="es" key="MOUNTED_NOPWCHANGE">La contraseña/archivo-llave del volumen no puede cambiarse mientras el volumen está montado. Desmonte el volumen primero.</string>
     <string lang="es" key="MOUNTED_NO_PKCS5_PRF_CHANGE">El algoritmo de derivación de clave de cabecera no puede ser cambiado mientras el volumen está montado. Desmonte el volumen primero.</string>
     <string lang="es" key="MOUNT_BUTTON">&amp;Montar</string>
@@ -591,12 +598,12 @@
     <string lang="es" key="SELECT_PKCS11_MODULE">Seleccione librería PKCS #11</string>
     <string lang="es" key="OUTOFMEMORY">Memoria Insuficiente</string>
     <string lang="es" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">IMPORTANTE: Recomendamos encarecidamente que los usuarios sin experiencia creen un contenedor de archivos VeraCrypt en el dispositivo/partición seleccionado, en lugar de intentar cifrar el dispositivo/partición entero.\n\nAl crear un contenedor VeraCrypt (al contrario que al cifrar un dispositivo o partición) no hay, por ejemplo, riesgo de destruir una gran cantidad de archivos. Tenga en cuenta que un contenedor VeraCrypt (a pesar de que contiene un disco virtual cifrado) es exactamente igual que cualquier archivo normal. Para más información, vea el capítulo Tutorial del Principiante en la Guía de Usuario de VeraCrypt.\n\n¿Seguro que desea cifrar el dispositivo/partición entero?</string>
-    <string lang="es" key="OVERWRITEPROMPT">AVISO: ¡El archivo '%hs' ya existe!\n\nIMPORTANTE: VERACRYPT NO CIFRARÁ EL ARCHIVO, PERO LO BORRARÁ. ¿Seguro que desea borrar el archivo y reemplazarlo por un nuevo contenedor VeraCrypt?</string>
+    <string lang="es" key="OVERWRITEPROMPT">AVISO: ¡El archivo '%s' ya existe!\n\nIMPORTANTE: VERACRYPT NO CIFRARÁ EL ARCHIVO, PERO LO BORRARÁ. ¿Seguro que desea borrar el archivo y reemplazarlo por un nuevo contenedor VeraCrypt?</string>
-    <string lang="es" key="OVERWRITEPROMPT_DEVICE">CUIDADO: ¡TODOS LOS ARCHIVOS ACTUALMENTE ALMACENADOS EN %s '%hs'%s SERÁN BORRADOS Y SE PERDERÁN (NO SERÁN CIFRADOS)!\n\n¿Seguro que desea continuar con el formato?</string>
+    <string lang="es" key="OVERWRITEPROMPT_DEVICE">CUIDADO: ¡TODOS LOS ARCHIVOS ACTUALMENTE ALMACENADOS EN %s '%s'%s SERÁN BORRADOS Y SE PERDERÁN (NO SERÁN CIFRADOS)!\n\n¿Seguro que desea continuar con el formato?</string>
-    <string lang="es" key="NONSYS_INPLACE_ENC_CONFIRM">AVISO: No podrá montar el volumen o acceder a los archivos almacenados en él hasta que haya sido cifrado por completo.\n\n¿Seguro que desea comenzar a cifrar %s '%hs'%s?</string>
+    <string lang="es" key="NONSYS_INPLACE_ENC_CONFIRM">AVISO: No podrá montar el volumen o acceder a los archivos almacenados en él hasta que haya sido cifrado por completo.\n\n¿Seguro que desea comenzar a cifrar %s '%s'%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="es" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">AVISO: Tenga en cuenta que si el suministro de energía se interrumpe repentinamente mientras se cifran datos existentes sin pérdida de información, o si el sistema operativo falla debido a un error de software o hardware mientras VeraCrypt cifra datos sin pérdida de información, se corromperán o perderán porciones de los datos. Por tanto, antes de comenzar a cifrar, asegúrese de que tiene copias de seguridad de los archivos que desea cifrar.\n\n¿Tiene dichas copias?</string>
-    <string lang="es" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CUIDADO: ¡TODOS LOS ARCHIVOS ALMACENADOS EN LA PARTICIÓN '%hs'%s (EN LA PRIMERA PARTICIÓN TRAS LA PARTICIÓN DEL SISTEMA) SERÁN BORRADOS Y SE PERDERÁN (NO SERÁN CIFRADOS)!\n\n¿Seguro que desea iniciar el formateo?</string>
+    <string lang="es" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CUIDADO: ¡TODOS LOS ARCHIVOS ALMACENADOS EN LA PARTICIÓN '%s'%s (EN LA PRIMERA PARTICIÓN TRAS LA PARTICIÓN DEL SISTEMA) SERÁN BORRADOS Y SE PERDERÁN (NO SERÁN CIFRADOS)!\n\n¿Seguro que desea iniciar el formateo?</string>
     <string lang="es" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">AVISO: ¡LA PARTICIÓN SELECCIONADA CONTIENE UNA GRAN CANTIDAD DE DATOS! ¡Todos los archivos almacenados en la partición serán eliminados y se perderán (NO serán cifrados)!</string>
     <string lang="es" key="ERASE_FILES_BY_CREATING_VOLUME">Borra cualquier archivo almacenado en la partición creando un volumen VeraCrypt dentro</string>
     <string lang="es" key="PASSWORD">Contraseña</string>
@@ -617,7 +624,7 @@
     <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="es" key="PASSWORD_HELP">Es muy importante que elija una buena contraseña. Debería evitar elegir una que contenga sólo una palabra que se pueda encontrar en un diccionario (o una combinación de 2, 3, o 4 de estas palabras). No debería contener nombres ni fechas de nacimiento. No debería ser fácil de adivinar. Una buena contraseña es una combinación aleatoria de letras mayúsculas y minúsculas, números, y caracteres especiales como @ ^ = $ * + etc. Recomendamos la elección de una contraseña que consista en más de 20 caracteres (cuanto más larga, mejor). La máxima longitud posible es 64 caracteres.</string>
     <string lang="es" key="PASSWORD_HIDDENVOL_HELP">Elija una contraseña para el volumen oculto. </string>
-    <string lang="es" key="PASSWORD_HIDDEN_OS_HELP">Elija una contraseña para el sistema operativo oculto (es decir, para el volumen oculto).</string>
+    <string lang="es" key="PASSWORD_HIDDEN_OS_HELP">Elija una contraseña para el sistema operativo oculto (es decir, para el volumen oculto). </string>
     <string lang="es" key="PASSWORD_HIDDEN_OS_NOTE">IMPORTANTE: La contraseña que elija para el sistema operativo oculto en este paso debe ser sustancialmente diferente de las otras dos contraseñas (es decir, de la contraseña para el volumen externo y de la del sistema operativo señuelo).</string>
     <string lang="es" key="PASSWORD_HIDDENVOL_HOST_DIRECT_HELP">Introduzca la contraseña para el volumen en el que desea crear un volumen oculto.\n\nTras pulsar Siguiente, VeraCrypt intentará montar el volumen. Tan pronto como el volumen sea montado, el mapa de bits del cluster será examinado para determinar el tamaño del área ininterrumpida de espacio libre (si la hay) cuyo final coincide con el final del volumen. Este área alojará el volumen oculto y por tanto limitará su máximo tamaño posible. La exploración del mapa de cluster es necesario para asegurar que ningún dato del volumen externo sea sobreescrito por el volumen oculto.</string>
     <string lang="es" key="PASSWORD_HIDDENVOL_HOST_HELP">\nElija una contraseña para el volumen externo. Esta será la contraseña que ud. podrá revelar a un enemigo si es obligado a hacerlo.\n\nIMPORTANTE: La contraseña debe ser sustancialmente diferente de la que elegirá para el volumen oculto.\n\nNota: La longitud máxima posible de la contraseña es 64 caracteres.</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="es" key="PREV">&lt; &amp;Atrás</string>
     <string lang="es" key="RAWDEVICES">¡No se pueden listar los dispositivos raw de su sistema!</string>
-    <string lang="es" key="READONLYPROMPT">El volumen '%hs' existe y es de sólo lectura. ¿Desea reemplazarlo?</string>
+    <string lang="es" key="READONLYPROMPT">El volumen '%s' existe y es de sólo lectura. ¿Desea reemplazarlo?</string>
     <string lang="es" key="SELECT_DEST_DIR">Seleccione el directorio de destino</string>
     <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>
@@ -680,13 +687,13 @@
     <string lang="es" key="TEST_CIPHERTEXT_SIZE">El texto cifrado de prueba suministrado es demasiado largo o corto.</string>
     <string lang="es" key="TEST_KEY_SIZE">La clave de prueba suministrada es demasiado larga o corta.</string>
     <string lang="es" key="TEST_PLAINTEXT_SIZE">El texto plano de prueba es demasiado largo o corto.</string>
-    <string lang="es" key="TWO_LAYER_CASCADE_HELP">Dos algoritmos en cascada operando en modo XTS. Cada bloque es cifrado primero con %hs (clave de %d-bit) y luego con %hs (clave de %d-bit). Cada algoritmo usa su propia clave. Todas las claves son independientes entre sí.</string>
+    <string lang="es" key="TWO_LAYER_CASCADE_HELP">Dos algoritmos en cascada operando en modo XTS. Cada bloque es cifrado primero con %s (clave de %d-bit) y luego con %s (clave de %d-bit). Cada algoritmo usa su propia clave. Todas las claves son independientes entre sí.</string>
-    <string lang="es" key="THREE_LAYER_CASCADE_HELP">Tres algoritmos en cascada operando en modo XTS. Cada bloque es cifrado primero con %hs (clave de %d-bit), luego con %hs (clave de %d-bit), y finalmente con %hs (clave de %d-bit). Cada algoritmo usa su propia clave. Todas las claves son independientes entre sí.</string>
+    <string lang="es" key="THREE_LAYER_CASCADE_HELP">Tres algoritmos en cascada operando en modo XTS. Cada bloque es cifrado primero con %s (clave de %d-bit), luego con %s (clave de %d-bit), y finalmente con %s (clave de %d-bit). Cada algoritmo usa su propia clave. Todas las claves son independientes entre sí.</string>
     <string lang="es" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Tenga en cuenta que, dependiendo de la configuración del sistema operativo, las características de ejecución y montaje automático podrían funcionar sólo si los archivos de disco viajero son creados en medios contra escritura del tipo CD/DVD. Esto no es un error de VeraCrypt (es una limitación de Windows).</string>
     <string lang="es" key="TRAVELER_DISK_CREATED">El disco viajero VeraCrypt ha sido creado con éxito.\n\nRecuerde que necesita privilegios de administrador para ejecutar VeraCrypt en modo portable. Recuerde también que, tras examinar el archivo del registro, se podría demostrar que VeraCrypt se ejecutó en un sistema Windows incluso si es ejecutado en modo portable.</string>
     <string lang="es" key="TC_TRAVELER_DISK">Disco Viajero VeraCrypt</string>
     <string lang="es" key="TWOFISH_HELP">Diseñado por Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall y Niels Ferguson. Publicado en 1998. Clave de 256-bit, bloque de 128-bit. Modo de operación XTS. Twofish fue uno de los finalistas AES.</string>
-    <string lang="es" key="MORE_INFO_ABOUT">Más información en %hs</string>
+    <string lang="es" key="MORE_INFO_ABOUT">Más información en %s</string>
     <string lang="es" key="UNKNOWN">Desconocido</string>
     <string lang="es" key="ERR_UNKNOWN">Ha ocurrido un error no especificado o desconocido (%d).</string>
     <string lang="es" key="UNMOUNTALL_LOCK_FAILED">Algunos volúmenes contienen carpetas o archivos en uso por el sistema o alguna aplicación.\n\n¿Forzar el desmontaje?</string>
@@ -694,7 +701,7 @@
     <string lang="es" key="UNMOUNT_FAILED">¡Fallo al desmontar!</string>
     <string lang="es" key="UNMOUNT_LOCK_FAILED">El volumen contiene carpetas o archivos en uso por el sistema o alguna aplicación.\n\n¿Forzar el desmontaje?</string>
     <string lang="es" key="NO_VOLUME_MOUNTED_TO_DRIVE">No hay ningún volumen montado en la letra de unidad especificada.</string>
-    <string lang="es" key="VOL_ALREADY_MOUNTED">El volumen que trata de montar ya está montado.</string>
+    <string lang="es" key="VOL_ALREADY_MOUNTED">El volumen que trata de montar ya está montado. </string>
     <string lang="es" key="VOL_MOUNT_FAILED">Ocurrió un error al intentar montar el volumen.</string>
     <string lang="es" key="VOL_SEEKING">Error al buscar la ubicación dentro del volumen.</string>
     <string lang="es" key="VOL_SIZE_WRONG">Error: Tamaño incorrecto del volumen.</string>
@@ -851,7 +858,7 @@
     <string lang="es" key="INSTALL_FAILED">La Instalación falló.</string>
     <string lang="es" key="UNINSTALL_FAILED">La Desinstalación falló.</string>
     <string lang="es" key="DIST_PACKAGE_CORRUPTED">Este paquete de distribución está dañado. Intente descargarlo nuevamente (preferentemente desde la página oficial de VeraCrypt en https://veracrypt.codeplex.com).</string>
-    <string lang="es" key="CANNOT_WRITE_FILE_X">No se puede escribir el archivo %hs</string>
+    <string lang="es" key="CANNOT_WRITE_FILE_X">No se puede escribir el archivo %s</string>
     <string lang="es" key="EXTRACTING_VERB">Extrayendo</string>
     <string lang="es" key="CANNOT_READ_FROM_PACKAGE">No se puede leer información del paquete.</string>
     <string lang="es" key="CANT_VERIFY_PACKAGE_INTEGRITY">No se puede verificar la integridad de este paquete de distribución.</string>
@@ -861,7 +868,7 @@
     <string lang="es" key="SETUP_UPDATE_OK">VeraCrypt ha sido actualizado con éxito.</string>
     <string lang="es" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt ha sido actualizado a una nueva versión. Antes de poder empezar a usarla, su ordenador debe ser reiniciado.\n\n¿Desea reiniciar ahora?</string>
     <string lang="es" key="SYS_ENC_UPGRADE_FAILED">¡Fallo al actualizar VeraCrypt!\n\nIMPORTANTE: Antes de apagar o reiniciar el sistema, es muy recomendable que utilice Restaurar Sistema (Menú Inicio &gt; Todos los programas &gt; Accesorios &gt; Herramientas del Sistema &gt; Restaurar Sistema) para devolver su sistema al punto de restauración llamado 'Instalación de VeraCrypt'. Si Restaurar Sistema no está disponible, debería intentar reinstalar la versión original o la nueva de VeraCrypt antes de apagar o reiniciar el sistema.</string>
-    <string lang="es" key="UNINSTALL_OK">VeraCrypt ha sido desinstalado con éxito.\n\nHaga click en 'Finalizar' para eliminar el instalador y la carpeta %hs. Tenga en cuenta que la carpeta no se eliminará si contiene archivos que no hayan sido instalados por el instalador o creados por VeraCrypt.</string>
+    <string lang="es" key="UNINSTALL_OK">VeraCrypt ha sido desinstalado con éxito.\n\nHaga click en 'Finalizar' para eliminar el instalador y la carpeta %s. Tenga en cuenta que la carpeta no se eliminará si contiene archivos que no hayan sido instalados por el instalador o creados por VeraCrypt.</string>
     <string lang="es" key="REMOVING_REG">Eliminando entradas de registro de VeraCrypt</string>
     <string lang="es" key="ADDING_REG">Añadiendo entradas de registro</string>
     <string lang="es" key="REMOVING_APPDATA">Eliminando información específica de la aplicación</string>
@@ -872,10 +879,10 @@
     <string lang="es" key="CREATING_SYS_RESTORE">Creando punto de Restauración del Sistema</string>
     <string lang="es" key="FAILED_SYS_RESTORE">¡Fallo al  crear punto de Restauración del Sistema!</string>
     <string lang="es" key="INSTALLER_UPDATING_BOOT_LOADER">Actualizando cargador de arranque</string>
-    <string lang="es" key="INSTALL_OF_FAILED">Ha fallado la instalación de '%hs'. %hs\n¿Desea continuar instalando?</string>
+    <string lang="es" key="INSTALL_OF_FAILED">Ha fallado la instalación de '%s'. %s\n¿Desea continuar instalando?</string>
-    <string lang="es" key="UNINSTALL_OF_FAILED">Ha fallado la desinstalación de '%hs'. %hs\n¿Desea continuar desinstalando?</string>
+    <string lang="es" key="UNINSTALL_OF_FAILED">Ha fallado la desinstalación de '%s'. %s\n¿Desea continuar desinstalando?</string>
     <string lang="es" key="INSTALL_COMPLETED">Instalación completada.</string>
-    <string lang="es" key="CANT_CREATE_FOLDER">La carpeta '%hs' no pudo ser creada</string>
+    <string lang="es" key="CANT_CREATE_FOLDER">La carpeta '%s' no pudo ser creada</string>
     <string lang="es" key="CLOSE_TC_FIRST">No se puede detener el controlador de dispositivos VeraCrypt.\n\nCierre todas las ventanas abiertas de VeraCrypt primero. Si no funciona, reinicie Windows y reinténtelo.</string>
     <string lang="es" key="DISMOUNT_ALL_FIRST">Se deben desmontar todos los volúmenes VeraCrypt antes de instalar/desinstalar VeraCrypt.</string>
     <string lang="es" key="UNINSTALL_OLD_VERSION_FIRST">Una versión obsoleta de VeraCrypt está instalada en este sistema. Debe ser desinstalada antes de instalar esta nueva versión de VeraCrypt.\n\nTan pronto como cierre este mensaje, se lanzará el desinstalador de la versión antigua. Tenga en cuenta que ningún volumen será descifrado al desinstalar VeraCrypt. Tras desinstalar la versión antigua de VeraCrypt, ejecute el instalador de la versión nueva otra vez.</string>
@@ -928,7 +935,7 @@
     <string lang="es" key="FAVORITE_LABEL_DEVICE_PATH_ERR">El dispositivo mostrado no es ni una partición ni un volumen dinámico. Por tanto, no se le puede asignar una etiqueta.</string>
     <string lang="es" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Establezca el tipo de la partición mostrada a un tipo reconocido por Windows (use el comando SETID de la herramienta 'diskpart' de Windows). Luego elimine la partición de favoritos y añádala otra vez. Así permitirá a VeraCrypt asignar una etiqueta a la partición.</string>
     <string lang="es" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Debido a una limitación de Windows, un contenedor almacenado en un sistema de archivos remoto compartido en red no puede ser montado como un volumen favorito del sistema (sin embargo, puede ser montado como un volumen favorito común cuando un usuario se conecte).</string>
-    <string lang="es" key="ENTER_PASSWORD_FOR">Introduzca contraseña para %hs</string>
+    <string lang="es" key="ENTER_PASSWORD_FOR">Introduzca contraseña para %s</string>
     <string lang="es" key="ENTER_PASSWORD_FOR_LABEL">Introduzca contraseña para '%s'</string>
     <string lang="es" key="ENTER_NORMAL_VOL_PASSWORD">Introduzca contraseña para el volumen común/externo.</string>
     <string lang="es" key="ENTER_HIDDEN_VOL_PASSWORD">Introduzca contraseña para el volumen oculto</string>
@@ -943,8 +950,8 @@
     <string lang="es" key="VOL_HEADER_BACKED_UP">La copia de seguridad de la cabecera del volumen ha sido creada con éxito.\n\nIMPORTANTE: Restaurar la cabecera usando esta copia de seguridad también restaurará la contraseña actual del volumen. Es más, si son necesarios archivos-llave para montar el volumen, los mismos archivos-llave serán necesarios para montarlo de nuevo cuando se restaure la cabecera del volumen.\n\nAVISO: Esta copia de seguridad puede usarse SÓLO para restaurar la cabecera de éste volumen concreto. Si la usa para restaurar la cabecera de un volumen distinto, podrá montar el volumen pero NO será capaz de descifrar ningún dato almacenado en él (porque cambiará su clave maestra).</string>
     <string lang="es" key="VOL_HEADER_RESTORED">La cabecera del volumen ha sido restaurada con éxito.\n\nIMPORTANTE: Recuerde que también puede haberse restaurado una contraseña antigua. Además, si cuando se creó la copia de seguridad de la cabecera se necesitaban archivos-llave para montar el volumen, esos archivos-llave serán necesarios de nuevo.</string>
     <string lang="es" key="EXTERNAL_VOL_HEADER_BAK_FIRST_INFO">Por razones de seguridad, tendrá que introducir la contraseña (y/o suministrar los archivos-llave) correcta para el volumen.\n\nNota: Si el volumen contiene un volumen oculto, tendrá que introducir la contraseña (y/o archivos-llave) para el volumen externo primero. Más tarde, si decide hacer copia de seguridad de la cabecera del volumen oculto, tendrá que introducir la contraseña (y/o archivos-llave) para el volumen oculto.</string>
-    <string lang="es" key="CONFIRM_VOL_HEADER_BAK">¿Seguro que desea crear una copia de seguridad de la cabecera del volumen para %hs?\n\nTras pulsar Sí, se le pedirá un nombre de archivo para la copia de seguridad.\n\nNota: Tanto la cabecera del volumen común como la del oculto serán re-cifradas usando sal nueva y almacenadas en el archivo de respaldo. Si no hay ningún volumen oculto dentro de este volumen, el área reservada para la cabecera del volumen oculto en el archivo será llenada con datos aleatorios (para preservar la negación plausible). Cuando restaure la cabecera del volumen desde el archivo de respaldo, necesitará introducir la contraseña (y/o archivos-llave) correcta que existía cuando la copia de seguridad fue creada. La contraseña (y/o archivos-llave) también determinará automáticamente el tipo de la cabecera de volumen a restaurar, es decir, común u oculto (recuerde que VeraCrypt determina el tipo mediante el proceso de prueba y error).</string>
+    <string lang="es" key="CONFIRM_VOL_HEADER_BAK">¿Seguro que desea crear una copia de seguridad de la cabecera del volumen para %s?\n\nTras pulsar Sí, se le pedirá un nombre de archivo para la copia de seguridad.\n\nNota: Tanto la cabecera del volumen común como la del oculto serán re-cifradas usando sal nueva y almacenadas en el archivo de respaldo. Si no hay ningún volumen oculto dentro de este volumen, el área reservada para la cabecera del volumen oculto en el archivo será llenada con datos aleatorios (para preservar la negación plausible). Cuando restaure la cabecera del volumen desde el archivo de respaldo, necesitará introducir la contraseña (y/o archivos-llave) correcta que existía cuando la copia de seguridad fue creada. La contraseña (y/o archivos-llave) también determinará automáticamente el tipo de la cabecera de volumen a restaurar, es decir, común u oculto (recuerde que VeraCrypt determina el tipo mediante el proceso de prueba y error).</string>
-    <string lang="es" key="CONFIRM_VOL_HEADER_RESTORE">¿Seguro que quiere restaurar la cabecera de volumen de %hs ?\n\nAVISO: Restaurar una cabecera de volumen también restaura la contraseña que era válida cuando se hizo la copia de seguridad. Es más, si se necesitaban archivos-llave cuando se creó dicha copia de seguridad, estos archivos serán necesarios de nuevo para montar el volumen tras la restauración.\n\nDespués de aceptar, seleccionará el archivo de copia de segurida de la cabecera.</string>
+    <string lang="es" key="CONFIRM_VOL_HEADER_RESTORE">¿Seguro que quiere restaurar la cabecera de volumen de %s ?\n\nAVISO: Restaurar una cabecera de volumen también restaura la contraseña que era válida cuando se hizo la copia de seguridad. Es más, si se necesitaban archivos-llave cuando se creó dicha copia de seguridad, estos archivos serán necesarios de nuevo para montar el volumen tras la restauración.\n\nDespués de aceptar, seleccionará el archivo de copia de segurida de la cabecera.</string>
     <string lang="es" key="DOES_VOLUME_CONTAIN_HIDDEN">¿Este volumen contiene un volumen oculto?</string>
     <string lang="es" key="VOLUME_CONTAINS_HIDDEN">El volumen contiene un volumen oculto</string>
     <string lang="es" key="VOLUME_DOES_NOT_CONTAIN_HIDDEN">El volumen no contiene un volumen oculto</string>
@@ -955,12 +962,14 @@
     <string lang="es" key="VOLUME_HAS_NO_BACKUP_HEADER">No hay ninguna copia de seguridad insertada en este volumen (recuerde que sólo los volúmenes creados por VeraCrypt 6.0 o posterior contienen copias de seguridad de cabecera insertadas).</string>
     <string lang="es" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">Está intentando realizar copias de seguridad de la cabecera de la partición/unidad del sistema. Esto no está permitido. Las operaciones de copia de seguridad o restauración relacionadas con la partición/unidad del sistema sólo se pueden realizar usando el Disco de Rescate VeraCrypt.\n\n¿Desea crear un Disco de Rescate VeraCrypt?</string>
     <string lang="es" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">Está intentando restaurar la cabecera de un volumen virtual VeraCrypt pero ha seleccionado la partición/unidad del sistema. Esto no está permitido. Las operaciones de copia de seguridad o restauración relacionadas con la partición/unidad del sistema sólo se pueden realizar usando el Disco de Rescate VeraCrypt.\n\n¿Desea crear un Disco de Rescate VeraCrypt?</string>
-    <string lang="es" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">Después de pulsar Aceptar, seleccionará un nombre de archivo para la nueva imagen ISO del Disco de Rescate VeraCrypt y la ubicación donde desea colocarla.</string>
+    <string lang="es" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">Después de pulsar Aceptar, seleccionará un nombre de archivo para la nueva imagen del Disco de Rescate VeraCrypt y la ubicación donde desea colocarla.</string>
-    <string lang="es" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">La imagen del Disco de Rescate ha sido creada y almacenada en este archivo:\n%hs\n\nAhora hay que grabar dicha imagen en un CD o DVD.\n\nIMPORTANTE: Tenga en cuenta que el archivo debe ser grabado en el CD/DVD como una imagen de disco ISO (no como un archivo individual). Para obtener información sobre cómo hacerlo, lea la documentación de su software de grabación CD/DVD.\n\nTras grabar el Disco de Rescate, seleccione 'Sistema' &gt; 'Verificar Disco de Rescate' para verificar que ha sido grabado correctamente.</string>
+    <string lang="es" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">La imagen del Disco de Rescate ha sido creada y almacenada en este archivo:\n%s\n\nAhora hay que grabar dicha imagen en un CD o DVD.\n\nIMPORTANTE: Tenga en cuenta que el archivo debe ser grabado en el CD/DVD como una imagen de disco ISO (no como un archivo individual). Para obtener información sobre cómo hacerlo, lea la documentación de su software de grabación CD/DVD.\n\nTras grabar el Disco de Rescate, seleccione 'Sistema' &gt; 'Verificar Disco de Rescate' para verificar que ha sido grabado correctamente.</string>
-    <string lang="es" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">La imagen del Disco de Rescate ha sido creada y almacenada en este archivo:\n%hs\n\nAhora hay que grabar dicha imagen en un CD o DVD.\n\n¿Desea ejecutar el Grabador de Imágenes de Disco de Windows?\n\nNota: tras grabar el Disco de Rescate, seleccione 'Sistema' &gt; 'Verificar Disco de Rescate' para verificar que ha sido grabado correctamente.</string>
+    <string lang="es" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">La imagen del Disco de Rescate ha sido creada y almacenada en este archivo:\n%s\n\nAhora hay que grabar dicha imagen en un CD o DVD.\n\n¿Desea ejecutar el Grabador de Imágenes de Disco de Windows?\n\nNota: tras grabar el Disco de Rescate, seleccione 'Sistema' &gt; 'Verificar Disco de Rescate' para verificar que ha sido grabado correctamente.</string>
-    <string lang="es" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Por favor inserte su Disco de Rescate VeraCrypt dentro de su unidad de CD/DVD y presione Aceptar para verificarlo.</string>
+    <string lang="es" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Por favor inserte su Disco de Rescate VeraCrypt y presione Aceptar para verificarlo.</string>
     <string lang="es" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">El Disco de Rescate VeraCrypt ha sido verificado con éxito.</string>
     <string lang="es" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">No se puede verificar el Disco de Rescate ha sido grabado correctamente.\n\nSi ha grabado el Disco de Rescate, expulse e inserte de nuevo el CD/DVD; después verifique otra vez. Si no funciona, pruebe con otro software de grabación y/o otro CD/DVD.\n\nSi está intentando verificar un Disco de Rescate VeraCrypt creado para otra clave maestra, contraseña, etc., por favor recuerde que ese Disco de Rescate fallará siempre esta verificación. Para crear un nuevo Disco de Rescate completamente compatible con su configuración actual, seleccione 'Sistema' &gt; 'Crear Disco de Rescate'.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk image fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
     <string lang="es" key="ERROR_CREATING_RESCUE_DISK">Error creando Disco de Rescate VeraCrypt.</string>
     <string lang="es" key="CANNOT_CREATE_RESCUE_DISK_ON_HIDDEN_OS">No se puede crear un Disco de Rescate VeraCrypt cuando un sistema operativo oculto se está ejecutando.\n\nPara crear un Disco de Rescate VeraCrypt, arranque el sistema operativo señuelo y seleccione 'Sistema' &gt; 'Crear Disco de Rescate'.</string>
     <string lang="es" key="RESCUE_DISK_CHECK_FAILED">No se puede verificar que el Disco de Rescate ha sido grabado correctamente.\n\nSi ha grabado el Disco de Rescate, expulse e inserte de nuevo el CD/DVD; después haga click en Siguiente para reintentarlo. Si no funciona, pruebe otro medio%s.\n\nSi no ha grabado aún el Disco de Rescate, hágalo y pulse Siguiente.\n\nSi está intentando verificar un Disco de Rescate VeraCrypt creado antes de iniciar este asistente, tenga en cuenta que dicho Disco de Rescate no se puede usar, porque fue creado para una clave maestra diferente. Necesita grabar el Disco de Rescate generado recientemente.</string>
@@ -989,8 +998,8 @@
     <string lang="es" key="DRIVE_LETTER_ITEM">Letra de unidad:   </string>
     <string lang="es" key="UNSUPPORTED_CHARS_IN_PWD">Error: La contraseña debe contener solamente caracteres ASCII.\n\nIntroducir otros caracteres en la contraseña puede hacer que sea imposible montar el volumen si la configuración de su sistema cambia.\n\nLos  siguientes caracteres están permitidos:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="es" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">Aviso: La contraseña contiene caracteres ajenos a ASCII. Esto puede causar que sea imposible montar el volumen si la configuración de su sistema cambia.\n\nDebe sustituir todos los caracteres no-ASCII en la contraseña por caracteres ASCII. Haga click  en 'Volúmenes' -&gt;  'Cambiar Contraseña del Volumen'.\n\nLos siguientes  caracteres son ASCII:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="es" key="EXE_FILE_EXTENSION_CONFIRM">AVISO: Recomendamos que evite extensiones de archivo que son usadas para archivos ejecutables (como .exe, .sys o .dll) y otras extensiones problemáticas similares. Usar estas extensiones hace que Windows y el software antivirus interfiera con el contenedor, lo que afecta negativamente el rendimiento del volumen y puede causar problemas serios.\n\nEs muy recomendable que elimine la extensión del archivo o la cambie (por ejemplo, a '.tc').\n\n¿Seguro que desea usar la extensión problemática?</string>
+    <string lang="es" key="EXE_FILE_EXTENSION_CONFIRM">AVISO: Recomendamos que evite extensiones de archivo que son usadas para archivos ejecutables (como .exe, .sys o .dll) y otras extensiones problemáticas similares. Usar estas extensiones hace que Windows y el software antivirus interfiera con el contenedor, lo que afecta negativamente el rendimiento del volumen y puede causar problemas serios.\n\nEs muy recomendable que elimine la extensión del archivo o la cambie (por ejemplo, a '.hc').\n\n¿Seguro que desea usar la extensión problemática?</string>
-    <string lang="es" key="EXE_FILE_EXTENSION_MOUNT_WARNING">AVISO: Este contenedor tiene una extensión que es usada por archivos ejecutables (como .exe, .sys o .dll) o alguna otra extensión que es igualmente problemática. Esto probablemente hará que Windows y el software antivirus interfiera con el contenedor, lo que afectará negativamente el rendimiento del volumen y puede causar otros problemas serios.\n\nEs muy recomendable que elimine la extensión del archivo del contenedor o la cambie (por ejemplo, a '.tc' después de desmontar el volumen.</string>
+    <string lang="es" key="EXE_FILE_EXTENSION_MOUNT_WARNING">AVISO: Este contenedor tiene una extensión que es usada por archivos ejecutables (como .exe, .sys o .dll) o alguna otra extensión que es igualmente problemática. Esto probablemente hará que Windows y el software antivirus interfiera con el contenedor, lo que afectará negativamente el rendimiento del volumen y puede causar otros problemas serios.\n\nEs muy recomendable que elimine la extensión del archivo del contenedor o la cambie (por ejemplo, a '.hc' después de desmontar el volumen.</string>
     <string lang="es" key="HOMEPAGE">Página Inicial</string>
     <string lang="es" key="LARGE_IDE_WARNING_XP">AVISO: Parece que no ha aplicado ningún Service Pack a su instalación Windows. ¡No debería escribir en discos IDE mayores de 128 GB bajo un Windows XP sin Service Pack 1 o posterior! Si lo hace, los datos del disco (no importa si se trata de un volumen VeraCrypt o no) podrían resultar corruptos. Tenga en cuenta que esto es una limitación de Windows, no un error de VeraCrypt.</string>
     <string lang="es" key="LARGE_IDE_WARNING_2K">AVISO: Parece que no ha aplicado Service Pack 3 o posterior a su instalación Windows. ¡No debería escribir en discos IDE mayores de 128 GB bajo un Windows 2000 sin Service Pack 3 o posterior! Si lo hace, los datos del disco (no importa si se trata de un volumen VeraCrypt o no) podrían resultar corruptos. Tenga en cuenta que esto es una limitación de Windows, no un error de VeraCrypt.\n\nNota: Podría necesitar habilitar el soporte LBA 48-bit en el registro: para más información, vea http://support.microsoft.com/kb/305098/EN-US</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="es" key="CHECKING_FS">Comprobando el sistema de archivos del volumen VeraCrypt montado como %s...</string>
-    <string lang="es" key="REPAIRING_FS">Intentando reparar el sistema de archivos del volumen VeraCrypt montado como %hs...</string>
+    <string lang="es" key="REPAIRING_FS">Intentando reparar el sistema de archivos del volumen VeraCrypt montado como %s...</string>
-    <string lang="es" key="WARN_CBC_MODE">PRECAUCIÓN: Este volumen está cifrado en modo CBC. Por cuestiones de seguridad, el modo CBC se considera obsoleto desde VeraCrypt 4.1.\n\nRecomendamos que mueva sus datos desde este volumen VeraCrypt a un nuevo volumem creado con esta versión de VeraCrypt. Después de hacerlo, debería borrar de forma segura o destruir el volumen antiguo. Para más información, vea el Historial de Versiones en la documentación, o las noticias de publicación de VeraCrypt 4.1 o superior.</string>
     <string lang="es" key="WARN_64_BIT_BLOCK_CIPHER">Aviso: Este volumen está cifrado con un algoritmo de cifrado tradicional (legacy).\n\nTodos los algoritmos de cifrado con bloque de 64 bit (como Blowfish, CAST-128 o Triple DES) están obsoletos. Se podrá montar este volumen usando versiones futuras de VeraCrypt. Sin embargo, no habrá más mejoras en las implementaciones de estos algoritmos de cifrado tradicional. Recomendamos que cree un nuevo volumen VeraCrypt cifrado con un algoritmo con bloque de 128 bit (como AES, Serpent, Twofish, etc.) y que mueva todos los archivos de este volumen al volumen nuevo.</string>
     <string lang="es" key="SYS_AUTOMOUNT_DISABLED">Su sistema no está configurado para montar automáticamente nuevos volúmenes. Puede ser imposible montar volúmenes VeraCrypt alojados en dispositivos. Se puede habilitar el montaje automático ejecutando el siguiente comando y reiniciando el sistema.\n\nmountvol.exe /E</string>
     <string lang="es" key="SYS_ASSIGN_DRIVE_LETTER">Asigne una letra de unidad a la partición/dispositivo antes de proceder ('Panel de Control' &gt; 'Sistema y mantenimiento' &gt; 'Herramientas Administrativas' - 'Crear y formatear particiones de disco duro').\n\nTenga en cuenta que este es un requisito del sistema operativo.</string>
@@ -1069,7 +1077,7 @@
     <string lang="es" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt ya no soporta el cifrado de la partición/unidad del sistema en Windows Vista sin ningún Service Pack. Antes de actualizar VeraCrypt, instale Service Pack 1 o posterior para Windows Vista.</string>
     <string lang="es" key="FEATURE_REQUIRES_INSTALLATION">Error: Esta característica requiere que se instale VeraCrypt en este sistema (actualmente está ejecutando VeraCrypt en modo portable).\n\nInstale VeraCrypt y reinténtelo.</string>
     <string lang="es" key="WINDOWS_NOT_ON_BOOT_DRIVE_ERROR">AVISO: Windows no parece estar instalado en la unidad desde la que él mismo arranca. Esto no está soportado.\n\nDebería continuar sólo si está seguro de que Windows está instalado en la unidad desde la que arranca.\n\n¿Desea continuar?</string>
-    <string lang="es" key="GPT_BOOT_DRIVE_UNSUPPORTED">Su unidad del sistema tiene una Tabla de Particiones GUID (GPT). Actualmente, sólo se soportan unidades con Tabla de Particiones MBR.</string>
+    <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</string>
     <string lang="es" key="TC_BOOT_LOADER_ALREADY_INSTALLED">PRECAUCIÓN: ¡El Cargador de Arranque VeraCrypt ya está instalado en su unidad del sistema!\n\nEs posible que otro sistema en su ordenador esté ya cifrado.\n\nAVISO: CONTINUAR CON EL CIFRADO DEL SISTEMA ACTUAL PUEDE HACE QUE OTROS SISTEMAS NO PUEDAN INICIARSE Y SUS DATOS SEAN INACCESIBLES.\n\n¿Seguro que desea continuar?</string>
     <string lang="es" key="SYS_LOADER_RESTORE_FAILED">Fallo al restaurar el cargador original del sistema.\n\nUse su Disco de Rescate VeraCrypt ('Opciones de Reparación' &gt; 'Restaurar cargador original del sistema') o un medio de instalación de Windows para reemplazar el Cargador de Arranque de VeraCrypt con el cargador del sistema de Windows.</string>
     <string lang="es" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">El cargador original del sistema no será guardado en el Disco de Rescate (causa probable: archivo de copia de seguridad perdido).</string>
@@ -1108,8 +1116,8 @@
     <string lang="es" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Nota: La contraseña tendrá que escribirse 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. Sin embargo, es importante recordar que NO es necesario un teclado de EEUU real. VeraCrypt automáticamente se asegura de que ud. pueda escribir la contraseña con seguridad (ahora y en el entorno de pre-arranque) incluso si NO tiene un teclado de EEUU.</string>
     <string lang="es" key="RESCUE_DISK_INFO">Antes de cifrar la partición/unidad, debe crear un Disco de Rescate VeraCrypt (DRT) que sirve para los siguientes propósitos:\n\n- Restaurar el Cargador de Arranque VeraCrypt, clave maestra u otros datos críticos si resultan dañados (pero tenga en cuenta que tendrá que seguir introduciendo la contraseña correcta).\n\n- Si Windows resulta dañado y no arranca, el DRT permite descifrar permanentemente la partición/unidad antes de que Windows inicie.\n\n- El DRT contendrá una copia de seguridad del contenido actual de la primera pista de la unidad (normalmente, un cargador del sistema o un administrador de arranque) y le permitirá restaurarlo si es necesario.\n\nLa imagen ISO del DRT será creada en esta ubicación:</string>
     <string lang="es" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">Tras pulsar Aceptar, se lanzará el Grabador de Imágenes de Disco de Windows. Úselo para grabar la imagen ISO del Disco de Rescate VeraCrypt en un CD o DVD.\n\nDespués de hacerlo, vuelva al Asistente de Creación de Volumen VeraCrypt y siga sus instrucciones.</string>
-    <string lang="es" key="RESCUE_DISK_BURN_INFO">La imagen del Disco de Rescate ha sido creada y almacenada en este archivo:\n%hs\n\nAhora debe grabarla en un CD o DVD.\n\n%lsDespués de grabar el Disco de Rescate, pulse Siguiente para verificar que ha sido grabado correctamente.</string>
+    <string lang="es" key="RESCUE_DISK_BURN_INFO">La imagen del Disco de Rescate ha sido creada y almacenada en este archivo:\n%s\n\nAhora debe grabarla en un CD o DVD.\n\n%lsDespués de grabar el Disco de Rescate, pulse Siguiente para verificar que ha sido grabado correctamente.</string>
-    <string lang="es" key="RESCUE_DISK_BURN_INFO_NO_CHECK">La imagen del Disco de Rescate ha sigo creada y almacenada en este archivo:\n%hs\n\nAhora debería grabar la imagen a un CD/DVD o moverla a una ubicación segura para un uso posterior.\n\n%lsPulse Siguiente para continuar.</string>
+    <string lang="es" key="RESCUE_DISK_BURN_INFO_NO_CHECK">La imagen del Disco de Rescate ha sigo creada y almacenada en este archivo:\n%s\n\nAhora debería grabar la imagen a un CD/DVD o moverla a una ubicación segura para un uso posterior.\n\n%lsPulse Siguiente para continuar.</string>
     <string lang="es" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">IMPORTANTE: Recuerde que el archivo debe ser escrito en el CD/DVD como una imagen de disco ISO (no como un archivo individual). Para obtener información sobre cómo hacerlo, vaya a la documentación de su software de grabación de CD/DVD. Si no tiene ningún software de ese tipo que pueda grabar la imagen ISO a un CD/DVD, haga click en el enlace siguiente para descargar software gratuito de este tipo.\n\n</string>
     <string lang="es" key="LAUNCH_WIN_ISOBURN">Lanzar el Grabador de Imágenes de Disco de Windows</string>
     <string lang="es" key="RESCUE_DISK_BURN_NO_CHECK_WARN">AVISO: ¡Si ya ha creado un Disco de Rescate VeraCrypt en el pasado, no debe ser reutilizado para esta partición/unidad del sistema porque fue creado para una clave maestra diferente! Cada vez que cifre una partición/unidad del sistema, debe crear un nuevo Disco de Rescate VeraCrypt incluso si ha usado la misma contraseña.</string>
@@ -1372,6 +1380,39 @@
     <string lang="es" key="TB_PER_SEC">TB/s</string>
     <string lang="es" key="PB_PER_SEC">PB/s</string>
     <string lang="es" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.et.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="et" name="Eesti" en-name="Estonian" version="0.1.0" translators="Maiko Mõtsar" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="en" key="IDC_BROWSE">Bro&amp;wse...</control>
     <control lang="et" key="IDC_DESKTOP_ICON">Lisa VeraCrypti ikoon Töölauale</control>
     <control lang="en" key="IDC_DONATE">Donate now...</control>
-    <control lang="en" key="IDC_FILE_TYPE">Associate the .tc file &amp;extension with VeraCrypt</control>
+    <control lang="en" key="IDC_FILE_TYPE">Associate the .hc file &amp;extension with VeraCrypt</control>
     <control lang="en" key="IDC_OPEN_CONTAINING_FOLDER">&amp;Open the destination location when finished</control>
     <control lang="et" key="IDC_PROG_GROUP">Lisa VeraCrypt &amp;Start menüüsse</control>
     <control lang="et" key="IDC_SYSTEM_RESTORE">Loo süsteemi taastepunkt</control>
@@ -37,6 +37,7 @@
     <control lang="en" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Download CD/DVD recording software</control>
     <control lang="en" key="IDC_FILE_CONTAINER">Create an encrypted file container</control>
     <control lang="en" key="IDC_GB">&amp;GB</control>
+    <control lang="en" key="IDC_TB">&amp;TB</control>
     <control lang="en" key="IDC_HIDDEN_SYSENC_INFO_LINK">More information</control>
     <control lang="en" key="IDC_HIDDEN_VOL">Hi&amp;dden VeraCrypt volume </control>
     <control lang="en" key="IDC_HIDDEN_VOL_HELP">More information about hidden volumes</control>
@@ -44,6 +45,7 @@
     <control lang="en" key="IDC_HIDVOL_WIZ_MODE_FULL">Normal mode</control>
     <control lang="et" key="IDC_KB">&amp;KB</control>
     <control lang="et" key="IDC_KEYFILES_ENABLE">Kasuta võtmefaile</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="et" key="IDC_KEY_FILES">Võtmefailid..</control>
     <control lang="et" key="IDC_LINK_HASH_INFO">Informatsioon räsi algoritmide kohta</control>
@@ -58,7 +60,8 @@
     <control lang="et" key="IDC_NO_HISTORY">Ära salvesta ajalukku</control>
     <control lang="et" key="IDC_OPEN_OUTER_VOLUME">Ava välimine konteiner</control>
     <control lang="en" key="IDC_PAUSE">&amp;Pause</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <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">&amp;Display password</control>
@@ -118,6 +121,7 @@
     <control lang="et" key="IDC_CREATE">Loo</control>
     <control lang="et" key="IDC_CREATE_VOLUME">Loo konteiner</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <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="et" key="IDC_ENABLE_KEYFILES">Kasuta võtmefaile</control>
     <control lang="et" key="IDC_ENABLE_NEW_KEYFILES">Kasuta võtmefaile</control>
@@ -132,6 +136,7 @@
     <control lang="en" key="IDC_FAVORITE_MOVE_UP">Move &amp;Up</control>
     <control lang="en" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Open &amp;Explorer window for selected volume when successfully mounted</control>
     <control lang="en" key="IDC_FAVORITE_REMOVE">&amp;Remove</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="en" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Global Settings</control>
     <control lang="en" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Display balloon tooltip after successful hot-key dismount</control>
     <control lang="en" key="IDC_HK_DISMOUNT_PLAY_SOUND">Play system notification sound after successful hot-key dismount</control>
@@ -189,7 +194,7 @@
     <control lang="et" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="en" key="IDD_PASSWORDCHANGE_DLG">Change Password or Keyfiles</control>
     <control lang="et" key="IDD_PASSWORD_DLG">Sisesta VeraCrypt konteineri salasõna</control>
-    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance Options</control>
+    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance and Driver Options</control>
     <control lang="et" key="IDD_PREFERENCES_DLG">VeraCrypt - Eelistused</control>
     <control lang="en" key="IDD_SYSENC_SETTINGS">VeraCrypt - System Encryption Settings</control>
     <control lang="en" key="IDD_TOKEN_PREFERENCES">VeraCrypt - Security Token Preferences</control>
@@ -235,7 +240,7 @@
     <control lang="et" key="IDM_ONLINE_TUTORIAL">Algaja käsiraamat</control>
     <control lang="en" key="IDM_ORGANIZE_FAVORITES">Organize Favorite Volumes...</control>
     <control lang="en" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organize System Favorite Volumes...</control>
-    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance...</control>
+    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance/Driver Configuration</control>
     <control lang="en" key="IDM_PERMANENTLY_DECRYPT_SYS">Permanently Decrypt System Partition/Drive</control>
     <control lang="et" key="IDM_PREFERENCES">Eelistused...</control>
     <control lang="et" key="IDM_REFRESH_DRIVE_LETTERS">Draivitähtede nimekirja värskendamine</control>
@@ -256,6 +261,7 @@
     <control lang="et" key="IDM_UNMOUNTALL">Haagi lahti kõik haagitud konteinerid</control>
     <control lang="et" key="IDM_UNMOUNT_VOLUME">Konteineri lahtihaakimine</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 Image</control>
     <control lang="et" key="IDM_VERSION_HISTORY">Versiooni ajalugu</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="et" key="IDM_VOLUME_PROPERTIES">Konteineri atribuudid</control>
@@ -365,7 +371,7 @@
     <control lang="en" key="IDT_SECURITY_TOKEN">Security token:</control>
     <control lang="et" key="IDT_SORT_METHOD">Sorteerimisviis:</control>
     <control lang="en" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Please wait. This process may take a long time...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="en" key="IDT_TEST_BLOCK_NUMBER">Block number:</control>
     <control lang="et" key="IDT_TEST_CIPHERTEXT">Šiffertekst (hexadecimal)</control>
     <control lang="en" key="IDT_TEST_DATA_UNIT_NUMBER">Data unit number (64-bit hexadecimal, data unit size is 512 bytes)</control>
@@ -410,13 +416,13 @@
     <string lang="et" key="CIPHER_TITLE">Krüpteerimise valikud</string>
     <string lang="et" key="CLEAN_WINMRU_FAILED">HOIATUS: Viimase konteineri/võtmefaili failitee kustutamine ebaõnnestus (failisirvija mälus)!</string>
     <string lang="et" key="COMPRESSION_NOT_SUPPORTED">Viga: konteiner on pakitud failisüsteemi tasemel. VeraCrypt ei toeta pakitud konteinereid (pane tähele, et krüptitud andmete pakkimine on ebaefektiivne ja liigne).\n\nPalun keela konteineri pakkimine järgides neid samme: 1) Parem klikk konteineril Windows Exploreris (mitte VeraCryptis). 2) Vali 'Properties'. 3) Dialoogiaknas 'Properties' kliki 'Advanced'. 4) Dialoogiakanas 'Advanced Attributes' keela valik 'Compress contents to save disk space' ja kliki 'OK'. 5) Dialoogiaknas 'Properties' kliki 'OK'.</string>
-    <string lang="et" key="CREATE_FAILED">Konteineri %hs loomine ebaõnnestus</string>
+    <string lang="et" key="CREATE_FAILED">Konteineri %s loomine ebaõnnestus</string>
-    <string lang="et" key="DEVICE_FREE_BYTES">%hs maht on %.2f baiti</string>
+    <string lang="et" key="DEVICE_FREE_BYTES">%s maht on %.2f baiti</string>
-    <string lang="et" key="DEVICE_FREE_KB">%hs maht on %.2f KB</string>
+    <string lang="et" key="DEVICE_FREE_KB">%s maht on %.2f KB</string>
-    <string lang="et" key="DEVICE_FREE_MB">%hs maht on %.2f MB</string>
+    <string lang="et" key="DEVICE_FREE_MB">%s maht on %.2f MB</string>
-    <string lang="en" key="DEVICE_FREE_GB">Size of %hs is %.2f GB</string>
+    <string lang="en" key="DEVICE_FREE_GB">Size of %s is %.2f GB</string>
-    <string lang="en" key="DEVICE_FREE_TB">Size of %hs is %.2f TB</string>
+    <string lang="en" key="DEVICE_FREE_TB">Size of %s is %.2f TB</string>
-    <string lang="en" key="DEVICE_FREE_PB">Size of %hs is %.2f PB</string>
+    <string lang="en" key="DEVICE_FREE_PB">Size of %s is %.2f PB</string>
     <string lang="et" key="DEVICE_IN_USE_FORMAT">HOIATUS: Seade/partitsioon on kasutuses rakenduste või operatsioonisüsteemi poolt. Seadme/partitsiooni formaatimine võib põhjustada andmekadu ja süsteemi ebastabiilsust.\n\nJätkan?</string>
     <string lang="en" key="DEVICE_IN_USE_INPLACE_ENC">Warning: The partition is in use by the operating system or applications. You should close any applications that might be using the partition (including antivirus software).\n\nContinue?</string>
     <string lang="et" key="FORMAT_CANT_DISMOUNT_FILESYS">Viga: seade/partitsioon sisaldab failisüsteemi, mida ei saa lahti haakida. Failisüsteem võib olla kasutuses operatsioonisüsteemi poolt. Seadme/partitsiooni formaatimine põhjustab väga tõenäoliselt andmete kao ja süsteemi ebastabiilsuse.\n\nSelle lahendamiseks soovitame, et sa kõigepealt kustutad selle partitsiooni ja siis lood ilma formaatimata uuesti. Selle tegemiseks järgi järgmisi juhtnööre: 1) Parem-klikk 'Arvuti' (või 'Minu Arvuti') ikooni peal Start menüüs ja vali 'Manage'. 'Computer Managemant' aken peaks kuvatama. 2) 'Computer Managemant' aknas vali 'Storage' &gt; 'Disk Management'. 3) Parem-klikk partitsiooni, mida soovid krüpteerida ja vali 'Delete Partition' või 'Delete Volume' või 'Delete Logical Drive'. 4) Kliki 'Jah'. Kui Windows käseb taaskäivitada, tee seda. Siis korda samme 1 ja 2 ja jätka sammuga 5. 5) Parem-kliki kasutamata/vaba ruumi peal ja vali	'New Partition' või 'New Simple Volume' või 'New Logical Drive'. 6) 'New Partition Wizard' või 'New Simple Volume Wizard' aken peaks ilmuma; järgi selle instruktsioone. Viisardi aknal tiitliga 'Format Partition' vali 'Do not format this partition' või 'Do not format this volume'. Samas viisardis kliki 'Next' ja siis 'Finish'. 7) Pane tähele, et seadme tee VeraCryptis võib olla vale. Seetõttu välju VeraCrypti konteineri loomise nõustaja (kui see ikka käib) ja käivita see uuesti. 8) Proovi krüptida seadet/partitsiooni uuesti.\n\nKui VeraCrypt korduvalt ebaõnnestub seadme/partitsiooni krüpteerimisega, võid kaaluda faili baasil konteineri loomist.</string>
@@ -435,15 +441,15 @@
     <string lang="en" key="INPLACE_ENC_INVALID_PATH">Error: VeraCrypt can in-place encrypt only a partition, a dynamic volume, or an entire system drive. Please make sure the specified path is valid.</string>
     <string lang="en" key="CANNOT_RESIZE_FILESYS">Error: Cannot shrink the filesystem (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPossible causes and solutions:\n\n- Not enough free space on the volume. Please make sure no other application is writing to the filesystem.\n\n- Corrupted file system. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
     <string lang="en" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Error: There is not enough free space on the volume and so the filesystem cannot be shrunk (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPlease delete any redundant files and empty the Recycle Bin so as to free at least 256 KB of space and then try again. Note that due to a Windows issue, the amount of free space reported by the Windows Explorer may be incorrect until the operating system is restarted. If restarting the system does not help, the file system may be corrupted. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
-    <string lang="et" key="DISK_FREE_BYTES">Vaba ruumi kettal %hs %.2f baiti.</string>
+    <string lang="et" key="DISK_FREE_BYTES">Vaba ruumi kettal %s %.2f baiti.</string>
-    <string lang="en" key="DISK_FREE_KB">Free space on drive %hs is %.2f KB</string>
+    <string lang="en" key="DISK_FREE_KB">Free space on drive %s is %.2f KB</string>
-    <string lang="en" key="DISK_FREE_MB">Free space on drive %hs is %.2f MB</string>
+    <string lang="en" key="DISK_FREE_MB">Free space on drive %s is %.2f MB</string>
-    <string lang="en" key="DISK_FREE_GB">Free space on drive %hs is %.2f GB</string>
+    <string lang="en" key="DISK_FREE_GB">Free space on drive %s is %.2f GB</string>
-    <string lang="en" key="DISK_FREE_TB">Free space on drive %hs is %.2f TB</string>
+    <string lang="en" key="DISK_FREE_TB">Free space on drive %s is %.2f TB</string>
-    <string lang="en" key="DISK_FREE_PB">Free space on drive %hs is %.2f PB</string>
+    <string lang="en" key="DISK_FREE_PB">Free space on drive %s is %.2f PB</string>
     <string lang="et" key="DRIVELETTERS">Ei suutnud vabu draivitähti hankida.</string>
     <string lang="en" key="DRIVER_NOT_FOUND">Error: VeraCrypt driver not found.\n\nPlease copy the files 'veracrypt.sys' and 'veracrypt-x64.sys' to the directory where the main VeraCrypt application (VeraCrypt.exe) is located.</string>
-    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall; on Windows XP, select 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
+    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' > Computer > 'Uninstall or change a program' > VeraCrypt > Uninstall; on Windows XP, select 'Start Menu' > Settings > 'Control Panel' > 'Add Or Remove Programs' > VeraCrypt > Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
     <string lang="et" key="ERR_CIPHER_INIT_FAILURE">Viga: šifri initsialiseerimise viga.</string>
     <string lang="et" key="ERR_CIPHER_INIT_WEAK_KEY">Viga: tuvastati nõrk või potensiaalselt nõrk võti. Võti visatakse ära. Palun proovi uuesti.</string>
     <string lang="en" key="EXCEPTION_REPORT">A critical error has occurred and VeraCrypt must be terminated. If this is caused by a bug in VeraCrypt, we would like to fix it. To help us, you can send us an automatically generated error report containing the following items:\n\n- Program version\n- Operating system version\n- Type of CPU\n- VeraCrypt component name\n- Checksum of VeraCrypt executable\n- Symbolic name of dialog window\n- Error category\n- Error address\n- VeraCrypt call stack\n\nIf you select 'Yes', the following URL (which contains the entire error report) will be opened in your default Internet browser.\n\n%hs\n\nDo you want to send us the above error report?</string>
@@ -497,7 +503,7 @@
     <string lang="en" key="WIPE_FINISHED">The content of the partition/device has been successfully erased.</string>
     <string lang="en" key="WIPE_FINISHED_DECOY_SYSTEM_PARTITION">The content of the partition where the original system (of which the hidden system is a clone) resided has been successfully erased.</string>
     <string lang="en" key="DECOY_OS_VERSION_WARNING">Please make sure the version of Windows you are going to install (on the wiped partition) is the same as the version of Windows you are currently running. This is required due to the fact that both systems will share a common boot partition.</string>
-    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' &gt; 'Add Mounted Volume to System Favorites').</string>
+    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' > 'Add Mounted Volume to System Favorites').</string>
     <string lang="en" key="SYSTEM_DECRYPTION_FINISHED">The system partition/drive has been successfully decrypted.</string>
     <string lang="et" key="FORMAT_FINISHED_HELP">\n\nVeraCrypti konteiner on loodud ja kasutuseks valmis. Kui soovid luua veel mõne VeraCrypti konteineri, kliki 'Edasi'. Vastasel juhul kliki 'Välju'.</string>
     <string lang="en" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nThe hidden VeraCrypt volume has been successfully created (the hidden operating system will reside within this hidden volume).\n\nClick Next to continue.</string>
@@ -524,7 +530,7 @@
     <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 password for this outer volume, and the existence of the hidden volume (and of the hidden operating system) will remain secret.\n\nIMPORTANT: The files you copy to the outer volume should not occupy more than %s. Otherwise, there may not be enough free space on the outer volume for the hidden volume (and you will not be able to continue). After you finish copying, click Next (do not dismount the volume).</string>
     <string lang="et" key="HIDVOL_HOST_FILLING_HELP">Väline konteiner on edukalt loodud ja haagitud kui draiv %hc:. Sellesse konteinerisse peaksid sa nüüd kopeerima tundliku välimusega faile, mida sa tegelikult EI TAHA peita. Need failid on neile, kes sunnivad sind salasõna avaldama. Vajadusel avaldad ainult selle välise konteineri, mitte peidetud konteineri salasõna. Failid, mida tegelikult tahad kaitsta, on salvestatud peidetud konteinerisse, mille loome hiljem. Kopeerimise lõpetamisel kliki 'Edasi'. Ära haagi konteinerit lahti.\n\nMärkus: peale Edasi klikkimist skanneeritakse välise konteineri klastrikaart leidmaks sekkumata vaba ala suurus, mis on ka peidetud konteineri maksimaalne suurus ja mille lõpp on konteineri lõpp. See ala majutab peidetud konteineri, seega limiteerib selle maksimaalse suuruse. Klastrikaardi skanneerimine tagab, et peidetud konteiner ei kirjuta üle andmeid välises konteineris.</string>
     <string lang="et" key="HIDVOL_HOST_FILLING_TITLE">Välimise konteineri sisu</string>
-    <string lang="et" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nJärgnevatel sammudel sätid valikud välisele konteinerile (mille sisse hiljem luuakse sisemine konteiner). </string>
+    <string lang="et" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nJärgnevatel sammudel sätid valikud välisele konteinerile (mille sisse hiljem luuakse sisemine konteiner).</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>
     <string lang="et" key="HIDVOL_HOST_PRE_CIPHER_TITLE">Väline konteiner</string>
     <string lang="en" key="HIDDEN_OS_PRE_CIPHER_HELP">In the following steps, you will set the options and password for the hidden volume, which will contain the hidden operating system.\n\nRemark: The cluster bitmap of the outer volume has been scanned in order to determine the size of uninterrupted area of free space whose end is aligned with the end of the outer volume. This area will accommodate the hidden volume, so it limits its maximum possible size. The maximum possible size of the hidden volume has been determined and confirmed to be greater than the size of the system partition (which is required, because the entire content of the system partition will need to be copied to the hidden volume). This ensures that no data currently stored on the outer volume will be overwritten by data written to the area of the hidden volume.</string>
@@ -561,6 +567,7 @@
     <string lang="et" key="MAX_HIDVOL_SIZE_KB">Maksimaalne võimalik peidetud konteineri suurus sellel konteineril on %.2f KB.</string>
     <string lang="et" key="MAX_HIDVOL_SIZE_MB">Maksimaalne võimalik peidetud konteineri suurus sellel konteineril on %.2f MB.</string>
     <string lang="en" key="MAX_HIDVOL_SIZE_GB">Maximum possible hidden volume size for this volume is %.2f GB.</string>
+    <string lang="en" key="MAX_HIDVOL_SIZE_TB">Maximum possible hidden volume size for this volume is %.2f TB.</string>
     <string lang="et" key="MOUNTED_NOPWCHANGE">Konteineri salasõna/võtmefaile ei saa muuta kui konteiner on haagitud. Palun haagi konteiner enne lahti.</string>
     <string lang="et" key="MOUNTED_NO_PKCS5_PRF_CHANGE">Päise võtme derivaatlogaritmi ei saa muuta, kui konteiner on haagitud. Palun haagi konteiner enne lahti.</string>
     <string lang="et" key="MOUNT_BUTTON">Haagi</string>
@@ -591,12 +598,12 @@
     <string lang="en" key="SELECT_PKCS11_MODULE">Select PKCS #11 Library</string>
     <string lang="et" key="OUTOFMEMORY">Mälu otsas</string>
     <string lang="en" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">IMPORTANT: We strongly recommend that inexperienced users create a VeraCrypt file container on the selected device/partition, instead of attempting to encrypt the entire device/partition.\n\nWhen you create a VeraCrypt file container (as opposed to encrypting a device or partition) there is, for example, no risk of destroying a large number of files. Note that a VeraCrypt file container (even though it contains a virtual encrypted disk) is actually just like any normal file. For more information, see the chapter Beginner's Tutorial in the VeraCrypt User Guide.\n\nAre you sure you want to encrypt the entire device/partition?</string>
-    <string lang="en" key="OVERWRITEPROMPT">WARNING: The file '%hs' already exists!\n\nIMPORTANT: VERACRYPT WILL NOT ENCRYPT THE FILE, BUT IT WILL DELETE IT. Are you sure you want to delete the file and replace it with a new VeraCrypt container?</string>
+    <string lang="en" key="OVERWRITEPROMPT">WARNING: The file '%s' already exists!\n\nIMPORTANT: VERACRYPT WILL NOT ENCRYPT THE FILE, BUT IT WILL DELETE IT. Are you sure you want to delete the file and replace it with a new VeraCrypt container?</string>
-    <string lang="en" key="OVERWRITEPROMPT_DEVICE">CAUTION: ALL FILES CURRENTLY STORED ON THE SELECTED %s '%hs'%s WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
+    <string lang="en" key="OVERWRITEPROMPT_DEVICE">CAUTION: ALL FILES CURRENTLY STORED ON THE SELECTED %s '%s'%s WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
-    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%s'%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting/decrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting/decrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting/decrypting, please make sure that you have backup copies of the files you want to encrypt/decrypt.\n\nDo you have such a backup?</string>
-    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%hs'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
+    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%s'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
     <string lang="en" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">WARNING: THE SELECTED PARTITION CONTAINS A LARGE AMOUNT OF DATA! Any files stored on the partition will be erased and lost (they will NOT be encrypted)!</string>
     <string lang="en" key="ERASE_FILES_BY_CREATING_VOLUME">Erase any files stored on the partition by creating a VeraCrypt volume within it</string>
     <string lang="et" key="PASSWORD">Salasõna</string>
@@ -645,7 +652,7 @@
     <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
     <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
     <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 &gt; Organize &gt; 'Folder and search options' &gt; View).</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="SELECTED_PARTITION_ALREADY_INPLACE_ENC">The selected partition/device is already fully encrypted.\nHeader Flags = 0x%.8X</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="en" key="PREV">&lt; &amp;Back</string>
     <string lang="et" key="RAWDEVICES">Võimetu koostama sinu süsteemi paigaldatud toorseadmete nimekirja!</string>
-    <string lang="et" key="READONLYPROMPT">Konteiner '%hs' eksisteerib ja on kirjutuskaitstud. Oled kindel, et soovid selle asendada?</string>
+    <string lang="et" key="READONLYPROMPT">Konteiner '%s' eksisteerib ja on kirjutuskaitstud. Oled kindel, et soovid selle asendada?</string>
     <string lang="et" key="SELECT_DEST_DIR">Vali sihtkataloog</string>
     <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>
@@ -680,13 +687,13 @@
     <string lang="et" key="TEST_CIPHERTEXT_SIZE">Testšiffri tekst, mille lisasid, on liiga pikk või liiga lühike.</string>
     <string lang="et" key="TEST_KEY_SIZE">Testvõti, mille lisasid, on liiga pikk või liiga lühike.</string>
     <string lang="et" key="TEST_PLAINTEXT_SIZE">Vormindamata testtekst, mille lisasid on liiga pikk või liiga lühike.</string>
-    <string lang="en" key="TWO_LAYER_CASCADE_HELP">Two ciphers in a cascade operating in XTS mode. Each block is first encrypted with %hs (%d-bit key) and then with %hs (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
+    <string lang="en" key="TWO_LAYER_CASCADE_HELP">Two ciphers in a cascade operating in XTS mode. Each block is first encrypted with %s (%d-bit key) and then with %s (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
-    <string lang="en" key="THREE_LAYER_CASCADE_HELP">Three ciphers in a cascade operating in XTS mode. Each block is first encrypted with %hs (%d-bit key), then with %hs (%d-bit key), and finally with %hs (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
+    <string lang="en" key="THREE_LAYER_CASCADE_HELP">Three ciphers in a cascade operating in XTS mode. Each block is first encrypted with %s (%d-bit key), then with %s (%d-bit key), and finally with %s (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
     <string lang="en" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Note that, depending on the operating system configuration, these auto-run and auto-mount features may work only when the traveler disk files are created on a non-writable CD/DVD-like medium. Also note that this is not a bug in VeraCrypt (it is a limitation of Windows).</string>
     <string lang="en" key="TRAVELER_DISK_CREATED">VeraCrypt traveler disk has been successfully created.\n\nNote that you need administrator privileges to run VeraCrypt in portable mode. Also note that, after examining the registry file, it may be possible to tell that VeraCrypt was run on a Windows system even if it is run in portable mode.</string>
     <string lang="en" key="TC_TRAVELER_DISK">VeraCrypt Traveler Disk</string>
     <string lang="en" key="TWOFISH_HELP">Designed by Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall, and Niels Ferguson. Published in 1998. 256-bit key, 128-bit block. Mode of operation is XTS. Twofish was one of the AES finalists.</string>
-    <string lang="et" key="MORE_INFO_ABOUT">Rohkem infot %hs kohta</string>
+    <string lang="et" key="MORE_INFO_ABOUT">Rohkem infot %s kohta</string>
     <string lang="et" key="UNKNOWN">Tundmatu</string>
     <string lang="en" key="ERR_UNKNOWN">An unspecified or unknown error occurred (%d).</string>
     <string lang="et" key="UNMOUNTALL_LOCK_FAILED">Osa konteinereid sisaldavad faile või katalooge, mis rakenduste või süsteemi poolt kasutuses.\n\nSunni lahtihaakima?</string>
@@ -706,7 +713,7 @@
     <string lang="et" key="WRONG_VOL_TYPE">VeraCrypt ei suuda muuda võõra konteineri salasõna.</string>
     <string lang="et" key="SELECT_FREE_DRIVE">Palun vali listist vaba draivitäht.</string>
     <string lang="et" key="SELECT_A_MOUNTED_VOLUME">Palun vali haagitud konteiner draivitähtede listist.</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="et" key="CANT_CREATE_AUTORUN">Viga: Ei suua luua autorun.inf faili</string>
     <string lang="et" key="ERR_PROCESS_KEYFILE">Viga võtmefaili käitlemisel!</string>
     <string lang="et" key="ERR_PROCESS_KEYFILE_PATH">Viga võtmefaili failitee käitlemisel!</string>
@@ -851,7 +858,7 @@
     <string lang="en" key="INSTALL_FAILED">Installation failed.</string>
     <string lang="en" key="UNINSTALL_FAILED">Uninstallation failed.</string>
     <string lang="en" key="DIST_PACKAGE_CORRUPTED">This distribution package is damaged. Please try downloading it again (preferably from the official VeraCrypt website at https://veracrypt.codeplex.com).</string>
-    <string lang="en" key="CANNOT_WRITE_FILE_X">Cannot write file %hs</string>
+    <string lang="en" key="CANNOT_WRITE_FILE_X">Cannot write file %s</string>
     <string lang="en" key="EXTRACTING_VERB">Extracting</string>
     <string lang="en" key="CANNOT_READ_FROM_PACKAGE">Cannot read data from the package.</string>
     <string lang="en" key="CANT_VERIFY_PACKAGE_INTEGRITY">Cannot verify the integrity of this distribution package.</string>
@@ -860,8 +867,8 @@
     <string lang="et" key="INSTALL_OK">VeraCrypt edukalt paigaldatud.</string>
     <string lang="en" key="SETUP_UPDATE_OK">VeraCrypt has been successfully updated.</string>
     <string lang="en" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt has been successfully upgraded. However, before you can start using it, the computer must be restarted.\n\nDo you want to restart it now?</string>
-    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
+    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu > All programs > Accessories > System Tools > System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
-    <string lang="et" key="UNINSTALL_OK">VeraCrypt on edukalt arvutist eemaldatud.\n\nKliki 'Lõpeta' eemaldamaks VeraCrypti paigaldaja ja kataloog %hs. Pane tähele, et kataloogi ei eemaldata, kui see sisaldab faile, mida ei paigaldanud VeraCrypti paigaldaja või loonud VeraCrypt.</string>
+    <string lang="et" key="UNINSTALL_OK">VeraCrypt on edukalt arvutist eemaldatud.\n\nKliki 'Lõpeta' eemaldamaks VeraCrypti paigaldaja ja kataloog %s. Pane tähele, et kataloogi ei eemaldata, kui see sisaldab faile, mida ei paigaldanud VeraCrypti paigaldaja või loonud VeraCrypt.</string>
     <string lang="et" key="REMOVING_REG">VeraCrypti registri sissekannete eemaldamine</string>
     <string lang="et" key="ADDING_REG">Registri sissekande lisamine</string>
     <string lang="et" key="REMOVING_APPDATA">Eemaldan programmi-spetsiifilisi andmeid</string>
@@ -872,10 +879,10 @@
     <string lang="et" key="CREATING_SYS_RESTORE">Süsteemi taastepunkti loomine</string>
     <string lang="et" key="FAILED_SYS_RESTORE">Süsteemi taastepunkti loomine ebaõnnestus!</string>
     <string lang="en" key="INSTALLER_UPDATING_BOOT_LOADER">Updating boot loader</string>
-    <string lang="en" key="INSTALL_OF_FAILED">Failed to install '%hs'. %hs\nDo you want to continue installing?</string>
+    <string lang="en" key="INSTALL_OF_FAILED">Failed to install '%s'. %s\nDo you want to continue installing?</string>
-    <string lang="en" key="UNINSTALL_OF_FAILED">Failed to uninstall '%hs'. %hs\nDo you want to continue uninstalling?</string>
+    <string lang="en" key="UNINSTALL_OF_FAILED">Failed to uninstall '%s'. %s\nDo you want to continue uninstalling?</string>
     <string lang="et" key="INSTALL_COMPLETED">Paigaldus lõpetatud.</string>
-    <string lang="et" key="CANT_CREATE_FOLDER">Kataloogi '%hs' ei suudeta luua</string>
+    <string lang="et" key="CANT_CREATE_FOLDER">Kataloogi '%s' ei suudeta luua</string>
     <string lang="et" key="CLOSE_TC_FIRST">VeraCrypti seadme tüüreli laadimine ebaõnnestus.\n\nPalun sulge alustuseks kõik avatud VeraCrypti aknad. Kui see ei aita, palun tee Windowsile taaskäivitus ja proovi siis uuesti.</string>
     <string lang="et" key="DISMOUNT_ALL_FIRST">Kõik VeraCrypti konteinerid peavad olema enne VeraCrypti paigaldamist või eemaldamist lahti haagitud.</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>
@@ -921,14 +928,14 @@
     <string lang="en" key="SYS_FAVORITE_VOLUMES_SAVED">System favorite volumes saved.\n\nTo enable mounting of system favorite volumes when the system starts, please select 'Settings' &gt; 'System Favorite Volumes' &gt; 'Mount system favorite volumes when Windows starts'.</string>
     <string lang="en" key="FAVORITE_ADD_DRIVE_DEV_WARNING">The volume you are adding to favorites is neither a partition nor a dynamic volume. Therefore, VeraCrypt will be unable to mount this favorite volume if the device number changes.</string>
     <string lang="en" key="FAVORITE_ADD_PARTITION_TYPE_WARNING">The volume you are adding to favorites is a partition not recognized by Windows.\n\nVeraCrypt will be unable to mount this favorite volume if the device number changes. Please set the type of the partition to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then add the partition to favorites again.</string>
-    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings &gt; Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
+    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings > Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_NETWORK_PATH_ERR">A container stored in a remote filesystem shared over a network cannot be automatically mounted when its host device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, the volume hosted on the device cannot be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable the volume hosted on the device to be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_LABEL_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, no label can be assigned to it.</string>
     <string lang="en" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable VeraCrypt to assign a label to the partition.</string>
     <string lang="en" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Due to a Windows limitation, a container stored in a remote filesystem shared over a network cannot be mounted as a system favorite volume (however, it can be mounted as a non-system favorite volume when a user logs on).</string>
-    <string lang="et" key="ENTER_PASSWORD_FOR">Sisesta %hs salasõna</string>
+    <string lang="et" key="ENTER_PASSWORD_FOR">Sisesta %s salasõna</string>
     <string lang="en" key="ENTER_PASSWORD_FOR_LABEL">Enter password for '%s'</string>
     <string lang="en" key="ENTER_NORMAL_VOL_PASSWORD">Enter password for the normal/outer volume</string>
     <string lang="en" key="ENTER_HIDDEN_VOL_PASSWORD">Enter password for the hidden volume</string>
@@ -943,8 +950,8 @@
     <string lang="et" key="VOL_HEADER_BACKED_UP">Konteineri päise varukoopia on edukalt loodud.\n\nTÄHTIS: taastades konteineri päist kasutades seda varukoopiat, taastab muuhulgas hetkel kehtiva salasõna. Veel enam, kui võtmefailid on vajalikud selle konteineri haakimiseks, on samad võtmefailid vajalikud ka peale konteineri päise taastamist.\n\nHOIATUS: Seda päise varukoopiat võib kasutada AINULT selle konkreetse konteineri päise taastamiseks. Kui sa kasutad seda varukoopiat mõne teise konteineri päise taastamiseks, on võialik konteinerit küll haakida, aga mitte dekrüpteerida (kuna sa muudad tema peavõtit).</string>
     <string lang="et" key="VOL_HEADER_RESTORED">Konteineri päis on edukalt taastatud.\n\nTÄHTIS: pane tähele, et vana salasõna on taastatud samuti. Veelgi, kui võtmefail(id) oli(d) vajalik(ud) konteineri haakimiseks kui varukoopia loodi, on samad võtmefailid taas vajalikud konteineri haakimiseks.</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) for the hidden volume.</string>
-    <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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</string>
+    <string lang="en" key="CONFIRM_VOL_HEADER_BAK">Are you sure you want to create volume header backup for %s?\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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</string>
-    <string lang="et" key="CONFIRM_VOL_HEADER_RESTORE">Oled kindel, et soovid taastada konteineri %hs päise?\n\nHOIATUS: päise taastamine taastab samuti salasõna, mis kehtis päisest varukoopia loomise hetkel. Lisaks, kui võtmefail(id) oli(d) kasutuses päise varukoopia loomise hetkel, on need samad võtmefailid taas haakimiseks vajalikud peale sellest varukoopiast päise taastamist.</string>
+    <string lang="et" key="CONFIRM_VOL_HEADER_RESTORE">Oled kindel, et soovid taastada konteineri %s päise?\n\nHOIATUS: päise taastamine taastab samuti salasõna, mis kehtis päisest varukoopia loomise hetkel. Lisaks, kui võtmefail(id) oli(d) kasutuses päise varukoopia loomise hetkel, on need samad võtmefailid taas haakimiseks vajalikud peale sellest varukoopiast päise taastamist.</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>
@@ -955,12 +962,14 @@
     <string lang="en" key="VOLUME_HAS_NO_BACKUP_HEADER">There is no backup header embedded in this volume (note that only volumes created by VeraCrypt 6.0 or later contain embedded backup headers).</string>
     <string lang="en" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">You are attempting to back up the header of the system partition/drive. This is not allowed. Backup/restore operations pertaining to the system partition/drive can be performed only using the VeraCrypt Rescue Disk.\n\nDo you want to create a VeraCrypt Rescue Disk?</string>
     <string lang="en" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">You are attempting to restore the header of a virtual VeraCrypt volume but you selected the system partition/drive. This is not allowed. Backup/restore operations pertaining to the system partition/drive can be performed only using the VeraCrypt Rescue Disk.\n\nDo you want to create a VeraCrypt Rescue Disk?</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">After you click OK, you will select a filename for the new VeraCrypt Rescue Disk ISO image and the location where you wish to place it.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">After you click OK, you will select a filename for the new VeraCrypt Rescue Disk image and the location where you wish to place it.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <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_INSERT">Please insert your VeraCrypt Rescue Disk 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 a new Rescue Disk fully compatible with your current configuration, select 'System' &gt; 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk 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' &gt; '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 be used, because it was created for a different master key. You need to burn the newly generated Rescue Disk.</string>
@@ -989,8 +998,8 @@
     <string lang="en" key="DRIVE_LETTER_ITEM">Drive Letter:   </string>
     <string lang="et" key="UNSUPPORTED_CHARS_IN_PWD">Viga: Salasõna peab sisaldama ainult ASCII sümboleid.\n\nMitte-ASCII sümbolid salasõnas võivad põhjustada, et konteineri haakimine on võimatu, kui süsteemi konfiguratsioon muutub.\n\nJärgnevad sümbolid on lubatud:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4  5 6 7 8 9 : ; &lt; = &gt; ? @ 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="et" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">Hoiatus: salasõna sisaldab mitte-ASCII sümboleid. See võib põhjustada, et konteineri hakkimine muutub võimatuks, kui sinu süsteemi konfiguratsioon muutub.\n\nPeaksid asendama kõik mitte-ASCII sümbolid ASCII sümbolitega. Selleks, kliki 'Konteinerid'	-&gt; 'Muuda konteineri salasõna'.\n\nJärgnevad on ASCII sümbolid:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4  5 6 7 8 9 : ; &lt; = &gt; ? @ 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="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 change it (e.g., to '.tc').\n\nAre you sure you want to use the problematic file extension?</string>
+    <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 change it (e.g., to '.hc').\n\nAre you sure you want to use the problematic file extension?</string>
-    <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 container or change it (e.g., to '.tc') after you dismount the volume.</string>
+    <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 container or change it (e.g., to '.hc') after you dismount the volume.</string>
     <string lang="et" key="HOMEPAGE">Koduleht</string>
     <string lang="et" key="LARGE_IDE_WARNING_XP">Hoiatus: Paistab, et sa pole lisanud ühtegi teeninduspakki oma Windowsi instalatsioonile. Sa ei tohiks kirjutada IDE ketastele suuremad kui 128 GB Windows XP all, millele pole lisatud Service Pack 1 või hilisem! Kui sa teed seda, andmed kettal (hoolimata, kas see on VeraCrypti konteiner või ei) võivad saada viga. Pane tähele, et see on Windowsi piirang, mitte VeraCrypti viga.</string>
     <string lang="et" key="LARGE_IDE_WARNING_2K">HOIATUS: Paistab, et sa pole lisanud Service Pack 3 või hilisemat oma Windowsi installatsioonile. Sa ei tohiks kirjutada IDE ketastele suuremad kui 128 GB Windows 2000 all, millele pole lisatud Service Pack 3 või hilisem! Kui sa teed seda, andmed kettal (hoolimata, kas see on VeraCrypti konteiner või ei) võivad saada viga. Pane tähele, et see on Windowsi piirang, mitte VeraCrypti viga.\n\nMärkus: Sa pead ka lubama 48-bitise LBA toe registris; lähemat informatsiooni vaata: http://support.microsoft.com/kb/305098/EN-US</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="et" key="CHECKING_FS">Kontrollin failisüsteemi TruCrypti konteineris haagitud kui %s...</string>
-    <string lang="et" key="REPAIRING_FS">Proovin parandada failisüsteemi VeraCrypti konteineris haagitud kui %hs...</string>
+    <string lang="et" key="REPAIRING_FS">Proovin parandada failisüsteemi VeraCrypti konteineris haagitud kui %s...</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 later.</string>
     <string lang="et" key="WARN_64_BIT_BLOCK_CIPHER">Hoiatus: see konteiner on krüpteeritud iganenud krüpteerimusalgoritmiga.\n\nKõik 64-bitise blokiga krüpteerimisalgoritmid (ehk Blowfish, CAST-128, või Triple DES) on iganenud. Tulevaste VeraCrypti versioonidega on võimalik sellist konteinerit küll haakida, kuid edasiarendusi ja täiendusi neile algoritmidele ei tehta. Me soovitame, et lood uue konteineri krüpteeritud 128-bitise blokiga algoritmiga (ehk AES, Serpent, Twofish, jne) ja liigutad kõik oma failid sellest konteinerist uude konteinerisse.</string>
     <string lang="et" key="SYS_AUTOMOUNT_DISABLED">Sinu süsteem ei ole konfigureeritud automaatselt haakima uusi konteinereid. Võib olla võimatu haakida seadme baasil VeraCrypti konteinereid. Automaatse haakimise saab lubada käivitades järgneva käsu ja taaskäivitades süsteemi.\n\nmountvol.exe /E</string>
     <string lang="et" key="SYS_ASSIGN_DRIVE_LETTER">Palun omista partitsioonile/seadmele enne jätkamist draivitäht ('Control Panel' &gt; 'System and Maintenance' &gt; 'Administrative Tools' - 'Create and format hard disk partitions').\n\nPane tähele, et see on operatsioonisüsteemi poolne nõue.</string>
@@ -1069,7 +1077,7 @@
     <string lang="en" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt no longer supports encryption of the system partition/drive on Windows Vista with no Service Pack installed. Before upgrading VeraCrypt, please install Service Pack 1 or higher for Windows Vista.</string>
     <string lang="en" key="FEATURE_REQUIRES_INSTALLATION">Error: This feature requires VeraCrypt to be installed on the system (you are running VeraCrypt in portable mode).\n\nPlease install VeraCrypt and then try again.</string>
     <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="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</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' &gt; '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>
@@ -1093,7 +1101,7 @@
     <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 medium (or using a service partition)?</string>
     <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 Hidden Volumes" in the VeraCrypt User's Guide.\n\nImportant: Before proceeding, please make sure you have read the section "Security Requirements and Precautions Pertaining to Hidden Volumes" in the VeraCrypt User's Guide.\n\n\nDoes the currently running operating system meet the above condition?</string>
     <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 from writing to the shared boot partition and from hibernating.\n\n\nDo you want to continue? If you select 'No', instructions for removing the extra boot partition will be displayed.</string>
-    <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' &gt; '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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
+    <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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
     <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>
@@ -1108,8 +1116,8 @@
     <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 you do NOT have a real US keyboard.</string>
     <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 starts.\n\n- The VRD will contain a backup of the present content of the first drive track (which typically contains a system loader or boot manager) and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ISO image will be created in the location specified below.</string>
     <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">The Rescue Disk image has been created and stored in this file:\n%s\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>
+    <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%s\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>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">IMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software. If you do not have any CD/DVD recording software that can write the ISO disk image to a CD/DVD, click the link below to download such free software.\n\n</string>
     <string lang="en" key="LAUNCH_WIN_ISOBURN">Launch Microsoft Windows Disc Image Burner</string>
     <string lang="en" key="RESCUE_DISK_BURN_NO_CHECK_WARN">WARNING: If you already created a VeraCrypt Rescue Disk in the past, it cannot be reused for this system partition/drive because it was created for a different master key! Every time you encrypt a system partition/drive, you must create a new VeraCrypt Rescue Disk for it even if you use the same password.</string>
@@ -1247,7 +1255,7 @@
     <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 system (but not on the decoy system), the decoy system would contain a VeraCrypt driver and VeraCrypt applications whose version numbers are different from the version number of the VeraCrypt Boot Loader. Such a discrepancy might indicate that there is a hidden operating system on this computer.\n\n\nDo you want to continue?</string>
     <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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' &gt; '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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' > 'Create Rescue Disk').</string>
     <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' &gt; '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' &gt; 'Create Rescue Disk'.</string>
     <string lang="en" key="BOOT_LOADER_UPGRADE_FAILED">Failed to upgrade the VeraCrypt Boot Loader.</string>
@@ -1272,7 +1280,7 @@
     <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' &gt; '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>
@@ -1297,8 +1305,8 @@
     <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 system.</string>
     <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' &gt; 'Performance' and enable 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' &gt; 'Performance' and disable 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>
@@ -1372,6 +1380,39 @@
     <string lang="et" key="TB_PER_SEC">TB/s</string>
     <string lang="et" key="PB_PER_SEC">PB/s</string>
     <string lang="en" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.eu.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="eu" name="Euskara" en-name="Basque" version="1.0.0" translators="Ander Genua" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="eu" key="IDC_BROWSE">Na&amp;bigatu...</control>
     <control lang="eu" key="IDC_DESKTOP_ICON">VeraCrypt-en ikonoa idazmahian sortu</control>
     <control lang="eu" key="IDC_DONATE">Orain eman...</control>
-    <control lang="eu" key="IDC_FILE_TYPE">.tc &amp;luzapena VeraCrypt-i lotu</control>
+    <control lang="eu" key="IDC_FILE_TYPE">.hc &amp;luzapena VeraCrypt-i lotu</control>
     <control lang="eu" key="IDC_OPEN_CONTAINING_FOLDER">&amp;Bukatzerakoan helbidea ireki</control>
     <control lang="eu" key="IDC_PROG_GROUP">VeraCrypt &amp;Hasiera menuan erantsi</control>
     <control lang="eu" key="IDC_SYSTEM_RESTORE">&amp;Sistemaren Berreskuratze puntu bat sortu</control>
@@ -37,6 +37,7 @@
     <control lang="eu" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">CD/DVD -ak grabatzeko softwarea jaitsi</control>
     <control lang="eu" key="IDC_FILE_CONTAINER">Fitxategiak edukitzeko zifratutako fitxategia sortu</control>
     <control lang="eu" key="IDC_GB">&amp;GB</control>
+    <control lang="eu" key="IDC_TB">&amp;TB</control>
     <control lang="eu" key="IDC_HIDDEN_SYSENC_INFO_LINK">Informazio gehiago</control>
     <control lang="eu" key="IDC_HIDDEN_VOL">VeraCrypt-en &amp;ezkututako bolumena</control>
     <control lang="eu" key="IDC_HIDDEN_VOL_HELP">Ezkutuko bolumeni buruzko informazio gehiago</control>
@@ -44,6 +45,7 @@
     <control lang="eu" key="IDC_HIDVOL_WIZ_MODE_FULL">Modu Normala</control>
     <control lang="eu" key="IDC_KB">&amp;KB</control>
     <control lang="eu" key="IDC_KEYFILES_ENABLE">Gako-artxiboa &amp;erabili</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="eu" key="IDC_KEY_FILES">&amp;Gako-artxiboa..</control>
     <control lang="eu" key="IDC_LINK_HASH_INFO">Hash algoritmoei buruzko informazioa</control>
@@ -58,7 +60,8 @@
     <control lang="eu" key="IDC_NO_HISTORY">&amp;Ez gorde inoiz historia</control>
     <control lang="eu" key="IDC_OPEN_OUTER_VOLUME">Kanpoko liburukia ireki</control>
     <control lang="eu" key="IDC_PAUSE">&amp;Eten</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="eu" key="IDC_QUICKFORMAT">Formatu Azkarra</control>
     <control lang="eu" key="IDC_SHOW_PASSWORD">&amp;Pasahitza erakutsi</control>
     <control lang="eu" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Pasahitza erakutsi</control>
@@ -118,6 +121,7 @@
     <control lang="eu" key="IDC_CREATE">Sortu</control>
     <control lang="eu" key="IDC_CREATE_VOLUME">&amp;Bolumena Sortu</control>
     <control lang="eu" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">&amp;Ez erakutsi inolako testurik hasieraketa aurreko kautotze pantailan (beheko mezu pertsonala izan ezik)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="eu" key="IDC_ENABLE_HARDWARE_ENCRYPTION">AES zifratze/argitze prozesua azeleratu prozesadorearen AES instrukzioak erabiliz (baldin badaude).</control>
     <control lang="eu" key="IDC_ENABLE_KEYFILES">Gako-fitxategiak erabili</control>
     <control lang="eu" key="IDC_ENABLE_NEW_KEYFILES">Gako-fitxategiak erabili</control>
@@ -132,6 +136,7 @@
     <control lang="eu" key="IDC_FAVORITE_MOVE_UP">&amp;Gora Mugitu</control>
     <control lang="eu" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Aukeratutako bolumena muntatzerakoan &amp;exploratzailearen lehio batean ireki</control>
     <control lang="eu" key="IDC_FAVORITE_REMOVE">&amp;Kendu</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="eu" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Aukera Globalak</control>
     <control lang="eu" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Argibide bunbuiloa erakutsi tekla bereziarekin ondo desmuntatu eta gero</control>
     <control lang="eu" key="IDC_HK_DISMOUNT_PLAY_SOUND">Sistemaren jakinarazpen soinua jarri tekla bereziarekin ondo desmuntatu eta gero</control>
@@ -256,6 +261,7 @@
     <control lang="eu" key="IDM_UNMOUNTALL">Muntatutako bolumen guztiak desmuntatu</control>
     <control lang="eu" key="IDM_UNMOUNT_VOLUME">Bolumena desmuntatu</control>
     <control lang="eu" key="IDM_VERIFY_RESCUE_DISK">Salbatze diska egiaztatu</control>
+    <control lang="en" key="IDM_VERIFY_RESCUE_DISK_ISO">Verify Rescue Disk Image</control>
     <control lang="eu" key="IDM_VERSION_HISTORY">Bertsioen Historia</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="eu" key="IDM_VOLUME_PROPERTIES">Bolumenaren ezaugarriak</control>
@@ -281,7 +287,6 @@
     <control lang="eu" key="IDT_HOTKEY_KEY">Esleitzeko Gakoa:</control>
     <control lang="eu" key="IDT_HW_AES_SUPPORTED_BY_CPU">Ordenagailu honetako prozesadoreak (CPU-ak) AES algoritmoa hardware bidez azelerazea onartzen du:</control>
     <control lang="eu" key="IDT_LOGON">Windowsen sartzean egiteko zereginak</control>
-
     <control lang="eu" key="IDT_MINUTES">minutu</control>
     <control lang="eu" key="IDT_MOUNT_LETTER">Bolumena muntatu diska letra honekin:</control>
     <control lang="eu" key="IDT_MOUNT_SETTINGS">Muntaketaren Aukerak</control>
@@ -329,7 +334,6 @@
     <control lang="eu" key="IDC_TOKEN_FILES_ADD">&amp;Artxibo agiriak gehitu...</control>
     <control lang="eu" key="IDC_USE_EMBEDDED_HEADER_BAK">Bolumenean goiburuaren integratutako &amp;babeskopia badago, erabili</control>
     <control lang="eu" key="IDC_XTS_MODE_ENABLED">XTS modua</control>
-
     <control lang="eu" key="IDD_ABOUT_DLG">VeraCrypt-i buruz</control>
     <control lang="eu" key="IDD_BENCHMARK_DLG">VeraCrypt - Zifratzeko Algoritmoaren Proba-Bankua</control>
     <control lang="eu" key="IDD_CIPHER_TEST_DLG">VeraCrypt - Bektoreak Frogatu</control>
@@ -367,7 +371,7 @@
     <control lang="eu" key="IDT_SECURITY_TOKEN">Sekurtasun agiria:</control>
     <control lang="eu" key="IDT_SORT_METHOD">Sailkatze Modua:</control>
     <control lang="eu" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Mesedez itxaron. Prozesu honek denbora asko iraun dezake...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="eu" key="IDT_TEST_BLOCK_NUMBER">Blokearen Zenbakia:</control>
     <control lang="eu" key="IDT_TEST_CIPHERTEXT">Zifratutako Testua (hamaseitarra)</control>
     <control lang="eu" key="IDT_TEST_DATA_UNIT_NUMBER">Datu unitatearen zenbakia (64-bit hamaseitar, datu unitatearen tamaina 512 byte-takoa da)</control>
@@ -412,13 +416,13 @@
     <string lang="eu" key="CIPHER_TITLE">Zifratzeko Aukerak</string>
     <string lang="eu" key="CLEAN_WINMRU_FAILED">KONTUZ: Aukeratutako bolumenaren/gako-fitxategiaren helbidea ezabatzean huts egin du (fitxategi-aukeratzaileak gogoratuko du)!</string>
     <string lang="eu" key="COMPRESSION_NOT_SUPPORTED">Errorea: Edukiontzia fitxategi sismtema mailean konprimatuta dago. VeraCrypt ez ditu onartzen konprimatutatutako edukiontziak (ohartu zaitez zifratutako datuak konprimatzea erredundantea eta baliogabekoa dela).\n\nMesedez, edukiontziaren konprimazioa desgaitu hurrengo hurratsak jarraituz:\n1) Eskubiko botoiarekin edukiontzian klik egin Windows Exporer-ean (ez VeraCrypt-en).\n2)'Ezaugarriak' hautatu.\n3)'Ezaugarriak' elkarriztekta-koadroan, 'Aurreratuak' aukeratu.\n4)'Atributu aurreratuak' elkarriztekta-koadroan 'Edukiak Konprimatu diskan lekua aurrezteko' aukera desgatu eta gero 'Ados' sakatu.\n5)'Ezaugarriak' elkarriztekta-koadroan, 'Ados' sakatu.</string>
-    <string lang="eu" key="CREATE_FAILED">Ezin izan da %hs bolumena sortu</string>
+    <string lang="eu" key="CREATE_FAILED">Ezin izan da %s bolumena sortu</string>
-    <string lang="eu" key="DEVICE_FREE_BYTES">%hs-ren tamaina %.2f byteekoa da</string>
+    <string lang="eu" key="DEVICE_FREE_BYTES">%s-ren tamaina %.2f byteekoa da</string>
-    <string lang="eu" key="DEVICE_FREE_KB">%hs-ren tamaina %.2f KB-ekoa da</string>
+    <string lang="eu" key="DEVICE_FREE_KB">%s-ren tamaina %.2f KB-ekoa da</string>
-    <string lang="eu" key="DEVICE_FREE_MB">%hs-ren tamaina %.2f MB-ekoa da</string>
+    <string lang="eu" key="DEVICE_FREE_MB">%s-ren tamaina %.2f MB-ekoa da</string>
-    <string lang="eu" key="DEVICE_FREE_GB">%hs-ren tamaina %.2f GB-ekoa da</string>
+    <string lang="eu" key="DEVICE_FREE_GB">%s-ren tamaina %.2f GB-ekoa da</string>
-    <string lang="eu" key="DEVICE_FREE_TB">%hs-ren tamaina %.2f TB-ekoa da</string>
+    <string lang="eu" key="DEVICE_FREE_TB">%s-ren tamaina %.2f TB-ekoa da</string>
-    <string lang="eu" key="DEVICE_FREE_PB">%hs-ren tamaina %.2f PB-ekoa da</string>
+    <string lang="eu" key="DEVICE_FREE_PB">%s-ren tamaina %.2f PB-ekoa da</string>
     <string lang="eu" key="DEVICE_IN_USE_FORMAT">KONTUZ: Sistemak edo aplikazioek gailua/partizioa erabiltzen ari dira. Gailua/partizioa formatatzea datuen hondatzea eta sistemaren ezegonkortasuna sortu dezake.\n\nJarraitu?</string>
     <string lang="eu" key="DEVICE_IN_USE_INPLACE_ENC">KONTUZ: Sistema eragileak edo aplikazioek partizioa erabiltzen ari dira. Partizioa erabiltzen egon daitezken aplikazio guztiak itxi behar dituzu (software antibirusa barne).\n\nJarraitu?</string>
     <string lang="eu" key="FORMAT_CANT_DISMOUNT_FILESYS">Errorea: Partizioak/gailuak dismuntatu ezin daitekeen fitxategi sistema dauka. Sistema eragileak fitxategi sistema erabiltzen ari daiteke. Partizioa/gailua formatatzea ziurenik datuak hondatuko ditu eta sistemaren desegonkortasuna sortuko du.\n\nArazo hau konpontzeko formatatu gabe partizioa ezabatu eta berriz sortzeko gomendatzen dugu. Hau egiteko hurrengo pausoak jarraitu:\n1)Eskubiko-klik egin ezazu 'PC' (edo 'Nire PC') ikonoan 'Hasiera Menu'-an, gero 'Kudeatu' aukeratu. 'Ordenagailuaren Kudeaketa' lehioa agertu beharko liteke.\n2)'Ordenagailuaren Kudeaketa' lehioan, 'Bilketa'&gt;'Diskoen Kudeaketa' aukeratu.\n3)Eskubiko-klik egin ezazu zifratu nahi duzun partizioan eta ondorengo aukera bat hautatu: 'Partizioa ezabatu', 'Bolumena Ezabatu' edo 'Unitate Logikoa Ezabatu'.\n4) 'Bai' sakatu. Windows-ek berrabiatzeko eskatzen badizu, hori egin. Gero 1 eta 2 pausuak berriro egin eta 5.arekin jarraitu.\n5)Eskubiko-clik esleitu gabeko/hutsik dagoen eremuan eta honako bat aukeratu: ' Partizio Berria', 'Bolumen Sinple Berria' ero 'Disko Logiko Berria'.\n6)'Partizio Berria Laguntzailea' edo 'Bolumen Sinple Berria Laguntzailea'-ren lehioa ireki beharko liteke; bere aginduak jarraitu itzazu. Laguntzailearen 'Partizioa Formatatu' lehioan, 'Partizioa Hau ez Formatatu' edo 'Bolumen hau ez Formatatu' aukeratu. Gero, laguntzaile horretan, 'Hurrengoa' sakatu eta gero 'Bukatu'. \n7) Ohartu zaitez VeraCrypt-en hautatu duzun unitatearen helbidea oker egon daitekeela orain. Hortaz, VeraCrypt Bolumenak Sortzeko Laguntzailetik atera zaitez (oraindik martxan badago) eta berriro ireki ezazu.\n8)Partizioa/Gailua berriro zifratzen saiatu zaitez\n\nVeraCrypt-ek behin eta berriro huts egiten badu gailua/partizioa enkriptatzerakoan, agian horren ordez fitxategi-edukiontzia izan dezakezu.</string>
@@ -437,14 +441,14 @@
     <string lang="eu" key="INPLACE_ENC_INVALID_PATH">Errorea: VeraCryptek bakarrik partizio oso bat, bolumen dinamiko bat edo sistemaren unitate osoa 'bertan' moduan zifratu dezake. Mesedez, ziurta zaitez aukeratutako helbidea zuzena dela.</string>
     <string lang="eu" key="CANNOT_RESIZE_FILESYS">Errorea: Ezin izan da fitxategi sistema txikiagotu (fitxategi sistema txikiagotu behar da bolumenaren goiburu eta goiburuaren babeskopiarako tokia egiteko).\n\nIzan daitezken zergatiak eta konponbideak:\n\nBolumenean ez dago toki huts nahikoa. Ziurta zaitez fitxategi sisteman idazten duen beste aplikaziorik ez dagoela.\n\n- Kaltetutako fitxategi sistema. Egiaztatzen eta konpontzen saiatu zaitez ('Ordenagailua' zerrendan dagokion unitate letran eskubiko clik egin, Ezaugarriak &gt; Tresnak &gt; 'Orain Egiaztatu' hautatu, ziurta zaitez 'Fitxategi sistemaren erroreak automatikoki konpondu' aukera hautatuta dagoela, eta 'Hasi' sakatu).\n\nGoiko pausoek ez badute lagundu, beheko pausoak jarraitu itzazu.</string>
     <string lang="eu" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Errorea: bolumenean ez dago beharrezkoa den leku librea eta fitxategi sistema ezin da txikiagotu (fitxategi sistema txikiagotu behar da bolumenaren goiburu eta goiburuaren babeskopiarako tokia egiteko).\n\nMesedez, bikoiztuta dauden fitxategiak ezabatu eta zakarrotzia hustu gutxienez 256KB eko toki libre uzteko eta berriz saiatu. Ohartu zaitez Windowsen arazo batengatik Windows Expolerrek adierazten duen duen leku librea oker egon daiteke sistema berrabiatu arte. Berrabiatzeak ez badu laguntzen, fitxategi sistema oker egon daiteke. Erroreak bilatu eta konpontzen saiatu zaitez ('Ordenagailua' zerrendan dagokion unitate letran eskubiko clik egin, Ezaugarriak &gt; Tresnak &gt; 'Orain Egiaztatu' hautatu, ziurta zaitez 'Fitxategi sistemaren erroreak automatikoki konpondu' aukera hautatuta dagoela, eta 'Hasi' sakatu).\n\nGoiko pausoek ez badute lagundu, beheko pausoak jarraitu itzazu.</string>
-    <string lang="eu" key="DISK_FREE_BYTES">%hs unitatean %.2f byte libre daude.</string>
+    <string lang="eu" key="DISK_FREE_BYTES">%s unitatean %.2f byte libre daude.</string>
-    <string lang="eu" key="DISK_FREE_KB">%hs unitatean%.2f KB libre daude.</string>
+    <string lang="eu" key="DISK_FREE_KB">%s unitatean%.2f KB libre daude.</string>
-    <string lang="eu" key="DISK_FREE_MB">%hs unitatean%.2f MB libre daude.</string>
+    <string lang="eu" key="DISK_FREE_MB">%s unitatean%.2f MB libre daude.</string>
-    <string lang="eu" key="DISK_FREE_GB">%hs unitatean%.2f GB libre daude.</string>
+    <string lang="eu" key="DISK_FREE_GB">%s unitatean%.2f GB libre daude.</string>
-    <string lang="eu" key="DISK_FREE_TB">%hs unitatean%.2f TB libre daude.</string>
+    <string lang="eu" key="DISK_FREE_TB">%s unitatean%.2f TB libre daude.</string>
-    <string lang="eu" key="DISK_FREE_PB">%hs unitatean%.2f PB libre daude.</string>
+    <string lang="eu" key="DISK_FREE_PB">%s unitatean%.2f PB libre daude.</string>
     <string lang="eu" key="DRIVELETTERS">Ezin izan dira erabili gabeko unitate letrak aurkitu.</string>
-    <string lang="eu" key="DRIVER_NOT_FOUND">Errorea: TryeCrypt-en kontrolatzailea ez da aurkitu.\n\nMesedez 'veracrypt.sys' eta 'veracrypt-x64.sys' fitxategiak VeraCrypt-en programa nagusia (VeraCrypt.exe) dagoen tokira kopiatu itzazu.</string>
+    <string lang="eu" key="DRIVER_NOT_FOUND">Errorea: VeraCryptCrypt-en kontrolatzailea ez da aurkitu.\n\nMesedez 'veracrypt.sys' eta 'veracrypt-x64.sys' fitxategiak VeraCrypt-en programa nagusia (VeraCrypt.exe) dagoen tokira kopiatu itzazu.</string>
     <string lang="eu" key="DRIVER_VERSION">Errorea: Onartzen ez den VeraCrypt kontrolatzailearen bertsoio bat martxan dago.\n\nVeraCrypt modu eramangarrian erabiltzen saiatzen ari bazara (hau da, instalatu gabe) eta dagoeneko VeraCrypt-en bertsio bat instalatuta dago, lehendabizi hura desinstalatu behar duzu (edo VeraCrypt instalatzailea erabiliz eguneratu). Desinstalatzeko, ondorengo pausoak jarraitu itzazu: Windows Vista eta gerokoetan, 'Hasiera' menua aukeratu &gt; Ordenagailua &gt; 'Pograma aldatu edo desinstalatu' &gt; VeraCrypt &gt; Desinstalatu; Windows XP-n 'Hasiera' menua aukeratu &gt; Aukerak &gt; 'Kontrol Panela' &gt; 'Programak Gehitu edo Kendu' &gt; VeraCrypt &gt; Kendu.\n\nAntzekotasunez, VeraCrypt modu eramangarrian erabiltzen saiatzen ari bazara (hau da, instalatu gabe) eta VeraCrypt-en bertsio ezberdin bat dagoeneko modu eramangarrian martxan baldin badago, lehendabizi sistema berrabiatu beharko duzu eta ondoren bertsio berria bakarrik abiatu.</string>
     <string lang="eu" key="ERR_CIPHER_INIT_FAILURE">Errorea: Zifraketaren hasieraketak huts egin du.</string>
     <string lang="eu" key="ERR_CIPHER_INIT_WEAK_KEY">Errorea: Gako ahul edo potentzialki ahula detektatu da. Gakoa alde batera utziko da. Mesedez, berrio sailatu.</string>
@@ -563,6 +567,7 @@
     <string lang="eu" key="MAX_HIDVOL_SIZE_KB">Bolumen honentzat, ezkutuko bolumenaren tamaina gehienezkoa %.2f KB-etakoa da.</string>
     <string lang="eu" key="MAX_HIDVOL_SIZE_MB">Bolumen honentzat, ezkutuko bolumenaren tamaina gehienezkoa %.2f MB-etakoa da.</string>
     <string lang="eu" key="MAX_HIDVOL_SIZE_GB">Bolumen honentzat, ezkutuko bolumenaren tamaina gehienezkoa %.2f GB-etakoa da.</string>
+    <string lang="eu" key="MAX_HIDVOL_SIZE_TB">Bolumen honentzat, ezkutuko bolumenaren tamaina gehienezkoa %.2f TB-etakoa da.</string>
     <string lang="eu" key="MOUNTED_NOPWCHANGE">Bolumenaren pasahitza/gako-fitxategiak ezin dira aldatu bolumena muntatuta dagoen bitartean. Mesedez, lehendabizi bolumena desmuntatu ezazu.</string>
     <string lang="eu" key="MOUNTED_NO_PKCS5_PRF_CHANGE">Goiburuaren deribazio algoritmoa ezin da aldatu bolumena muntatuta dagoen bitartean. Mesedez, hori baino lehen bolumena desmuntatu ezazu.</string>
     <string lang="eu" key="MOUNT_BUTTON">&amp;Muntatu</string>
@@ -593,12 +598,12 @@
     <string lang="eu" key="SELECT_PKCS11_MODULE">PKCS #11 Liburutegia Aukeratu</string>
     <string lang="eu" key="OUTOFMEMORY">Memoriarik Gabe</string>
     <string lang="eu" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">GARRATZITSUA: Esperientziarik gabeko erabiltzaileentzat oso gomendagarria da VeraCrypt fitxategi-edukionktzi bat aukeratutako partizio/gailuan sortzea, partizio/gailu osoa zifratzen saiatu beharrean.\n\n Fitxategi-edukiontzi bat sortzerakoan (gailu edo partizio osoa zifratzearekin konparatuta) ez dago, adibidez, fitxategi kopuru handia hondatzeko arriskurik. Ohartu zaitez VeraCrypt-en fitxategi-edukiontzi bat (nahiz eta bere barruan zifratutako disko bat izan) berez beste edozein fitxategi normal bat bezalakoa da. Informazio gehiago nahi baduzu, VeraCrypt-en Erabiltzaile Gidan Hasiberrien Tutoriala kapituloa irakurri ezazu.\n\nZiur zaude gailu/partizio osoa zifratu nahi duzula?</string>
-    <string lang="eu" key="OVERWRITEPROMPT">KONTUZ: '%hs' fitxategia dagoeneko badago!\n\nGARRANTZITSUA: VERACRYPT-EK EZ DU FITXATEGIA ZIFRATUKO, EZABATUKO DU.	Ziur zaude fitxategia ezabatu eta VeraCrypt edukiontzi berri batengatik ordezkatu nahi duzula?</string>
+    <string lang="eu" key="OVERWRITEPROMPT">KONTUZ: '%s' fitxategia dagoeneko badago!\n\nGARRANTZITSUA: VERACRYPT-EK EZ DU FITXATEGIA ZIFRATUKO, EZABATUKO DU.	Ziur zaude fitxategia ezabatu eta VeraCrypt edukiontzi berri batengatik ordezkatu nahi duzula?</string>
-    <string lang="eu" key="OVERWRITEPROMPT_DEVICE">KONTUZ: AUKERATUTAKO %s '%hs'%s-etan GORDETA DAUDEN FITXATEGI GUZTIAK EZABATU ETA GALDUKO DIRA (EZ DIRA ZIFRATUKO)!\n\nZiur zaude formataketarekin jarraitu nahi duzula?</string>
+    <string lang="eu" key="OVERWRITEPROMPT_DEVICE">KONTUZ: AUKERATUTAKO %s '%s'%s-etan GORDETA DAUDEN FITXATEGI GUZTIAK EZABATU ETA GALDUKO DIRA (EZ DIRA ZIFRATUKO)!\n\nZiur zaude formataketarekin jarraitu nahi duzula?</string>
-    <string lang="eu" key="NONSYS_INPLACE_ENC_CONFIRM">KONTUZ: Bolumena guztiz zifratzen den arte ezin izango duzu, ez muntatu, ez bertan dauden fitxategiak erabili.\n\nZiur zaude aukeratutako %s '%hs'%s-ak zifratu nahi dituzula?</string>
+    <string lang="eu" key="NONSYS_INPLACE_ENC_CONFIRM">KONTUZ: Bolumena guztiz zifratzen den arte ezin izango duzu, ez muntatu, ez bertan dauden fitxategiak erabili.\n\nZiur zaude aukeratutako %s '%s'%s-ak zifratu nahi dituzula?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="eu" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">KONTUZ: VeraCrypt-ek datuak "bertan" zifratzen ari den bitartean argia joaten bada edo sistemak huts egiten badu, softwarearen edo hardwarearen akats batengatik, datuen zatiak hondatu edo galduko dira. Horregatik, zifratzen hasi aurretik, ziurta zaitez zifratu nahi dituzun fitxategien babeskopiak dituzula.\n\nBabeskopia hori daukazu?</string>
-    <string lang="eu" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">KONTUZ: '%hs'%s (adib. SISTEMAREN PARTIZIOAREN ATZEAN DAGOEN HURRENGO PARTIZIOAN) PARTIZIOAN GORDETA DAUDEN FITXATEGI GUZTIAK EZABATU ETA GALDUKO DIRA (EZ DIRA ZIFRATUKO)!Ziur zaude formatatu nahi duzula?</string>
+    <string lang="eu" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">KONTUZ: '%s'%s (adib. SISTEMAREN PARTIZIOAREN ATZEAN DAGOEN HURRENGO PARTIZIOAN) PARTIZIOAN GORDETA DAUDEN FITXATEGI GUZTIAK EZABATU ETA GALDUKO DIRA (EZ DIRA ZIFRATUKO)!Ziur zaude formatatu nahi duzula?</string>
     <string lang="eu" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">KONUZ: AUKERATUTAKO PARTIZIOAK DATU ASKO DAUZKA! Partizioan gordeta dauden datuak ezabatu eta galduko dira (EZ dira zifratuko)!</string>
     <string lang="eu" key="ERASE_FILES_BY_CREATING_VOLUME">Partizioan gordeta dauden fitxategi guztiak ezabatu han VeraCrypt bolumen bat sortuz</string>
     <string lang="eu" key="PASSWORD">Pasahitza</string>
@@ -658,7 +663,7 @@
     <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>
     <string lang="eu" key="PREV">&lt; &amp;Atzera</string>
     <string lang="eu" key="RAWDEVICES">Ezin izan da sisteman instalatuta dauden gailu gordinak zerrendan jarri!</string>
-    <string lang="eu" key="READONLYPROMPT">'%hs' bolumena existitzen da eta irakurtzeko bakarrik da. Ziur zaude ordezkatu nahi duzula?</string>
+    <string lang="eu" key="READONLYPROMPT">'%s' bolumena existitzen da eta irakurtzeko bakarrik da. Ziur zaude ordezkatu nahi duzula?</string>
     <string lang="eu" key="SELECT_DEST_DIR">Helmuga Karpeta Aukeratu</string>
     <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>
@@ -682,13 +687,13 @@
     <string lang="eu" key="TEST_CIPHERTEXT_SIZE">Eman duzun zifratutako testua luzeegia edo motzegia da.</string>
     <string lang="eu" key="TEST_KEY_SIZE">Frogetarako eman duzun gakoa luzeegia edo motzegia da.</string>
     <string lang="eu" key="TEST_PLAINTEXT_SIZE">Eman duzun testu argia luzeegia edo motzegia da.</string>
-    <string lang="eu" key="TWO_LAYER_CASCADE_HELP">Bi zifraketa bata bestearen ondoren XTS moduan. Bloke bakoitza lehendabizi %hs-rekin (%d biteko gakoa) zifratzen da eta gero %hs-rekin (%d biteko gakoa). Zifraketa bakoitzak bere gakoa erabiltzen du. Gako guztiak bata bestearekiko independienteak dira.</string>
+    <string lang="eu" key="TWO_LAYER_CASCADE_HELP">Bi zifraketa bata bestearen ondoren XTS moduan. Bloke bakoitza lehendabizi %s-rekin (%d biteko gakoa) zifratzen da eta gero %s-rekin (%d biteko gakoa). Zifraketa bakoitzak bere gakoa erabiltzen du. Gako guztiak bata bestearekiko independienteak dira.</string>
-    <string lang="eu" key="THREE_LAYER_CASCADE_HELP">Hiru zifraketa bata bestearen ondoren XTS moduan. Bloke bakoitza lehendabizi %hs-rekin (%d biteko gakoa) zifratzen da, gero %hs-rekin (%d biteko gakoa) eta azkenik %hs-rekin (%d biteko gakoa). Zifraketa bakoitzak bere gakoa erabiltzen du. Gako guztiak bata bestearekiko independienteak dira.</string>
+    <string lang="eu" key="THREE_LAYER_CASCADE_HELP">Hiru zifraketa bata bestearen ondoren XTS moduan. Bloke bakoitza lehendabizi %s-rekin (%d biteko gakoa) zifratzen da, gero %s-rekin (%d biteko gakoa) eta azkenik %s-rekin (%d biteko gakoa). Zifraketa bakoitzak bere gakoa erabiltzen du. Gako guztiak bata bestearekiko independienteak dira.</string>
     <string lang="eu" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Ohartu zaitez, sistema eragilearen konfigurazioaren arabera, auto-exekutatu eta auto-muntatu ezaugarriak bakarrik idatzi ezin daitezkeen CD/DVD motako gailuetan sortutako diska eramangarrietan ibiliko direla. Ohartu zaitez ere, hau ez dela TrueCypt-en akats bat (Windows-en muga bat da).</string>
     <string lang="eu" key="TRAVELER_DISK_CREATED">VeraCrypten diska eramangarria sortu da.\n\n Ohartu zaitez administratzaile baimenak behar dituzula VeraCrypt modu eramangarrian abiatzeko. Ohartu zaitez ere, erregsitro fitxategia begiratu eta gero, agian posible dela VeraCrypt Windows sistema batean abiatu zela ikustea nahiz eta modu eramangarrian abiatu izana.</string>
     <string lang="eu" key="TC_TRAVELER_DISK">VeraCrypt Disko Bidaiariak</string>
     <string lang="eu" key="TWOFISH_HELP">Diseinatzaileak: Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall eta Niels Ferguson. 1998an argitaratuta. 256 biteko gakoa, 128 biteko blokea. XTS funtzionatzeko modua. Towfish AES-eko finalista bat izan zen.</string>
-    <string lang="eu" key="MORE_INFO_ABOUT">Informazio gehiago %hs-ri buruz</string>
+    <string lang="eu" key="MORE_INFO_ABOUT">Informazio gehiago %s-ri buruz</string>
     <string lang="eu" key="UNKNOWN">Ezezaguna</string>
     <string lang="eu" key="ERR_UNKNOWN">Zehaztu gabeko errore bat edo errore ezezagun bat gertatu da (%d).</string>
     <string lang="eu" key="UNMOUNTALL_LOCK_FAILED">Bolumen batzuk sistemak edo aplikazioek erabiltzen ari diren fitxategiak edo karpetak dauzkate.\n\nDesmuntarazi?</string>
@@ -853,7 +858,7 @@
     <string lang="eu" key="INSTALL_FAILED">Instalazioak huts egin du.</string>
     <string lang="eu" key="UNINSTALL_FAILED">Desinstalazioak huts egin du.</string>
     <string lang="eu" key="DIST_PACKAGE_CORRUPTED">Banaketaren pakete hau hondatuta dago. Mesedez, saiatu zaitez berriro deskargatzen (hobe VeraCrypt-en weborri ofizialetik https://veracrypt.codeplex.com).</string>
-    <string lang="eu" key="CANNOT_WRITE_FILE_X">Ezin da %hs fitxategia idatzi</string>
+    <string lang="eu" key="CANNOT_WRITE_FILE_X">Ezin da %s fitxategia idatzi</string>
     <string lang="eu" key="EXTRACTING_VERB">Ateratzen</string>
     <string lang="eu" key="CANNOT_READ_FROM_PACKAGE">Ezin da paketeko informazioa irakurri.</string>
     <string lang="eu" key="CANT_VERIFY_PACKAGE_INTEGRITY">Distribuzio honen paketearen osotasuna ezin da egiaztatu.</string>
@@ -863,7 +868,7 @@
     <string lang="eu" key="SETUP_UPDATE_OK">VeraCrypt eguneratu da.</string>
     <string lang="eu" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt ondo eguneratu da. Ala ere, erabiltzen hasi baino lehen, ordenagailua berrabiatu egin behar da.\n\nOrain berrabiatu nahi al duzu?</string>
     <string lang="eu" key="SYS_ENC_UPGRADE_FAILED">VeraCrypt ezin izan da eguneratu !\n\nGARRANTZITSUA: Sistema itzali edo berrabiatu baino lehen, gogor gomendatzen dugu Sistemaren Berreskuratzea erabiltzea (Windows-en Hasiera menua &gt; Programa Guztiak &gt; Osagarriak &gt; Sistemaren Tresnak &gt; Sistemaren Berreskuratzea) eta 'VeraCrypt-en instalazioa' deritzon berreskuratze puntura bueltatzea. Sistemaren Berreskuratzea ez baldin badago eskuragarri, VeraCrypt-en bertsio zaharra edo berria berriz instalatzen saiatu beharko zinateke sistema itzali edo berrabiatu baino lehen.</string>
-    <string lang="eu" key="UNINSTALL_OK">VeraCrypt desinstalatu egin da.\n\n'Bukatu' sakatu VeraCrypt instalatzailea eta %hs karpeta ezabatzeko. Ohartu zaitez karpeta ez dela ezabatuko bertan VeraCrypt-en instalatzaileak edo VeraCrypt-ek berak sortu ez dituen fitxategiak baldin badaudet.</string>
+    <string lang="eu" key="UNINSTALL_OK">VeraCrypt desinstalatu egin da.\n\n'Bukatu' sakatu VeraCrypt instalatzailea eta %s karpeta ezabatzeko. Ohartu zaitez karpeta ez dela ezabatuko bertan VeraCrypt-en instalatzaileak edo VeraCrypt-ek berak sortu ez dituen fitxategiak baldin badaudet.</string>
     <string lang="eu" key="REMOVING_REG">VeraCrypt-en erregsitro sarrerak kentzen</string>
     <string lang="eu" key="ADDING_REG">Erregistroaren sarrera idazten</string>
     <string lang="eu" key="REMOVING_APPDATA">Aplikazioaren datu espezifikoak ezabatzen</string>
@@ -874,10 +879,10 @@
     <string lang="eu" key="CREATING_SYS_RESTORE">Sistemaren Berreskuratze Puntua Sortzen</string>
     <string lang="eu" key="FAILED_SYS_RESTORE">Ezin izan da Sistemaren Berreskuratze Puntua sortu!</string>
     <string lang="eu" key="INSTALLER_UPDATING_BOOT_LOADER">Hasieraketa kargatzailea eguneratzen</string>
-    <string lang="eu" key="INSTALL_OF_FAILED"> '%hs' instalatzerakoan huts egin du. %hs\nInstalatzen jarraitu nahi al duzu?</string>
+    <string lang="eu" key="INSTALL_OF_FAILED"> '%s' instalatzerakoan huts egin du. %s\nInstalatzen jarraitu nahi al duzu?</string>
-    <string lang="eu" key="UNINSTALL_OF_FAILED">'%hs' desinstalatzerakoan huts egin du. %hs\nDesinstalatzen jarraitu nahi al duzu?</string>
+    <string lang="eu" key="UNINSTALL_OF_FAILED">'%s' desinstalatzerakoan huts egin du. %s\nDesinstalatzen jarraitu nahi al duzu?</string>
     <string lang="eu" key="INSTALL_COMPLETED">Inslatazioa bukatu da.</string>
-    <string lang="eu" key="CANT_CREATE_FOLDER">'%hs' karpeta ezin izan da sortu</string>
+    <string lang="eu" key="CANT_CREATE_FOLDER">'%s' karpeta ezin izan da sortu</string>
     <string lang="eu" key="CLOSE_TC_FIRST">VeraCrypt gailu erabiltzailea ezin da deskargatu.\n\nMesedez, lehendabizi VeraCrypt lehio guztiak itxi itzazu. Honek konpontzen ez badu, Windows berrabiatu eta berriro saiatu zaitez, mesedez.</string>
     <string lang="eu" key="DISMOUNT_ALL_FIRST">VeraCrypt bolumen guztiak desmuntatu behar dira VeraCrypt instalatu edo desinstalatu baino lehen.</string>
     <string lang="eu" key="UNINSTALL_OLD_VERSION_FIRST">Sisteman VeraCrypt-en bertsio zaharkitu bat instalatuta dago. VeraCrypt-en bertsio berri hau instalatu baino lehen desinstalatu egin behar da.\n\nMezu lehio hau itxi bezain laister, bertsio zaharraren desinstalatzailea abiatuko da. Ohartu zaitez, ez dela bolumenik argituko VeraCrypt desinstalatzerakoan. VeraCrypt-en bertsio zaharra desinstalatu eta gero, VeraCrypt-en bertsio berriaren instalatzailea berriz abiatu ezazu..</string>
@@ -930,7 +935,7 @@
     <string lang="eu" key="FAVORITE_LABEL_DEVICE_PATH_ERR">Azpian dagoen gailua ez da, ez partizio bat, ez bolumen dinamiko bat. Horregatik, ezin zaio etiketarik jarri.</string>
     <string lang="eu" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Mesedez, azpian agertzen den partizioari mota aldatu iezaiozu Windowsek ezagutzen duen mota batera (Windowsen 'diskpart' tresnak daukan SETID komandoa erabiliz). Ondoren partizioa gogokoetatik kendu eta berriz ere gehitu ezazu. Honek partizioari etiketak gehitzea ahalbidetuko dizu.</string>
     <string lang="eu" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Windowsen limitazio batengatik, sare bidez banatzen den urrutiko fitxategi sistema batean dagoen edukiontzi bat ezin da sistemaren gogoko bezala muntatu (hala ere, gogoko bolumen arrunt bat bezela muntatu daiteke erabiltzaileak sesioa hasterakoan).</string>
-    <string lang="eu" key="ENTER_PASSWORD_FOR">%hs-rentzako pasahitza sartu</string>
+    <string lang="eu" key="ENTER_PASSWORD_FOR">%s-rentzako pasahitza sartu</string>
     <string lang="eu" key="ENTER_PASSWORD_FOR_LABEL">'%s'-rentzako pasahitza sartu</string>
     <string lang="eu" key="ENTER_NORMAL_VOL_PASSWORD">Bolumen normalaren/kanpokoaren pasahitza sartu</string>
     <string lang="eu" key="ENTER_HIDDEN_VOL_PASSWORD">Ezkutuko bolumenarentzako pasahitza sartu</string>
@@ -945,8 +950,8 @@
     <string lang="eu" key="VOL_HEADER_BACKED_UP">Bolumenaren goiburuaren babeskopia sortu egin da.\n\nGARRANTZITSUA: Bolumenaren goiburua leheneratzen baduzu babeskopia hau erabiliz bolumenaren oraingo pasahitza izango du. Gainera, bolumena muntatzeko gako-fitxategiak beharrezkoak badira, gako-fitxategi berdinak beharrezkoak izango dira bolumenaren gohiburua leheneratu eta gero bolumena muntatzeko.\n\nKONTUZ: Bolumenaren goiburuaren babeskopia BAKARRIK bolumen zehatz honen goiburua leheneratzeko balio du. Goiburuaren babeskopia hau bolumen ezberdin baten goiburua leheneratzeko erabiltzen baduzu, bolumena muntatzeko gai izango zara, baina EZIN izango duzu han gordetako daturik argitu (bere gako nagusia aldatuko baituzu).</string>
     <string lang="eu" key="VOL_HEADER_RESTORED">Bolumenaren goiburua leheneratu egin da.\n\nGARRANTZITSUA: Ohartu zaitez pasahitz zaharra leheneratu egin dela ere. Babeskopia egin zenean bolumena muntatzeko gako-fitxategirik behar bazen, gako fitxategi berdinak beharrezkoak dira orain bolumena berriro muntatzeko.</string>
     <string lang="eu" key="EXTERNAL_VOL_HEADER_BAK_FIRST_INFO">Sekurtasun arrazoiengatik, bolumenaren pasahitz zuzena (edo gako-fitxategi zuzenak) sartu beharko duzu.\n\nOharra: Bolumenak ezkutuko bolumena badauka, lehendabizi kanpoko bolumenaren pasahitz zuzena (edo gako-fitxategi zuzenak) sartu beharko duzu. Ondoren, ezkutuko bolumenaren goiburuaren babeskopia egitea aukeratzen baduzu, ezkutuko bolumenaren pasahitz zuzena (edo gako-fitxategi zuzenak) sartu beharko duzu.</string>
-    <string lang="eu" key="CONFIRM_VOL_HEADER_BAK">Ziur zaude %hs bolumenaren goiburuaren babeskopia egin nahi duzula?\n\n'Bai' klikatu eta gero, goiburuaren babeskopiarentzako fitxategi izen bat eskatuko da.\n\nOharra: Bolumen normalaren eta ezkutuko bolumenaren goiburuak berriz zifratuko dira ausazko datu ezberdinekin eta babeskopia fitxategian gordeko dira. Bolumen honetan ezkutuko bolumenik ez badago, babeskopia fitxategian ezkutuko bolumenarentzat dagoen tokia ausazko datuekin beteko da (ezeztapen onargarria mantentzeko). Bolumenaren goiburua babeskopia fitxategitik leheneratzerakoan, bolumenaren babeskopia sortu zen momentuko pasahitz zuzena (edo/eta gako fitxategi zuzenak) sartu behar izango duzu. Pasahitzak (edo/eta gako fitxategiek) erabakiko dute ere ze bolumenaren goiburua leheneratuko den, normala edo ezkutukoa (ohartu zaitez VeraCrypt-ek hau erabakitzen duela saiaketa eta errore prozesu baten bitartez).</string>
+    <string lang="eu" key="CONFIRM_VOL_HEADER_BAK">Ziur zaude %s bolumenaren goiburuaren babeskopia egin nahi duzula?\n\n'Bai' klikatu eta gero, goiburuaren babeskopiarentzako fitxategi izen bat eskatuko da.\n\nOharra: Bolumen normalaren eta ezkutuko bolumenaren goiburuak berriz zifratuko dira ausazko datu ezberdinekin eta babeskopia fitxategian gordeko dira. Bolumen honetan ezkutuko bolumenik ez badago, babeskopia fitxategian ezkutuko bolumenarentzat dagoen tokia ausazko datuekin beteko da (ezeztapen onargarria mantentzeko). Bolumenaren goiburua babeskopia fitxategitik leheneratzerakoan, bolumenaren babeskopia sortu zen momentuko pasahitz zuzena (edo/eta gako fitxategi zuzenak) sartu behar izango duzu. Pasahitzak (edo/eta gako fitxategiek) erabakiko dute ere ze bolumenaren goiburua leheneratuko den, normala edo ezkutukoa (ohartu zaitez VeraCrypt-ek hau erabakitzen duela saiaketa eta errore prozesu baten bitartez).</string>
-    <string lang="eu" key="CONFIRM_VOL_HEADER_RESTORE">Ziur zaude %hs -ren bolumenaren goiburua leheneratu nahi duzula?\n\nKONTUZ: Bolumenaren goiburua leheneratzeak bolumenaren pasahitza leheneratzen du ere, babeskopia egin zenean erabiltzen zenera, hain zuzen ere. Babeskopia egin zenean bolumena muntatzeko gako-fitxategirik behar bazen, bolumenaren gohiburua leheneratu eta gero gako-fitxategi berdinak behar izango dira berriro bolumena muntatzeko.\n\n'Bai' sakatu eta gero, goiburuaren babeskopia fitxategia aukeratuko duzu.</string>
+    <string lang="eu" key="CONFIRM_VOL_HEADER_RESTORE">Ziur zaude %s -ren bolumenaren goiburua leheneratu nahi duzula?\n\nKONTUZ: Bolumenaren goiburua leheneratzeak bolumenaren pasahitza leheneratzen du ere, babeskopia egin zenean erabiltzen zenera, hain zuzen ere. Babeskopia egin zenean bolumena muntatzeko gako-fitxategirik behar bazen, bolumenaren gohiburua leheneratu eta gero gako-fitxategi berdinak behar izango dira berriro bolumena muntatzeko.\n\n'Bai' sakatu eta gero, goiburuaren babeskopia fitxategia aukeratuko duzu.</string>
     <string lang="eu" key="DOES_VOLUME_CONTAIN_HIDDEN">Bolumen honek ezkutuko bolumenik ba al dauka?</string>
     <string lang="eu" key="VOLUME_CONTAINS_HIDDEN">Bolumenak ezkutuko bolumen bat dauka</string>
     <string lang="eu" key="VOLUME_DOES_NOT_CONTAIN_HIDDEN">Bolumenak ez dauka ezkutuko bolumenik</string>
@@ -957,12 +962,14 @@
     <string lang="eu" key="VOLUME_HAS_NO_BACKUP_HEADER">Bolumen honetan ez dago kapsulatutako goiburuaren babeskopiarik (Ohartu zaitez VeraCrypt 6.0 edo geroagoko programekin sortutako bolumenek bakarrik daukatela kapsulatutako goiburuaren babeskopiak).</string>
     <string lang="eu" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">Sistemaren partizioa/unitatearen goiburuaren babeskopia egiten saiatzen ari zara. Hau ez dago onartua. Sistemaren unitate/partizioaren babeskopia egiteko edo babeskopiatik leheneratzeko beharrezkoa da VeraCrypt Salbatze Diska erabiltzea.\n\nVeraCrypt-en Salbatze Diska sortu nahi?</string>
     <string lang="eu" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">VeraCrypt bolumen birtual baten goiburua leheneratzen saiatzen ari zara baina sistemaren partizio/unitatearen bolumena aukeratu duzu. Hau ez dago onartuta. Sistemaren partizioa/unitatean babeskopia eta leheneratze eragiketak VeraCrypt Salbatze Diska erabiliz bakarrik egin daitezke.\n\nVeraCrypt Salbatze Diska sortu nahi?</string>
-    <string lang="eu" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">'Ados' sakatu eta gero, VeraCrypt-en Salbatze Diskaren ISO irudia gordetzeko izena eta hura gorde nahi duzun tokia hautatu beharko dituzu</string>
+    <string lang="eu" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">'Ados' sakatu eta gero, VeraCrypt-en Salbatze Diskaren irudia gordetzeko izena eta hura gorde nahi duzun tokia hautatu beharko dituzu</string>
-    <string lang="eu" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">Salbatze Diskaren irudia sortu da eta fitxategi honetan gorde da:\n%hs\n\nOrain Salbatze Diskaren irudi hori CD edo DVD batean idatzi behar duzu.\n\nGARRANTZITSUA: Ohartu zaitez fitxategia ISO diska irudi baten moduan idatzi behar dela CD/DVD-an (ez fitxategi bat bezala). Hori egiteko informazio gehiago behar baduzu, zure CD/DVD-ak grabatzeko softwarearen dokumentazioa irakurri ezazu.\n\nSalbatze Diska idatzi eta gero, 'Sistema' &gt; 'Salbatze Diska egiaztatu' aukeratu ezazu ondo idatzi dela ziurtatzeko.</string>
+    <string lang="eu" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">Salbatze Diskaren irudia sortu da eta fitxategi honetan gorde da:\n%s\n\nOrain Salbatze Diskaren irudi hori CD edo DVD batean idatzi behar duzu.\n\nGARRANTZITSUA: Ohartu zaitez fitxategia ISO diska irudi baten moduan idatzi behar dela CD/DVD-an (ez fitxategi bat bezala). Hori egiteko informazio gehiago behar baduzu, zure CD/DVD-ak grabatzeko softwarearen dokumentazioa irakurri ezazu.\n\nSalbatze Diska idatzi eta gero, 'Sistema' &gt; 'Salbatze Diska egiaztatu' aukeratu ezazu ondo idatzi dela ziurtatzeko.</string>
-    <string lang="eu" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">Salbatze Diska sortu da eta ondorengo fitxategian sortu da:\n%hs\n\nOrain Salbatze Diskaren irudia CD edo DVD batean idatzi behar duzu.\n\nMicrosoft Windows-en Diska Irudi Idazlea abiatu nahi al duzu?\nOharra: Salbatze Diska idatzi eta gero, 'Sistema' &gt; 'Salbatze Diska Egiaztatu' aukeratu ezazu ondo idatzi dela ziurtatzeko.</string>
+    <string lang="eu" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">Salbatze Diska sortu da eta ondorengo fitxategian sortu da:\n%s\n\nOrain Salbatze Diskaren irudia CD edo DVD batean idatzi behar duzu.\n\nMicrosoft Windows-en Diska Irudi Idazlea abiatu nahi al duzu?\nOharra: Salbatze Diska idatzi eta gero, 'Sistema' &gt; 'Salbatze Diska Egiaztatu' aukeratu ezazu ondo idatzi dela ziurtatzeko.</string>
-    <string lang="eu" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Mesedez, zure VeraCrypt Salbatze Diska zure CD/DVD unitatean sartu ezazu eta Ados klikatu hura egiaztatzeko.</string>
+    <string lang="eu" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Mesedez, zure VeraCrypt Salbatze Diska zure ezazu eta Ados klikatu hura egiaztatzeko.</string>
     <string lang="eu" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">VeraCrypt salbatze diska arazorik aurkitu gabe egiaztatu da.</string>
     <string lang="eu" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">Ezin da egiaztatu Salbatze Diska akatsik gabe idatzi dela.\n\nSalbatze Diska idatzi baduzu, mesedez, CD/DVD-a atera eta berriz sartu ezazu; gero berriro saiatu. Honek laguntzen ez badu, saiatu zaitez CD/DVD-ak idazteko beste programa batekin edo beste gailu batean idazten.\n\nBeste gako nagusi, pasahitz e.a. ezberdin batentzako sortu den VeraCrypt Salbatze Diska egiaztatzen saiatzen bazara, ohartu zaitez Salbatze Diskak egiaztatze honetan beti errorea emango duela. Daukazun konfigurazioarekin guztiz bateragarria den Salbatze Diska Sortzeko, 'Sistema' &gt; 'Salbatze Diska Sortu' aukeratu ezazu.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk image fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
     <string lang="eu" key="ERROR_CREATING_RESCUE_DISK">TrueCryp-en Salbatze Diska Sortzerakoan Errorea.</string>
     <string lang="eu" key="CANNOT_CREATE_RESCUE_DISK_ON_HIDDEN_OS">VeraCrypt-en Salbatze Diska ezin da sortu ezkutuko sistema eragile bat martxan dagoenean.\n\nVeraCrypt-en Salbatze Diska sortzeko, sistema eragile amua hasieratu eta 'Sistema' &gt; 'Salbatze Diska Sortu' aukeratu ezazu.</string>
     <string lang="eu" key="RESCUE_DISK_CHECK_FAILED">&gt;Ezin da egiaztatu Salbatze Diska akatsik gabe idatzi dela.\n\nSalbatze Diska idatzi baduzu, mesedez, CD/DVD-a atera eta berriz sartu ezazu; gero 'Hurrengoa' sakatu eta berriro klik egin ezazu. Honek lagunzten ez badu beste gailu batekin %s saiatu zaitez.\n\nSalbatze Diska oraindik idatzi ez baduzu, mesedez, hori egin ezazu eta 'Hurrengoa' sakatu\n\nLaguntzaile hau hasi baino lehen egindago VeraCrypt Salbatze Diska bat egiaztatzen saiatzen bazara, ohartu zaitez Salbatze Diska hori ezin izango dela erabili, gako nagusi ezberdin batentzako sortu baitzen. Orain sortutako Salbatze Diska idatzi behar duzu.</string>
@@ -991,8 +998,8 @@
     <string lang="eu" key="DRIVE_LETTER_ITEM">Unitatearen Letra:   </string>
     <string lang="eu" key="UNSUPPORTED_CHARS_IN_PWD">Errorea: Pasahitzak ASCII karaktereak bakarrik izan ditzake.\n\nSistemaren konfigurazioa aldatzen bada pasahitzan dauden ASCII ez diren karaktereak muntaketa eragotzi dezakete.\n\nHurrengo karaktereak erabili daitezke:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="eu" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">Kontuz: Pasahitzak ASCII ez diren karaktereak ditu. Honek bolumena ezin muntatzea eragin dezake zure sistemaren konfigurazioa aldatzen bada.\n\nPasahitzan dituzun ASCII ez diren karaktereak ASCII karaktereen ordez aldatu beharko zenituzke. Hau egiteko, 'Volumenak' -&gt; 'Change Volume Password' sakatu ezazu. Ondorengo hauek ASCII karaktereak dira:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="eu" key="EXE_FILE_EXTENSION_CONFIRM">KONTUZ: Gogor gomendatzen dugu fitxategi exekutagarrien fitxategi luzapenak (adibidez, .exe, .sys, edo .dll) eta bestelako arazodun fitxategi luzapenak ez erabiltzea. Fitxategi luzapen hauek erabiltzeak Windows eta antibirusek edukiontzietan oztopatzea ekartzen du, honek bolumenaren abiaduran eragin okerra dauka eta beste arazo garrantzitsuak sortu ditzake.\n\nGogor gomendatzen dugu fitxategiaren luzapena kentzea edo aldatzea (adibidez '.tc'-ra).\n\nZiur zaude arazoak ematen dituen fitxategi luzapena erabili nahi duzula?</string>
+    <string lang="eu" key="EXE_FILE_EXTENSION_CONFIRM">KONTUZ: Gogor gomendatzen dugu fitxategi exekutagarrien fitxategi luzapenak (adibidez, .exe, .sys, edo .dll) eta bestelako arazodun fitxategi luzapenak ez erabiltzea. Fitxategi luzapen hauek erabiltzeak Windows eta antibirusek edukiontzietan oztopatzea ekartzen du, honek bolumenaren abiaduran eragin okerra dauka eta beste arazo garrantzitsuak sortu ditzake.\n\nGogor gomendatzen dugu fitxategiaren luzapena kentzea edo aldatzea (adibidez '.hc'-ra).\n\nZiur zaude arazoak ematen dituen fitxategi luzapena erabili nahi duzula?</string>
-    <string lang="eu" key="EXE_FILE_EXTENSION_MOUNT_WARNING">KONTUZ: Edukiontziak fitxategi exekutagarrientzako erabiltzen den luzapena dauka (adibidez, .exe, .sys, edo .dll) edo arazoak sortu ditzaken antzeko luzapen bat. Fitxategi luzapen hauek erabiltzeak Windows eta antibirusek edukiontzietan oztopatzea ekartzen du, honek bolumenaren abiaduran eragin okerra dauka eta beste arazo garrantzitsuak sortu ditzake.\n\nGogor gomendatzen dugu fitxategiaren luzapena kentzea edo aldatzea (adibidez '.tc'-ra) bolumena desmuntatu eta gero.</string>
+    <string lang="eu" key="EXE_FILE_EXTENSION_MOUNT_WARNING">KONTUZ: Edukiontziak fitxategi exekutagarrientzako erabiltzen den luzapena dauka (adibidez, .exe, .sys, edo .dll) edo arazoak sortu ditzaken antzeko luzapen bat. Fitxategi luzapen hauek erabiltzeak Windows eta antibirusek edukiontzietan oztopatzea ekartzen du, honek bolumenaren abiaduran eragin okerra dauka eta beste arazo garrantzitsuak sortu ditzake.\n\nGogor gomendatzen dugu fitxategiaren luzapena kentzea edo aldatzea (adibidez '.hc'-ra) bolumena desmuntatu eta gero.</string>
     <string lang="eu" key="HOMEPAGE">Horri-Nagusia</string>
     <string lang="eu" key="LARGE_IDE_WARNING_XP">KONTUZ: Badirudi ez diozula Service Pack-ik instalatu zure Windowseko instalazioari. Ez zenuke idatzi behar 128GB baino gehiago dituzten IDE diskoetan Service Pack 1 edo gehiago ez duten Windows XP-tan! Egiten baduzu, diskan dauden datuak (berdin dio VeraCrypt bolumen bat den edo ez) hondatu daitezke. Ohartu zaitez hau Windowsen muga bat dela, ez VeraCrypt-en akats bat.</string>
     <string lang="eu" key="LARGE_IDE_WARNING_2K">KONTUZ: Badirudi ez diozula Service Pack edo ondorengorik jarri zure Windows instalazioari. Ez zenuke idatzi behar 128GB baino gehiago dituzten IDE diskoetan Service Pack 3 edo gehiago ez duten Windows 2000-tan! Egiten baduzu, diskan dauden datuak (berdin dio VeraCrypt bolumen bat den edo ez) hondatu daitezke. Ohartu zaitez hau Windowsen muga bat dela, ez VeraCrypt-en akats bat.\n\nOharra: Horretaz gain, agian 48 bit-eko LBA onartzea gaitu beharko duzu erregistroan; informazio gehiago nahi baduzu, http://support.microsoft.com/kb/305098/EN-US begiratu ezazu.</string>
@@ -1052,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="eu" key="CHECKING_FS">%s bezala muntatutako VeraCrypt bolumenaren fitxategi sistema egiaztatzen...</string>
-    <string lang="eu" key="REPAIRING_FS">%hs bezala muntatutako VeraCrypt bolumenaren fitxategi sistema konpontzen saiatzen...</string>
+    <string lang="eu" key="REPAIRING_FS">%s bezala muntatutako VeraCrypt bolumenaren fitxategi sistema konpontzen saiatzen...</string>
-    <string lang="eu" key="WARN_CBC_MODE">Kontuz: Bolumen hau CBC moduan zifratuta dago. Sekurtasun arazoengatik, CBC modua zaharkituta gelditu da VeraCrypt 4.1-ez geroztik.\n\nGogor gomendazen dugu datu hauek VeraCrypt bolumen honetik VeraCrypt-en bertsio honekin egindako VeraCrypt bolumen batera. Hau egin eat gero, bolumen zaharra sekurtasunez ezabatu eta suntsitu beharko zenuke. Informazio gehiago nahi baduzu, dokumentazioan Bertsioen Historia begiratu ezazu edo VeraCrypt 4.1 eta gerokoekin agertu diren argitalpenen oharrak..</string>
     <string lang="eu" key="WARN_64_BIT_BLOCK_CIPHER">Kontuz: bolumen hau algoritmo zaharkitu batekin zifratuta dago.\n\n 64 biteko blokeak erabiltzen dituzten algoritmo guztiak (adib. Blowfish, CAST-128 edo DES hirukoitza) zaharkituta daude. Etorkizuneko VeraCrypt bertsioetan bolumen hau muntatu ahal izango da. Hala ere, ez da hobekuntzarik egingo zifratze algoritmo zaharkitu hauetan. Gomendatzen dizugu 128 biteko blokeak erabiltzen dituen zifratze algoritmo batekin (adib. AES; Serpent, Towfish e.a.) VeraCrypt bolumen berri bat egitea eta fitxategiak bolumen zaharretik berrira mugitzea.</string>
     <string lang="eu" key="SYS_AUTOMOUNT_DISABLED">Zure sistema ez dago konfiguratuta bolumen berriak auto-muntatzeko. Ezinezkoa izan daiteke gailuan ostatutako VeraCrypt bolumenak muntatzea. Auto-muntatzea aktibatu daiteke hurrengo komandoa exekutatuz eta sistema berrabiatuz.\n\nmountvol.exe /E</string>
     <string lang="eu" key="SYS_ASSIGN_DRIVE_LETTER">Mesedez unitate letra bat eman iezaiozu partizio/gailuari jarraitu aurretik ( 'Kontrol-panela' &gt; 'Sistema eta Mantentzea' &gt; 'Tresna Administratiboak' - 'Disko gogorrean partizioak egin eta formatatu').\n\nOhartu zaitez hau sistema eragilearen eskakizuna dela.</string>
@@ -1071,7 +1077,7 @@
     <string lang="eu" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt-ek jadanik ez du onartzen Service Pack instalatuta ez daukan Windows Vista-tan sistemaren partizioa/unitatea zifratzea. VeraCrypt eguneratu baino lehen, mesedez, Windows Vistaren Service Pack 1 edo ondorengo bat instalatu ezazu.</string>
     <string lang="eu" key="FEATURE_REQUIRES_INSTALLATION">Errorea: Ezaugarri honek beharrezkoa du VeraCrypt sisteman instalatuta egotea (VeraCrypt modu eramangarrian erabiltzen ari zara)\n\nMesedez, VeraCrypt instalatu ezazu eta berriro saiatu..</string>
     <string lang="eu" key="WINDOWS_NOT_ON_BOOT_DRIVE_ERROR">KONTUZ: Ez dirudi Windows hasieratzen den unitatean instalatuta dagoenik. Hau ez dago onartuta.\n\nWindows hasieratzen den unitatean instalatuta dagoela ziur badakizu bakarrik jarraitu beharko zenuke.\n\nJarraitu nahi duzu?</string>
-    <string lang="eu" key="GPT_BOOT_DRIVE_UNSUPPORTED">Zure sistemaren unitateak GUID partizio taula dauka (GPT). Orain, MBR partizio taula daukaten unitateak bakarrik onartzen dira.</string>
+    <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</string>
     <string lang="eu" key="TC_BOOT_LOADER_ALREADY_INSTALLED">KONTUZ: VeraCrypt-en Hasieraketa Kargazailea dagoeneko sistemaren unitatean instalatuta dago!\n\nIzan daiteke dagoeneko zure ordenagailuan beste sistema bat zifratuta egotea.\n\nKONTUZ: ORAIN MARTXAN DAGOEN SISTEMAREN ZIFRAKETAK BESTE SISTEMAK ABIAEZINAK ETA EUREN DATUAK ESKURAEZINAK UTZI DITZAKE.\n\nZiur zaude jarraitu nahi duzula?</string>
     <string lang="eu" key="SYS_LOADER_RESTORE_FAILED">    Jatorrizko sistemaren kargatzailea leheneratzerakoan huts egin du.\n\nMesedez zure VeraCrypt-en Salbatze Diska erabili ezazu ('Konponketa Aukerak' &gt; 'Sistemaren kargatzaile originalera leheneratu') edo Windows instalazio diska erabili ezazu Windowsen sistemaren kargatzailea VeraCrypt-en Hasieraketa Kargatzailea ordez jartzeko.</string>
     <string lang="eu" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">Sitemaren kargatzaile originala ez da Salbatze Diskan gordeko (honen zergatia: agian babeskopia fitxategi bat falta da).</string>
@@ -1110,8 +1116,8 @@
     <string lang="eu" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Oharra: Pasahitza hasieraketa aurreko ingurunean idatzi beharko da (Windows hasi aurretik) eta bertan ez daude eskuragarri EB-etako Windows teklatua ez diren teklatu diseinuak. Hortaz, pasahitzak beti sartu behar dira EB-etako teklatu diseinu estandarra erabiliz. Hala ere, garrantzitsua da jakitea EZ duzula behar benetazko EB-etako teklatua. VeraCrypt-ek automatikoki ziurtatzen da pasahitza sekurtasunez sartu dezakezula (orain eta hasieraketa aurreko ingurunean) nahiz eta EB-etako teklatu fisikorik EZ izan.</string>
     <string lang="eu" key="RESCUE_DISK_INFO">Unitate/Partizioa zifratu aurretik, VeraCrypt Salbatze Diska (TSD) sortu behar duzu, TSDk honetarako balio du:\n\n- VeraCrypt Hasieraketa Kargatzailea, gako nagusia edo beste nahitaezko daturen bat hondatzen bada, TSDk hori leheneratzera lagunduko dizu (ohartu zaitez, edozein modutan pasahitz zuzena sartu beharko duzula).\n\n- Windows hondatu eta ezin bada abiatu, TSDak Windows hasi aurretik parizio/unitate osoa argitu dezake.\n\n- TSKak diskaren lehendabiziko pistaren babeskopia izango du (non normalean sistemaren kargatzailea edo hasieraketa kudeatzailea dauden) eta beharrezkoa bada hura leheneratzen utziko dizu.\n\nVeraCrypt Salbatze Diskaren ISO irudia azpian dagoen helbidean sortuko da.</string>
     <string lang="eu" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">'Ados' sakatu eta gero Mikrosoft Windows Image Burner programa abiatuko da. Mesedez, hau erabili ezazu VeraCrypt Salbatze Diskaren ISO irudia CD edo DVD batean idazteko.\n\nHori egin eta gero VeraCrypt Bolumenak Sortzeko Laguntzailera bueltatu zaitez eta haren jarraibideak bete itzazu.</string>
-    <string lang="eu" key="RESCUE_DISK_BURN_INFO">Salbatze diska sortu da eta fitxategi honetan gorde da:\n%hs\n\nOrain CD edo DVD batean idatzi behar duzu.\n\n%lsSalbatze Diska sortu eta gero, 'Hurrengoa' saktu ondo idatzi dela ziurtatzeko.</string>
+    <string lang="eu" key="RESCUE_DISK_BURN_INFO">Salbatze diska sortu da eta fitxategi honetan gorde da:\n%s\n\nOrain CD edo DVD batean idatzi behar duzu.\n\n%lsSalbatze Diska sortu eta gero, 'Hurrengoa' saktu ondo idatzi dela ziurtatzeko.</string>
-    <string lang="eu" key="RESCUE_DISK_BURN_INFO_NO_CHECK">Salbatze Diskaren irudia sortu eta fitxategi honetan gorde da:\n%hs\n\nOrain irudia CD/DVD batean idatzi beharko zenuke edo toki seguru batera eraman ezazu etorkizunean erabili ahal izateko.\n\n%lsHurrengoa sakatu jarraitzeko.</string>
+    <string lang="eu" key="RESCUE_DISK_BURN_INFO_NO_CHECK">Salbatze Diskaren irudia sortu eta fitxategi honetan gorde da:\n%s\n\nOrain irudia CD/DVD batean idatzi beharko zenuke edo toki seguru batera eraman ezazu etorkizunean erabili ahal izateko.\n\n%lsHurrengoa sakatu jarraitzeko.</string>
     <string lang="eu" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">GARRANTZITSUA: Ohartu zaitez fitxategia ISO diska irudi bat bezala idatzi behar dela CD/DVD-an (ez fitxategi bakar bat bezala). Hau egiteko informazio gehiago nahi baduzu, zure CD/DVD-ak idazteko softwarearen dokumentazioan bilatu ezazu. CD/DVD batean ISO diska irudi bat idazteko gai den softwarrerik ez baduzu, sakatu ezazu hondorengo lotura hori egiten duen software libre bat deskargatzeko.\n\n</string>
     <string lang="eu" key="LAUNCH_WIN_ISOBURN">Micrsoft Windows-en Disko Irudien Grabatzailea abiatu</string>
     <string lang="eu" key="RESCUE_DISK_BURN_NO_CHECK_WARN">KONTUZ: Dagoeneko VeraCrypt Salbatze Diska bat sortu baduzu, ezin da sistemaren partizio/diska honetan berrerabili gako nagusi ezberdin batentzako sortu zelako. Sistemaren partizio/unitate bat zifratzen duzun bakoitzean, VeraCrypt Salbatze Diska berria sortu behar duzu pasahitz berdina badute ere.</string>
@@ -1374,6 +1380,39 @@
     <string lang="eu" key="TB_PER_SEC">TB/s</string>
     <string lang="eu" key="PB_PER_SEC">PB/s</string>
     <string lang="eu" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.fa.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="fa" name="فارسي" en-name="Persian" version="0.1.0" translators="Ali Bitazar, Rodabeh Sarmadi" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="en" key="IDC_BROWSE">Bro&amp;wse...</control>
     <control lang="en" key="IDC_DESKTOP_ICON">Add VeraCrypt icon to &amp;desktop</control>
     <control lang="en" key="IDC_DONATE">Donate now...</control>
-    <control lang="en" key="IDC_FILE_TYPE">Associate the .tc file &amp;extension with VeraCrypt</control>
+    <control lang="en" key="IDC_FILE_TYPE">Associate the .hc file &amp;extension with VeraCrypt</control>
     <control lang="en" key="IDC_OPEN_CONTAINING_FOLDER">&amp;Open the destination location when finished</control>
     <control lang="en" key="IDC_PROG_GROUP">Add VeraCrypt to &amp;Start menu</control>
     <control lang="en" key="IDC_SYSTEM_RESTORE">Create System &amp;Restore point</control>
@@ -37,19 +37,21 @@
     <control lang="en" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Download CD/DVD recording software</control>
     <control lang="en" key="IDC_FILE_CONTAINER">Create an encrypted file container</control>
     <control lang="en" key="IDC_GB">&amp;GB</control>
+    <control lang="en" key="IDC_TB">&amp;TB</control>
     <control lang="en" key="IDC_HIDDEN_SYSENC_INFO_LINK">More information</control>
     <control lang="en" key="IDC_HIDDEN_VOL">Hi&amp;dden VeraCrypt volume </control>
     <control lang="en" key="IDC_HIDDEN_VOL_HELP">More information about hidden volumes</control>
     <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="fa" key="IDC_KB">&amp;كيلوبايت</control>
+    <control lang="fa" key="IDC_KB">&amp;KB</control>
     <control lang="fa" key="IDC_KEYFILES_ENABLE">از كليدفايلها استفاده نماييد</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="fa" key="IDC_KEY_FILES">كليد فايلها ...</control>
     <control lang="en" key="IDC_LINK_HASH_INFO">Information on hash algorithms</control>
     <control lang="en" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">More information</control>
     <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
-    <control lang="fa" key="IDC_MB">&amp;مگابايت</control>
+    <control lang="fa" key="IDC_MB">&amp;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>
@@ -58,7 +60,8 @@
     <control lang="fa" key="IDC_NO_HISTORY">هيچگونه اثري را ذخيره نكند</control>
     <control lang="fa" key="IDC_OPEN_OUTER_VOLUME">پارتيشن بيروني را انتخاب كند</control>
     <control lang="en" key="IDC_PAUSE">&amp;Pause</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <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">&amp;Display password</control>
@@ -118,6 +121,7 @@
     <control lang="fa" key="IDC_CREATE">بساز</control>
     <control lang="fa" key="IDC_CREATE_VOLUME">&amp;ساخت پارتيشن</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <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="fa" key="IDC_ENABLE_KEYFILES">از كليد فايل استفاده كند</control>
     <control lang="fa" key="IDC_ENABLE_NEW_KEYFILES">از كليد فايل استفاده كند</control>
@@ -132,6 +136,7 @@
     <control lang="en" key="IDC_FAVORITE_MOVE_UP">Move &amp;Up</control>
     <control lang="en" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Open &amp;Explorer window for selected volume when successfully mounted</control>
     <control lang="en" key="IDC_FAVORITE_REMOVE">&amp;Remove</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="en" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Global Settings</control>
     <control lang="en" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Display balloon tooltip after successful hot-key dismount</control>
     <control lang="en" key="IDC_HK_DISMOUNT_PLAY_SOUND">Play system notification sound after successful hot-key dismount</control>
@@ -189,7 +194,7 @@
     <control lang="en" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="en" key="IDD_PASSWORDCHANGE_DLG">Change Password or Keyfiles</control>
     <control lang="en" key="IDD_PASSWORD_DLG">Enter VeraCrypt Volume Password</control>
-    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance Options</control>
+    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance and Driver Options</control>
     <control lang="en" key="IDD_PREFERENCES_DLG">VeraCrypt - Preferences</control>
     <control lang="en" key="IDD_SYSENC_SETTINGS">VeraCrypt - System Encryption Settings</control>
     <control lang="en" key="IDD_TOKEN_PREFERENCES">VeraCrypt - Security Token Preferences</control>
@@ -235,7 +240,7 @@
     <control lang="en" key="IDM_ONLINE_TUTORIAL">Beginner's Tutorial</control>
     <control lang="en" key="IDM_ORGANIZE_FAVORITES">Organize Favorite Volumes...</control>
     <control lang="en" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organize System Favorite Volumes...</control>
-    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance...</control>
+    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance/Driver Configuration</control>
     <control lang="en" key="IDM_PERMANENTLY_DECRYPT_SYS">Permanently Decrypt System Partition/Drive</control>
     <control lang="en" key="IDM_PREFERENCES">Preferences...</control>
     <control lang="en" key="IDM_REFRESH_DRIVE_LETTERS">Refresh Drive Letters</control>
@@ -256,6 +261,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 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>
@@ -365,7 +371,7 @@
     <control lang="en" key="IDT_SECURITY_TOKEN">Security token:</control>
     <control lang="en" key="IDT_SORT_METHOD">Sort Method:</control>
     <control lang="en" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Please wait. This process may take a long time...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="en" key="IDT_TEST_BLOCK_NUMBER">Block number:</control>
     <control lang="en" key="IDT_TEST_CIPHERTEXT">Ciphertext (hexadecimal)</control>
     <control lang="en" key="IDT_TEST_DATA_UNIT_NUMBER">Data unit number (64-bit hexadecimal, data unit size is 512 bytes)</control>
@@ -410,13 +416,13 @@
     <string lang="en" key="CIPHER_TITLE">Encryption Options</string>
     <string lang="en" key="CLEAN_WINMRU_FAILED">WARNING: Failed to clear the path of the last selected volume/keyfile (remembered by file selector)!</string>
     <string lang="en" key="COMPRESSION_NOT_SUPPORTED">Error: The container has been compressed at the filesystem level. VeraCrypt does not support compressed containers (note that compression of encrypted data is ineffective and redundant).\n\nPlease disable compression for the container by following these steps:\n1) Right-click the container in Windows Explorer (not in VeraCrypt).\n2) Select 'Properties'.\n3) In the 'Properties' dialog box, click 'Advanced'.\n4) In the 'Advanced Attributes' dialog box, disable the option 'Compress contents to save disk space' and click 'OK'.\n5) In the 'Properties' dialog box, click 'OK'.</string>
-    <string lang="en" key="CREATE_FAILED">Failed to create volume %hs</string>
+    <string lang="en" key="CREATE_FAILED">Failed to create volume %s</string>
-    <string lang="en" key="DEVICE_FREE_BYTES">Size of %hs is %.2f bytes</string>
+    <string lang="en" key="DEVICE_FREE_BYTES">Size of %s is %.2f bytes</string>
-    <string lang="en" key="DEVICE_FREE_KB">Size of %hs is %.2f KB</string>
+    <string lang="en" key="DEVICE_FREE_KB">Size of %s is %.2f KB</string>
-    <string lang="en" key="DEVICE_FREE_MB">Size of %hs is %.2f MB</string>
+    <string lang="en" key="DEVICE_FREE_MB">Size of %s is %.2f MB</string>
-    <string lang="en" key="DEVICE_FREE_GB">Size of %hs is %.2f GB</string>
+    <string lang="en" key="DEVICE_FREE_GB">Size of %s is %.2f GB</string>
-    <string lang="en" key="DEVICE_FREE_TB">Size of %hs is %.2f TB</string>
+    <string lang="en" key="DEVICE_FREE_TB">Size of %s is %.2f TB</string>
-    <string lang="en" key="DEVICE_FREE_PB">Size of %hs is %.2f PB</string>
+    <string lang="en" key="DEVICE_FREE_PB">Size of %s is %.2f PB</string>
     <string lang="en" key="DEVICE_IN_USE_FORMAT">WARNING: The device/partition is in use by the operating system or applications. Formatting the device/partition might cause data corruption and system instability.\n\nContinue?</string>
     <string lang="en" key="DEVICE_IN_USE_INPLACE_ENC">Warning: The partition is in use by the operating system or applications. You should close any applications that might be using the partition (including antivirus software).\n\nContinue?</string>
     <string lang="en" key="FORMAT_CANT_DISMOUNT_FILESYS">Error: The device/partition contains a file system that could not be dismounted. The file system may be in use by the operating system. Formatting the device/partition would very likely cause data corruption and system instability.\n\nTo solve this issue, we recommend that you first delete the partition and then recreate it without formatting. To do so, follow these steps:\n1) Right-click the 'Computer' (or 'My Computer') icon in the 'Start Menu' and select 'Manage'. The 'Computer Management' window should appear.\n2) In the 'Computer Management' window, select 'Storage' &gt; 'Disk Management'.\n3) Right-click the partition you want to encrypt and select either 'Delete Partition', or 'Delete Volume', or 'Delete Logical Drive'.\n4) Click 'Yes'. If Windows asks you to restart the computer, do so. Then repeat the steps 1 and 2 and continue from the step 5.\n5) Right-click the unallocated/free space area and select either 'New Partition', or 'New Simple Volume', or 'New Logical Drive'.\n6) The 'New Partition Wizard' or 'New Simple Volume Wizard' window should appear now; follow its instructions. On the wizard page entitled 'Format Partition', select either 'Do not format this partition' or 'Do not format this volume'. In the same wizard, click 'Next' and then 'Finish'.\n7) Note that the device path you have selected in VeraCrypt may be wrong now. Therefore, exit the VeraCrypt Volume Creation Wizard (if it is still running) and then start it again.\n8) Try encrypting the device/partition again.\n\nIf VeraCrypt repeatedly fails to encrypt the device/partition, you may want to consider creating a file container instead.</string>
@@ -435,15 +441,15 @@
     <string lang="en" key="INPLACE_ENC_INVALID_PATH">Error: VeraCrypt can in-place encrypt only a partition, a dynamic volume, or an entire system drive. Please make sure the specified path is valid.</string>
     <string lang="en" key="CANNOT_RESIZE_FILESYS">Error: Cannot shrink the filesystem (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPossible causes and solutions:\n\n- Not enough free space on the volume. Please make sure no other application is writing to the filesystem.\n\n- Corrupted file system. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
     <string lang="en" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Error: There is not enough free space on the volume and so the filesystem cannot be shrunk (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPlease delete any redundant files and empty the Recycle Bin so as to free at least 256 KB of space and then try again. Note that due to a Windows issue, the amount of free space reported by the Windows Explorer may be incorrect until the operating system is restarted. If restarting the system does not help, the file system may be corrupted. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
-    <string lang="en" key="DISK_FREE_BYTES">Free space on drive %hs is %.2f bytes.</string>
+    <string lang="en" key="DISK_FREE_BYTES">Free space on drive %s is %.2f bytes.</string>
-    <string lang="en" key="DISK_FREE_KB">Free space on drive %hs is %.2f KB</string>
+    <string lang="en" key="DISK_FREE_KB">Free space on drive %s is %.2f KB</string>
-    <string lang="en" key="DISK_FREE_MB">Free space on drive %hs is %.2f MB</string>
+    <string lang="en" key="DISK_FREE_MB">Free space on drive %s is %.2f MB</string>
-    <string lang="en" key="DISK_FREE_GB">Free space on drive %hs is %.2f GB</string>
+    <string lang="en" key="DISK_FREE_GB">Free space on drive %s is %.2f GB</string>
-    <string lang="en" key="DISK_FREE_TB">Free space on drive %hs is %.2f TB</string>
+    <string lang="en" key="DISK_FREE_TB">Free space on drive %s is %.2f TB</string>
-    <string lang="en" key="DISK_FREE_PB">Free space on drive %hs is %.2f PB</string>
+    <string lang="en" key="DISK_FREE_PB">Free space on drive %s is %.2f PB</string>
     <string lang="en" key="DRIVELETTERS">Could not get available drive letters.</string>
     <string lang="en" key="DRIVER_NOT_FOUND">Error: VeraCrypt driver not found.\n\nPlease copy the files 'veracrypt.sys' and 'veracrypt-x64.sys' to the directory where the main VeraCrypt application (VeraCrypt.exe) is located.</string>
-    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall; on Windows XP, select 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
+    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' > Computer > 'Uninstall or change a program' > VeraCrypt > Uninstall; on Windows XP, select 'Start Menu' > Settings > 'Control Panel' > 'Add Or Remove Programs' > VeraCrypt > Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
     <string lang="en" key="ERR_CIPHER_INIT_FAILURE">Error: Cipher initialization failure.</string>
     <string lang="en" key="ERR_CIPHER_INIT_WEAK_KEY">Error: A weak or a potentially weak key has been detected. The key will be discarded. Please try again.</string>
     <string lang="en" key="EXCEPTION_REPORT">A critical error has occurred and VeraCrypt must be terminated. If this is caused by a bug in VeraCrypt, we would like to fix it. To help us, you can send us an automatically generated error report containing the following items:\n\n- Program version\n- Operating system version\n- Type of CPU\n- VeraCrypt component name\n- Checksum of VeraCrypt executable\n- Symbolic name of dialog window\n- Error category\n- Error address\n- VeraCrypt call stack\n\nIf you select 'Yes', the following URL (which contains the entire error report) will be opened in your default Internet browser.\n\n%hs\n\nDo you want to send us the above error report?</string>
@@ -497,7 +503,7 @@
     <string lang="en" key="WIPE_FINISHED">The content of the partition/device has been successfully erased.</string>
     <string lang="en" key="WIPE_FINISHED_DECOY_SYSTEM_PARTITION">The content of the partition where the original system (of which the hidden system is a clone) resided has been successfully erased.</string>
     <string lang="en" key="DECOY_OS_VERSION_WARNING">Please make sure the version of Windows you are going to install (on the wiped partition) is the same as the version of Windows you are currently running. This is required due to the fact that both systems will share a common boot partition.</string>
-    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' &gt; 'Add Mounted Volume to System Favorites').</string>
+    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' > 'Add Mounted Volume to System Favorites').</string>
     <string lang="en" key="SYSTEM_DECRYPTION_FINISHED">The system partition/drive has been successfully decrypted.</string>
     <string lang="en" key="FORMAT_FINISHED_HELP">\n\nThe VeraCrypt volume has been created and is ready for use. If you wish to create another VeraCrypt volume, click Next. Otherwise, click Exit.</string>
     <string lang="en" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nThe hidden VeraCrypt volume has been successfully created (the hidden operating system will reside within this hidden volume).\n\nClick Next to continue.</string>
@@ -524,7 +530,7 @@
     <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 password for this outer volume, and the existence of the hidden volume (and of the hidden operating system) will remain secret.\n\nIMPORTANT: The files you copy to the outer volume should not occupy more than %s. Otherwise, there may not be enough free space on the outer volume for the hidden volume (and you will not be able to continue). After you finish copying, click Next (do not dismount the volume).</string>
     <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 you finish copying, click Next. Do not dismount the volume.\n\nNote: After you click Next, cluster bitmap of the outer volume will be scanned to determine the size of uninterrupted area of free space whose end is aligned with the end of the volume. This area will accommodate the hidden volume, so it will limit its maximum possible size. Cluster bitmap scanning ensures that no data on the outer volume are overwritten by the hidden volume.</string>
     <string lang="en" key="HIDVOL_HOST_FILLING_TITLE">Outer Volume Contents</string>
-    <string lang="en" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nIn the next steps, you will set the options for the outer volume (within which the hidden volume will be created later on). </string>
+    <string lang="en" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nIn the next steps, you will set the options for the outer volume (within which the hidden volume will be created later on).</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>
     <string lang="en" key="HIDVOL_HOST_PRE_CIPHER_TITLE">Outer Volume</string>
     <string lang="en" key="HIDDEN_OS_PRE_CIPHER_HELP">In the following steps, you will set the options and password for the hidden volume, which will contain the hidden operating system.\n\nRemark: The cluster bitmap of the outer volume has been scanned in order to determine the size of uninterrupted area of free space whose end is aligned with the end of the outer volume. This area will accommodate the hidden volume, so it limits its maximum possible size. The maximum possible size of the hidden volume has been determined and confirmed to be greater than the size of the system partition (which is required, because the entire content of the system partition will need to be copied to the hidden volume). This ensures that no data currently stored on the outer volume will be overwritten by data written to the area of the hidden volume.</string>
@@ -561,6 +567,7 @@
     <string lang="en" key="MAX_HIDVOL_SIZE_KB">Maximum possible hidden volume size for this volume is %.2f KB.</string>
     <string lang="en" key="MAX_HIDVOL_SIZE_MB">Maximum possible hidden volume size for this volume is %.2f MB.</string>
     <string lang="en" key="MAX_HIDVOL_SIZE_GB">Maximum possible hidden volume size for this volume is %.2f GB.</string>
+    <string lang="en" key="MAX_HIDVOL_SIZE_TB">Maximum possible hidden volume size for this volume is %.2f TB.</string>
     <string lang="en" key="MOUNTED_NOPWCHANGE">Volume password/keyfiles cannot be changed while the volume is mounted. Please dismount the volume first.</string>
     <string lang="en" key="MOUNTED_NO_PKCS5_PRF_CHANGE">The header key derivation algorithm cannot be changed while the volume is mounted. Please dismount the volume first.</string>
     <string lang="en" key="MOUNT_BUTTON">&amp;Mount</string>
@@ -591,12 +598,12 @@
     <string lang="en" key="SELECT_PKCS11_MODULE">Select PKCS #11 Library</string>
     <string lang="en" key="OUTOFMEMORY">Out of Memory</string>
     <string lang="en" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">IMPORTANT: We strongly recommend that inexperienced users create a VeraCrypt file container on the selected device/partition, instead of attempting to encrypt the entire device/partition.\n\nWhen you create a VeraCrypt file container (as opposed to encrypting a device or partition) there is, for example, no risk of destroying a large number of files. Note that a VeraCrypt file container (even though it contains a virtual encrypted disk) is actually just like any normal file. For more information, see the chapter Beginner's Tutorial in the VeraCrypt User Guide.\n\nAre you sure you want to encrypt the entire device/partition?</string>
-    <string lang="en" key="OVERWRITEPROMPT">WARNING: The file '%hs' already exists!\n\nIMPORTANT: VERACRYPT WILL NOT ENCRYPT THE FILE, BUT IT WILL DELETE IT. Are you sure you want to delete the file and replace it with a new VeraCrypt container?</string>
+    <string lang="en" key="OVERWRITEPROMPT">WARNING: The file '%s' already exists!\n\nIMPORTANT: VERACRYPT WILL NOT ENCRYPT THE FILE, BUT IT WILL DELETE IT. Are you sure you want to delete the file and replace it with a new VeraCrypt container?</string>
-    <string lang="en" key="OVERWRITEPROMPT_DEVICE">CAUTION: ALL FILES CURRENTLY STORED ON THE SELECTED %s '%hs'%s WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
+    <string lang="en" key="OVERWRITEPROMPT_DEVICE">CAUTION: ALL FILES CURRENTLY STORED ON THE SELECTED %s '%s'%s WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
-    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%s'%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting/decrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting/decrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting/decrypting, please make sure that you have backup copies of the files you want to encrypt/decrypt.\n\nDo you have such a backup?</string>
-    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%hs'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
+    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%s'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
     <string lang="en" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">WARNING: THE SELECTED PARTITION CONTAINS A LARGE AMOUNT OF DATA! Any files stored on the partition will be erased and lost (they will NOT be encrypted)!</string>
     <string lang="en" key="ERASE_FILES_BY_CREATING_VOLUME">Erase any files stored on the partition by creating a VeraCrypt volume within it</string>
     <string lang="en" key="PASSWORD">Password</string>
@@ -645,7 +652,7 @@
     <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
     <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
     <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 &gt; Organize &gt; 'Folder and search options' &gt; View).</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="SELECTED_PARTITION_ALREADY_INPLACE_ENC">The selected partition/device is already fully encrypted.\nHeader Flags = 0x%.8X</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="en" key="PREV">&lt; &amp;Back</string>
     <string lang="en" key="RAWDEVICES">Unable to list raw devices installed on your system!</string>
-    <string lang="en" key="READONLYPROMPT">The volume '%hs' exists, and is read-only. Are you sure you want to replace it?</string>
+    <string lang="en" key="READONLYPROMPT">The volume '%s' exists, and is read-only. Are you sure you want to replace it?</string>
     <string lang="en" key="SELECT_DEST_DIR">Select destination directory</string>
     <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>
@@ -680,13 +687,13 @@
     <string lang="en" key="TEST_CIPHERTEXT_SIZE">The test ciphertext you have supplied is too long or short.</string>
     <string lang="en" key="TEST_KEY_SIZE">The test key you have supplied is too long or short.</string>
     <string lang="en" key="TEST_PLAINTEXT_SIZE">The test plaintext you have supplied is too long or short.</string>
-    <string lang="en" key="TWO_LAYER_CASCADE_HELP">Two ciphers in a cascade operating in XTS mode. Each block is first encrypted with %hs (%d-bit key) and then with %hs (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
+    <string lang="en" key="TWO_LAYER_CASCADE_HELP">Two ciphers in a cascade operating in XTS mode. Each block is first encrypted with %s (%d-bit key) and then with %s (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
-    <string lang="en" key="THREE_LAYER_CASCADE_HELP">Three ciphers in a cascade operating in XTS mode. Each block is first encrypted with %hs (%d-bit key), then with %hs (%d-bit key), and finally with %hs (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
+    <string lang="en" key="THREE_LAYER_CASCADE_HELP">Three ciphers in a cascade operating in XTS mode. Each block is first encrypted with %s (%d-bit key), then with %s (%d-bit key), and finally with %s (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
     <string lang="en" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Note that, depending on the operating system configuration, these auto-run and auto-mount features may work only when the traveler disk files are created on a non-writable CD/DVD-like medium. Also note that this is not a bug in VeraCrypt (it is a limitation of Windows).</string>
     <string lang="en" key="TRAVELER_DISK_CREATED">VeraCrypt traveler disk has been successfully created.\n\nNote that you need administrator privileges to run VeraCrypt in portable mode. Also note that, after examining the registry file, it may be possible to tell that VeraCrypt was run on a Windows system even if it is run in portable mode.</string>
     <string lang="en" key="TC_TRAVELER_DISK">VeraCrypt Traveler Disk</string>
     <string lang="en" key="TWOFISH_HELP">Designed by Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall, and Niels Ferguson. Published in 1998. 256-bit key, 128-bit block. Mode of operation is XTS. Twofish was one of the AES finalists.</string>
-    <string lang="en" key="MORE_INFO_ABOUT">More information on %hs</string>
+    <string lang="en" key="MORE_INFO_ABOUT">More information on %s</string>
     <string lang="en" key="UNKNOWN">Unknown</string>
     <string lang="en" key="ERR_UNKNOWN">An unspecified or unknown error occurred (%d).</string>
     <string lang="en" key="UNMOUNTALL_LOCK_FAILED">Some volumes contain files or folders being used by applications or system.\n\nForce dismount?</string>
@@ -706,7 +713,7 @@
     <string lang="en" key="WRONG_VOL_TYPE">VeraCrypt cannot change the password for a foreign volume.</string>
     <string lang="en" key="SELECT_FREE_DRIVE">Please select a free drive letter from the list.</string>
     <string lang="en" key="SELECT_A_MOUNTED_VOLUME">Please select a mounted volume in the drive letter list.</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="en" key="CANT_CREATE_AUTORUN">Error: Cannot create autorun.inf</string>
     <string lang="en" key="ERR_PROCESS_KEYFILE">Error while processing keyfile!</string>
     <string lang="en" key="ERR_PROCESS_KEYFILE_PATH">Error processing keyfile path!</string>
@@ -851,7 +858,7 @@
     <string lang="en" key="INSTALL_FAILED">Installation failed.</string>
     <string lang="en" key="UNINSTALL_FAILED">Uninstallation failed.</string>
     <string lang="en" key="DIST_PACKAGE_CORRUPTED">This distribution package is damaged. Please try downloading it again (preferably from the official VeraCrypt website at https://veracrypt.codeplex.com).</string>
-    <string lang="en" key="CANNOT_WRITE_FILE_X">Cannot write file %hs</string>
+    <string lang="en" key="CANNOT_WRITE_FILE_X">Cannot write file %s</string>
     <string lang="en" key="EXTRACTING_VERB">Extracting</string>
     <string lang="en" key="CANNOT_READ_FROM_PACKAGE">Cannot read data from the package.</string>
     <string lang="en" key="CANT_VERIFY_PACKAGE_INTEGRITY">Cannot verify the integrity of this distribution package.</string>
@@ -860,8 +867,8 @@
     <string lang="en" key="INSTALL_OK">VeraCrypt has been successfully installed.</string>
     <string lang="en" key="SETUP_UPDATE_OK">VeraCrypt has been successfully updated.</string>
     <string lang="en" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt has been successfully upgraded. However, before you can start using it, the computer must be restarted.\n\nDo you want to restart it now?</string>
-    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
+    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu > All programs > Accessories > System Tools > System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
-    <string lang="en" key="UNINSTALL_OK">VeraCrypt has been successfully uninstalled.\n\nClick 'Finish' to remove the VeraCrypt installer and the folder %hs. Note that the folder will not be removed if it contains any files that were not installed by the VeraCrypt installer or created by VeraCrypt.</string>
+    <string lang="en" key="UNINSTALL_OK">VeraCrypt has been successfully uninstalled.\n\nClick 'Finish' to remove the VeraCrypt installer and the folder %s. Note that the folder will not be removed if it contains any files that were not installed by the VeraCrypt installer or created by VeraCrypt.</string>
     <string lang="en" key="REMOVING_REG">Removing VeraCrypt registry entries</string>
     <string lang="en" key="ADDING_REG">Adding registry entry</string>
     <string lang="en" key="REMOVING_APPDATA">Removing application-specific data</string>
@@ -872,10 +879,10 @@
     <string lang="en" key="CREATING_SYS_RESTORE">Creating System Restore point</string>
     <string lang="en" key="FAILED_SYS_RESTORE">Failed to create System Restore point!</string>
     <string lang="en" key="INSTALLER_UPDATING_BOOT_LOADER">Updating boot loader</string>
-    <string lang="en" key="INSTALL_OF_FAILED">Failed to install '%hs'. %hs\nDo you want to continue installing?</string>
+    <string lang="en" key="INSTALL_OF_FAILED">Failed to install '%s'. %s\nDo you want to continue installing?</string>
-    <string lang="en" key="UNINSTALL_OF_FAILED">Failed to uninstall '%hs'. %hs\nDo you want to continue uninstalling?</string>
+    <string lang="en" key="UNINSTALL_OF_FAILED">Failed to uninstall '%s'. %s\nDo you want to continue uninstalling?</string>
     <string lang="en" key="INSTALL_COMPLETED">Installation completed.</string>
-    <string lang="en" key="CANT_CREATE_FOLDER">The folder '%hs' could not be created</string>
+    <string lang="en" key="CANT_CREATE_FOLDER">The folder '%s' could not be created</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="en" key="DISMOUNT_ALL_FIRST">All VeraCrypt volumes must be dismounted before installing or uninstalling 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>
@@ -921,14 +928,14 @@
     <string lang="en" key="SYS_FAVORITE_VOLUMES_SAVED">System favorite volumes saved.\n\nTo enable mounting of system favorite volumes when the system starts, please select 'Settings' &gt; 'System Favorite Volumes' &gt; 'Mount system favorite volumes when Windows starts'.</string>
     <string lang="en" key="FAVORITE_ADD_DRIVE_DEV_WARNING">The volume you are adding to favorites is neither a partition nor a dynamic volume. Therefore, VeraCrypt will be unable to mount this favorite volume if the device number changes.</string>
     <string lang="en" key="FAVORITE_ADD_PARTITION_TYPE_WARNING">The volume you are adding to favorites is a partition not recognized by Windows.\n\nVeraCrypt will be unable to mount this favorite volume if the device number changes. Please set the type of the partition to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then add the partition to favorites again.</string>
-    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings &gt; Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
+    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings > Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_NETWORK_PATH_ERR">A container stored in a remote filesystem shared over a network cannot be automatically mounted when its host device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, the volume hosted on the device cannot be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable the volume hosted on the device to be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_LABEL_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, no label can be assigned to it.</string>
     <string lang="en" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable VeraCrypt to assign a label to the partition.</string>
     <string lang="en" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Due to a Windows limitation, a container stored in a remote filesystem shared over a network cannot be mounted as a system favorite volume (however, it can be mounted as a non-system favorite volume when a user logs on).</string>
-    <string lang="en" key="ENTER_PASSWORD_FOR">Enter password for %hs</string>
+    <string lang="en" key="ENTER_PASSWORD_FOR">Enter password for %s</string>
     <string lang="en" key="ENTER_PASSWORD_FOR_LABEL">Enter password for '%s'</string>
     <string lang="en" key="ENTER_NORMAL_VOL_PASSWORD">Enter password for the normal/outer volume</string>
     <string lang="en" key="ENTER_HIDDEN_VOL_PASSWORD">Enter password for the hidden volume</string>
@@ -943,8 +950,8 @@
     <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 header backup to restore a header of a different volume, you will be able to mount the volume, but you will NOT be able to decrypt any data stored in the volume (because you will change its master key).</string>
     <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) for the hidden volume.</string>
-    <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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</string>
+    <string lang="en" key="CONFIRM_VOL_HEADER_BAK">Are you sure you want to create volume header backup for %s?\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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</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="CONFIRM_VOL_HEADER_RESTORE">Are you sure you want to restore volume header of %s?\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>
@@ -955,12 +962,14 @@
     <string lang="en" key="VOLUME_HAS_NO_BACKUP_HEADER">There is no backup header embedded in this volume (note that only volumes created by VeraCrypt 6.0 or later contain embedded backup headers).</string>
     <string lang="en" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">You are attempting to back up the header of the system partition/drive. This is not allowed. Backup/restore operations pertaining to the system partition/drive can be performed only using the VeraCrypt Rescue Disk.\n\nDo you want to create a VeraCrypt Rescue Disk?</string>
     <string lang="en" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">You are attempting to restore the header of a virtual VeraCrypt volume but you selected the system partition/drive. This is not allowed. Backup/restore operations pertaining to the system partition/drive can be performed only using the VeraCrypt Rescue Disk.\n\nDo you want to create a VeraCrypt Rescue Disk?</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">After you click OK, you will select a filename for the new VeraCrypt Rescue Disk ISO image and the location where you wish to place it.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">After you click OK, you will select a filename for the new VeraCrypt Rescue Disk image and the location where you wish to place it.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <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_INSERT">Please insert your VeraCrypt Rescue Disk 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 a new Rescue Disk fully compatible with your current configuration, select 'System' &gt; 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk 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' &gt; '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 be used, because it was created for a different master key. You need to burn the newly generated Rescue Disk.</string>
@@ -989,8 +998,8 @@
     <string lang="en" key="DRIVE_LETTER_ITEM">Drive Letter:   </string>
     <string lang="en" key="UNSUPPORTED_CHARS_IN_PWD">Error: Password must contain only ASCII characters.\n\nNon-ASCII characters in password might cause the volume to be impossible to mount when your system configuration changes.\n\nThe following characters are allowed:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="en" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">Warning: Password contains non-ASCII characters. This may cause the volume to be impossible to mount when your system configuration changes.\n\nYou should replace all non-ASCII characters in the password with ASCII characters. To do so, click 'Volumes' -&gt; 'Change Volume Password'.\n\nThe following are ASCII characters:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="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 change it (e.g., to '.tc').\n\nAre you sure you want to use the problematic file extension?</string>
+    <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 change it (e.g., to '.hc').\n\nAre you sure you want to use the problematic file extension?</string>
-    <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 container or change it (e.g., to '.tc') after you dismount the volume.</string>
+    <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 container or change it (e.g., to '.hc') after you dismount the volume.</string>
     <string lang="en" key="HOMEPAGE">Homepage</string>
     <string lang="en" key="LARGE_IDE_WARNING_XP">WARNING: It appears that you have not applied any Service Pack to your Windows installation. You should not write to IDE disks larger than 128 GB under Windows XP to which you did not apply Service Pack 1 or later! 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 bug in VeraCrypt.</string>
     <string lang="en" key="LARGE_IDE_WARNING_2K">WARNING: It appears that you have not applied Service Pack 3 or later to your Windows installation. You should not write to IDE disks larger than 128 GB under Windows 2000 to which you did not apply Service Pack 3 or later! 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 bug in VeraCrypt.\n\nNote: You may also need to enable the 48-bit LBA support in the registry; for more information, see http://support.microsoft.com/kb/305098/EN-US</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="en" key="CHECKING_FS">Checking the file system on the VeraCrypt volume mounted as %s...</string>
-    <string lang="en" key="REPAIRING_FS">Attempting to repair the file system on the VeraCrypt volume mounted as %hs...</string>
+    <string lang="en" key="REPAIRING_FS">Attempting to repair the file system on the VeraCrypt volume mounted as %s...</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 later.</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 encryption algorithm (e.g., AES, Serpent, Twofish, etc.) and that you move all files from this volume to the new volume.</string>
     <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="en" key="SYS_ASSIGN_DRIVE_LETTER">Please assign a drive letter to the partition/device before proceeding ('Control Panel' &gt; 'System and Maintenance' &gt; 'Administrative Tools' - 'Create and format hard disk partitions').\n\nNote that this is a requirement of the operating system.</string>
@@ -1069,7 +1077,7 @@
     <string lang="en" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt no longer supports encryption of the system partition/drive on Windows Vista with no Service Pack installed. Before upgrading VeraCrypt, please install Service Pack 1 or higher for Windows Vista.</string>
     <string lang="en" key="FEATURE_REQUIRES_INSTALLATION">Error: This feature requires VeraCrypt to be installed on the system (you are running VeraCrypt in portable mode).\n\nPlease install VeraCrypt and then try again.</string>
     <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="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</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' &gt; '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>
@@ -1093,7 +1101,7 @@
     <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 medium (or using a service partition)?</string>
     <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 Hidden Volumes" in the VeraCrypt User's Guide.\n\nImportant: Before proceeding, please make sure you have read the section "Security Requirements and Precautions Pertaining to Hidden Volumes" in the VeraCrypt User's Guide.\n\n\nDoes the currently running operating system meet the above condition?</string>
     <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 from writing to the shared boot partition and from hibernating.\n\n\nDo you want to continue? If you select 'No', instructions for removing the extra boot partition will be displayed.</string>
-    <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' &gt; '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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
+    <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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
     <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>
@@ -1108,8 +1116,8 @@
     <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 you do NOT have a real US keyboard.</string>
     <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 starts.\n\n- The VRD will contain a backup of the present content of the first drive track (which typically contains a system loader or boot manager) and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ISO image will be created in the location specified below.</string>
     <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">The Rescue Disk image has been created and stored in this file:\n%s\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>
+    <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%s\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>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">IMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software. If you do not have any CD/DVD recording software that can write the ISO disk image to a CD/DVD, click the link below to download such free software.\n\n</string>
     <string lang="en" key="LAUNCH_WIN_ISOBURN">Launch Microsoft Windows Disc Image Burner</string>
     <string lang="en" key="RESCUE_DISK_BURN_NO_CHECK_WARN">WARNING: If you already created a VeraCrypt Rescue Disk in the past, it cannot be reused for this system partition/drive because it was created for a different master key! Every time you encrypt a system partition/drive, you must create a new VeraCrypt Rescue Disk for it even if you use the same password.</string>
@@ -1247,7 +1255,7 @@
     <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 system (but not on the decoy system), the decoy system would contain a VeraCrypt driver and VeraCrypt applications whose version numbers are different from the version number of the VeraCrypt Boot Loader. Such a discrepancy might indicate that there is a hidden operating system on this computer.\n\n\nDo you want to continue?</string>
     <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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' &gt; '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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' > 'Create Rescue Disk').</string>
     <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' &gt; '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' &gt; 'Create Rescue Disk'.</string>
     <string lang="en" key="BOOT_LOADER_UPGRADE_FAILED">Failed to upgrade the VeraCrypt Boot Loader.</string>
@@ -1272,7 +1280,7 @@
     <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' &gt; '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>
@@ -1297,8 +1305,8 @@
     <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 system.</string>
     <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' &gt; 'Performance' and enable 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' &gt; 'Performance' and disable 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>
@@ -1372,6 +1380,39 @@
     <string lang="en" key="TB_PER_SEC">TB/s</string>
     <string lang="en" key="PB_PER_SEC">PB/s</string>
     <string lang="en" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.fi.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="fi" name="Suomi" en-name="Finnish" version="0.1.0" translators="Matti Ruhanen" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="fi" key="IDC_BROWSE">Se&amp;laa..</control>
     <control lang="fi" key="IDC_DESKTOP_ICON">Lisää VeraCrypt ikoni &amp;työpöydälle</control>
     <control lang="en" key="IDC_DONATE">Donate now...</control>
-    <control lang="fi" key="IDC_FILE_TYPE">Liitä .tc tiedostot &amp;päätteet VeraCrypt ohjelmalle</control>
+    <control lang="fi" key="IDC_FILE_TYPE">Liitä .hc tiedostot &amp;päätteet VeraCrypt ohjelmalle</control>
     <control lang="fi" key="IDC_OPEN_CONTAINING_FOLDER">&amp;Avaa kohde lopuksi</control>
     <control lang="fi" key="IDC_PROG_GROUP">Lisää VeraCrypt &amp;Käynnistys menuun</control>
     <control lang="fi" key="IDC_SYSTEM_RESTORE">Luo Systeemin &amp;Palautus piste</control>
@@ -37,6 +37,7 @@
     <control lang="fi" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Lataa CD/DVD toisto ohjelma</control>
     <control lang="fi" key="IDC_FILE_CONTAINER">Luo salattu tiedostosäilö</control>
     <control lang="fi" key="IDC_GB">&amp;GB</control>
+    <control lang="fi" key="IDC_TB">&amp;TB</control>
     <control lang="fi" key="IDC_HIDDEN_SYSENC_INFO_LINK">Lisää tietoa</control>
     <control lang="fi" key="IDC_HIDDEN_VOL">Pi&amp;ilotettu VeraCrypt taltio </control>
     <control lang="fi" key="IDC_HIDDEN_VOL_HELP">Lisätietoa piilotetuista taltioista</control>
@@ -44,6 +45,7 @@
     <control lang="fi" key="IDC_HIDVOL_WIZ_MODE_FULL">Normaalitila</control>
     <control lang="fi" key="IDC_KB">&amp;KB</control>
     <control lang="fi" key="IDC_KEYFILES_ENABLE">Käytä &amp;Avaintiedostoja</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="fi" key="IDC_KEY_FILES">&amp;Avaintiedostot..</control>
     <control lang="fi" key="IDC_LINK_HASH_INFO">Tietoa hash algoritmeista</control>
@@ -58,7 +60,8 @@
     <control lang="fi" key="IDC_NO_HISTORY">&amp;Älä tallenna historiatietoja</control>
     <control lang="fi" key="IDC_OPEN_OUTER_VOLUME">Avaa Ulkopuolinen Taltio</control>
     <control lang="fi" key="IDC_PAUSE">&amp;Tauko</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="fi" key="IDC_QUICKFORMAT">Nopea Alustus</control>
     <control lang="fi" key="IDC_SHOW_PASSWORD">&amp;Näytä Salasana</control>
     <control lang="fi" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Näytä salasana</control>
@@ -77,7 +80,7 @@
     <control lang="fi" key="IDT_DONE">Valmis</control>
     <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="fi" key="IDT_ENCRYPTION_ALGO">Salausalgoritmi</control>
-    <control lang="fi" key="IDT_FILESYSTEM">Järjestelmä</control>
+    <control lang="fi" key="IDT_FILESYSTEM">Järjestelmä </control>
     <control lang="fi" key="IDT_FILE_CONTAINER">Luo virtuaalisesti salattu levy tiedoston sisälle. Tämä valinta on suositeltava aloittelijalle.</control>
     <control lang="fi" key="IDT_FORMAT_OPTIONS">Valinnat</control>
     <control lang="fi" key="IDT_HASH_ALGO">Hash algoritmi</control>
@@ -118,6 +121,7 @@
     <control lang="fi" key="IDC_CREATE">Luo</control>
     <control lang="fi" key="IDC_CREATE_VOLUME">L&amp;uo Taltio</control>
     <control lang="fi" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">älä &amp;näytä tekstiä esikäynnistys autentikointi ikkunassa (paitsi alapuolinen käyttäjän viesti)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <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="fi" key="IDC_ENABLE_KEYFILES">Käytä Avaintiedostoa</control>
     <control lang="fi" key="IDC_ENABLE_NEW_KEYFILES">Käytä Avaintiedostoa</control>
@@ -132,6 +136,7 @@
     <control lang="en" key="IDC_FAVORITE_MOVE_UP">Move &amp;Up</control>
     <control lang="en" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Open &amp;Explorer window for selected volume when successfully mounted</control>
     <control lang="en" key="IDC_FAVORITE_REMOVE">&amp;Remove</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="en" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Global Settings</control>
     <control lang="en" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Display balloon tooltip after successful hot-key dismount</control>
     <control lang="en" key="IDC_HK_DISMOUNT_PLAY_SOUND">Play system notification sound after successful hot-key dismount</control>
@@ -189,7 +194,7 @@
     <control lang="fi" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="fi" key="IDD_PASSWORDCHANGE_DLG">Muuta Salasana tai Avaintiedosto</control>
     <control lang="fi" key="IDD_PASSWORD_DLG">Anna VeraCrypt Taltion Salasana</control>
-    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance Options</control>
+    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance and Driver Options</control>
     <control lang="fi" key="IDD_PREFERENCES_DLG">VeraCrypt - Ominaisuudet</control>
     <control lang="fi" key="IDD_SYSENC_SETTINGS">VeraCrypt - Järjestelmän Salaus Asetukset</control>
     <control lang="fi" key="IDD_TOKEN_PREFERENCES">VeraCrypt - Turvallisuustunnisteen Preferenssi</control>
@@ -235,7 +240,7 @@
     <control lang="fi" key="IDM_ONLINE_TUTORIAL">Aloittelijan Koulutus</control>
     <control lang="en" key="IDM_ORGANIZE_FAVORITES">Organize Favorite Volumes...</control>
     <control lang="en" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organize System Favorite Volumes...</control>
-    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance...</control>
+    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance/Driver Configuration</control>
     <control lang="fi" key="IDM_PERMANENTLY_DECRYPT_SYS">Avaa Pysyvästi Salaus Järjestelmän Osiolle/Asemalle</control>
     <control lang="fi" key="IDM_PREFERENCES">Ominaisuudet..</control>
     <control lang="fi" key="IDM_REFRESH_DRIVE_LETTERS">Päivitä Asema Kirjaimet</control>
@@ -256,6 +261,7 @@
     <control lang="fi" key="IDM_UNMOUNTALL">Poista Yhteys Kaikilta Yhdistetyiltä Taltioilta</control>
     <control lang="fi" key="IDM_UNMOUNT_VOLUME">Poista Yhdistetyt Taltio</control>
     <control lang="fi" key="IDM_VERIFY_RESCUE_DISK">Tarkista Pelastuslevy</control>
+    <control lang="en" key="IDM_VERIFY_RESCUE_DISK_ISO">Verify Rescue Disk Image</control>
     <control lang="fi" key="IDM_VERSION_HISTORY">Versio Historia</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="fi" key="IDM_VOLUME_PROPERTIES">Taltion Ominaisuudet</control>
@@ -294,7 +300,7 @@
     <control lang="fi" key="IDT_SECURITY_OPTIONS">Salausvalinnat</control>
     <control lang="fi" key="IDT_TASKBAR_ICON">VeraCrypt Taustatehtävä</control>
     <control lang="fi" key="IDT_TRAVELER_MOUNT">VeraCrypt taltion yhteys (liittyy liikutettavan levyn juureen):</control>
-    <control lang="fi" key="IDT_TRAVEL_INSERTION">Liikutettavan levyn sisällyttäminen:</control>
+    <control lang="fi" key="IDT_TRAVEL_INSERTION">Liikutettavan levyn sisällyttäminen: </control>
     <control lang="fi" key="IDT_TRAVEL_ROOT">Luo liikutettava levytiedosto (Liikutettavan levyjuuri hakemisto):</control>
     <control lang="fi" key="IDT_VOLUME">Taltio</control>
     <control lang="fi" key="IDT_WINDOWS_RELATED_SETTING">Ikkuna</control>
@@ -339,7 +345,7 @@
     <control lang="fi" key="IDD_NEW_TOKEN_KEYFILE">Uuden Turvallisuustunniste Avaintiedoston Ominaisuudet</control>
     <control lang="fi" key="IDD_RANDOM_POOL_ENRICHMENT">VeraCrypt - Satunnainen poolin Rikastus</control>
     <control lang="fi" key="IDD_RAWDEVICES_DLG">Valitse Osio tai Laite</control>
-    <control lang="en" key="IDD_STATIC_MODELESS_WAIT_DLG">VeraCrypt</control>
+    <control lang="fi" key="IDD_STATIC_MODELESS_WAIT_DLG">VeraCrypt</control>
     <control lang="fi" key="IDD_TOKEN_KEYFILES">Turvallisuustunniste Avaintiedostot</control>
     <control lang="fi" key="IDD_TOKEN_PASSWORD">Turvallisuustunniste salasana/PIN vaaditaan</control>
     <control lang="fi" key="IDT_ACTIVE_LANG_PACK">Aktiivinen kielipaketti</control>
@@ -365,7 +371,7 @@
     <control lang="fi" key="IDT_SECURITY_TOKEN">Turvallisuustunniste:</control>
     <control lang="fi" key="IDT_SORT_METHOD">Järjestäminen:</control>
     <control lang="en" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Please wait. This process may take a long time...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="fi" key="IDT_TEST_BLOCK_NUMBER">Lohko numero:</control>
     <control lang="fi" key="IDT_TEST_CIPHERTEXT">Salakirjoitettu teksti (hexadecimal)</control>
     <control lang="fi" key="IDT_TEST_DATA_UNIT_NUMBER">Datan yksikkö numero (64-bit hexadecimal, data yksikön koko on 512 byteä)</control>
@@ -410,13 +416,13 @@
     <string lang="fi" key="CIPHER_TITLE">Salauksen Valinnat</string>
     <string lang="fi" key="CLEAN_WINMRU_FAILED">VAROITUS: Virhe pyyhittäessä viimeksi valitun taltion/avaintiedoston polkua (tiedosto valitsimen muistissa)!</string>
     <string lang="fi" key="COMPRESSION_NOT_SUPPORTED">Virhe: Säilö on tiivistetty tiedostojärjestelmätasolla. VeraCrypt ei tue tiivistettyjä säilöjä (Huomioi, että tiivistetty salattu data on tehoton ja tarpeeton).\n\nPoista säilön tiivistys seuraavalla tavalla: 1) Hiiren oikea klikkaus Windowsin resurssinhallinnassa (ei VeraCryptissä). 2) Valitse 'Ominaisuudet'. 3) 'Ominaisuudet' ikkunassa paina 'Lisäominaisuudet'. 4) 'Lisäominaisuus' ikkunassa, poista valinta 'Sisällön tiivistys säästää levytilaa' ja paina 'OK'. 5) 'Ominaisuudet' ikkunassa, paina 'OK'.</string>
-    <string lang="fi" key="CREATE_FAILED">Virhe luodessa %hs taltio</string>
+    <string lang="fi" key="CREATE_FAILED">Virhe luodessa %s taltio</string>
-    <string lang="fi" key="DEVICE_FREE_BYTES">%hs koko on %.2f byteä</string>
+    <string lang="fi" key="DEVICE_FREE_BYTES">%s koko on %.2f byteä</string>
-    <string lang="fi" key="DEVICE_FREE_KB">%hs koko on %.2f KB</string>
+    <string lang="fi" key="DEVICE_FREE_KB">%s koko on %.2f KB</string>
-    <string lang="fi" key="DEVICE_FREE_MB">%hs koko on %.2f MB</string>
+    <string lang="fi" key="DEVICE_FREE_MB">%s koko on %.2f MB</string>
-    <string lang="fi" key="DEVICE_FREE_GB">%hs koko on %.2f GB</string>
+    <string lang="fi" key="DEVICE_FREE_GB">%s koko on %.2f GB</string>
-    <string lang="fi" key="DEVICE_FREE_TB">%hs koko on %.2f TB</string>
+    <string lang="fi" key="DEVICE_FREE_TB">%s koko on %.2f TB</string>
-    <string lang="fi" key="DEVICE_FREE_PB">%hs koko on %.2f PB</string>
+    <string lang="fi" key="DEVICE_FREE_PB">%s koko on %.2f PB</string>
     <string lang="fi" key="DEVICE_IN_USE_FORMAT">VAROITUS: Laite/osio on jo käyttöjärjestelmän tai sovelluksen käytössä. Alustamalla nyt laitteen/osion sillä saattaa olla vaikutusta joko datan tuhoutumiselle ja järjestelmän epävakauteen.\n\nJatka?</string>
     <string lang="fi" key="DEVICE_IN_USE_INPLACE_ENC">Varoitus: Osion on käyttöjärjestelmän ja sovelluksen käytössä. Sinun tulee sulkea sovellus joka saattaa käyttää osiota (sisältäen virustorjunta ohjelman)).\n\nJatka?</string>
     <string lang="fi" key="FORMAT_CANT_DISMOUNT_FILESYS">Virhe: Laite/osio sisältää tiedostojärjestelmän jolta ei voida poistaa yhteyttä. Tiedostojärjestelmä saattaa olla järjestelmän käytössä. Alustamalla laite/osio suurella todennäköisyydellä aiheuttaa datan vioittumisen ja järjestelmän epävakauden.\n\nRatkaisu: Suosittelemme, että ensiksi poistat osion ja luot sen uudelleen ilman alustusta. Tehtyäsi näin, seuraavaksi: 1) Klikkaa hiiren oikealla 'Tietokone' (tai 'My Computer') ikonia 'Käynnistä' menusta ja valitse 'Hallitse'. 'Tietokone hallinta' ikkuna ilmestyy. 2) 'Tietokone hallinta' ikkunassa, valitse 'Storage' &gt; 'Disk Management'. 3) Klikkaa hiiren oikealla osio jonka haluat salakirjoittaa ja valitse joko 'Poista Osio', tai 'Poista Taltio', tai 'Poista Looginen Asema'. 4) Paina 'Kyllä'. Jos Windows pyytää sinua käynnistämään tietokoneen uudelleen, tee niin. Sitten toista kohdat 1 ja 2 ja jatka kohtaan 5. 5) Klikkaa hiiren oikealla allokoimaton/vapaa tilan alue ja valitse joko 'Uusi Osio', tai 'Uusi Yksinkertainen Taltio', tai 'Uusi Looginen Asema'. 6) 'Uusi Osio Velho' tai 'Uusi Yksinkertainen Taltio Velho' ikkuna pitäisi nyt ilmestyä; seuraamalla ohjeita. Velhon sivulla nimetty 'Alusta Osio', valitse molemmat 'Älä alusta tätä osiota' tai 'Älä alusta tätä taltiota'. Samassa opastuksessa, paina 'Seuraava' ja sitten 'Lopeta'. 7) Huomioi, että laite polku jonka valitsit VeraCrypt voi olla väärä. Siksi, poistu VeraCrypt ohjelman Opastetusta Taltion Luonnista (jos se edelleen on toiminnassa) ja aloita uudelleen. 8) Yritä salakirjoittaa laite/osio uudelleen.\n\nJos VeraCrypt toistuvasti epäonnistuu laite/osion salakirjoituksessa, saatat harkita haluavasi luoda  sen sijaan tiedosto säilön.</string>
@@ -435,15 +441,15 @@
     <string lang="fi" key="INPLACE_ENC_INVALID_PATH">Virhe: VeraCrypt voi salata paikalla ainoastaan osion, dynaamisen taltion, tai kokonaisen järjestelmä aseman. Varmista että määritelty polku on olemassa.</string>
     <string lang="fi" key="CANNOT_RESIZE_FILESYS">Virhe: Ei voida kutistaa tiedostojärjestelmää (tiedostojärjestelmä tarvitsee kutistusta tehdäksesi tilaa asemaotsikolle ja varmuustallennukselle).\n\nMahdollinen seuraus ja ratkaisut:\n\n- Ei tarpeeksi tilaa asemalla. Varmista ettei muut sovellukset kirjoita tiedostojärjestelmään.\n\n- Vioittunut tiedostojärjestelmä. Yritä tarkistaa ja korjata virheet (klikkaa hiirenoikella aseman kirjainta 'Tietokone' listalta, sitten valitse Ominaisuudet &gt; Työkalut &gt; 'Tarkista Nyt', varmista että valinta 'Automaattinen korjaus tiedostojärjestelmälle' on päällä ja paina Aloita).\n\nJos aiemmat vaiheet eivät auta, seuraa seuraavia vaiheita.</string>
     <string lang="fi" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Virhe: Asemalla ei ole tarpeeksi tilaa ja siksi tiedostojärjestelmää ei voitu kutistaa (tiedostojärjestelmää tarvitsee kutistaa tehdäkseen tilaa taltion otsikolle ja varmuustallenteella).\n\nOle hyvä ja poista tarpeettomat tiedostot ja tyhjennä roskakori siten että on vähintään 256 KB vapaata tilaa ja yritä uudelleen. Huomioi että on Windows asia, vapaan tilan määrä ilmoitettuna Windows Resurssinhallinnassa voi olla virheellinen ennen kuin käyttöjärjestelmä on uudelleen käynnistetty. Jos uudelleen käynnistys ei auta, tiedostojärjestelmä saattaa olla vioittunut. Yritä tarkistaa se ja korjata virheet (hiiren-oikean painallus asemakirjaimen kohdalla 'Tietokone' listalta, sitten valitse Ominaisuudet &gt; Työkalut &gt; 'Tarkista Nyt', varmista että valinta 'Automaattinen korjaus tiedostojärjestelmälle' on päällä ja paina Aloita).\n\nJos aiemmat vaiheet eivät auta, seuraa seuraavia vaiheita.</string>
-    <string lang="fi" key="DISK_FREE_BYTES">Vapaa tilaa %hs asemalla on %.2f byteä.</string>
+    <string lang="fi" key="DISK_FREE_BYTES">Vapaa tilaa %s asemalla on %.2f byteä.</string>
-    <string lang="fi" key="DISK_FREE_KB">Vapaa tilaa asemalla %hs on %.2f KB</string>
+    <string lang="fi" key="DISK_FREE_KB">Vapaa tilaa asemalla %s on %.2f KB</string>
-    <string lang="fi" key="DISK_FREE_MB">Vapaa tilaa asemalla %hs on %.2f MB</string>
+    <string lang="fi" key="DISK_FREE_MB">Vapaa tilaa asemalla %s on %.2f MB</string>
-    <string lang="fi" key="DISK_FREE_GB">Vapaa tilaa asemalla %hs on %.2f GB</string>
+    <string lang="fi" key="DISK_FREE_GB">Vapaa tilaa asemalla %s on %.2f GB</string>
-    <string lang="fi" key="DISK_FREE_TB">Vapaa tilaa asemalla %hs on %.2f TB</string>
+    <string lang="fi" key="DISK_FREE_TB">Vapaa tilaa asemalla %s on %.2f TB</string>
-    <string lang="fi" key="DISK_FREE_PB">Vapaa tilaa asemalla %hs on %.2f PB</string>
+    <string lang="fi" key="DISK_FREE_PB">Vapaa tilaa asemalla %s on %.2f PB</string>
     <string lang="fi" key="DRIVELETTERS">Levykirjaimien haku epäonnistui.</string>
     <string lang="fi" key="DRIVER_NOT_FOUND">Virhe: VeraCrypt levyä ei löydy.\n\nKopioi tiedosto 'veracrypt.sys' ja 'veracrypt-x64.sys' hakemistoon, jossa VeraCrypt sovellus (VeraCrypt.exe) sijaitsee.</string>
-    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall; on Windows XP, select 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
+    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' > Computer > 'Uninstall or change a program' > VeraCrypt > Uninstall; on Windows XP, select 'Start Menu' > Settings > 'Control Panel' > 'Add Or Remove Programs' > VeraCrypt > Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
     <string lang="fi" key="ERR_CIPHER_INIT_FAILURE">Virhe: Salakirjoitus alustus virhe.</string>
     <string lang="fi" key="ERR_CIPHER_INIT_WEAK_KEY">Virhe: Heikko tai mahdollinen heikko avain on havaittu. Avain hylätty. Yritä uudelleen.</string>
     <string lang="fi" key="EXCEPTION_REPORT">Kriittinen virhe on tapahtunut ja VeraCrypt täytyy keskeyttää. Jos tämä johtui virheestä VeraCrypt ohjelmassa, haluaisimme korjata sen. Auttaaksesi meitä, voit lähettää automaattisesti generoidun raportin mikä sisältää seuraavat asiat:\n\n- Ohjelma versio\n- Käyttöjärjestelmäverso\n- CPU tyyppi\n- VeraCrypt komponentin nimi\n- Tarkistussumma VeraCrypt ohjelmasta\n- Symbolinen dialogin ikkunan nimi\n- Virhe kategoria\n- Virhe osoite\n- VeraCrypt kutsu pino\n\nJos valitsit 'Kyllä', seuraava URL (sisältää virheraportin) avataan oletusselaimessasi.\n\n%hs\n\nHaluatko lähettää meille oheisen virheraportin?</string>
@@ -497,7 +503,7 @@
     <string lang="fi" key="WIPE_FINISHED">Osion/aseman sisältö on onnistuneesti tyhjennetty.</string>
     <string lang="fi" key="WIPE_FINISHED_DECOY_SYSTEM_PARTITION">Osio sisältö missä alkuperäinen järjestelmä (missä piilotettu järjestelmä on kopio) sijaitsee on onnistuneesti poistettu.</string>
     <string lang="fi" key="DECOY_OS_VERSION_WARNING">Varmista, että Windows-versio, jonka aiot asentaa (pyyhityltä osiolta) on sama kuin Windows-versio, joka sinulla on parhaillaan käynnissä. Tämä on tarpeen johtuu siitä, että molemmat järjestelmät jakavat yhteisen boot-osion.</string>
-    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' &gt; 'Add Mounted Volume to System Favorites').</string>
+    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' > 'Add Mounted Volume to System Favorites').</string>
     <string lang="fi" key="SYSTEM_DECRYPTION_FINISHED">Järjestelmäosion/aseman salaus on onnistuneesti avattu.</string>
     <string lang="fi" key="FORMAT_FINISHED_HELP">\n\nVeraCrypt taltio on luotu onnistuneesti ja se on valmiina käytettäväksi.\n\nJos haluat luoda toisen VeraCrypt taltion, paina Seuraava.\n\nMuussa tapauksessa, paina Lopetus.</string>
     <string lang="fi" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nPiilotettu VeraCrypt taltio on onnistuneesti luotu (piilotettu käyttöjärjestelmä sijaitsee tämän piilotetun taltion sisällä).\n\nPaina Seuraava jatkaaksesi.</string>
@@ -524,7 +530,7 @@
     <string lang="fi" key="HIDVOL_HOST_FILLING_HELP_SYSENC">Ulkoinen taltio on luotu ja kytketty asemalle %hc:. Tälle ulkoiselle taltiolle sinun tulee kopioida jotakin herkältä näyttäviä tiedostoja joita ET halua piilottaa. Ne ovat siellä koska jos olet pakotettu paljastamaan ensimmäiselle osiolle järjestelmäosion takana, missä ovat sekä ulkoinen taltio että piilotettua taltio (sisältää piilotetun käyttöjärjestelmän) sijaitsevat. Sinun on mahdollista paljastaa salasana ulkoiselle taltiolle ja olemassa olevalle piilotetulle taltiolle (ja piilotetulla käyttöjärjestelmällä) pysyy salassa.\n\nTÄRKEÄÄ: Tiedostot jotka kopioit ulkoiselle taltiolle ei pidä varata enempää kuin %s. Muutoin, siellä ei ole riittävästi tilaa piilotetulle ulkoiselle taltiolle (ja sinun ei ole mahdollista jatkaa). Kun olet lopettanut kopioinnin, paina Seuraava (älä pois kytke taltioita).</string>
     <string lang="fi" key="HIDVOL_HOST_FILLING_HELP">Ulkoinen taltio on luotu onnistuneesti ja yhdistetty asemalle %hc:. Tälle asemalle sinun pitää nyt kopioida jokin arkaluontoisen näköinen tiedosto jota sinä ET oikeasti tahdo piilottaa. Tiedostot ovat siellä koska kukaan ei pakota sinua paljastamaan salasanaasi. Sinä kerrot ainoastaan salasanan ulkoiselle taltiolle, et piilotetulle. Tiedostot joista todella välität ovat tallennetut piilotetulle taltiolle, joka luodaan myöhemmin. Kun lopetat kopioinnin, paina Seuraava. Älä irrota taltiota.\n\nTiedotus: Kun painat Seuraava näppäintä, ulkoisen taltio ryhmän bittikartta tutkitaan määritettäessä keskeytymättömän vapaan alueen kokoa joka päättyy taltion lopussa. Tämä alue sijaitsee piilotetulla taltiolle, siksi se rajoittaa mahdollisen maksimi koon. Ryhmä bittikartta käydään läpi varmistettaessa sen ettei ulkoinen piilotettu taltion ole ylikirjoittanut dataa.</string>
     <string lang="fi" key="HIDVOL_HOST_FILLING_TITLE">Ulkoinen Taltio Sisältö</string>
-    <string lang="fi" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nSeuraavassa vaiheessa asetat vaihtoehdot ulkoiselle taltiolle (jonne piilotettu taltio luodaan myöhemmin). </string>
+    <string lang="fi" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nSeuraavassa vaiheessa asetat vaihtoehdot ulkoiselle taltiolle (jonne piilotettu taltio luodaan myöhemmin).</string>
     <string lang="fi" key="HIDVOL_HOST_PRE_CIPHER_HELP_SYSENC">\n\nSeuraavaksi, sinä luot niin kutsutun ulkoisen VeraCrypt taltion joka on ensimmäisen osion sisällä käyttöjärjestelmän osion takana (kuten selostimme yhdessä edellisissä askeleissa).</string>
     <string lang="fi" key="HIDVOL_HOST_PRE_CIPHER_TITLE">Ulkoinen Taltio</string>
     <string lang="fi" key="HIDDEN_OS_PRE_CIPHER_HELP">Seuraavissa vaiheissa, sinun tulet valitsemaan vaihtoehdon ja salasanan piilotetulle taltiolle, mikä sisältää piilotetun käyttöjärjestelmän.\n\nMaininta: Klusterin bittikartta ulkoiselle taltiolle on skannattu keskeytymättömän alueen tunnistamiseksi vapaalla alueella mikä on järjestetty ulkoisen taltion loppuun. Tämä alue sisältää piilotetun taltion, siksi se rajoittaa mahdollisen maksimi koon. Maksimi mahdollinen koko piilotetulle taltiolle on tunnistettu ja vahvistettu olevaksi isompi kuin järjestelmäosion koko (mikä on vaadittu, koska kokonainen sisältö tarvitaan kopioida piilotetulle taltiolle). Tämä takaa sen että nykyisin ulkoiselle taltiolle tallennettu tietoa ei ylikirjoiteta piilotetun taltion kirjoitetulla tiedolla.</string>
@@ -561,6 +567,7 @@
     <string lang="fi" key="MAX_HIDVOL_SIZE_KB">Suurin mahdollinen piilotettu taltion koko tälle taltiolle on %.2f KB.</string>
     <string lang="fi" key="MAX_HIDVOL_SIZE_MB">Suurin mahdollinen piilotettu taltion koko tälle taltiolle on %.2f MB.</string>
     <string lang="fi" key="MAX_HIDVOL_SIZE_GB">Suurin mahdollinen piilotettu taltion koko tälle taltiolle on %.2f GB.</string>
+    <string lang="fi" key="MAX_HIDVOL_SIZE_TB">Suurin mahdollinen piilotettu taltion koko tälle taltiolle on %.2f TB.</string>
     <string lang="fi" key="MOUNTED_NOPWCHANGE">Taltion salasanaa/avaintiedostoa ei voida muuttaa kun taltio on yhdistettynä. Poista yhteys taltiolta.</string>
     <string lang="fi" key="MOUNTED_NO_PKCS5_PRF_CHANGE">Otsikkoavaimen periytyvää algoritmia ei voida muuttaa kun taltio on yhdistettynä. Poista yhteys taltiolta.</string>
     <string lang="fi" key="MOUNT_BUTTON">Y&amp;hdistä Laite</string>
@@ -591,12 +598,12 @@
     <string lang="fi" key="SELECT_PKCS11_MODULE">Valitse PKCS #11 Kirjasto</string>
     <string lang="fi" key="OUTOFMEMORY">Muisti loppui</string>
     <string lang="fi" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">TÄRKEÄÄ: Vahvasti suosittelemme että aloittelijat luovat VeraCrypt tiedosto säilön valitulle laitteelle/osiolle, sen sijaan että yrittäisivät salata kokonaisen laitteen/osion.\n\nKun luot VeraCrypt tiedosto säilön (päinvastoin kuin salaisit laitteen tai osion), esimerkiksi, kun ei ole riskiä tuhota isoa määrää tiedostoja. Huomioi, että VeraCrypt tiedosto säilö (vaikka sisältäisi virtuaalisen suojatun levyn) on oikeastaan kuin normaali tiedosto. Siksi, se voi olla esimerkiksi helpompi uudelleen nimetä, siirtää, tai kopioida kuten normaali tiedosto. Lisätietoa, katso kappale Aloittelijan Opas VeraCrypt Käyttäjä Oppaassa.\n\nHaluatko varmasti suojata kokonaisen laitteen/osion?</string>
-    <string lang="fi" key="OVERWRITEPROMPT">VAROITUS: Tiedosto '%hs' on jo olemassa!\n\nTÄRKEÄÄ: VERACRYPT EI SALAA TIEDOSTOA, VAAN SE TUHOTAAN. Oletko varma, että haluat tuhota tiedoston ja korvata sen uudella VeraCrypt säilöllä?</string>
+    <string lang="fi" key="OVERWRITEPROMPT">VAROITUS: Tiedosto '%s' on jo olemassa!\n\nTÄRKEÄÄ: VERACRYPT EI SALAA TIEDOSTOA, VAAN SE TUHOTAAN. Oletko varma, että haluat tuhota tiedoston ja korvata sen uudella VeraCrypt säilöllä?</string>
-    <string lang="fi" key="OVERWRITEPROMPT_DEVICE">VAROITUS: KAIKKI TIEDOSTOT JOTKA OVAT TALLENNETTUNA VALITULLA %s '%hs'%s NE TUHOTAAN JA HÄVITETÄÄN (NIITÄ EI SALATA)!\n\nHaluatko varmasti jatkaa alustusta?</string>
+    <string lang="fi" key="OVERWRITEPROMPT_DEVICE">VAROITUS: KAIKKI TIEDOSTOT JOTKA OVAT TALLENNETTUNA VALITULLA %s '%s'%s NE TUHOTAAN JA HÄVITETÄÄN (NIITÄ EI SALATA)!\n\nHaluatko varmasti jatkaa alustusta?</string>
-    <string lang="fi" key="NONSYS_INPLACE_ENC_CONFIRM">VAROITUS: Sinun ei ole mahdollista yhdistää taltiota tai päästä tallennettuihin tiedostoihin käsiksi ennen kuin se on täysin salattu.\n\nOletko varma että haluat aloittaa salauksen valitulle %s '%hs'%s?</string>
+    <string lang="fi" key="NONSYS_INPLACE_ENC_CONFIRM">VAROITUS: Sinun ei ole mahdollista yhdistää taltiota tai päästä tallennettuihin tiedostoihin käsiksi ennen kuin se on täysin salattu.\n\nOletko varma että haluat aloittaa salauksen valitulle %s '%s'%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="fi" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">VAROITUS: Huomioi että jos virta yhtäkkiä katkeaa ennen kuin salaus on suoritettu olemassa olevalle tiedoille, tai kun käyttöjärjestelmä keskeytyy virheeseen tai laitteisto vian vuoksi kun VeraCrypt on salaamassa olemassa olevaa tietoa, osa tiedoista korruptoituu tai häviää. Siksi, ennen kuin aloitat salauksen, ole hyvä ja varmista sinulla on varmuustallennus tiedostoista jotka haluat salata.\n\nOnko sinulla tällainen varmuustallenne?</string>
-    <string lang="fi" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">VAROITUS: MITKÄ TAHANSA TIEDOSTOT JOTKA OVAT TALLENNETTU OSIOLLE '%hs'%s (KUIN TAAS ENSIMMÄISELLE OSIOLLE KÄYTTöJÄRJESTELMÄN TAKAISELLA OSIOLLA) POISTETAAN JA NE HÄVIÄVÄT (NIITÄ EI SALATA)!\n\nOletko varma että haluat jatkaa formatoinnilla?</string>
+    <string lang="fi" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">VAROITUS: MITKÄ TAHANSA TIEDOSTOT JOTKA OVAT TALLENNETTU OSIOLLE '%s'%s (KUIN TAAS ENSIMMÄISELLE OSIOLLE KÄYTTöJÄRJESTELMÄN TAKAISELLA OSIOLLA) POISTETAAN JA NE HÄVIÄVÄT (NIITÄ EI SALATA)!\n\nOletko varma että haluat jatkaa formatoinnilla?</string>
     <string lang="fi" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">VAROITUS: VALITTU OSIO SISÄLTÄÄ ISON MÄÄRÄN TIETOA! Mikä tahansa tallennettu tiedosto osiolle pyyhitään ja katoaa (niitä EI salata)!</string>
     <string lang="fi" key="ERASE_FILES_BY_CREATING_VOLUME">Pyyhi mikä tahansa tallennettu tiedosto osiolta luomalla sen sisään VeraCrypt taltion</string>
     <string lang="fi" key="PASSWORD">Salasana</string>
@@ -616,7 +623,7 @@
     <string lang="fi" key="NONSYS_INPLACE_ENC_RESUME_VOL_SELECT_HELP">Ole hyvä ja valitse yksi listatuista taltioista. Lista sisältää jokaisen helppopääsyisen ei-järjestelmätaltion missä salauksen prosessi on keskeytynyt ja jonka otsikko voi olla salaus purettuna käyttäen saatavana olevaa salasanaa ja/tai avaintiedostoa(t).</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="fi" key="PASSWORD_HELP">On erittäin tärkeää että valitset hyvän salasanan. Sinun tulee välttää sellaisia jotka sisältävät vain yhden sanan joka voidaan löytää sanakirjasta (tai yhdistelmää 2, 3, tai 4 vastaavia sanoja). Sen ei pidä sisältää mitään nimeä tai syntymäpäivää. Ei pidä olla helposti arvattavissa. Hyvä salasana on satunnainen yhdistelmä isoja ja pieniä kirjaimia, numeroita, ja erikoismerkkejä kuten @ ^ = $ * + jne. Suosittelemme valitsemaan salasanaan useamman kuin 20 merkkiä (mitä pitempi sitä parempi). Maksimi pituus on 64 merkkiä.</string>
-    <string lang="fi" key="PASSWORD_HIDDENVOL_HELP">Valitse salasana piilotetulle taltiolle.</string>
+    <string lang="fi" key="PASSWORD_HIDDENVOL_HELP">Valitse salasana piilotetulle taltiolle. </string>
     <string lang="fi" key="PASSWORD_HIDDEN_OS_HELP">Valitse salasana piilotetulle käyttöjärjestelmälle (esim. piilotetulle taltiolle). </string>
     <string lang="fi" key="PASSWORD_HIDDEN_OS_NOTE">TÄRKEÄÄ: Salasana jonka valitsit piilotetulle käyttöjärjestelmälle tässä kohtaa tulee olla erilainen kuin toiset kaksi salasanaa (näitä ovat ulkoisen taltion salasana ja houkutuslintuna olevan käyttöjärjestelmän salasana).</string>
     <string lang="fi" key="PASSWORD_HIDDENVOL_HOST_DIRECT_HELP">Anna taltiolle salasana jonka haluat luoda piilotetun taltion sisälle.\n\nPaina Seuraavaksi, VeraCrypt yrittää yhdistää taltion. Hetki kun taltio on yhdistetty, ryhmä bittikartta tutkitaan läpi määritelläkseen vapaan tilan keskeytys alueella (jos on joitakin) mikä loppuu sovitettuun taltion loppuun. Tämä alue sijaitsee piilotetulla taltiolla ja siksi sillä on rajoitettu koko. Ryhmä bittikartan tutkiminen on tarpeen varmistaakseen ettei ulkoisella taltiolla olevaa dataa ylikirjoiteta piilotetun taltion toimesta.</string>
@@ -645,7 +652,7 @@
     <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
     <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
     <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 &gt; Organize &gt; 'Folder and search options' &gt; View).</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="fi" key="HIDDEN_VOL_PROT_PASSWORD_US_KEYB_LAYOUT">Jos yrität suojata piilotetussa säilössä olevan piilotetun järjestelmän, varmista että käytät vakio näppäimistöäsi kun kirjoitat salasanan piilotetulle taltiolle. Tämä on vaadittu koska todellisuudessa salasana tulee kirjoittaa esikäynnistys ympäristössä (ennekuin Windows käynnistyy) kun Windows näppäimistösi ei vielä käytettävissä.</string>
     <string lang="fi" key="FOUND_NO_PARTITION_W_DEFERRED_INPLACE_ENC">VeraCrypt ei löytänyt mitään taltiota missä ei-järjestelmä salaus olisi keskeytynyt ja missä taltion otsikko voi olla salaus purettuna käyttäen saatavana olevalla salasanalla ja/tai avaintiedostolla.\n\nVarmista että salasana ja/tai avaintiedosto ovat oikein ja että osio/taltio ei ole järjestelmän tai sovelluksien käytössä (sisältäen virustorjunta ohjelmiston).</string>
     <string lang="en" key="SELECTED_PARTITION_ALREADY_INPLACE_ENC">The selected partition/device is already fully encrypted.\nHeader Flags = 0x%.8X</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="fi" key="PREV">&lt; &amp;Takaisin</string>
     <string lang="fi" key="RAWDEVICES">Asennettujen raaka laitteiden listausta ei saada tehtyä järjestelmässäsi!</string>
-    <string lang="fi" key="READONLYPROMPT">Taltio '%hs' löytyi, ja on vain lukutilassa. Haluatko korvata sen?</string>
+    <string lang="fi" key="READONLYPROMPT">Taltio '%s' löytyi, ja on vain lukutilassa. Haluatko korvata sen?</string>
     <string lang="fi" key="SELECT_DEST_DIR">Valitse kohde hakemisto</string>
     <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>
@@ -680,13 +687,13 @@
     <string lang="fi" key="TEST_CIPHERTEXT_SIZE">Annetun testi salatekstin pituus on liian pitkä tai lyhyt.</string>
     <string lang="fi" key="TEST_KEY_SIZE">Annetun testi avaimen pituus on liian pitkä tai lyhyt.</string>
     <string lang="fi" key="TEST_PLAINTEXT_SIZE">Annetun testi tekstin pituus on liian pitkä tai lyhyt.</string>
-    <string lang="fi" key="TWO_LAYER_CASCADE_HELP">Kaksi ryhmää cascade toiminnassa ovat XTS tilassa. Jokainen ryhmä on ensimmäisenä salattuina %hs (%d-bitin avain) ja sitten %hs (%d-bitin avain). Jokainen salakirjoitus käyttää omaa avainta. Kaikki avaimet ovat toisistaan riippumattomia.</string>
+    <string lang="fi" key="TWO_LAYER_CASCADE_HELP">Kaksi ryhmää cascade toiminnassa ovat XTS tilassa. Jokainen ryhmä on ensimmäisenä salattuina %s (%d-bitin avain) ja sitten %s (%d-bitin avain). Jokainen salakirjoitus käyttää omaa avainta. Kaikki avaimet ovat toisistaan riippumattomia.</string>
-    <string lang="fi" key="THREE_LAYER_CASCADE_HELP">Kolme ryhmää on cascadoitu toimimaan XTS tilassa. Jokainen ryhmä on ensimmäiseksi salattuina %hs (%d-bitin avain), ja sitten %hs (%d-bitin avain), ja lopuksi %hs (%d-bitin avain). Jokainen salakirjoitus käyttää omaa avainta. Kaikki avaimet ovat toisistaan riippumattomia.</string>
+    <string lang="fi" key="THREE_LAYER_CASCADE_HELP">Kolme ryhmää on cascadoitu toimimaan XTS tilassa. Jokainen ryhmä on ensimmäiseksi salattuina %s (%d-bitin avain), ja sitten %s (%d-bitin avain), ja lopuksi %s (%d-bitin avain). Jokainen salakirjoitus käyttää omaa avainta. Kaikki avaimet ovat toisistaan riippumattomia.</string>
     <string lang="fi" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Huomioi, että riippuen käyttämästäsi käyttöjärjestelmästä, nämä automaattinen ajo ja automaattinen kytkentä ominaisuudet saattavat toimia ainoastaan kun liikutettavat levytiedostot ovat luotuna ei-kirjoitettavaan CD/DVD-kaltaiselle levylle. Huomioi, että tämä ei ole virhe VeraCrypt ohjelmassa (tämä on Windowsin rajoitus).</string>
     <string lang="fi" key="TRAVELER_DISK_CREATED">VeraCrypt liikutettava levy on onnistuneesti luotu.\n\nHuomioi, että tarvitset pääkäyttäjän oikeudet ajaaksesi VeraCrypt liikutettavassa tilassa. Huomioi myös, että järjestelmärekisterin tutkimisen jälkeen on mahdollista nähdä, että VeraCrypt on suoritettu Windows järjestelmän alla vaikka sitä olisi ajettu liikutettavassa tilassa.</string>
     <string lang="fi" key="TC_TRAVELER_DISK">VeraCrypt Liikutettava Levy</string>
     <string lang="fi" key="TWOFISH_HELP">Suunnittelu: Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall, and Niels Ferguson. Julkaistu 1998. 256-bit avain, 128-bit lohko. Toimintatapa on XTS. Twofish on yksi AES finalisti.</string>
-    <string lang="fi" key="MORE_INFO_ABOUT">Lisätietoa %hs</string>
+    <string lang="fi" key="MORE_INFO_ABOUT">Lisätietoa %s</string>
     <string lang="fi" key="UNKNOWN">Tuntematon</string>
     <string lang="en" key="ERR_UNKNOWN">An unspecified or unknown error occurred (%d).</string>
     <string lang="fi" key="UNMOUNTALL_LOCK_FAILED">Jotkin asemat sisältävät tiedostoja tai hakemistoja jotka ovat sovelluksen tai järjestelmän käytössä.\n\nPakotettu yhteyden poisto?</string>
@@ -706,7 +713,7 @@
     <string lang="fi" key="WRONG_VOL_TYPE">VeraCrypt ei voi muuttaa salasanaa vieraalle taltiolle.</string>
     <string lang="fi" key="SELECT_FREE_DRIVE">Valitse vapaa aseman kirjain listalta.</string>
     <string lang="fi" key="SELECT_A_MOUNTED_VOLUME">Valitse yhdistettävän taltion kirjain listalta.</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="fi" key="CANT_CREATE_AUTORUN">Virhe: Ei voida luoda autorun.inf tiedostoa</string>
     <string lang="fi" key="ERR_PROCESS_KEYFILE">Virhe suoritettaessa avaintiedostoa!</string>
     <string lang="fi" key="ERR_PROCESS_KEYFILE_PATH">Virhe suoritettaessa avaintiedosto polkua!</string>
@@ -851,7 +858,7 @@
     <string lang="fi" key="INSTALL_FAILED">Asennus epäonnistui.</string>
     <string lang="fi" key="UNINSTALL_FAILED">Asennuksen poisto epäonnistui.</string>
     <string lang="fi" key="DIST_PACKAGE_CORRUPTED">Tämä jaettu paketti on viallinen. Yritä ladata se uudelleen (mieluiten virallisilta VeraCrypt kotisivuilta osoitteesta https://veracrypt.codeplex.com).</string>
-    <string lang="fi" key="CANNOT_WRITE_FILE_X">Ei voida kirjoittaa tiedostoa %hs</string>
+    <string lang="fi" key="CANNOT_WRITE_FILE_X">Ei voida kirjoittaa tiedostoa %s</string>
     <string lang="fi" key="EXTRACTING_VERB">Puretaan</string>
     <string lang="fi" key="CANNOT_READ_FROM_PACKAGE">Ei voida lukea tietoja paketista.</string>
     <string lang="fi" key="CANT_VERIFY_PACKAGE_INTEGRITY">Ei voida tarkistaa jaetun paketin yhteneväisyyttä.</string>
@@ -860,8 +867,8 @@
     <string lang="fi" key="INSTALL_OK">VeraCrypt onnistuneesti asennettu.</string>
     <string lang="fi" key="SETUP_UPDATE_OK">VeraCrypt on onnistuneesti päivitetty.</string>
     <string lang="en" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt has been successfully upgraded. However, before you can start using it, the computer must be restarted.\n\nDo you want to restart it now?</string>
-    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
+    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu > All programs > Accessories > System Tools > System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
-    <string lang="fi" key="UNINSTALL_OK">VeraCrypt on onnistuneesti poistettu.\n\nPaina 'Lopetus' poistaaksesi VeraCrypt asennuksen ja %hs hakemiston. Huomioi, että hakemistoa ei poisteta jo jokin hakemiston tiedosto ei ole VeraCryptin asentama tai luotu VeraCrypt avulla.</string>
+    <string lang="fi" key="UNINSTALL_OK">VeraCrypt on onnistuneesti poistettu.\n\nPaina 'Lopetus' poistaaksesi VeraCrypt asennuksen ja %s hakemiston. Huomioi, että hakemistoa ei poisteta jo jokin hakemiston tiedosto ei ole VeraCryptin asentama tai luotu VeraCrypt avulla.</string>
     <string lang="fi" key="REMOVING_REG">Poistetaan VeraCrypt rekisterin sisältö</string>
     <string lang="fi" key="ADDING_REG">Lisätään rekisterin sisältö</string>
     <string lang="fi" key="REMOVING_APPDATA">Poista sovelluserityinen data</string>
@@ -872,10 +879,10 @@
     <string lang="fi" key="CREATING_SYS_RESTORE">Luodaan järjestelmän palautuspiste</string>
     <string lang="fi" key="FAILED_SYS_RESTORE">Epäonnistuttiin palautus pisteen luonnissa!</string>
     <string lang="fi" key="INSTALLER_UPDATING_BOOT_LOADER">Päivitä Käynnistyslataaja</string>
-    <string lang="fi" key="INSTALL_OF_FAILED">Epäonnistui asentaa '%hs'. %hs Haluatko jatkaa asennusta?</string>
+    <string lang="fi" key="INSTALL_OF_FAILED">Epäonnistui asentaa '%s'. %s Haluatko jatkaa asennusta?</string>
-    <string lang="fi" key="UNINSTALL_OF_FAILED">Asennuksen poisto '%hs' epäonnistui. %hs Haluatko jatkaa poistoa?</string>
+    <string lang="fi" key="UNINSTALL_OF_FAILED">Asennuksen poisto '%s' epäonnistui. %s Haluatko jatkaa poistoa?</string>
     <string lang="fi" key="INSTALL_COMPLETED">Asennuksen poisto valmis.</string>
-    <string lang="fi" key="CANT_CREATE_FOLDER">Hakemistoa '%hs' ei voida luoda</string>
+    <string lang="fi" key="CANT_CREATE_FOLDER">Hakemistoa '%s' ei voida luoda</string>
     <string lang="fi" key="CLOSE_TC_FIRST">VeraCrypt laiteohjainta ei voida purkaa.\n\nSulje ensin kaikki avoimet VeraCrypt ikkunat. Jos tämä ei auta, käynnistä Windows uudelleen ja yritä uudelleen.</string>
     <string lang="fi" key="DISMOUNT_ALL_FIRST">Kaikki VeraCrypt taltioilta täytyy poistaa yhteys ennen kuin onnistuu VeraCrypt asennus tai asennuksen poisto.</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>
@@ -921,14 +928,14 @@
     <string lang="fi" key="SYS_FAVORITE_VOLUMES_SAVED">Järjestelmän suosikkitaltiot tallennettu.\n\nAktivoidaksesi järjestelmän suosikkitaltioiden kytkemisen, kun järjestelmä käynnistyy, valitse 'Asetukset' &gt; 'Järjestelmän Suosikkitaltiot' &gt; 'Kytke järjestelmän suosikkitaltiot, kun Windows käynnistyy'.</string>
     <string lang="en" key="FAVORITE_ADD_DRIVE_DEV_WARNING">The volume you are adding to favorites is neither a partition nor a dynamic volume. Therefore, VeraCrypt will be unable to mount this favorite volume if the device number changes.</string>
     <string lang="en" key="FAVORITE_ADD_PARTITION_TYPE_WARNING">The volume you are adding to favorites is a partition not recognized by Windows.\n\nVeraCrypt will be unable to mount this favorite volume if the device number changes. Please set the type of the partition to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then add the partition to favorites again.</string>
-    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings &gt; Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
+    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings > Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_NETWORK_PATH_ERR">A container stored in a remote filesystem shared over a network cannot be automatically mounted when its host device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, the volume hosted on the device cannot be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable the volume hosted on the device to be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_LABEL_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, no label can be assigned to it.</string>
     <string lang="en" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable VeraCrypt to assign a label to the partition.</string>
     <string lang="en" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Due to a Windows limitation, a container stored in a remote filesystem shared over a network cannot be mounted as a system favorite volume (however, it can be mounted as a non-system favorite volume when a user logs on).</string>
-    <string lang="fi" key="ENTER_PASSWORD_FOR">Anna Salasana %hs:lle</string>
+    <string lang="fi" key="ENTER_PASSWORD_FOR">Anna Salasana %s:lle</string>
     <string lang="en" key="ENTER_PASSWORD_FOR_LABEL">Enter password for '%s'</string>
     <string lang="fi" key="ENTER_NORMAL_VOL_PASSWORD">Anna salasana tavalliselle/ulkoiselle taltiolle</string>
     <string lang="fi" key="ENTER_HIDDEN_VOL_PASSWORD">Anna salasana piilotetulle taltiolle</string>
@@ -943,8 +950,8 @@
     <string lang="fi" key="VOL_HEADER_BACKED_UP">Taltion otsikko varmistus nyt onnistuneesti luotu.\n\nTÄRKEÄÄ: Palauta taltion otsikot käyttämällä tätä varmistusta palautetaan nykyinen taltion salasana. Lisäksi, jos avaintiedosto(t) ovat/on tarpeellista yhdistää taltiolle, sama avaintiedosto(t) voi olla tarpeen yhdistää uudelleen kun taltion otsikko on.\n\nVAROITUS: Tämä taltio otsikko varmuuskopio voidaan käyttää palautettaessa VAIN otsikot tietyltä taltiolta. Jos käytät otsikko varmuuskopiota otsikoiden palautukseen eri taltioilta, voit yhdistää taltion, mutta ET voi purkaa salattua tietoa taltiolta (koska olet muuttanut sen pääavainta).</string>
     <string lang="fi" key="VOL_HEADER_RESTORED">Taltion otsikko on nyt palautettu onnistuneesti.\n\nTÄRKEÄÄ: Huomioi, että vanha salasana saatetaan myös palauttaa. Sitä paitsi, jos avaintiedosto(t) on/ovat tarpeen yhdistää taltiolle kun varmuuskopio on luotu, sama avaintiedosto(t) ovat nyt tarpeen yhdistää taltiolle uudelleen.</string>
     <string lang="fi" key="EXTERNAL_VOL_HEADER_BAK_FIRST_INFO">Turvallisuus syistä, sinun tulee antaa oikea salasana (ja/tai hankkia oikea avaintiedosto) taltiolle.\n\nHuomioi: Jos taltio sisältää piilotetun aseman, sinun tulee antaa oikea salasana (ja/tai hankkia oikea avaintiedostot) ulkoiselle taltiolle ensin. Vaihtoehtona, jos valitset piilotetun taltion varmistuksen, sinun tulee antaa oikea salasana (ja/tai oikeat avaintiedostot) piilotetulle taltiolle.</string>
-    <string lang="fi" key="CONFIRM_VOL_HEADER_BAK">Oletko varma että haluat luoda taltion otsikon varmistuksen %hs?\n\nKun olet painanut 'Kyllä', sinulle näytetään otsikko varmistuksen tiedostonimi.\n\nHuomioi: Molemmat vakio ja piilotettu taltio otsikot tullaan uudelleen salamaan käyttäen uutta suola ja talletettua varmuustiedostoa. Jos ei ole piilotettua taltiota tässä taltiossa, alue varataan piilotetulle taltion otsikolle varmuus tiedosto täytetään satunnaisdatalla (säilyttää  kiistanalainen uskottavuus). Kun palautetaan taltion otsikko varmuustallenteesta, sinun tulee antaa oikea salasana (ja/tai hankkia oikea avaintiedosto) joka on/oli voimassa kun taltion otsikko varmistus on luotu. Salasana (ja/tai avaintiedosto) tullaan taltion otsikon palautus tyyppi automaattisesti tunnistamaan, se on tavallinen tai piilotettu (huomioi että VeraCrypt tunnistaa tyypin läpi suorituksen tai virheen).</string>
+    <string lang="fi" key="CONFIRM_VOL_HEADER_BAK">Oletko varma että haluat luoda taltion otsikon varmistuksen %s?\n\nKun olet painanut 'Kyllä', sinulle näytetään otsikko varmistuksen tiedostonimi.\n\nHuomioi: Molemmat vakio ja piilotettu taltio otsikot tullaan uudelleen salamaan käyttäen uutta suola ja talletettua varmuustiedostoa. Jos ei ole piilotettua taltiota tässä taltiossa, alue varataan piilotetulle taltion otsikolle varmuus tiedosto täytetään satunnaisdatalla (säilyttää  kiistanalainen uskottavuus). Kun palautetaan taltion otsikko varmuustallenteesta, sinun tulee antaa oikea salasana (ja/tai hankkia oikea avaintiedosto) joka on/oli voimassa kun taltion otsikko varmistus on luotu. Salasana (ja/tai avaintiedosto) tullaan taltion otsikon palautus tyyppi automaattisesti tunnistamaan, se on tavallinen tai piilotettu (huomioi että VeraCrypt tunnistaa tyypin läpi suorituksen tai virheen).</string>
-    <string lang="fi" key="CONFIRM_VOL_HEADER_RESTORE">Oletko varma, että palautat taltion otsikon %hs?\n\nVAROITUS: Palauttamalla taltion otsikon palautuu myös taltion salasana, joka oli voimassa kun varmuuskopio luotiin. Sitä paitsi, jos avaintiedosto(t) oli/olivat tarpeen yhdistää taltiolle kun varmuuskopio luotiin, sama avaintiedosto(t) on tarpeen yhdistää taltio uudelleen sen jälkeen kun taltion otsikko on palautettu.\n\nKun olet painanut Kyllä, voit valita varmuuskopio tiedoston otsikon.</string>
+    <string lang="fi" key="CONFIRM_VOL_HEADER_RESTORE">Oletko varma, että palautat taltion otsikon %s?\n\nVAROITUS: Palauttamalla taltion otsikon palautuu myös taltion salasana, joka oli voimassa kun varmuuskopio luotiin. Sitä paitsi, jos avaintiedosto(t) oli/olivat tarpeen yhdistää taltiolle kun varmuuskopio luotiin, sama avaintiedosto(t) on tarpeen yhdistää taltio uudelleen sen jälkeen kun taltion otsikko on palautettu.\n\nKun olet painanut Kyllä, voit valita varmuuskopio tiedoston otsikon.</string>
     <string lang="fi" key="DOES_VOLUME_CONTAIN_HIDDEN">Sisältääkö taltio piilotetun taltion?</string>
     <string lang="fi" key="VOLUME_CONTAINS_HIDDEN">Taltio sisältää piilotetun taltion</string>
     <string lang="fi" key="VOLUME_DOES_NOT_CONTAIN_HIDDEN">Taltio ei sisällä piilotettua taltiota</string>
@@ -956,11 +963,13 @@
     <string lang="fi" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">Olet yrittänyt varmuuskopioida otsikkoa järjestelmäosiolta/asemalta. Tämä ei ole sallittua. Varmuustalletus/palautus toiminto mikä koskee järjestelmäosiota/asemaa voidaan suorittaa ainoastaan käyttämällä VeraCrypt Pelastuslevyä.\n\nHaluatko luoda VeraCrypt Pelastuslevyn?</string>
     <string lang="fi" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">Olet yrittänyt palauttaa otsikkoa virtuaalisesta VeraCrypt taltiolta mutta valitsit järjestelmäosion/aseman. Tämä ei ole sallittua. Varmuustalletus/palautus toiminto mikä koskee järjestelmäosiota/asemaa voidaan suorittaa ainoastaan käyttämällä VeraCrypt Pelastuslevyä.\n\nHaluatko luoda VeraCrypt Pelastuslevyn?</string>
     <string lang="fi" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">Kun olet painanut OK, valitse tiedoston mini uudelle VeraCrypt Pelastuslevyn ISO imagelle ja talletus sijainti sille.</string>
-    <string lang="fi" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">Pelastuslevy on luotu ja talletettu tähän tiedostoon: %hs\n\nNyt sinun tulee kirjoittaa (polttaa) Pelastuslevy CD tai DVD:lle.\n\nTÄRKEÄÄ: Huomioi, että tiedosto täytyy kirjoittaa CD/DVD:lle kuten ISO levyimagena (ei yksittäisenä tiedostona). Tietoa siitä miten tämä tehdään,katso CD/DVD ohjelmiston manuaalista.\n\nKun poltat Pelastuslevyn, valitse 'Järjestelmä' &gt; 'Tarkista Pelastuslevy' tarkistaaksesi että Pelastuslevyn poltto onnistui.</string>
+    <string lang="fi" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">Pelastuslevy on luotu ja talletettu tähän tiedostoon: %s\n\nNyt sinun tulee kirjoittaa (polttaa) Pelastuslevy CD tai DVD:lle.\n\nTÄRKEÄÄ: Huomioi, että tiedosto täytyy kirjoittaa CD/DVD:lle kuten ISO levyimagena (ei yksittäisenä tiedostona). Tietoa siitä miten tämä tehdään,katso CD/DVD ohjelmiston manuaalista.\n\nKun poltat Pelastuslevyn, valitse 'Järjestelmä' &gt; 'Tarkista Pelastuslevy' tarkistaaksesi että Pelastuslevyn poltto onnistui.</string>
-    <string lang="fi" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">Pelastuslevy on luotu ja tallennettu tiedostoon: %hs\n\nNyt sinun tarvitsee polttaa Pelastuslevy tiedosto CD tai DVD-levylle.\n\nHaluatko käynnistää Microsoft Windows Levytiedosto polton nyt?\n\nHuomioi: Kun olet polttanut Pelastuslevyn, valitse 'Järjestelmä' &gt; 'Takista Pelastuslevy että se on oikein poltettu.</string>
+    <string lang="fi" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">Pelastuslevy on luotu ja tallennettu tiedostoon: %s\n\nNyt sinun tarvitsee polttaa Pelastuslevy tiedosto CD tai DVD-levylle.\n\nHaluatko käynnistää Microsoft Windows Levytiedosto polton nyt?\n\nHuomioi: Kun olet polttanut Pelastuslevyn, valitse 'Järjestelmä' &gt; 'Takista Pelastuslevy että se on oikein poltettu.</string>
-    <string lang="fi" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Aseta VeraCrypt Pelastuslevy CD/DVD asemaan ja paina OK tarkistaaksesi sen.</string>
+    <string lang="fi" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Aseta VeraCrypt Pelastuslevy paina OK tarkistaaksesi sen.</string>
     <string lang="fi" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">VeraCrypt Pelastuslevy onnistuneesti tarkistettu.</string>
     <string lang="fi" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">Ei voida tarkistaa onko Pelastuslevyn poltettu oikein.\n\nJos olet polttanut Pelastu Levyn, poista ja uudelleen aseta CD/DVD levy ja yritä uudelleen. Jos tämä ei auta, koita toista CD/DVD levyn poltto ohjelmaa ja/tai välinettä.\n\nJos yritit tarkistaa VeraCrypt Pelastuslevyä luotuna eri pää avaimella, salasana, tmv., huomioi tämä että tällainen Pelastuslevy aina epäonnistuu tässä tarkistuksessa. Luodaksesi uuden yhteensopivan Pelastuslevyn nykyisellä konfiguraatiollasi, valitse 'Järjestelmä' &gt; 'Luo Pelastuslevy'.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk image fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
     <string lang="fi" key="ERROR_CREATING_RESCUE_DISK">Virhe luotaessa VeraCrypt Pelastuslevyä.</string>
     <string lang="fi" key="CANNOT_CREATE_RESCUE_DISK_ON_HIDDEN_OS">VeraCrypt Pelastuslevy ei voida luoda kun piilotettu käyttöjärjestelmä on käynnissä.\n\nLuodaksesi VeraCrypt Pelastuslevyn, käynnistä houkutuslintuna oleva käyttöjärjestelmä ja sitten valitse 'Järjestelmä' &gt; 'Luo Pelastuslevy'.</string>
     <string lang="fi" key="RESCUE_DISK_CHECK_FAILED">Ei voida tarkistaa Pelastuslevyä onko sen oikein poltettu.\n\nJos poltit Pelastuslevyn, poista se asemasta ja aseta uudelleen CD/DVD asemaan; sitten paina jälleen Seuraava nappia. Jos tämä ei auta, koita toista levyä%s.\n\nJos et ole polttanut Pelastuslevyä vielä, tee se, ja paina sitten Seuraava.\n\nJos yritit tarkistaa VeraCrypt Pelastuslevyä joka luotiin ennen kuin aloitit tämän ohjatun opastuksen, huomioi se, että tällaista Pelastuslevyä ei voida käyttää, koska se on luotu eri pääavaimelle. Sinun täytyy polttaa vasta tehty Pelastuslevy.</string>
@@ -989,8 +998,8 @@
     <string lang="fi" key="DRIVE_LETTER_ITEM">Asema Kirjain:   </string>
     <string lang="fi" key="UNSUPPORTED_CHARS_IN_PWD">Virhe: Salasana täytyy sisältää vain ASCII merkkejä.\n\nEi-ASCII merkit salasanassa saattaa aiheuttaa sen ettei taltiota voida yhdistää kun järjestelmä konfiguraatio muuttuu.\n\nSeuraavat merkit ovat sallittuja:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="fi" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">Varoitus: Salasana sisältää EI-ASCII merkkejä. Tämä saattaa aiheuttaa sen ettei taltiota voida yhdistää kun järjestelmä konfiguraatio muuttuu.\n\nSinun tulee korvata kaikki EI-ASCII merkit salasanassa ASCII merkeillä. Tehdäksesi niin, paina 'Taltiot' -&gt; 'Muuta Taltion Salasana'.\n\nSeuraavat merkit ovat mahdollisia:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="fi" key="EXE_FILE_EXTENSION_CONFIRM">VAROITUS: Suosittelemme että vältät tiedostopäätteitä joita käytetään suoritettavissa ohjelmissa (kuten .exe, .sys, tai .dll) ja muita samankaltaisia ongelmia aiheuttavia päätteitä. Käytettäessä tällaisia päätteitä aiheutuu Windows ja virusohjelmistossa säilölle toiminteita, jotka saattavat heikentää taltion suorituskykya ja saattavat aiheuttaa lisäksi vakavia ongelmia.\n\nSuosittelemme että poistat tai muutat tiedostopäätteet (kuten, vaikka '.tc').\n\nOletko varma että haluat yhä käyttää ongelmallista tiedostopäätettä?</string>
+    <string lang="fi" key="EXE_FILE_EXTENSION_CONFIRM">VAROITUS: Suosittelemme että vältät tiedostopäätteitä joita käytetään suoritettavissa ohjelmissa (kuten .exe, .sys, tai .dll) ja muita samankaltaisia ongelmia aiheuttavia päätteitä. Käytettäessä tällaisia päätteitä aiheutuu Windows ja virusohjelmistossa säilölle toiminteita, jotka saattavat heikentää taltion suorituskykya ja saattavat aiheuttaa lisäksi vakavia ongelmia.\n\nSuosittelemme että poistat tai muutat tiedostopäätteet (kuten, vaikka '.hc').\n\nOletko varma että haluat yhä käyttää ongelmallista tiedostopäätettä?</string>
-    <string lang="fi" key="EXE_FILE_EXTENSION_MOUNT_WARNING">VAROITUS: Tällä säilöllä on tiedostopääte jota käytetään suoritettavissa tiedostoissa (kuten .exe, .sys, tai .dll) tai jokin muu tiedostopääte jolla on samanlailla ongelmallinen. Joka hyvin todennäköisesti johtaa Windows tai virustorjuntaohjelmiston häirintään säilön kanssa, mikä epäsuotuisasti vaikuttaa taltion suorituskykyyn ja saattaa aiheuttaa vakavia ongelmia.\n\nSuosittelemme vahvasti että poistat säilön tiedostopäätteen tai muutat sen (esim., '.tc') sen jälkeen kun pois-kytket taltion.</string>
+    <string lang="fi" key="EXE_FILE_EXTENSION_MOUNT_WARNING">VAROITUS: Tällä säilöllä on tiedostopääte jota käytetään suoritettavissa tiedostoissa (kuten .exe, .sys, tai .dll) tai jokin muu tiedostopääte jolla on samanlailla ongelmallinen. Joka hyvin todennäköisesti johtaa Windows tai virustorjuntaohjelmiston häirintään säilön kanssa, mikä epäsuotuisasti vaikuttaa taltion suorituskykyyn ja saattaa aiheuttaa vakavia ongelmia.\n\nSuosittelemme vahvasti että poistat säilön tiedostopäätteen tai muutat sen (esim., '.hc') sen jälkeen kun pois-kytket taltion.</string>
     <string lang="fi" key="HOMEPAGE">Kotisivu</string>
     <string lang="fi" key="LARGE_IDE_WARNING_XP">VAROITUS: Näyttäisi siltä että sinulla ei ole mitään Service Pack asennettuna Windowsiin. Sinun ei pidä kirjoittaa IDE levylle isompaa kuin 128 GB tiedostoa Windows XP:llä jos sinulla ei ole Service Pack 1 tai myöhempää! Jos kuitenkin teen niin, data levyllä (ei väliä onko se VeraCrypt taltio vaiko ei) saattaa vioittua. Huomioi, että tämä on Windowsin rajoitus eikä virhe VeraCrypt ohjelmassa.</string>
     <string lang="fi" key="LARGE_IDE_WARNING_2K">VAROITUS: Näyttäisi siltä että sinulla ei ole Service Pack 3 tai myöhempää asennettuna Windowsiin. Sinun ei pidä kirjoittaa IDE levylle isompaa kuin 128 GB tiedostoa Windows 2000 jos sinulla ei ole Service Pack 3 tai myöhempää! Jos kuitenkin teen niin, data levyllä (ei väliä onko se VeraCrypt taltio vaiko ei) saattaa vioittua. Huomioi, että tämä on Windowsin rajoitus eikä virhe VeraCrypt ohjelmassa.\n\nTiedotus: Saatat tarvita aktivoida 48-bit LBA tuki rekisteristä; lisätietoa, katso http://support.microsoft.com/kb/305098/EN-US</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="fi" key="CHECKING_FS">Tarkistetaan tiedostojärjestelmää joka on VeraCrypt yhdistetty %s taltio..</string>
-    <string lang="fi" key="REPAIRING_FS">Yritetään korjata tiedostojärjestelmää joka on VeraCrypt yhdistetty %hs taltio..</string>
+    <string lang="fi" key="REPAIRING_FS">Yritetään korjata tiedostojärjestelmää joka on VeraCrypt yhdistetty %s taltio..</string>
-    <string lang="fi" key="WARN_CBC_MODE">Varoitus: Tämä taltio on salakirjoitettu CBC Tilaan. Turvallisuudesta johtuen, CBC tila on epäluotettava VeraCrypt versiosta 4.1 lähtien.\n\nVahvasti suosittelemme että siirrät tästä VeraCrypt taltiosta uuteen, mikä taltio on luotu tällä VeraCrypt versiolla. Tämän tehtyäsi, sinun täytyy turvallisuus syistä poistaa vanha taltio. Tarvittaessa lisätietoja, katso ohjelman Version Historia dokumentissa tai julkaisun mukana olleesta VeraCrypt 4.1 tai myöhemmästä julkaisu viestistä.</string>
     <string lang="fi" key="WARN_64_BIT_BLOCK_CIPHER">Varoitus: Tämä taltio on salakirjoitettu laillisella salakirjoitus algoritmilla.\n\nKaikki 64-bit-block salakirjoitus algoritmit (esimerkiksi, Blowfish, CAST-128, tai Triple DES) ovat vältettyjä. On mahdollista yhdistää tämä taltio käyttäen tulevia VeraCrypt versioita. Kuitenkaan ei tule olemaan lisäyksiä salakirjoitus algoritmi toteutuksiin. Suosittelemme että luot uuden VeraCrypt taltion käyttäen 128-bit-block salakirjoitus algoritmia (esimerkiksi, AES, Serpent, Twofish, jne.) ja että siirrät kaikki tiedostot tästä taltiosta uuteen.</string>
     <string lang="fi" key="SYS_AUTOMOUNT_DISABLED">Järjestelmäsi ei ole konfiguroitu käyttämään Autoyhdistä Laitteet toimintoa uusille taltioille. On mahdotonta yhdistää laite-isännöity VeraCrypt taltio. Autoyhdistä laitteet voidaan aktivoida ajamalla seuraava komento ja käynnistämällä järjestelmä uudelleen.\n\nmountvol.exe /E</string>
     <string lang="fi" key="SYS_ASSIGN_DRIVE_LETTER">Määrittele kirjain osiolle/laitteelle ennen suoritusta ('Control Panel' &gt; 'System and Maintenance' &gt; 'Administrative Tools' - 'Lisää ja alusta kovalevyn osioita').\n\nHuomioi, että tämä on käyttöjärjestelmän vaatimus.</string>
@@ -1069,7 +1077,7 @@
     <string lang="en" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt no longer supports encryption of the system partition/drive on Windows Vista with no Service Pack installed. Before upgrading VeraCrypt, please install Service Pack 1 or higher for Windows Vista.</string>
     <string lang="fi" key="FEATURE_REQUIRES_INSTALLATION">Virhe: Tämä ominaisuus vaatii, että VeraCrypt on asennettuna järjestelmään (käytät VeraCrypt ohjelmaa liikutettavassa tilassa).\n\nOle hyvä ja asenna VeraCrypt ja sitten yritä uudelleen.</string>
     <string lang="fi" key="WINDOWS_NOT_ON_BOOT_DRIVE_ERROR">VAROITUS: Windows ei ole asennettu samalle asemalle kuin mistä se käynnistetään. Tämä ei ole tuettuna.\n\nSinun tulee jatkaa ainoastaan vain jos olet varma että Windows on asennettuna asemalle josta se käynnistetään.\n\nHaluatko jatkaa?</string>
-    <string lang="fi" key="GPT_BOOT_DRIVE_UNSUPPORTED">Järjestelmäsi asemassa on GUID partitio taulu (GPT). Nykyisin vain aseman MBR osio taulu on tuettuna.</string>
+    <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</string>
     <string lang="fi" key="TC_BOOT_LOADER_ALREADY_INSTALLED">VAROITUS: VeraCrypt Käynnistyslataaja on jo asennettu järjestelmälevylle!\n\nOn mahdollista että koneen toinen käyttöjärjestelmä on jo salattu.\n\nVAROITUS: SUORITTAMALLA SALAUKSEN NYKYISELLE AJETTAVALLE JÄRJESTELMÄLLE SAATTAA TOINEN JÄRJESTELMÄ(T) MAHDOTTOMAKSI KÄYNNISTÄÄ JA ASIANOMAINEN MAHDOTONTA KÄYTTÄÄ.\n\nOletko varma, että haluat jatkaa?</string>
     <string lang="fi" key="SYS_LOADER_RESTORE_FAILED">Alkuperäisen järjestelmälataajan palautus ei onnistunut.\n\nKäytä VeraCrypt Pelastuslevyä ('Korjaa Valinta' &gt; 'Palauta alkuperäinen järjestelmä lataaja') tai Windows asennusohjelmalla korvataksesi VeraCrypt käynnistyslataajan Windows järjestelmälataajalla.</string>
     <string lang="fi" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">Alkuperäinen järjestelmä lataaja ei ole talletettu Pelastuslevylle (mahdollinen syy: puuttuva varmuuskopio tiedosto).</string>
@@ -1093,7 +1101,7 @@
     <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 medium (or using a service partition)?</string>
     <string lang="fi" key="DECOY_OS_REQUIREMENTS">Turvallisuus syistä, jos nykyisin käytettävä käyttöjärjestelmä vaatii aktivoinnin, se tulee aktivoida ennen tehtävän jatkamista. Huomioi että piilotettu käyttöjärjestelmä luodaan kopioimalla järjestelmäosion sisältö piilotetulle taltiolle (siksi jos käyttöjärjestelmää ei ole aktivoitu, piilotettua käyttöjärjestelmääkään ei aktivoida). Lisätietoja, katso kappale "Turvallisuus Varotoimet Liittyen Piilotettuihin Osioihin" VeraCrypt Käyttäjä Oppaassa.\n\nTärkeää: Ennen kuin jatkat, varmista että olet lukenut kappaleen "Turvallisuus Varotoimet Liittyen Piilotettuun Taltioihin" VeraCrypt Käyttäjän Oppaassa.\n\n\nOnko nykyisessä käyttöjärjestelmässäsi oheisen kaltainen tilanne?</string>
     <string lang="fi" key="CONFIRM_HIDDEN_OS_EXTRA_BOOT_PARTITION">Järjestelmäsi käyttää lisäkäynnistysosiota. VeraCrypt ei tue nukkumistilaa piilotetulla käyttöjärjestelmällä joka käyttää lisäkäynnistysosiota (houkutuslintuna oleva järjestelmä voi olla nukkuvana ilman mitään ongelmaa).\n\nHuomioi että käynnistysosio on jaettuna sekä houkutuslintujärjestelmän ja piilotetun järjestelmän kanssa. Siitä syystä, estääkseen datan vuotamisen ja ongelmat nukkumistilasta palatessa, VeraCrypt on torjuttava piilotettua järjestelmää kirjoittamasta jaetulle käynnistysosiolle.\n\n\nHaluatko jatkaa? jos valitset 'Ei', näytetään ohjeet lisäkäynnistyosion poistamiseksi</string>
-    <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' &gt; '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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
+    <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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
     <string lang="fi" key="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">Varoitus: Siellä on allokoimatonta tilaa järjestelmäosion ja ensimmäisen osion takana. Kun olet luonut piilotetun käyttöjärjestelmän, sinun täytyy luoda uudet osiot tälle allokoimattomalle tilalle. Muutoin, piilotettu käyttöjärjestelmä ei ole mahdollista käynnistää (ennen kuin poistat sellaisen vasta luodun osion).</string>
     <string lang="fi" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Tämä algoritmi ei ole tuettuna järjestelmän salauksessa.</string>
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
@@ -1106,10 +1114,10 @@
     <string lang="fi" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">Kuten VeraCrypt väliaikaisesti muutettu näppäimistä mallia vakion US näppäimistä malliksi, ei ole mahdollista kirjoittaa kirjaimia kun oikea Alt näppäin on alhaalla. Kuitenkin, voit kirjoittaa useimpia kirjaimia painamalla jotain kirjaimia Vaihto näppäin alhaalla.</string>
     <string lang="fi" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt torjuu näppäimistön ulkoasu muutokset.</string>
     <string lang="fi" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Huomioi: Salasana täytyy olla kirjoitettu esikäynnistys ympäristössä (ennen kuin Windows käynnistyy) jossa ei-US Windows näppäimistö ulkoasu ole saatavana. Siksi, salasana täytyy aina kirjoittaa käyttäen standardia US näppäimistö ulkoasua. Kuitenkin, on tärkeää huomioida että ET tarvitse oikeaa US näppäimistöä. VeraCrypt automaattisesti varmistaa voit turvallisesti kirjoittaa salasanan (juuri nyt ja esikäynnistys ympäristössä) vaikka sinulla EI ole oikeaa US näppäimistöä.</string>
-    <string lang="fi" key="RESCUE_DISK_INFO">Ennen kuin voit salata osion tai aseman, sinun täytyy luoda VeraCrypt Pelastuslevy (TPL), joka palvelee seuraavissa tarkoituksissa:\n\n- Jos VeraCrypt Käynnistyslataaja , Pääavain, tai muu kriittinen data tuhoutuu, TPL sallii sinun palauttaa se (huomioi, kuitenkin, kun sinä tulee edelleen antaa oikea salasana).\n\n- Jos Windows tuhoutuu ja et voi käynnistää sitä, TPL sallii sinun pysyvästi purkaa salaus osiolta tai asemalta ennekuin Windows käynnistyy.\n\n- TPL sisältää varmistuksen nykyisestä aseman ensimmäisestä raidan sisällöstä (joka tyypillisesti sisältää järjestelmälataajan tai käynnistyksen hallintaohjelman) ja sallii sinun palauttaa sen jos tarpeen.\n\nVeraCrypt Pelastuslevy ISO imagen luonti määritellään alla. </string>
+    <string lang="fi" key="RESCUE_DISK_INFO">Ennen kuin voit salata osion tai aseman, sinun täytyy luoda VeraCrypt Pelastuslevy (TPL), joka palvelee seuraavissa tarkoituksissa:\n\n- Jos VeraCrypt Käynnistyslataaja , Pääavain, tai muu kriittinen data tuhoutuu, TPL sallii sinun palauttaa se (huomioi, kuitenkin, kun sinä tulee edelleen antaa oikea salasana).\n\n- Jos Windows tuhoutuu ja et voi käynnistää sitä, TPL sallii sinun pysyvästi purkaa salaus osiolta tai asemalta ennekuin Windows käynnistyy.\n\n- TPL sisältää varmistuksen nykyisestä aseman ensimmäisestä raidan sisällöstä (joka tyypillisesti sisältää järjestelmälataajan tai käynnistyksen hallintaohjelman) ja sallii sinun palauttaa sen jos tarpeen.\n\nVeraCrypt Pelastuslevy ISO imagen luonti määritellään alla.</string>
     <string lang="fi" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">Sen jälkeen kun olet painanut OK, Microsoft Windows Levyimage poltto käynnistetään. Käytä sitä polttaaksesi VeraCrypt Pelastuslevyn ISO image CD/DVD:lle.\n\nSen jälkeen, palaa VeraCrypt Opastettuun Taltion Luontiin ja seuraa ohjeita.</string>
-    <string lang="fi" key="RESCUE_DISK_BURN_INFO">Pelastuslevy image on luotu ja talletettu tiedostoon: %hs\n\nNyt sinun tulee polttaa se Pelastuslevy CD tai DVD:lle.\n\n%lsPelastuslevyn polton jälkeen, paina Seuraava varmistaaksesi että Pelastuslevy on poltettu oikein.</string>
+    <string lang="fi" key="RESCUE_DISK_BURN_INFO">Pelastuslevy image on luotu ja talletettu tiedostoon: %s\n\nNyt sinun tulee polttaa se Pelastuslevy CD tai DVD:lle.\n\n%lsPelastuslevyn polton jälkeen, paina Seuraava varmistaaksesi että Pelastuslevy on poltettu oikein.</string>
-    <string lang="fi" key="RESCUE_DISK_BURN_INFO_NO_CHECK">Pelastuslevy image on luotu ja tallennettu tiedostoon: %hs\n\nNyt sinun tulee joko polttaa Pelastuslevyt CD/DVD:lle tai siirtää se varmaan paikkaan myöhempää käyttöä varten.\n\n%lsPaina Seuraava jatkaaksesi.</string>
+    <string lang="fi" key="RESCUE_DISK_BURN_INFO_NO_CHECK">Pelastuslevy image on luotu ja tallennettu tiedostoon: %s\n\nNyt sinun tulee joko polttaa Pelastuslevyt CD/DVD:lle tai siirtää se varmaan paikkaan myöhempää käyttöä varten.\n\n%lsPaina Seuraava jatkaaksesi.</string>
     <string lang="fi" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">TÄRKEÄÄ: Huomioi, että tiedoston täytyy olla kirjoitettu CD/DVD:lle ISO levy imagena (ei itse tiedostona). Ohjeistus siitä. miten tämä tehdään, seuraa dokumentaatiota jonka sait CD/DVD ohjelmiston mukana. Jos sinulla ei ole CD/DVD tallennus ohjelmaa, jolla voidaan kirjoittaa ISO levyimage CD/DVD:lle, paina alla olevaa linkkiä ladataksesi ilmaisen ohjelmiston.\n\n</string>
     <string lang="fi" key="LAUNCH_WIN_ISOBURN">Käynnistä Microsoft Windows Levy Imagen Poltto</string>
     <string lang="fi" key="RESCUE_DISK_BURN_NO_CHECK_WARN">VAROITUS: Jos olet jo luonut VeraCrypt Pelastuslevyn aiemmin, sitä ei voida uudelleen käyttää tälle järjestelmäosiolle/asemalle koska se on luotu eri pääavaimelle! Joka kerta kun salaat osion/levyn, sinun täytyy luoda uusi VeraCrypt Pelastuslevy vaikka käyttäisitkin samaa salasanaa.</string>
@@ -1247,7 +1255,7 @@
     <string lang="fi" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">Jos kohtaat jokin aikaisemmin kuvatuista ongelmista, tee salauksen purku osiolla/levylle (jos sen on salattu) ja sitten yritä salata se uudelleen käyttäen non-cascade salausalgoritmia (kuten 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 system (but not on the decoy system), the decoy system would contain a VeraCrypt driver and VeraCrypt applications whose version numbers are different from the version number of the VeraCrypt Boot Loader. Such a discrepancy might indicate that there is a hidden operating system on this computer.\n\n\nDo you want to continue?</string>
     <string lang="fi" key="UPDATE_TC_IN_HIDDEN_OS_TOO">VeraCrypt Käynnistys Lataajan versio numero tässä käyttöjärjestelmässä eroaa VeraCrypt ajurin versio numerosta (ja VeraCrypt sovelluksen) asennettuna tälle järjestelmälle.\n\nSinun tulee ajaa VeraCrypt asennus (jonka versio numero on sama kuin yhden VeraCrypt Käynnistys Lataajan) päivittääksesi VeraCrypt ohjelman tälle käyttöjärjestelmälle.</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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' &gt; '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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' > 'Create Rescue Disk').</string>
     <string lang="fi" key="BOOT_LOADER_UPGRADE_OK">VeraCrypt Käynnistyslataaja on päivitetty.\n\nVahvasti suosittelemme että luot uuden VeraCrypt Pelastuslevyn (joka sisältää uuden VeraCrypt version Käynnistys Lataajasta) valitsemalla 'Järjestelmä' &gt; 'Luo Pelastuslevy' sen jälkeen kun uudelleen käynnistät tietokoneen.</string>
     <string lang="fi" key="BOOT_LOADER_UPGRADE_OK_HIDDEN_OS">VeraCrypt Käynnistys Lataaja on päivitetty.\n\nOn vahvasti suositeltavaa että käynnistät houkutuslintu käyttöjärjestelmän ja sitten luot uuden VeraCrypt Pelastuslevyn (mikä sisältää uuden version VeraCrypt Käynnistys Lataajasta) valitsemalla 'Järjestelmä' &gt; 'Luo Pelastuslevy'.</string>
     <string lang="fi" key="BOOT_LOADER_UPGRADE_FAILED">VeraCrypt käynnistys lataajan päivittäminen epäonnistui.</string>
@@ -1272,7 +1280,7 @@
     <string lang="fi" key="INVALID_TOKEN_KEYFILE_PATH">turvallisuustunnisteen avaintiedosto polku on virheellinen.</string>
     <string lang="fi" key="SECURITY_TOKEN_ERROR">turvallisuustunniste virhe</string>
     <string lang="fi" key="CKR_PIN_INCORRECT">Salasana turvallisuustunnisteelle on virheellinen.</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' &gt; '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="fi" key="ALL_TOKEN_SESSIONS_CLOSED">Kaikki avoimet turvallisuustunniste istunnot on suljettu.</string>
     <string lang="fi" key="SELECT_TOKEN_KEYFILES">Valitse Turvallisuustunniste Avaintiedostot</string>
     <string lang="fi" key="TOKEN_SLOT_ID">Korttipaikka</string>
@@ -1297,8 +1305,8 @@
     <string lang="fi" key="MOUNTED_DEVICE_FORCED_READ_ONLY_WRITE_PROTECTION">Taltio '%s' on yhdistetty vain lukutilaan koska käyttöjärjestelmä raportoi isäntä aseman olevan kirjoitussuojatun.\n\nHuomioi että jotkin käyttäjän laiteajurit ovat raportoineet johtuen kirjoitettavan median olevan virheellisesti kirjoitussuojatun. Tämä ongelma ei johdu VeraCrypt ohjelmasta. Se voidaan ratkaista päivittämällä tai poistamalla jokin käyttäjän (ei-Microsoft) laiteajurit jotka ovat nykyään asennettuina tähän järjestelmään.</string>
     <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' &gt; 'Performance' and enable 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' &gt; 'Performance' and disable 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="fi" key="ASK_REMOVE_DEVICE_WRITE_PROTECTION">Haluatko että VeraCrypt yrittää poistaa osion/aseman kirjoitussuojauksen?</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>
@@ -1372,6 +1380,39 @@
     <string lang="fi" key="TB_PER_SEC">TB/s</string>
     <string lang="fi" key="PB_PER_SEC">PB/s</string>
     <string lang="en" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.fr.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="fr" name="Français" en-name="French" version="0.3.0" translators="Stéphane S., Olivier M., Thierry T" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="fr" key="IDC_BROWSE">&amp;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_FILE_TYPE">Associer l'extension '.hc' à 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>
@@ -37,6 +37,7 @@
     <control lang="fr" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Télécharger le logiciel de gravure de CD/DVD</control>
     <control lang="fr" key="IDC_FILE_CONTAINER">Créer un fichier conteneur chiffré</control>
     <control lang="fr" key="IDC_GB">&amp;Go</control>
+    <control lang="fr" key="IDC_TB">&amp;To</control>
     <control lang="fr" key="IDC_HIDDEN_SYSENC_INFO_LINK">Plus d'infos</control>
     <control lang="fr" key="IDC_HIDDEN_VOL">Volume VeraCrypt &amp;caché </control>
     <control lang="fr" key="IDC_HIDDEN_VOL_HELP">Plus d'infos sur les volumes cachés</control>
@@ -44,6 +45,7 @@
     <control lang="fr" key="IDC_HIDVOL_WIZ_MODE_FULL">Mode normal</control>
     <control lang="fr" key="IDC_KB">&amp;Ko</control>
     <control lang="fr" key="IDC_KEYFILES_ENABLE">&amp;Utiliser fichiers clés</control>
+    <control lang="fr" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Essayer d'abords de monter avec un mot de passe vide</control>
     <control lang="fr" key="IDC_KEYFILES_RANDOM_SIZE">Taille aléatoire ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="fr" key="IDC_KEY_FILES">&amp;Fichiers clés...</control>
     <control lang="fr" key="IDC_LINK_HASH_INFO">Infos : algorithmes de hachage</control>
@@ -58,7 +60,8 @@
     <control lang="fr" key="IDC_NO_HISTORY">&amp;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">&amp;Pause</control>
-    <control lang="fr" key="IDC_PIM_ENABLE">Saisir un PIM</control>
+    <control lang="fr" key="IDC_PIM_ENABLE">Saisir un P&amp;IM</control>
+    <control lang="fr" key="IDC_NEW_PIM_ENABLE">Saisir un PIM</control>
     <control lang="fr" key="IDC_QUICKFORMAT">Formatage rapide</control>
     <control lang="fr" key="IDC_SHOW_PASSWORD">&amp;Afficher le mot de passe</control>
     <control lang="fr" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Afficher le mot de passe</control>
@@ -82,7 +85,7 @@
     <control lang="fr" key="IDT_FORMAT_OPTIONS">Options</control>
     <control lang="fr" key="IDT_HASH_ALGO">Algorithme de hachage</control>
     <control lang="fr" key="IDT_HEADER_KEY">Clé d'en-tête : </control>
-    <control lang="fr" key="IDT_LEFT">Reste </control>
+    <control lang="fr" key="IDT_LEFT">Reste</control>
     <control lang="fr" key="IDT_MASTER_KEY">Clé principale : </control>
     <control lang="fr" key="IDT_MULTI_BOOT">Sélectionner cette option s'il y a au moins deux systèmes d'exploitation installés sur cet ordinateur.\n\nPar exemple :\n- Windows 2000 et Windows XP\n- Windows XP et Windows Vista\n- Windows et Mac OS X\n- Windows et Linux\n- Windows, Linux et Mac OS X</control>
     <control lang="fr" key="IDT_NON_SYS_DEVICE">Chiffre une partition non système sur tout disque interne ou externe (ex : clé USB). Optionnellement, crée un volume caché.</control>
@@ -94,7 +97,7 @@
     <control lang="fr" key="IDT_PROGRESS">Progression :</control>
     <control lang="fr" key="IDT_RANDOM_POOL">Nb aléatoire : </control>
     <control lang="fr" key="IDT_SINGLE_BOOT">Sélectionner cette option s'il n'y a qu'un seul système d'exploitation installé sur cette machine (même s'il y a plusieurs utilisateurs).</control>
-    <control lang="fr" key="IDT_SPEED">Vitesse </control>
+    <control lang="fr" key="IDT_SPEED">Vitesse</control>
     <control lang="fr" key="IDT_STATUS">État</control>
     <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>
@@ -118,6 +121,7 @@
     <control lang="fr" key="IDC_CREATE">Créer</control>
     <control lang="fr" key="IDC_CREATE_VOLUME">Créer un volume</control>
     <control lang="fr" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Ne &amp;montrer aucun texte dans l'écran d'authentification de pré-amorçage (excepté le message ci-dessous)</control>
+    <control lang="fr" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Désactiver la détection des attaques de type "Evil Maid"</control>
     <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>
@@ -132,6 +136,7 @@
     <control lang="fr" key="IDC_FAVORITE_MOVE_UP">&amp;Monter</control>
     <control lang="fr" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Ouvrir une fenêtre de l'&amp;Explorateur pour le volume sélectionné quand il est monté avec succès</control>
     <control lang="fr" key="IDC_FAVORITE_REMOVE">&amp;Supprimer</control>
+    <control lang="fr" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Utiliser le label du favori comme label du lecteur dans l'Explorateur</control>
     <control lang="fr" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Paramètres globaux</control>
     <control lang="fr" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Afficher une infobulle après un démontage par raccourci réussi</control>
     <control lang="fr" key="IDC_HK_DISMOUNT_PLAY_SOUND">Jouer un son de notification système après un démontage par raccourci réussi</control>
@@ -189,7 +194,7 @@
     <control lang="fr" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="fr" key="IDD_PASSWORDCHANGE_DLG">Modifier le mot de passe ou les fichiers clés</control>
     <control lang="fr" key="IDD_PASSWORD_DLG">Entrer le mot de passe du volume VeraCrypt</control>
-    <control lang="fr" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Options de performance</control>
+    <control lang="fr" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Options de performance et configuration du pilote</control>
     <control lang="fr" key="IDD_PREFERENCES_DLG">VeraCrypt - Préférences</control>
     <control lang="fr" key="IDD_SYSENC_SETTINGS">VeraCrypt - Paramètres de chiffrement du système</control>
     <control lang="fr" key="IDD_TOKEN_PREFERENCES">VeraCrypt - Jeton de sécurité - Préférences</control>
@@ -235,7 +240,7 @@
     <control lang="fr" key="IDM_ONLINE_TUTORIAL">Didactitiel pour débuter</control>
     <control lang="fr" key="IDM_ORGANIZE_FAVORITES">Organiser les volumes favoris...</control>
     <control lang="fr" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organiser les volumes système favoris...</control>
-    <control lang="fr" key="IDM_PERFORMANCE_SETTINGS">Performances...</control>
+    <control lang="fr" key="IDM_PERFORMANCE_SETTINGS">Performances et Configuration du pilote</control>
     <control lang="fr" key="IDM_PERMANENTLY_DECRYPT_SYS">Déchiffrer définitivement la partition/le disque système</control>
     <control lang="fr" key="IDM_PREFERENCES">Préférences...</control>
     <control lang="fr" key="IDM_REFRESH_DRIVE_LETTERS">Actualiser les lettres de lecteur</control>
@@ -256,6 +261,7 @@
     <control lang="fr" key="IDM_UNMOUNTALL">Démonter tous les volumes montés</control>
     <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_VERIFY_RESCUE_DISK_ISO">Vérifier l'image du disque de secours</control>
     <control lang="fr" key="IDM_VERSION_HISTORY">Historique</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>
@@ -321,7 +327,7 @@
     <control lang="fr" key="IDC_MOUNT_SYSENC_PART_WITHOUT_PBA">Monter la partition &amp;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">Évaluer</control>
-    <control lang="fr" key="IDC_PRINT">&amp;Imprimer </control>
+    <control lang="fr" key="IDC_PRINT">&amp;Imprimer</control>
     <control lang="fr" key="IDC_PROTECT_HIDDEN_VOL">&amp;Empêcher les dommages causés en écrivant dans le volume externe</control>
     <control lang="fr" key="IDC_RESET">&amp;Réinitialiser</control>
     <control lang="fr" key="IDC_SHOW_PASSWORD_MO">&amp;Afficher mot de passe</control>
@@ -329,7 +335,7 @@
     <control lang="fr" key="IDC_USE_EMBEDDED_HEADER_BAK">Utiliser l'en-tête de sauvegarde incorporé dans le &amp;volume s'il est disponible</control>
     <control lang="fr" key="IDC_XTS_MODE_ENABLED">Mode XTS</control>
     <control lang="fr" key="IDD_ABOUT_DLG">À propos de VeraCrypt</control>
-    <control lang="fr" key="IDD_BENCHMARK_DLG">VeraCrypt - Banc de test de l'algorithme de chiffrement</control>
+    <control lang="fr" key="IDD_BENCHMARK_DLG">VeraCrypt - Banc de test des algorithmes</control>
     <control lang="fr" key="IDD_CIPHER_TEST_DLG">VeraCrypt - Vecteurs test</control>
     <control lang="fr" key="IDD_COMMANDHELP_DLG">Aide sur la commande en ligne</control>
     <control lang="fr" key="IDD_KEYFILES">VeraCrypt - Fichiers clés</control>
@@ -371,7 +377,7 @@
     <control lang="fr" key="IDT_TEST_DATA_UNIT_NUMBER">Nombre d'unité de données (hexadécimal de 64 bits, taille d'une unité = 512 octets)</control>
     <control lang="fr" key="IDT_TEST_KEY">Clé (hexadécimal)</control>
     <control lang="fr" key="IDT_TEST_PLAINTEXT">Texte en clair (hexadecimal)</control>
-    <control lang="fr" key="IDT_TOKEN_KEYFILE_NAME">Nom du fichier clé : </control>
+    <control lang="fr" key="IDT_TOKEN_KEYFILE_NAME">Nom du fichier clé :</control>
     <control lang="fr" key="IDT_XTS_MODE">Mode XTS</control>
     <control lang="fr" key="MENU_SYSTEM_ENCRYPTION">S&amp;ystème</control>
     <control lang="fr" key="MENU_VOLUMES">&amp;Volumes</control>
@@ -388,7 +394,7 @@
     <string lang="fr" key="ADMIN_PRIVILEGES_DRIVER">Pour charger le pilote VeraCrypt, vous avez besoin d'être connecté avec un compte ayant des privilèges d'administrateur.</string>
     <string lang="fr" key="ADMIN_PRIVILEGES_WARN_DEVICES">Notez que pour chiffrer/déchiffrer/formater une partition/un périphérique vous devez être connecté avec un compte possédant des privilèges d'administrateur.\n\nCela ne s'applique pas aux volumes hébergeant un fichier.</string>
     <string lang="fr" key="ADMIN_PRIVILEGES_WARN_HIDVOL">Pour créer un volume caché vous devez être connecté à un compte possédant des privilèges d'administrateur.\n\nContinuer ?</string>
-    <string lang="fr" key="ADMIN_PRIVILEGES_WARN_NTFS">Notez que pour formater le volume en NTFS vous devez être connecté avec un compte possédant des privilèges d'administrateur.\n\nSans privilèges d'administrateur, vous pouvez formater le volume en FAT.</string>
+    <string lang="fr" key="ADMIN_PRIVILEGES_WARN_NTFS">Notez que pour formater le volume en NTFS/exFAT vous devez être connecté avec un compte possédant des privilèges d'administrateur.\n\nSans privilèges d'administrateur, vous pouvez formater le volume en FAT.</string>
     <string lang="fr" key="AES_HELP">Algorithme cryptographique (Rijndael, publié en 1998) approuvé par la FIPS, qui peut être utilisé par les agences/départements fédéraux américains pour protéger cryptographiquement les informations sensibles. Clé à 256 bits, bloc de 128 bits, 14 rondes (AES-256). Le mode opératoire est XTS.</string>
     <string lang="fr" key="ALREADY_MOUNTED">Le volume est déjà monté.</string>
     <string lang="fr" key="ERR_SELF_TESTS_FAILED">ATTENTION : Au moins un algorithme de chiffrement ou de hachage a échoué aux tests automatiques ! L'installation de VeraCrypt peut être corrompue.</string>
@@ -410,13 +416,13 @@
     <string lang="fr" key="CIPHER_TITLE">Options de chiffrement</string>
     <string lang="fr" key="CLEAN_WINMRU_FAILED">AVERTISSEMENT : L'effacement de l'emplacement du dernier volume/fichier clé sélectionné a échoué (enregistré par le sélecteur de fichiers) !</string>
     <string lang="fr" key="COMPRESSION_NOT_SUPPORTED">Erreur : Le volume a été compressé au niveau du système d'exploitation. VeraCrypt ne supporte pas les conteneurs compressés (notez que la compression de données chiffrées est inefficace et redondante).\n\nDésactivez la compression du conteneur en suivant ces étapes : 1) Cliquez-droit sur le conteneur (dans l'Explorateur de Windows). 2) Sélectionnez 'Propriétés'. 3) Sur l'onglet 'Général', cliquez sur 'Avancé'. 4) Dans 'Attributs avancés' décochez 'Compresser le contenu pour minimiser l'espace disque nécessaire'. Cliquez 'OK'. 5) Dans 'Propriétés', cliquez 'OK'.</string>
-    <string lang="fr" key="CREATE_FAILED">La création du volume %hs a échoué</string>
+    <string lang="fr" key="CREATE_FAILED">La création du volume %s a échoué</string>
-    <string lang="fr" key="DEVICE_FREE_BYTES">La taille de %hs est de %.2f octets</string>
+    <string lang="fr" key="DEVICE_FREE_BYTES">La taille de %s est de %.2f octets</string>
-    <string lang="fr" key="DEVICE_FREE_KB">La taille de %hs est de %.2f Ko</string>
+    <string lang="fr" key="DEVICE_FREE_KB">La taille de %s est de %.2f Ko</string>
-    <string lang="fr" key="DEVICE_FREE_MB">La taille de %hs est de %.2f Mo</string>
+    <string lang="fr" key="DEVICE_FREE_MB">La taille de %s est de %.2f Mo</string>
-    <string lang="fr" key="DEVICE_FREE_GB">La taille de %hs est de %.2f Go</string>
+    <string lang="fr" key="DEVICE_FREE_GB">La taille de %s est de %.2f Go</string>
-    <string lang="fr" key="DEVICE_FREE_TB">La taille de %hs est de %.2f To</string>
+    <string lang="fr" key="DEVICE_FREE_TB">La taille de %s est de %.2f To</string>
-    <string lang="fr" key="DEVICE_FREE_PB">La taille de %hs est de %.2f Po</string>
+    <string lang="fr" key="DEVICE_FREE_PB">La taille de %s est de %.2f Po</string>
     <string lang="fr" key="DEVICE_IN_USE_FORMAT">AVERTISSEMENT : La partition/le périphérique est utilisé par le système ou par une application. Formater peut conduire à une perte de données ou une instabilité du système.\n\nContinuer ?</string>
     <string lang="fr" key="DEVICE_IN_USE_INPLACE_ENC">AVERTISSEMENT : La partition est utilisée par le système ou une application. Vous devriez fermer toute application qui pourrait utiliser la partition (logiciel antivirus inclus).\n\nContinuer ?</string>
     <string lang="fr" key="FORMAT_CANT_DISMOUNT_FILESYS">Erreur : Le périphérique/la partition contient un système de fichiers qui n'a pas pû être démonté. Le système de fichiers peut être utilisé par le système d'exploitation. Formater le périphérique/la partition peut conduire à la corruption des données et à l'instabilité du système.\n\n Pour résoudre ce problème, il est recommandé de supprimer la partition puis de la recréer sans la formater. Pour se faire, faites comme suit : 1) Cliquez-droit sur 'Poste de Travail', sélectionnez 'Gérer'. La fenêtre 'Gestion de l'ordinateur' devrait apparaître. 2) Dans 'Gestion de l'ordinateur' sélectionnez 'Stockage' &gt; 'Gestion des disques'. 3) Cliquez-droit sur la partition à chiffrer puis choisissez soit 'Supprimer la partition' soit 'Supprimer le volume' ou 'Supprimer le disque logique'. 4) Cliquez 'Oui'. Si Windows propose de redémarrer, faites-le. Puis répétez les étapes 1 et 2 puis continuez à partir de l'étape 5. 5) Cliquez-droit sur l'espace libre et choisissez soit 'Nouvelle partition' soit 'Nouveau volume simple' ou 'Nouveau disque logique'. 6) La fenêtre d'un assistant apparaît, suivez ses instructions. Sur la page de l'assistant intitulée 'Formater la partition' choisissez soit 'Ne pas formater cette partition' ou 'Ne pas formater ce volume'. Cliquez sur 'Suivant'. Puis sur 'Terminer'. 7) Notez que le chemin du périphérique sélectionné dans VeraCrypt peut être désormais erroné. Aussi quittez l'assistant de création de volume VeraCrypt si besoin est et relancez-le. 8) Dans VeraCrypt, essayez à nouveau de chiffrer le périphérique/la partition.\n\nSi VeraCrypt continue d'échouer lors du chiffrement, pensez alors à créer un fichier conteneur à la place.</string>
@@ -435,12 +441,12 @@
     <string lang="fr" key="INPLACE_ENC_INVALID_PATH">Erreur : VeraCrypt peut uniquement chiffrer une partition, un volume dynamique ou un lecteur complet. Assurez-vous que le chemin d'accès spécifié est valide.</string>
     <string lang="fr" key="CANNOT_RESIZE_FILESYS">Erreur : Impossible de réduire le système de fichiers (le système de fichiers doit être réduit pour libérer de l'espace pour l'en-tête de volume et l'en-tête de sauvegarde).\n\nPossible causes et solutions : \n\n- Il n'y a pas assez d'espace libre sur le volume. Assurez-vous qu'aucune autre application n'écrit sur le système de fichiers.\n\n- Le système de fichiers est corrompu. Essayez de vérifier et de corriger les erreurs (cliquez avec le bouton droit sur l'unité logique correspondante dans la liste « Ordinateur », puis sélectionnez Propriétés &gt; Outils &gt; « Vérifier maintenant », assurez-vous que l'option « corriger automatiquement les erreurs de système de fichier » est activée, puis cliquez sur Démarrer).\n\nSi les étapes ci-dessus ne résolvent pas le problème, veuillez suivre les étapes suivantes.</string>
     <string lang="fr" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Erreur : Il n'y a pas suffisamment d'espace libre sur le volume et donc le système de fichiers ne peut pas être réduit (le système de fichiers doit être réduit pour libérer de l'espace pour l'en-tête de volume et l'en-tête de sauvegarde).\n\nSupprimez tous les fichiers redondants et videz la corbeille afin de libérer au moins 256 Ko d'espace et puis essayez à nouveau. Notez qu'en raison d'un problème de Windows, la quantité d'espace libre, rapporté par l'Explorateur Windows peut être incorrecte jusqu'au redémarrage du système d'exploitation. Si le redémarrage du système ne suffit pas, le système de fichiers est endommagé. Essayez de vérifier et de corriger les erreurs (cliquez avec le bouton droit sur l'unité logique correspondante dans la liste « Ordinateur », puis sélectionnez Propriétés &gt; Outils &gt; « Vérifier maintenant », assurez-vous que l'option « corriger automatiquement les erreurs de système de fichier » est activée, puis cliquez sur Démarrer).\n\nSi les étapes ci-dessus ne résolvent pas le problème, veuillez suivre les étapes suivantes.</string>
-    <string lang="fr" key="DISK_FREE_BYTES">L'espace libre sur le disque %hs est %.2f octets.</string>
+    <string lang="fr" key="DISK_FREE_BYTES">L'espace libre sur le disque %s est %.2f octets.</string>
-    <string lang="fr" key="DISK_FREE_KB">L'espace libre sur le disque %hs est %.2f Ko</string>
+    <string lang="fr" key="DISK_FREE_KB">L'espace libre sur le disque %s est %.2f Ko</string>
-    <string lang="fr" key="DISK_FREE_MB">L'espace libre sur le disque %hs est %.2f Mo</string>
+    <string lang="fr" key="DISK_FREE_MB">L'espace libre sur le disque %s est %.2f Mo</string>
-    <string lang="fr" key="DISK_FREE_GB">L'espace libre sur le disque %hs est %.2f Go</string>
+    <string lang="fr" key="DISK_FREE_GB">L'espace libre sur le disque %s est %.2f Go</string>
-    <string lang="fr" key="DISK_FREE_TB">L'espace libre sur le disque %hs est %.2f To</string>
+    <string lang="fr" key="DISK_FREE_TB">L'espace libre sur le disque %s est %.2f To</string>
-    <string lang="fr" key="DISK_FREE_PB">L'espace libre sur le disque %hs est %.2f Po</string>
+    <string lang="fr" key="DISK_FREE_PB">L'espace libre sur le disque %s est %.2f Po</string>
     <string lang="fr" key="DRIVELETTERS">Impossible d'obtenir les lettres de lecteur disponibles.</string>
     <string lang="fr" key="DRIVER_NOT_FOUND">Erreur : Le pilote VeraCrypt est introuvable.\n\nCopiez les fichiers 'veracrypt.sys' et 'veracrypt-x64.sys' dans le répertoire où se trouve l'application principale de VeraCrypt (VeraCrypt.exe).</string>
     <string lang="fr" key="DRIVER_VERSION">Erreur : Une version incompatible du pilote VeraCrypt est actuellement en cours d'exécution.\n\nSi vous essayez d'exécuter VeraCrypt en mode portable (c'est-à-dire sans l'installer) et qu'une autre version de VeraCrypt est déjà installé, vous devez tout d'abord la désinstaller (ou la mettre à niveau à l'aide de l'installateur de VeraCrypt). Pour la désinstaller, procédez comme suit : sur Windows Vista ou une version ultérieure, sélectionnez « Menu Démarrer » &gt; ordinateur &gt; « Désinstaller ou modifier un programme » &gt; VeraCrypt &gt; désinstaller ; sur Windows XP, sélectionnez « Menu Démarrer » &gt; Paramètres &gt; « Panneau de configuration » &gt; « Ajouter ou supprimer des programmes » &gt; VeraCrypt &gt; Supprimer.\n\nDe même, si vous essayez d'exécuter VeraCrypt en mode portable (c'est-à-dire sans l'installer) et qu'une autre version de VeraCrypt est déjà en cours d'exécution en mode portable, vous devez redémarrer le système, puis alors exécutez cette nouvelle version.</string>
@@ -458,7 +464,7 @@
     <string lang="fr" key="SYSTEM_CRASH_ANALYSIS_INFO">Après que vous ayez cliqué sur OK, VeraCrypt analisera la panne système. Cela peut prendre plusieurs minutes.</string>
     <string lang="fr" key="DEBUGGER_NOT_FOUND">Assurez-vous que la variable d'environnement 'PATH' inclus le chemin d'accès à 'kd.exe' (debugger du noyau).</string>
     <string lang="fr" key="SYSTEM_CRASH_NO_VERACRYPT">Il semble que VeraCrypt n'a probablement pas causé l'arrêt inattendu du système. Plusieurs autres raisons sont possibles (par exemple, un panne d'un  composant matériel, un bug dans un pilote de périphérique, etc.)</string>
-    <string lang="fr" key="SYSTEM_CRASH_UPDATE_DRIVER">Les résultats de l'analyse indiquent que la mise à jour du pilote suivant pourrait résoudre ce problème :</string>
+    <string lang="fr" key="SYSTEM_CRASH_UPDATE_DRIVER">Les résultats de l'analyse indiquent que la mise à jour du pilote suivant pourrait résoudre ce problème : </string>
     <string lang="fr" key="SYSTEM_CRASH_REPORT">Pour nous aider à déterminer s'il y a un bug dans VeraCrypt, vous pouvez nous envoyer un rapport d'erreur généré automatiquement contenant les éléments suivants : \n\n- La version du programme\n- La version du système d'exploitation\n- Le type de CPU\n - Le nom du composant VeraCrypt\n- La somme de contrôle de l'exécutable VeraCrypt\n- Le nom symbolique de la fenêtre de dialogue\n- La catégorie d'erreur\n- L'adresse de l'erreur\n- La pile d'exécution VeraCrypt\n\nSi vous sélectionnez « Oui », l'URL suivante (qui contient le rapport d'erreur entier) s'ouvrira dans votre navigateur internet par défaut.</string>
     <string lang="fr" key="ASK_SEND_ERROR_REPORT">Voulez-vous nous faire parvenir le rapport d'erreur ci-dessus ?</string>
     <string lang="fr" key="ENCRYPT">&amp;Chiffrer</string>
@@ -479,7 +485,7 @@
     <string lang="fr" key="FILESYS_PAGE_TITLE">Grands fichiers</string>
     <string lang="fr" key="FILESYS_PAGE_HELP_QUESTION">Comptez-vous stocker des fichiers plus grands que 4 Go sur ce volume VeraCrypt ?</string>
     <string lang="fr" key="FILESYS_PAGE_HELP_EXPLANATION">Selon votre choix ci-dessus, VeraCrypt choisira un système de fichiers qui convient pour le volume VeraCrypt (vous pourrez sélectionner un système de fichiers lors de la prochaine étape).</string>
-    <string lang="fr" key="FILESYS_PAGE_HELP_EXPLANATION_HIDVOL">Comme vous créez un volume externe, vous devriez choisir 'Non'. Si vous choisissez 'Oui', le système de fichiers par défaut sera NTFS, qui ne convient pas aussi bien que FAT pour les volumes externes (par exemple la taille maxi pour le volume caché sera plus grande de façon significative si le volume externe est formaté en FAT). Normalement FAT est le choix par défaut pour les deux types de volume (caché, et normal - ainsi les volumes FAT ne sont pas suspicieux). Cependant, si l'utilisateur indique son intention de stocker des fichiers plus grands que 4Go (que le système FAT ne supporte pas) alors FAT n'est pas le choix par défaut.</string>
+    <string lang="fr" key="FILESYS_PAGE_HELP_EXPLANATION_HIDVOL">Comme vous créez un volume externe, vous devriez choisir 'Non'. Si vous choisissez 'Oui', le système de fichiers par défaut sera NTFS, qui ne convient pas aussi bien que FAT/exFAT pour les volumes externes (par exemple la taille maxi pour le volume caché sera plus grande de façon significative si le volume externe est formaté en FAT/exFAT). Normalement FAT est le choix par défaut pour les deux types de volume (caché, et normal - ainsi les volumes FAT ne sont pas suspicieux). Cependant, si l'utilisateur indique son intention de stocker des fichiers plus grands que 4Go (que le système FAT ne supporte pas) alors FAT n'est pas le choix par défaut.</string>
     <string lang="fr" key="FILESYS_PAGE_HELP_EXPLANATION_HIDVOL_CONFIRM">Êtes-vous sûr de vouloir choisir 'Oui' ?</string>
     <string lang="fr" key="DEVICE_TRANSFORM_MODE_PAGE_TITLE">Mode création de volume</string>
     <string lang="fr" key="DEVICE_TRANSFORM_MODE_PAGE_FORMAT_HELP">C'est le moyen le plus rapide pour créer un volume VeraCrypt hébergé sur une partition ou sur un périphérique (le chiffrage sur place, qui est l'autre option, est plus lent parce que le contenu de chaque secteur doit être d'abord lu, chiffré puis écrit). Toutes les données actuellement stockées sur la partition/périphérique sélectionné seront perdues (les données ne seront pas chiffrées ; elles seront remplacées par des données aléatoires). Si vous souhaitez chiffrer les données existantes sur une partition, choisissez l'autre option.</string>
@@ -534,8 +540,8 @@
     <string lang="fr" key="HIDVOL_PROT_WARN_AFTER_MOUNT">Le volume caché est maintenant protégé contre les dommages jusqu'au démontage du volume externe.\n\nAVERTISSEMENT : Si vous tentez de sauvegarder des données dans la zone du volume caché, VeraCrypt lancera la protection en écriture sur l'intégralité du volume (partie externe et cachée) jusqu'au démontage. Cela peut provoquer la corruption du système de fichiers sur le volume externe ce qui (si répétition) pourrait affecter le déni plausible du volume caché. Aussi faites tout votre possible pour éviter d'écrire dans la zone du volume caché. Toute tentative de sauvegarde sur le volume caché échouera et les données seront perdues ! Windows considérera cela comme une erreur d'écriture ("L'écriture décalée a échoué" ou "Le paramètre est incorrect").</string>
     <string lang="fr" key="HIDVOL_PROT_WARN_AFTER_MOUNT_PLURAL">Tous les volumes cachés dans les nouveaux volumes montés sont maintenant protégés contre les dommages jusqu'au démontage.\n\nAVERTISSEMENT : Si vous tentez de sauvegarder des données dans la zone de protection du volume caché de ces volumes, VeraCrypt lancera la protection en écriture sur l'intégralité du volume (partie externe et cachée) jusqu'au démontage. Cela peut provoquer la corruption du système de fichiers sur le volume externe ce qui (si répétition) pourrait affecter le déni plausible du volume caché. Aussi faites tout votre possible pour éviter d'écrir dans la zone du volume caché. Toute tentative de sauvegarde sur le volume caché échouera et les données seront perdues ! Windows considérera cela comme une erreur d'écriture ("L'écriture décalée a échoué" ou "Le paramètre est incorrect").</string>
     <string lang="fr" key="DAMAGE_TO_HIDDEN_VOLUME_PREVENTED">AVERTISSEMENT : Vous tentez de sauvegarder des données dans la zone du volume caché du volume monté %c: ! VeraCrypt a empêché la sauvegarde des données pour protéger le volume caché. Cela peut provoquer la corruption du système de fichiers sur le volume externe et Windows considérera cela comme une erreur d'écriture ("L'écriture décalée a échoué" ou "Le paramètre est incorrect"). L'intégralité du volume (partie externe et cachée) sera protégée contre l'écriture jusqu'à son démontage. Si ce n'est pas la première fois que cela arrive, le déni plausible de ce volume caché peut être défavorablement affecté (à cause de possibles inconsistences corrélées inhabituelles dans le système de fichiers du volume externe). Aussi vous devriez considérer la création d'un nouveau volume VeraCrypt (avec Formatage rapide désactivé) et le déplacement des fichiers de ce volume vers le nouveau volume; ce volume devrait être supprimé de façon sécurisée (partie externe et cachée). Il est fortement recommandé de redémarrer votre système d'exploitation maintenant.</string>
-    <string lang="fr" key="CANNOT_SATISFY_OVER_4G_FILE_SIZE_REQ">Vous avez indiqué l'intention de stocker des fichiers de plus de 4Go sur le volume. Pour cela, le volume doit être formater en NTFS, ce qui, cependant, ne sera pas possible.</string>
+    <string lang="fr" key="CANNOT_SATISFY_OVER_4G_FILE_SIZE_REQ">Vous avez indiqué l'intention de stocker des fichiers de plus de 4Go sur le volume. Pour cela, le volume doit être formater en NTFS/exFAT, ce qui, cependant, ne sera pas possible.</string>
-    <string lang="fr" key="CANNOT_CREATE_NON_HIDDEN_NTFS_VOLUMES_UNDER_HIDDEN_OS">Veuillez noter que lorsqu'un système d'exploitation caché s'exécute, les volumes non-masqués VeraCrypt ne peuvent pas être formatés en NTFS. La raison est que le volume devra être monté temporairement sans protection contre l'écriture afin de permettre au système d'exploitation de le formater en NTFS (alors que le formatage en FAT est réalisé par VeraCrypt, non par le système d'exploitation et sans montage du volume). Pour plus de détails techniques, voir ci-dessous. Vous pouvez créer un volume NTFS non masqué au sein du système d'exploitation de leurre.</string>
+    <string lang="fr" key="CANNOT_CREATE_NON_HIDDEN_NTFS_VOLUMES_UNDER_HIDDEN_OS">Veuillez noter que lorsqu'un système d'exploitation caché s'exécute, les volumes non-masqués VeraCrypt ne peuvent pas être formatés en NTFS/exFAT. La raison est que le volume devra être monté temporairement sans protection contre l'écriture afin de permettre au système d'exploitation de le formater en NTFS/exFAT (alors que le formatage en FAT est réalisé par VeraCrypt, non par le système d'exploitation et sans montage du volume). Pour plus de détails techniques, voir ci-dessous. Vous pouvez créer un volume NTFS/exFAT non masqué au sein du système d'exploitation de leurre.</string>
     <string lang="fr" key="HIDDEN_VOL_CREATION_UNDER_HIDDEN_OS_HOWTO">Pour des raisons de sécurité, lorsqu'un système d'exploitation caché s'exécute, les volumes cachés peuvent être créés uniquement dans le mode « direct » (parce que les volumes extérieurs doivent toujours être montés en lecture seule). Pour créer un volume caché en toute sécurité, suivez ces étapes :\n\n1) Démarrer le système leurre.\n\n2) Créer un volume VeraCrypt normal et copier sur ce volume certains fichiers d'apparence sensible qu'en fait vous ne voulez pas masquer (le volume va devenir le volume externe).\n\n3 Démarrer le système caché et lancer l'Assistant de création de Volume VeraCrypt. Si le volume est hébergé dan un fichier, le déplacer vers la partition système ou sur un autre volume caché (dans le cas contraire, le volume caché nouvellement créé devrait être monté en lecture seule et ne peut pas être formaté). Suivez les instructions de l'Assistant afin de sélectionner le mode de création de volume caché "en direct".\n\n4) Dans l'Assistant, sélectionnez le volume que vous avez créé à l'étape 2 et puis suivez les instructions pour créer un volume caché qu'il contient.</string>
     <string lang="fr" key="HIDDEN_OS_WRITE_PROTECTION_BRIEF_INFO">Pour des raisons de sécurité, lorsqu'un système d'exploitation caché s'exécute, les systèmes de fichiers locaux non chiffrés et les volumes VeraCrypt non masqués sont montés en lecture seule (aucune donnée ne peut être écrite dans ces systèmes de fichiers ou volumes VeraCrypt).\n\nLes données peuvent être écrites dans n'importe quel système de fichiers qui réside dans un volume de VeraCrypt caché (à condition que le volume caché ne se trouve pas dans un récipient stocké sur un système de fichiers non chiffré ou sur tout autres fichiers en lecture seule).</string>
     <string lang="fr" key="HIDDEN_OS_WRITE_PROTECTION_EXPLANATION">Il y a trois raisons principales pour lesquelles ces contre-mesures ont été mises en œuvre :\n\n- Cela permet la création d'une plateforme sécurisée pour le montage des volumes cachés VeraCrypt. Notez que nous recommandons officiellement que les volumes cachés soient montés uniquement lorsqu'un système d'exploitation caché s'exécute. (Pour plus d'informations, consultez la sous-section « Exigences de sécurité et précautions relatives aux Volumes cachés » dans la documentation).\n\n- Dans certains cas, il est possible de déterminer qu'à un certain moment, un système de fichiers particulier n'était pas monté sous (ou qu'un fichier particulier sur le système de fichiers n'était pas enregistré ou accessible de l'intérieur) une instance particulière d'un système d'exploitation (par exemple, en analysant et en comparant les journaux du système de fichiers, l'horodatage des fichiers, journaux d'applications, etc.). Cela peut indiquer qu'un système d'exploitation caché est installé sur l'ordinateur. Les contre-mesures empêchent ces points.\n\n- Il empêche la corruption de données et permet la mise en veille prolongée sans danger. Lorsque Windows sort de l'hibernation, il suppose que tous les systèmes de fichiers sont montés dans le même État que lorsque le système est entré en hibernation. VeraCrypt assure cela en protégeant l'écriture sur n'importe quel système de fichiers accessible aussi bien au sein du leurre et que des systèmes cachés. Sans cette protection, le système de fichiers peut être endommagé lorsqu'il est monté par un seul système, tandis que l'autre système est mis en veille prolongée.</string>
@@ -553,7 +559,7 @@
     <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>
+    <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 : %s, code d'erreur : 0x%.8X)</string>
     <string lang="fr" key="INIT_REGISTER">Impossible d'initialiser l'application. L'enregistrement de la classe Dialog a échoué.</string>
     <string lang="fr" key="INIT_RICHEDIT">Erreur : Echec de chargement de la librairie système Rich Edit.</string>
     <string lang="fr" key="INTRO_TITLE">Assistant de création de volume</string>
@@ -561,6 +567,7 @@
     <string lang="fr" key="MAX_HIDVOL_SIZE_KB">Taille maximale du volume caché pour ce volume : %.2f Ko.</string>
     <string lang="fr" key="MAX_HIDVOL_SIZE_MB">Taille maximale du volume caché pour ce volume : %.2f Mo.</string>
     <string lang="fr" key="MAX_HIDVOL_SIZE_GB">Taille maximale du volume caché pour ce volume : %.2f Go.</string>
+    <string lang="fr" key="MAX_HIDVOL_SIZE_TB">Taille maximale du volume caché pour ce volume : %.2f To.</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">&amp;Monter</string>
@@ -591,12 +598,12 @@
     <string lang="fr" key="SELECT_PKCS11_MODULE">Sélectionner la bibliothèque PKCS #11</string>
     <string lang="fr" key="OUTOFMEMORY">Pas assez de mémoire</string>
     <string lang="fr" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">IMPORTANT : Nous recommandons fortement que les utilisateurs inexpérimentés créent un conteneur de fichier VeraCrypt sur le périphérique/partition sélectionné, au lieu d'essayer de chiffrer la totalité du lecteur/partition.\n\nQuand vous créez un conteneur de fichier VeraCrypt (par opposition à chiffrer une partition ou un périphérique) il n'y a, par exemple, aucun risque de détruire un grand nombre de fichiers. Notez qu'un conteneur de fichier VeraCrypt (même s'il contient un disque virtuel crypté) est en fait juste comme n'importe quel fichier normal. Pour plus d'informations, voir le tutoriel dans chapitre débutants dans le guide utilisateur VeraCrypt.\n\n Êtes-vous sûr que vous souhaitez chiffrer l'ensemble du lecteur/partition ?</string>
-    <string lang="fr" key="OVERWRITEPROMPT">AVERTISSEMENT : Le fichier '%hs' existe déjà !\n\nIMPORTANT : VERACRYPT NE CHIFFRERA PAS LE FICHIER, MAIS IL LE SUPPRIMERA.\n\nÊtes-vous sûr de vouloir supprimer le fichier et le remplacer par un nouveau conteneur VeraCrypt ?</string>
+    <string lang="fr" key="OVERWRITEPROMPT">AVERTISSEMENT : Le fichier '%s' existe déjà !\n\nIMPORTANT : VERACRYPT NE CHIFFRERA PAS LE FICHIER, MAIS IL LE SUPPRIMERA.\n\nÊtes-vous sûr de vouloir supprimer le fichier et le remplacer par un nouveau conteneur VeraCrypt ?</string>
-    <string lang="fr" key="OVERWRITEPROMPT_DEVICE">ATTENTION : TOUS LES FICHIERS ACTUELLEMENT STOCKÉS SUR %s '%hs'%s  SERONT ÉCRASÉS ET PERDUS (ILS NE SERONT PAS CHIFFRÉS) !\n\nÊtes vous sûr de vouloir procéder au formatage.</string>
+    <string lang="fr" key="OVERWRITEPROMPT_DEVICE">ATTENTION : TOUS LES FICHIERS ACTUELLEMENT STOCKÉS SUR %s '%s'%s  SERONT ÉCRASÉS ET PERDUS (ILS NE SERONT PAS CHIFFRÉS) !\n\nÊtes vous sûr de vouloir procéder au formatage.</string>
-    <string lang="fr" key="NONSYS_INPLACE_ENC_CONFIRM">AVERTISSEMENT : Vous ne serez pas en mesure de monter le volume ou d'accéder à des fichiers stockés dessus, jusqu'à ce qu'il ait été entièrement chiffré.\n\n Êtes-vous sûr que vous souhaitez démarrer le chiffrement sur la sélection %s '%hs'%s?</string>
+    <string lang="fr" key="NONSYS_INPLACE_ENC_CONFIRM">AVERTISSEMENT : Vous ne serez pas en mesure de monter le volume ou d'accéder à des fichiers stockés dessus, jusqu'à ce qu'il ait été entièrement chiffré.\n\n Êtes-vous sûr que vous souhaitez démarrer le chiffrement sur la sélection %s '%s'%s?</string>
-    <string lang="fr" key="NONSYS_INPLACE_DEC_CONFIRM">AVERTISSEMENT : Vous ne serez pas en mesure de monter le volume ou d'accéder à des fichiers stockés dessus, jusqu'à ce qu'il ait été entièrement déchiffré.\n\n Êtes-vous sûr que vous souhaitez démarrer le déchiffrement sur la sélection %s '%hs'%s?</string>
+    <string lang="fr" key="NONSYS_INPLACE_DEC_CONFIRM">AVERTISSEMENT : Vous ne serez pas en mesure de monter le volume ou d'accéder à des fichiers stockés dessus, jusqu'à ce qu'il ait été entièrement déchiffré.\n\n Êtes-vous sûr que vous souhaitez démarrer le déchiffrement sur la sélection %s '%s'%s?</string>
     <string lang="fr" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">AVERTISSEMENT : Veuillez noter que si l'alimentation est soudainement interrompu lors du chiffrement/déchiffrement des données existantes en place, ou lorsque le système d'exploitation plante à cause d'une erreur de logiciel ou de matériel alors que VeraCrypt chiffre/déchiffre les données existantes en place, certaines parties des données seront corrompues ou perdues. Par conséquent, avant de commencer à chiffrer, assurez-vous que vous disposez de copies de sauvegarde des fichiers que vous voulez chiffrer.\n\nDisposez-vous  d'une sauvegarde ?</string>
-    <string lang="fr" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">PRUDENCE : TOUS LES FICHIERS ACTUELLEMENT STOCKÉS SUR LA PARTITION '%hs'%s (i.e. SUR LA PREMIÈRE PARTITION APRÈS LA PARTITION SYSTÈME) SERONT ÉCRASÉS ET PERDUS (ILS NE SERONT PAS CHIFFRÉS) !\n\nÊtes-vous sûr de vouloir procéder au formatage ?</string>
+    <string lang="fr" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">PRUDENCE : TOUS LES FICHIERS ACTUELLEMENT STOCKÉS SUR LA PARTITION '%s'%s (i.e. SUR LA PREMIÈRE PARTITION APRÈS LA PARTITION SYSTÈME) SERONT ÉCRASÉS ET PERDUS (ILS NE SERONT PAS CHIFFRÉS) !\n\nÊtes-vous sûr de vouloir procéder au formatage ?</string>
     <string lang="fr" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">ATTENTION : LA PARTITION SÉLECTIONNÉE CONTIENT UNE GRANDE QUANTITÉ DE DONNÉES ! Tous les fichiers stockés sur la partition seront effacés et perdus (ils ne seront pas chiffrés) !</string>
     <string lang="fr" key="ERASE_FILES_BY_CREATING_VOLUME">Effacer tous les fichiers stockés sur la partition en créant un volume VeraCrypt dessus</string>
     <string lang="fr" key="PASSWORD">Mot de passe</string>
@@ -656,14 +663,14 @@
     <string lang="fr" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Avertissement: Comme le lecteur contient le chargeur d'amorçage de VeraCrypt, il se peut que ça soit un disque système chiffré. Si c'est le cas, veuillez noter que VeraCrypt ne peut pas déchiffrer une partition individuelle sur un disque système chiffré (vous pouvez seulement déchiffré le disque système en entier). Dans ce cas, vous serez en mesure de continuer maintenant, mais vous recevrez le message d'erreur "Mot de passe incorrect" plus tard.</string>
     <string lang="fr" key="PREV">&lt; &amp;Précédent</string>
     <string lang="fr" key="RAWDEVICES">Impossible de lister les périphériques installés sur votre système !</string>
-    <string lang="fr" key="READONLYPROMPT">Le volume '%hs' existe, il est en lecture seule. Êtes-vous sûr de vouloir le remplacer ?</string>
+    <string lang="fr" key="READONLYPROMPT">Le volume '%s' existe, il est en lecture seule. Êtes-vous sûr de vouloir le remplacer ?</string>
     <string lang="fr" key="SELECT_DEST_DIR">Sélectionnez le répertoire de destination</string>
     <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">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 exFAT est 424 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>
     <string lang="fr" key="SIZE_HELP_HIDDEN_VOL">Veuillez spécifier la taille du volume caché à créer. La taille minimum d'un volume caché est 40 Ko (ou 3664 Ko s'il est formaté en NTFS). La taille maximale possible, que vous pouvez spécifier pour un volume caché est affichée ci-dessus.</string>
     <string lang="fr" key="SIZE_HIDVOL_HOST_TITLE">Taille du volume externe</string>
@@ -680,13 +687,13 @@
     <string lang="fr" key="TEST_CIPHERTEXT_SIZE">Le cryptogramme de test que vous avez fourni est trop long ou trop court.</string>
     <string lang="fr" key="TEST_KEY_SIZE">La clé de test que vous avez fournie est trop longue ou trop courte.</string>
     <string lang="fr" key="TEST_PLAINTEXT_SIZE">Le texte en clair que vous avez fourni est trop long ou trop court.</string>
-    <string lang="fr" key="TWO_LAYER_CASCADE_HELP">Deux chiffrements en cascade opérant en mode XTS. Chaque bloc est d'abord chiffré avec %hs (clé de %d bits), puis avec %hs (clé de %d bits). Chaque chiffrement utilise sa propre clé. Toutes les clés sont mutuellement indépendantes.</string>
+    <string lang="fr" key="TWO_LAYER_CASCADE_HELP">Deux chiffrements en cascade opérant en mode XTS. Chaque bloc est d'abord chiffré avec %s (clé de %d bits), puis avec %s (clé de %d bits). Chaque chiffrement utilise sa propre clé. Toutes les clés sont mutuellement indépendantes.</string>
-    <string lang="fr" key="THREE_LAYER_CASCADE_HELP">Trois chiffrements en cascade opérant en mode XTS. Chaque bloc est d'abord chiffré avec %hs (clé de %d bits), puis avec %hs (clé de %d bits) et enfin avec %hs (clé de %d bits). Chaque chiffrement utilise sa propre clé. Toutes les clés sont mutuellement indépendantes.</string>
+    <string lang="fr" key="THREE_LAYER_CASCADE_HELP">Trois chiffrements en cascade opérant en mode XTS. Chaque bloc est d'abord chiffré avec %s (clé de %d bits), puis avec %s (clé de %d bits) et enfin avec %s (clé de %d bits). Chaque chiffrement utilise sa propre clé. Toutes les clés sont mutuellement indépendantes.</string>
     <string lang="fr" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Notez que, selon la configuration du système d'exploitation, les propriétés d'auto-exécution et de montage automatique ne peuvent fonctionner que lorsque les fichiers sur disque amovibles sont créés sur un support de type CD/DVD non réinscriptibles. Notez également que ce n'est pas un bug dans VeraCrypt (c'est une limitation de Windows).</string>
     <string lang="fr" key="TRAVELER_DISK_CREATED">Le disque amovible VeraCrypt a été créé avec succès.\n\nNotez que vous avez besoin des privilèges administrateur pour exécuter VeraCrypt en mode portable. Notez également qu'après examen du registre, il peut être possible de dire que VeraCrypt a été exécuté sur un système Windows, même s'il est exécutée en mode portable.</string>
     <string lang="fr" key="TC_TRAVELER_DISK">Disque nomade VeraCrypt</string>
     <string lang="fr" key="TWOFISH_HELP">Conçu par Bruce Schneier, David Wagner, John Kelsey, Niels Ferguson, Doug Whiting et Chris Hall. Publié en 1998. Clé de 256 bits et bloc de 128 bits. Le mode opératoire est XTS. Twofish était l'un des finalistes de AES.</string>
-    <string lang="fr" key="MORE_INFO_ABOUT">Plus d'infos sur %hs</string>
+    <string lang="fr" key="MORE_INFO_ABOUT">Plus d'infos sur %s</string>
     <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>
@@ -722,11 +729,11 @@
     <string lang="fr" key="ALL_FILES">Tous les fichiers</string>
     <string lang="fr" key="TC_VOLUMES">Volumes VeraCrypt</string>
     <string lang="fr" key="DLL_FILES">Modules de bibliothèque</string>
-    <string lang="fr" key="FORMAT_NTFS_STOP">Le formatage NTFS ne peut pas continuer.</string>
+    <string lang="fr" key="FORMAT_NTFS_STOP">Le formatage NTFS/exFAT ne peut pas continuer.</string>
     <string lang="fr" key="CANT_MOUNT_VOLUME">Impossible de monter le volume.</string>
     <string lang="fr" key="CANT_DISMOUNT_VOLUME">Impossible de démonter le volume.</string>
-    <string lang="fr" key="FORMAT_NTFS_FAILED">Windows n'a pas pû formater le volume en NTFS.\n\nSélectionnez un type de système de fichiers différent (si possible) et essayez à nouveau. Vous pouvez aussi laisser le volume non formaté (sélectionnez 'Aucun' comme système de fichiers), quittez cet assistant, montez le volume puis utilisez soit un outil système soit un outil tiers pour formater le volume monté (le volume restera chiffré).</string>
+    <string lang="fr" key="FORMAT_NTFS_FAILED">Windows n'a pas pû formater le volume en NTFS/exFAT.\n\nSélectionnez un type de système de fichiers différent (si possible) et essayez à nouveau. Vous pouvez aussi laisser le volume non formaté (sélectionnez 'Aucun' comme système de fichiers), quittez cet assistant, montez le volume puis utilisez soit un outil système soit un outil tiers pour formater le volume monté (le volume restera chiffré).</string>
-    <string lang="fr" key="FORMAT_NTFS_FAILED_ASK_FAT">Windows n'a pas pû formater le volume en NTFS.\n\nVoulez-vous formater le volume en FAT à la place ?</string>
+    <string lang="fr" key="FORMAT_NTFS_FAILED_ASK_FAT">Windows n'a pas pû formater le volume en NTFS/exFAT.\n\nVoulez-vous formater le volume en FAT à la place ?</string>
     <string lang="fr" key="DEFAULT">Défaut</string>
     <string lang="fr" key="PARTITION_LOWER_CASE">partition</string>
     <string lang="fr" key="PARTITION_UPPER_CASE">LA PARTITION</string>
@@ -740,10 +747,10 @@
     <string lang="fr" key="CLUSTER_TOO_SMALL">La taille de cluster sélectionnée est trop petite pour cette taille de volume. Une taille plus grande sera utilisée.</string>
     <string lang="fr" key="CANT_GET_VOLSIZE">Erreur : Impossible d'obtenir la taille du volume !\n\nAssurez-vous que le volume sélectionné n'est pas utilisé par le système ou par une application.</string>
     <string lang="fr" key="HIDDEN_VOL_HOST_SPARSE">Les volumes cachés ne doivent pas être créés dans les conteneurs dynamiques (fichiers fragmentés). Pour parvenir au déni plausible, le volume caché doit être créé dans un conteneur non-dynamique.</string>
-    <string lang="fr" key="HIDDEN_VOL_HOST_UNSUPPORTED_FILESYS">L'assistant  de création de volume VeraCrypt ne peut créer un volume caché que dans un volume FAT ou NTFS.</string>
+    <string lang="fr" key="HIDDEN_VOL_HOST_UNSUPPORTED_FILESYS">L'assistant  de création de volume VeraCrypt ne peut créer un volume caché que dans un volume FAT/exFAT ou NTFS.</string>
     <string lang="fr" key="HIDDEN_VOL_HOST_UNSUPPORTED_FILESYS_WIN2000">Sous Windows 2000, l'assistant de création de volume VeraCrypt ne peut créer un volume caché que dans un volume FAT.</string>
-    <string lang="fr" key="HIDDEN_VOL_HOST_NTFS">Note : Le système de fichiers FAT convient mieux que NTFS pour les volumes externes (par ex : la taille maximale du volume caché aurait été probablement plus grande si le volume externe avait été formaté en FAT).</string>
+    <string lang="fr" key="HIDDEN_VOL_HOST_NTFS">Note : Le système de fichiers FAT/exFAT convient mieux que NTFS pour les volumes externes (par ex : la taille maximale du volume caché aurait été probablement plus grande si le volume externe avait été formaté en FAT/exFAT).</string>
-    <string lang="fr" key="HIDDEN_VOL_HOST_NTFS_ASK">Notez que le système de fichiers FAT convient mieux que NTFS pour les volumes externes. Par exemple la taille maximale du volume caché aurait été probablement plus grande si le volume externe avait été formaté en FAT (la raison en est que NTFS stocke toujours les données internes au milieu du volume et ainsi, le volume caché ne peut résider que dans la seconde moitié du volume externe).\n\nÊtes-vous sûr de vouloir formater le volume externe en NTFS ?</string>
+    <string lang="fr" key="HIDDEN_VOL_HOST_NTFS_ASK">Notez que le système de fichiers FAT/exFAT convient mieux que NTFS pour les volumes externes. Par exemple la taille maximale du volume caché aurait été probablement plus grande si le volume externe avait été formaté en FAT/exFAT (la raison en est que NTFS stocke toujours les données internes au milieu du volume et ainsi, le volume caché ne peut résider que dans la seconde moitié du volume externe).\n\nÊtes-vous sûr de vouloir formater le volume externe en NTFS ?</string>
     <string lang="fr" key="OFFER_FAT_FORMAT_ALTERNATIVE">Voulez-vous plutôt formater le volume en FAT ?</string>
     <string lang="fr" key="FAT_NOT_AVAILABLE_FOR_SO_LARGE_VOLUME">Remarque : Ce volume ne peut pas être formaté en FAT car il dépasse la taille de volume maximale prise en charge par le système de fichiers FAT32 pour la taille de secteur en vigueur (2 to pour les secteurs de 512 octets et 16 TB pour les secteurs de 4096 octets).</string>
     <string lang="fr" key="PARTITION_TOO_SMALL_FOR_HIDDEN_OS">La partition pour le système d'exploitation caché (i.e. la première partition après la partition système) doit être au moins 5% plus large que la partition système (il s'agit de celle qui contient le système d'exploitation qui fonctionne actuellement).</string>
@@ -851,7 +858,7 @@
     <string lang="fr" key="INSTALL_FAILED">L'installation a échoué.</string>
     <string lang="fr" key="UNINSTALL_FAILED">La désinstallation a échoué.</string>
     <string lang="fr" key="DIST_PACKAGE_CORRUPTED">Ce package est endommagé. Essayez de le télécharger à nouveau (de préférence à partir du site web officiel de VeraCrypt à l'URL https://veracrypt.codeplex.com).</string>
-    <string lang="fr" key="CANNOT_WRITE_FILE_X">Impossible d'écrire dans le fichier %hs</string>
+    <string lang="fr" key="CANNOT_WRITE_FILE_X">Impossible d'écrire dans le fichier %s</string>
     <string lang="fr" key="EXTRACTING_VERB">Extraction de</string>
     <string lang="fr" key="CANNOT_READ_FROM_PACKAGE">Impossible de lire les données du package.</string>
     <string lang="fr" key="CANT_VERIFY_PACKAGE_INTEGRITY">Impossible de vérifier l'intégrité du package.</string>
@@ -861,7 +868,7 @@
     <string lang="fr" key="SETUP_UPDATE_OK">VeraCrypt a été mis à jour avec succès.</string>
     <string lang="fr" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt a été mis à niveau avec succès. Toutefois, avant de commencer à l'utiliser, l'ordinateur doit être redémarré.\n\nSouhaitez-vous redémarrer maintenant ?</string>
     <string lang="fr" key="SYS_ENC_UPGRADE_FAILED">Échec de mise à niveau de VeraCrypt!\n\nIMPORTANT : avant d'arrêter ou de redémarrer le système, nous recommandons fortement que vous utilisiez la restauration du système (menu Démarrer de Windows &gt; tous les programmes &gt; Accessoires &gt; Outils système &gt; restauration du système) pour restaurer votre système sur le point de restauration nommé « Installation de VeraCrypt ». Si la restauration du système n'est pas disponible, vous devriez essayer de réinstaller l'original ou la nouvelle version de VeraCrypt avant que vous arrêtiez ou redémarriez le système.</string>
-    <string lang="fr" key="UNINSTALL_OK">VeraCrypt a été désinstallé avec succès.\n\nCliquez sur 'Terminer' pour supprimer l'installeur de VeraCrypt ainsi que le dossier %hs. Notez que le dossier ne sera pas supprimé s'il contient des fichiers qui n'ont pas été installés par l'installeur de VeraCrypt ou créés par VeraCrypt.</string>
+    <string lang="fr" key="UNINSTALL_OK">VeraCrypt a été désinstallé avec succès.\n\nCliquez sur 'Terminer' pour supprimer l'installeur de VeraCrypt ainsi que le dossier %s. Notez que le dossier ne sera pas supprimé s'il contient des fichiers qui n'ont pas été installés par l'installeur de VeraCrypt ou créés par VeraCrypt.</string>
     <string lang="fr" key="REMOVING_REG">Supprimer les entrées VeraCrypt de la base de registre</string>
     <string lang="fr" key="ADDING_REG">Ajoût d'une entrée à la base de registre</string>
     <string lang="fr" key="REMOVING_APPDATA">Suppression des données spécifiques à l'application</string>
@@ -872,10 +879,10 @@
     <string lang="fr" key="CREATING_SYS_RESTORE">Création du point de restauration système</string>
     <string lang="fr" key="FAILED_SYS_RESTORE">La création du point de restauration système a échoué !</string>
     <string lang="fr" key="INSTALLER_UPDATING_BOOT_LOADER">Mise à jour du chargeur d'amorçage</string>
-    <string lang="fr" key="INSTALL_OF_FAILED">Impossible d'installer '%hs'. %hs Voulez-vous continuer l'installation ?</string>
+    <string lang="fr" key="INSTALL_OF_FAILED">Impossible d'installer '%s'. %s Voulez-vous continuer l'installation ?</string>
-    <string lang="fr" key="UNINSTALL_OF_FAILED">Impossible de désinstaller '%hs'. %hs Voulez-vous continuer la désinstallation ?</string>
+    <string lang="fr" key="UNINSTALL_OF_FAILED">Impossible de désinstaller '%s'. %s Voulez-vous continuer la désinstallation ?</string>
     <string lang="fr" key="INSTALL_COMPLETED">Installation terminée.</string>
-    <string lang="fr" key="CANT_CREATE_FOLDER">Le dossier '%hs' n'a pas pû être créé</string>
+    <string lang="fr" key="CANT_CREATE_FOLDER">Le dossier '%s' n'a pas pû être créé</string>
     <string lang="fr" key="CLOSE_TC_FIRST">Le pilote de périphérique VeraCrypt n'a pas pû être déchargé.\n\nFermez toutes les fenêtres VeraCrypt en premier. Si cela n'aide pas, redémarrez Windows et essayez à nouveau.</string>
     <string lang="fr" key="DISMOUNT_ALL_FIRST">Tous les volumes VeraCrypt doivent être démontés avant d'installer ou de désinstaller VeraCrypt.</string>
     <string lang="fr" key="UNINSTALL_OLD_VERSION_FIRST">Une version obsolète de VeraCrypt est installée sur ce système. Elle doit être désinstallée avant d'installer cette nouvelle version de VeraCrypt.\n\nDès que vous fermerez ce message, le programme de désinstallation de l'ancienne version sera lancé. Notez qu'aucun volume n'est déchiffré lorsque vous désinstallez VeraCrypt. Après avoir désinstallé l'ancienne version de VeraCrypt, réexécutez le programme d'installation de la nouvelle version de VeraCrypt.</string>
@@ -928,7 +935,7 @@
     <string lang="fr" key="FAVORITE_LABEL_DEVICE_PATH_ERR">Le périphérique affiché ci-dessous n'est ni une partition ni un volume dynamique. Donc, aucune étiquette ne peut lui être assigné.</string>
     <string lang="fr" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Veuillez associer le type de la partition affichée ci-dessous à un type reconnu par Windows (utilisez la commande SETID de l'outil Windows « diskpart »). Puis supprimer la partition des favoris et rajoutez-la. Cela permettra à VeraCrypt d'attribuer une étiquette à la partition.</string>
     <string lang="fr" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">En raison d'une limitation de Windows, un conteneur stocké dans un système de fichiers distant, partagé sur un réseau, ne peut pas être monté comme un volume système préféré (Cependant, il peut être monté comme un volume non-système préféré lorsqu'un utilisateur ouvre une session).</string>
-    <string lang="fr" key="ENTER_PASSWORD_FOR">Entrez le mot de passe pour %hs</string>
+    <string lang="fr" key="ENTER_PASSWORD_FOR">Entrez le mot de passe pour %s</string>
     <string lang="fr" key="ENTER_PASSWORD_FOR_LABEL">Entrez un mot de passe pour '%s'</string>
     <string lang="fr" key="ENTER_NORMAL_VOL_PASSWORD">Entrez le mot de passe pour le volume normal/externe</string>
     <string lang="fr" key="ENTER_HIDDEN_VOL_PASSWORD">Entrez le mot de passe pour le volume caché</string>
@@ -943,8 +950,8 @@
     <string lang="fr" key="VOL_HEADER_BACKED_UP">La sauvegarde de l'en-tête du volume a été créée avec succès.\n\nIMPORTANT : Restaurer l'en-tête du volume avec cette sauvegarde restaurera aussi le mot de passe actuel du volume. De plus si un(des) fichier(s) clé est(sont) nécessaire(s) pour monter le volume, la(les) même(s) clé(s) sera(seront) nécessaire(s) pour monter à nouveau le volume quand l'en-tête sera restauré.\n\nAVERTISSEMENT : Cette sauvegarde de l'en-tête de volume ne peut être utilisée que pour restaurer l'en-tête de ce volume en particulier. Si vous utilisez cette sauvegarde d'en-tête sur un volume différent, vous pourrez monter le volume mais vous ne pourrez PAS déchiffrer les données stockées (car vous changerez sa clé principale).</string>
     <string lang="fr" key="VOL_HEADER_RESTORED">L'en-tête du volume a été restaurée avec succès.\n\nIMPORTANT : Notez qu'un ancien mot de passe peut aussi avoir été restauré. De plus si un(des) fichier(s) clé est(sont) nécessaire(s) pour monter le volume, la(les) même(s) clé(s) sera(seront) nécessaire(s) pour monter à nouveau le volume.</string>
     <string lang="fr" key="EXTERNAL_VOL_HEADER_BAK_FIRST_INFO">Pour des raisons de sécurité, vous allez devoir saisir le mot de passe (et/ou le(s) fichier(s) clé) du volume.\n\nNote : Si le volume contient un volume caché, vous devrez saisir le mot de passe (et/ou le(s) fichier(s) clé) du volume externe en premier. Ensuite si vous décidez de sauvegarder l'en-tête du volume caché, vous devrez saisir le mot de passe (et/ou le(s) fichier(s) clé) du volume caché.</string>
-    <string lang="fr" key="CONFIRM_VOL_HEADER_BAK">Êtes-vous sûr de vouloir créer une sauvegarde de l'en-tête du volume : %hs ?\n\nAprès avoir cliqué 'Oui', vous serez invité à donner un nom à la sauvegarde de l'en-tête.\n\nNote : Les en-têtes du volume caché et du volume normal seront à nouveau chiffrés en utilisant un nouveau sel et stockés dans le fichier de sauvegarde. S'il n'y a pas de volume caché dans ce volume, la zone réservée pour l'en-tête du volume caché dans le fichier de sauvegarde sera remplie avec des données aléatoires (pour préserver le déni plausible). Lors de la restauration de l'en-tête d'un volume à partir d'un fichier de sauvegarde, vous devrez saisir le mot de passe (et/ou le(s) fichier(s) clé) qui étai(en)t valide(s) quand la sauvegarde de l'en-tête du volume a été créée. Le mot de passe (et/ou le(s) fichier(s) clé) déterminera(détermineront) automatiquement le type de l'en-tête du volume a restaurer, i.e. normal ou caché (notez que VeraCrypt déterminera le type par la méthode d'essais et d'erreurs).</string>
+    <string lang="fr" key="CONFIRM_VOL_HEADER_BAK">Êtes-vous sûr de vouloir créer une sauvegarde de l'en-tête du volume : %s ?\n\nAprès avoir cliqué 'Oui', vous serez invité à donner un nom à la sauvegarde de l'en-tête.\n\nNote : Les en-têtes du volume caché et du volume normal seront à nouveau chiffrés en utilisant un nouveau sel et stockés dans le fichier de sauvegarde. S'il n'y a pas de volume caché dans ce volume, la zone réservée pour l'en-tête du volume caché dans le fichier de sauvegarde sera remplie avec des données aléatoires (pour préserver le déni plausible). Lors de la restauration de l'en-tête d'un volume à partir d'un fichier de sauvegarde, vous devrez saisir le mot de passe (et/ou le(s) fichier(s) clé) qui étai(en)t valide(s) quand la sauvegarde de l'en-tête du volume a été créée. Le mot de passe (et/ou le(s) fichier(s) clé) déterminera(détermineront) automatiquement le type de l'en-tête du volume a restaurer, i.e. normal ou caché (notez que VeraCrypt déterminera le type par la méthode d'essais et d'erreurs).</string>
-    <string lang="fr" key="CONFIRM_VOL_HEADER_RESTORE">Êtes-vous sûr de vouloir restaurer l'en-tête du volume : %hs ?\n\nAVERTISSEMENT : La restauration de l'en-tête du volume restaure aussi le mot de passe du volume qui était valide quand la sauvegarde a été effectuée. De plus si un(des) fichier(s) clé est(sont) nécessaire(s) pour monter le volume, la(les) même(s) clé(s) sera(seront) nécessaire(s) pour monter à nouveau le volume quand l'en-tête sera restauré.\n\nAprès avoir cliqué 'Oui', vous sélectionnerez le fichier de sauvegarde de l'en-tête.</string>
+    <string lang="fr" key="CONFIRM_VOL_HEADER_RESTORE">Êtes-vous sûr de vouloir restaurer l'en-tête du volume : %s ?\n\nAVERTISSEMENT : La restauration de l'en-tête du volume restaure aussi le mot de passe du volume qui était valide quand la sauvegarde a été effectuée. De plus si un(des) fichier(s) clé est(sont) nécessaire(s) pour monter le volume, la(les) même(s) clé(s) sera(seront) nécessaire(s) pour monter à nouveau le volume quand l'en-tête sera restauré.\n\nAprès avoir cliqué 'Oui', vous sélectionnerez le fichier de sauvegarde de l'en-tête.</string>
     <string lang="fr" key="DOES_VOLUME_CONTAIN_HIDDEN">Le volume contient-il un volume caché ?</string>
     <string lang="fr" key="VOLUME_CONTAINS_HIDDEN">Le volume contient un volume caché</string>
     <string lang="fr" key="VOLUME_DOES_NOT_CONTAIN_HIDDEN">Le volume ne contient pas de volume caché</string>
@@ -955,12 +962,14 @@
     <string lang="fr" key="VOLUME_HAS_NO_BACKUP_HEADER">Il n'y a pas de sauvegarde d'en-tête intégrée dans ce volume (seuls les volumes créés avec VeraCrypt 6.0 et ultérieur contiennent des en-têtes de sauvegarde intégrés).</string>
     <string lang="fr" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">Vous essayez de sauvegarder l'en-tête de la partition/du disque système. Cela n'est pas autorisé. Toute opération de sauvegarde/restauration concernant la partition/le disque système ne peut être effectué qu'en utilisant le disque de secours VeraCrypt.\n\nVoulez-vous créer un disque de secours VeraCrypt ?</string>
     <string lang="fr" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">Vous essayez de restaurer l'en-tête d'un volume virtuel VeraCrypt mais vous avez sélectionné la partition/le disque système.  Cela n'est pas autorisé. Toute opération de sauvegarde/restauration concernant la partition/le disque système ne peut être effectué qu'en utilisant le disque de secours VeraCrypt.\n\nVoulez-vous créer un disque de secours VeraCrypt ?</string>
-    <string lang="fr" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">Après avoir cliqué sur 'OK', vous sélectionnerez un nom de fichier et un emplacement pour la nouvelle image ISO du disque de secours VeraCrypt.</string>
+    <string lang="fr" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">Après avoir cliqué sur 'OK', vous sélectionnerez un nom de fichier et un emplacement pour la nouvelle image du disque de secours VeraCrypt.</string>
-    <string lang="fr" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">L'image du disque de secours a été créée et stockée dans ce fichier :\n%hs\n\nMaintenant vous avez besoin de graver l'image du disque de secours sur un CD ou DVD.\n\nIMPORTANT : Notez que le fichier doit être écrit sur le CD/DVD sous forme d'image de disque ISO (pas dans un fichier individuel). Pour plus d'informations sur la façon de le faire, veuillez vous reporter à la documentation d'utilisation de votre logiciel de gravure.\n\nAprès avoir graver le disque de secours, sélectionnez « Système » &gt; « Vérifier le disque de secours » pour vérifier qu'il a été graver correctement.</string>
+    <string lang="fr" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">L'image du disque de secours a été créée et stockée dans ce fichier :\n%s\n\nMaintenant vous avez besoin de graver l'image du disque de secours sur un CD ou DVD.\n\nIMPORTANT : Notez que le fichier doit être écrit sur le CD/DVD sous forme d'image de disque ISO (pas dans un fichier individuel). Pour plus d'informations sur la façon de le faire, veuillez vous reporter à la documentation d'utilisation de votre logiciel de gravure.\n\nAprès avoir graver le disque de secours, sélectionnez « Système » &gt; « Vérifier le disque de secours » pour vérifier qu'il a été graver correctement.</string>
-    <string lang="fr" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">L'image du disque de secours a été créée et stockée dans ce fichier :\n%hs\n\nMaintenant vous avez besoin de graver l'image du disque de secours sur un CD ou un DVD.\n\nSouhaitez-vous lancer maintenant le logiciel de gravure Microsoft ?\n\nRemarque : Après avoir graver le disque de secours, sélectionnez « Système » &gt; « Vérifier le disque de secours » pour vérifier qu'il a été graver correctement.</string>
+    <string lang="fr" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">L'image du disque de secours a été créée et stockée dans ce fichier :\n%s\n\nMaintenant vous avez besoin de graver l'image du disque de secours sur un CD ou un DVD.\n\nSouhaitez-vous lancer maintenant le logiciel de gravure Microsoft ?\n\nRemarque : Après avoir graver le disque de secours, sélectionnez « Système » &gt; « Vérifier le disque de secours » pour vérifier qu'il a été graver correctement.</string>
-    <string lang="fr" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Insérez votre disque de secours VeraCrypt dans votre lecteur de CD/DVD et cliquez sur 'OK' pour le vérifier.</string>
+    <string lang="fr" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Insérez votre disque de secours VeraCrypt et cliquez sur 'OK' pour le vérifier.</string>
     <string lang="fr" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">Le disque de secours VeraCrypt a été vérifié avec succès.</string>
     <string lang="fr" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">Impossible de vérifier que le disque de secours a été correctement gravé.\n\nSi vous avez gravé le disque de secours, éjectez-le et réinsérez-le puis essayez à nouveau. Si cela n'aide pas, essayez un autre logiciel de gravure ou un autre support.\n\nSi vous essayez de vérifier un disque de secours créé pour une clé principale différente, un mot de passe différent, etc... dans ce cas la vérification échouera à tous les coups. Pour créer un nouveau disque de secours totalement compatible avec votre configuration actuelle, sélectionnez 'Système' &gt; 'Créer un disque de secours'.</string>
+    <string lang="fr" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">L'image du disque de secours VeraCrypt a été vérifiée avec succès.</string>
+    <string lang="fr" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">La vérification de l'image du disque de secours a échoué.\n\nSi vous essayez de vérifier une image de disque de secours créé pour une clé principale différente, un mot de passe différent, etc... dans ce cas la vérification échouera à tous les coups. Pour créer une nouvelle image du disque de secours totalement compatible avec votre configuration actuelle, sélectionnez 'Système' &gt; 'Créer un disque de secours'.</string>
     <string lang="fr" key="ERROR_CREATING_RESCUE_DISK">Erreur lors de la création du disque de secours VeraCrypt.</string>
     <string lang="fr" key="CANNOT_CREATE_RESCUE_DISK_ON_HIDDEN_OS">Le disque de secours VeraCrypt ne peut pas être créé quand un système d'exploitation caché est en cours d'exécution.\n\nPour créer un disque de secours VeraCrypt, démarrez le système d'exploitation leurre puis sélectionnez 'Système' &gt; 'Créer un disque de secours'.</string>
     <string lang="fr" key="RESCUE_DISK_CHECK_FAILED">Impossible de vérifier que le disque de secours a été correctement gravé.\n\nSi vous avez gravé le disque de secours, éjectez-le et réinsérez-le CD/DVD ; puis cliquez sur Suivant pour essayer à nouveau. Si cela ne fonctionne pas, essayez avec un autre media%s.\n\nSi vous n'avez pas encore gravé le disque de secours, veuillez le faire et  cliquez sur Suivant.\n\nSi vous a tenté de vérifier un disque de secours VeraCrypt créé avant de lancer cet Assistant, ce disque de secours ne peut pas être utilisé, car il a été créé pour une clé maître différente. Vous avez besoin de graver le disque de secours nouvellement généré.</string>
@@ -989,8 +998,8 @@
     <string lang="fr" key="DRIVE_LETTER_ITEM">Unité logique :   </string>
     <string lang="fr" key="UNSUPPORTED_CHARS_IN_PWD">Erreur : Le mot de passe ne doit contenir que des caractères ASCII.\n\nLes caractères non-ASCII peuvent empêcher le volume d'être montés si la configuration de votre système change.\n\nLes caractères suivants sont autorisés :\n\n! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="fr" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">Avertissement : Le mot de passe contient certains caractères non-ASCII. Cela peut empêcher le montage du volume si la configuration de votre système change.\n\nVous devriez remplacer les caractères non-ASCII du mot de passe par des caractères ASCII. Pour cela cliquez sur 'Volumes' -&gt; 'Modifier le mot de passe du volume'.\n\nLes caractères ASCII sont les suivants :\n\n! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="fr" key="EXE_FILE_EXTENSION_CONFIRM">AVERTISSEMENT : Nous recommandons fortement que vous évitiez les extensions de fichiers qui sont utilisées pour les fichiers exécutables (tels que .exe, .sys ou .dll) et d'autres extensions de fichiers de même teneur. En utilisant ces extensions de fichier, Windows et les logiciels antivirus provoquent des interférences avec le conteneur, ce qui compromet les performances du volume et peut également causer d'autres graves problems.\n\nNous recommandons fortement que vous supprimiez l'extension de fichier ou la modifiez (par exemple, à '.tc').\n\nÊtes-vous sûr que vous souhaitez utiliser cette extension de fichier ?</string>
+    <string lang="fr" key="EXE_FILE_EXTENSION_CONFIRM">AVERTISSEMENT : Nous recommandons fortement que vous évitiez les extensions de fichiers qui sont utilisées pour les fichiers exécutables (tels que .exe, .sys ou .dll) et d'autres extensions de fichiers de même teneur. En utilisant ces extensions de fichier, Windows et les logiciels antivirus provoquent des interférences avec le conteneur, ce qui compromet les performances du volume et peut également causer d'autres graves problems.\n\nNous recommandons fortement que vous supprimiez l'extension de fichier ou la modifiez (par exemple, à '.hc').\n\nÊtes-vous sûr que vous souhaitez utiliser cette extension de fichier ?</string>
-    <string lang="fr" key="EXE_FILE_EXTENSION_MOUNT_WARNING">AVERTISSEMENT : Nous recommandons fortement que vous évitiez les extensions de fichiers qui sont utilisées pour les fichiers exécutables (tels que .exe, .sys ou .dll) et d'autres extensions de fichiers de même teneur. En utilisant ces extensions de fichier, Windows et les logiciels antivirus provoquent des interférences avec le conteneur, ce qui compromet les performances du volume et peut également causer d'autres graves problems.\n\nNous recommandons fortement que vous supprimiez l'extension de fichier ou la modifiez (par exemple, à '.tc') après avoir démonter le volume.</string>
+    <string lang="fr" key="EXE_FILE_EXTENSION_MOUNT_WARNING">AVERTISSEMENT : Nous recommandons fortement que vous évitiez les extensions de fichiers qui sont utilisées pour les fichiers exécutables (tels que .exe, .sys ou .dll) et d'autres extensions de fichiers de même teneur. En utilisant ces extensions de fichier, Windows et les logiciels antivirus provoquent des interférences avec le conteneur, ce qui compromet les performances du volume et peut également causer d'autres graves problems.\n\nNous recommandons fortement que vous supprimiez l'extension de fichier ou la modifiez (par exemple, à '.hc') après avoir démonter le volume.</string>
     <string lang="fr" key="HOMEPAGE">Site Web</string>
     <string lang="fr" key="LARGE_IDE_WARNING_XP">AVERTISSEMENT : Il semble que vous n'avez pas appliqué de Service Pack à votre installation Windows. Vous ne devriez pas écrire sur des disques IDE plus grands que 128 Go sous Windows XP où le Service Pack 1 ou ultérieur n'est pas installé ! Si vous le faites, les données du disque (quelles qu'elles soient) peuvent être corrompues. Notez qu'il s'agit d'une limitation de Windows et non un bogue de VeraCrypt.</string>
     <string lang="fr" key="LARGE_IDE_WARNING_2K">AVERTISSEMENT : Il semble que vous n'avez pas appliqué le Service Pack 3 ou ultérieur à votre installation Windows. Vous ne devriez pas écrire sur des disques IDE plus grands que 128 Go sous Windows 2000 où le Service Pack 3 ou ultérieur n'est pas installé ! Si vous le faites, les données du disque (quelles qu'elles soient) peuvent être corrompues. Notez qu'il s'agit d'une limitation de Windows et non un bogue de VeraCrypt.\n\nNote : Vous pouvez avoir besoin d'activer le support LBA 48 bits dans la base de registre. Pour plus d'informations, consultez http://support.microsoft.com/kb/305098/fr</string>
@@ -1050,9 +1059,8 @@
     <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'&gt;'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>
+    <string lang="fr" key="CHECKING_FS">Vérification du système de fichiers sur le volume VeraCrypt monté sous %s...</string>
-    <string lang="fr" key="REPAIRING_FS">Tentative de réparation du système de fichiers sur le volume VeraCrypt monté sous %hs...</string>
+    <string lang="fr" key="REPAIRING_FS">Tentative de réparation du système de fichiers sur le volume VeraCrypt monté sous %s...</string>
-    <string lang="fr" key="WARN_CBC_MODE">Avertissement : Ce volume est chiffré en mode CBC. À cause de problèmes de sécurité, le mode CBC est à éviter depuis VeraCrypt v4.1.\n\nIl est fortement recommandé de déplacer les données de ce volume VeraCrypt vers un nouveau volume créé par cette version de VeraCrypt. Après l'avoir fait, vous devriez supprimer de façon sécurisée l'ancien volume. Pour plus d'information, consultez l'historique de version dans la documentation ou les notices de sortie de VeraCrypt v4.1 et ultérieure.</string>
     <string lang="fr" key="WARN_64_BIT_BLOCK_CIPHER">AVERTISSEMENT : Ce volume est chiffré avec un algorithme de chiffrement ayant un bloc de 64 bits.\n\nDe tels algorithmes (Blowfish, CAST-128 et Triple DES) sont progressivement abandonnés. Il  sera possible de monter ce volume en utilisant la version 5.0 et ultérieure de VeraCrypt. Cependant il n'y aura plus d'améliorations concernant l'implémentation de ces algorithmes. Il est recommandé de créer un nouveau volume VeraCrypt chiffré avec un algorithme de chiffrement ayant un bloc de 128 bits (ex : AES, Serpent, Twofish, etc.) et d'y déplacer tous les fichiers de l'ancien volume.</string>
     <string lang="fr" key="SYS_AUTOMOUNT_DISABLED">Votre système n'est pas configuré pour monter automatiquement de nouveaux volumes. Il est impossible de monter des volumes hébergeant un périphérique. Le montage automatique peut être activé en exécutant la commande suivante suivie d'un redémarrage système.\n\nmountvol.exe /E</string>
     <string lang="fr" key="SYS_ASSIGN_DRIVE_LETTER">Assignez une lettre de lecteur au périphérique/à la partition avant de poursuivre.\n\nNotez qu'il s'agit d'une exigence du système d'exploitation.</string>
@@ -1069,7 +1077,7 @@
     <string lang="fr" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt ne prend plus en charge le chiffrement du lecteur/partition système sous Windows Vista sans Service Pack installé. Avant la mise à niveau de VeraCrypt, installez le Service Pack 1 ou supérieur pour Windows Vista.</string>
     <string lang="fr" key="FEATURE_REQUIRES_INSTALLATION">Erreur : cette fonctionnalité nécessite que VeraCrypt soit installé sur le système (VeraCrypt fonctionne actuellement en mode portable).\n\nVeuillez installer VeraCrypt et réessayer.</string>
     <string lang="fr" key="WINDOWS_NOT_ON_BOOT_DRIVE_ERROR">ATTENTION : Windows ne semble pas être installé sur le lecteur à aprtir duquel il démarre. Ceci n'est pas supporté.\n\nVous devriez continuer uniquement si vous êtes sûr que Windows est installé sur le disque à partir duquel il démarre.\n\nVoulez-vous continuer ?</string>
-    <string lang="fr" key="GPT_BOOT_DRIVE_UNSUPPORTED">Votre disque système possède un GUID de table de partition (GPT). Actuellement seuls les disques avec un MBR sont supportés.</string>
+    <string lang="fr" key="GPT_BOOT_DRIVE_UNSUPPORTED">Vous utilisez une version 32-bit de Windows et votre disque système possède un GUID de table de partition (GPT). Actuellement, le chiffrement des disques système GPT est supporté seulement sous Windows 64-bit.</string>
     <string lang="fr" key="TC_BOOT_LOADER_ALREADY_INSTALLED">ATTENTION : Le chargeur d'amorçage de VeraCrypt est déjà installé sur votre disque système !\n\nIl est possible qu'un autre système sur votre ordinateur soit déjà chiffré.\n\nAVERTISSEMENT : PROCÉDER AU CHIFFREMENT DU SYSTÈME ACTUELLEMENT EN FONCTIONNEMENT PEUT RENDRE LES AUTRES SYSTÈMES IMPOSSIBLES À DÉMARRER ET LES DONNÉES RELATIVES INACCESSIBLES.\n\nÊtes-vous sûr de vouloir continuer ?</string>
     <string lang="fr" key="SYS_LOADER_RESTORE_FAILED">Impossible de restaurer le chargeur d'amorçage système original.\n\nVeuillez utiliser le disque de secours VeraCrypt ("Options de réparation" &gt; « Restaurer le chargeur d'amorçage du système original ») ou le support d'installation de Windows pour remplacer le chargeur d'amorçage de VeraCrypt avec le chargeur du système Windows.</string>
     <string lang="fr" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">Le chargeur de système d'origine ne sera pas stocké sur le disque de secours (cause probable : fichier de sauvegarde manquant).</string>
@@ -1108,8 +1116,8 @@
     <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 toute sécurité votre mot de passe (maintenant et dans l'environnement de pré-amorçage) même si vous ne possédez pas un vrai clavier américain.</string>
     <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/disque avant le démarrage de Windows.\n\n- Le VRD contiendra une sauvegarde du contenu actuel de la première plage du disque (qui contient en général un chargeur de système ou le gestionnaire de démarrage) et vous permettra de le restaurer si necessaire.\n\n L'image ISO du disque de récupération VeraCrypt sera créée à l'emplacement spécifié ci-dessous.</string>
     <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">L'image de la disque de secours a été créée et stockée dans le fichier : \n%s\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>
+    <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%s\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>
     <string lang="fr" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">IMPORTANT : Le fichier doit être écrit sur le CD/DVD sous forme d'image ISO (pas dans un fichier individuel). Pour plus d'informations sur la façon de le faire, veuillez vous reporter à la documentation de votre logiciel de gravure de CD/DVD. Si vous n'avez pas de logiciel de gravure de CD/DVD cliquez sur le lien ci-dessous pour télécharger un logiciel gratuit.\n\n</string>
     <string lang="fr" key="LAUNCH_WIN_ISOBURN">Lancez le logiciel de gravure d'image disque de Microsoft</string>
     <string lang="fr" key="RESCUE_DISK_BURN_NO_CHECK_WARN">AVERTISSEMENT : Si vous avez déjà créé un disque de secours VeraCrypt dans le passé, il ne peut pas être utilisé à nouveau pour cette partition/ce disque système car il a été créé pour une clé principale différente ! Chaque fois que vous chiffrez une partition/un disque système, vous devez créer un disque de secours VeraCrypt même si vous utilisez le même mot de passe.</string>
@@ -1372,6 +1380,39 @@
     <string lang="fr" key="TB_PER_SEC">To/s</string>
     <string lang="fr" key="PB_PER_SEC">Po/s</string>
     <string lang="fr" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="fr" key="IDC_BOOT_LOADER_CACHE_PIM">Inclure le &amp;PIM quand le mot de passe d'authentification de pré-amorçage est mis en cache</control>
+    <control lang="fr" key="IDC_PREF_CACHE_PIM">Inclure le PIM quand le mot de passe est mis en cache</control>
+    <control lang="fr" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Permettre d'utiliser les lecteurs réseaux déconnectés comme point de montage</control>
+    <string lang="fr" key="PASSWORD_UTF8_TOO_LONG">Le mot de passe saisi est trop long: sa representation UTF-8 dépasse 64 octets.</string>
+    <string lang="fr" key="PASSWORD_UTF8_INVALID">Le mot de passe saisi contient des caractères Unicode qui n'ont pas pu être converti en UTF-8.</string>
+    <string lang="fr" key="INIT_DLL">Erreur : Echec de chargement d'une librairie système.</string>
+    <string lang="fr" key="ERR_EXFAT_INVALID_VOLUME_SIZE">La taille du volume spécifiée en ligne de commande n'est pas compatible avec exFAT.</string>
+    <control lang="fr" key="IDT_ENTROPY_BAR">Données aléatoires récoltées grâce aux mouvements de la souris</control>
+    <control lang="fr" key="IDT_VOLUME_ID">ID du volume:</control>
+    <string lang="fr" key="VOLUME_ID">ID du Volume</string>
+    <control lang="fr" key="IDC_FAVORITE_USE_VOLUME_ID">Utilier l'ID du volume pour monter le favoris</control>
+    <string lang="fr" key="VOLUME_ID_INVALID">L'ID du volume est invalide</string>
+    <string lang="fr" key="VOLUME_ID_NOT_FOUND">Aucun volume avec l'ID spécifié n'a été trouver sur le système</string>
+    <string lang="fr" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copier la valeur vers le Presse-Papier...</string>
+    <control lang="fr" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Ne demander aucun PIM dans l'écran d'authentification de pré-amorçage.</control>
+    <string lang="fr" key="DISABLE_BOOT_LOADER_PIM_PROMPT">AVERTISSEMENT : Gardez à l'esprit que si vous activez cette option, la valeur du PIM sera écrite non chiffrée sur le disk.\n\nÊtes-vous sûr que vous souhaitez activer cette option ?</string>
+    <string lang="fr" key="PIM_TOO_BIG">La valeur maximale du PIM est 2147468.</string>
+    <control lang="fr" key="IDC_SKIP_RESCUE_VERIFICATION">Ne pas vérifier le disque de secours</control>
+    <control lang="fr" key="IDC_HIDE_WAITING_DIALOG">Ne pas afficher la fenêtre d'attente lors de l'exécution des opérations</control>
+    <control lang="fr" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Ne demander aucun algorithme de hashage dans l'écran d'authentification de pré-amorçage.</control>
+    <string lang="fr" key="GOST89_HELP">GOST est un algorithme de chiffrement standard du gouvernement Russe et qui est défini dans le standard GOST 28147-89 sous le nom Magma. Développé dans les années 70 à l'époque soviétique, il fait toujours partie du dernier standard GOST R 34.12-2015 qui a introduit son successeur Kuznyechik sans pour autant le retirer.</string>
+    <string lang="fr" key="KUZNYECHIK_HELP">Kuznyechik est un algorithme de chiffrement publié en 2015 et spécifié dans le standard national de la Fédération de Russie GOST R 34.12-2015 et ausi dans RFC 7801. Clé de 256 bits, bloc de 128 bits. Le mode opératoire est XTS.</string>
+    <string lang="fr" key="CAMELLIA_HELP">Développé conjointement par les entreprises japonaises Mitsubishi Electric and NTT et publié en 2000. Clé de 256 bits et bloc de 128 bits. Le mode opératoire est XTS. Camellia a été approuvé par ISO/IEC, le projet NESSIE de l'Union Européenne et le projet CRYPTREC du gouvernement Japonais.</string>
+    <string lang="fr" key="TIME">Temps</string>
+    <string lang="fr" key="ITERATIONS">Itérations</string>
+    <string lang="fr" key="PRE-BOOT">Pré-Amorçage</string>
+    <string lang="fr" key="RESCUE_DISK_EFI_INFO">Avant de pouvoir chiffrer la partition, 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 avant le démarrage de Windows.\n\n- Le VRD contiendra une sauvegarde du contenu actuel du chargeur de système EFI et vous permettra de le restaurer si necessaire.\n\n L'image ZIP du disque de récupération VeraCrypt sera créée à l'emplacement spécifié ci-dessous.</string>
+    <string lang="fr" key="RESCUE_DISK_EFI_EXTRACT_INFO">L'image ZIP du disque de secours a été créée et stockée dans le fichier : \n%s\n\nMainteant vous avez besoin de la décompresser dans une clef USB formattée en FAT/FAT32.\n\n%lsAprès l'avoir créé, cliquez sur suivant pour vérifier qu'il a été créé correctement.</string>
+    <string lang="fr" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">L'image ZIP du disque de secours a été créée et stockée dans le fichier : \n%s\n\nVous devriez maintenant décompresser l'image dans une clef USB formattée en FAT/FAT32 ou la déplacer vers un emplacement sécurisé pour une utilisation ultérieure.\n\n%lsCliquez sur "Suivant" pour continuer.</string>
+    <string lang="fr" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT : Le fichier ZIP doit être décompressé directement à la racine de la clef USB. Par exemple, si la lettre E: est attribuée à la clef USB, alors la décompression du fichier zip devrait créer un répertoire E:\\EFI sur la clef USB.\n\n</string>
+    <string lang="fr" key="RESCUE_DISK_EFI_CHECK_FAILED">Impossible de vérifier que le disque de secours a été correctement décompressé.\n\nSi vous avez décompressé le disque de secours dans une clef USB, éjectez-la et réinsérez-la ; puis cliquez sur Suivant pour essayer à nouveau. Si cela ne fonctionne pas, essayez avec une autre clef USB et/ou un autre logiciel ZIP.\n\nSi vous n'avez pas encore décompressé le disque de secours, veuillez le faire et cliquez sur Suivant.\n\nSi vous a tenté de vérifier un disque de secours VeraCrypt créé avant de lancer cet Assistant, ce disque de secours ne peut pas être utilisé, car il a été créé pour une clé maître différente. Vous avez besoin de graver le disque de secours nouvellement généré.</string>
+	<string lang="fr" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Impossible de vérifier que le disque de secours a été correctement décompressé.\n\nSi vous avez décompressé le disque de secours dans une clef USB, éjectez-la et réinsérez-la puis essayez à nouveau. Si cela n'aide pas, essayez un autre logiciel de ZIP ou une autre clef USB.\n\nSi vous essayez de vérifier un disque de secours créé pour une clé principale différente, un mot de passe différent, etc... dans ce cas la vérification échouera à tous les coups. Pour créer un nouveau disque de secours totalement compatible avec votre configuration actuelle, sélectionnez 'Système' &gt; 'Créer un disque de secours'.</string>
+	<string lang="fr" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">L'image ZIP du disque de secours a été créée et stockée dans le fichier : \n%s\n\nMainteant vous avez besoin de la décompresser dans une clef USB formattée en FAT/FAT32.\n\nIMPORTANT : Le fichier ZIP doit être décompressé directement à la racine de la clef USB. Par exemple, si la lettre E: est attribuée à la clef USB, alors la décompression du fichier zip devrait créer un répertoire E:\\EFI sur la clef USB.\n\nAprès avoir créer le disque de secours, sélectionnez « Système » &gt; « Vérifier le disque de secours » pour vérifier qu'il a été créé correctement.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.hu.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="hu" name="Magyar" en-name="Hungarian" version="0.1.0" translators="Nyul Balazs" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="en" key="IDC_BROWSE">Bro&amp;wse...</control>
     <control lang="en" key="IDC_DESKTOP_ICON">Add VeraCrypt icon to &amp;desktop</control>
     <control lang="en" key="IDC_DONATE">Donate now...</control>
-    <control lang="en" key="IDC_FILE_TYPE">Associate the .tc file &amp;extension with VeraCrypt</control>
+    <control lang="en" key="IDC_FILE_TYPE">Associate the .hc file &amp;extension with VeraCrypt</control>
     <control lang="en" key="IDC_OPEN_CONTAINING_FOLDER">&amp;Open the destination location when finished</control>
     <control lang="hu" key="IDC_PROG_GROUP">VeraCrypt hozzáadása a &amp;Start menühöz</control>
     <control lang="hu" key="IDC_SYSTEM_RESTORE">Rendszer visszaállítási pont létrehozása</control>
@@ -37,6 +37,7 @@
     <control lang="en" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Download CD/DVD recording software</control>
     <control lang="en" key="IDC_FILE_CONTAINER">Create an encrypted file container</control>
     <control lang="en" key="IDC_GB">&amp;GB</control>
+    <control lang="en" key="IDC_TB">&amp;TB</control>
     <control lang="en" key="IDC_HIDDEN_SYSENC_INFO_LINK">More information</control>
     <control lang="en" key="IDC_HIDDEN_VOL">Hi&amp;dden VeraCrypt volume </control>
     <control lang="en" key="IDC_HIDDEN_VOL_HELP">More information about hidden volumes</control>
@@ -44,6 +45,7 @@
     <control lang="en" key="IDC_HIDVOL_WIZ_MODE_FULL">Normal mode</control>
     <control lang="hu" key="IDC_KB">&amp;KB</control>
     <control lang="en" key="IDC_KEYFILES_ENABLE">U&amp;se keyfiles</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="en" key="IDC_KEY_FILES">&amp;Keyfiles...</control>
     <control lang="en" key="IDC_LINK_HASH_INFO">Information on hash algorithms</control>
@@ -58,7 +60,8 @@
     <control lang="en" key="IDC_NO_HISTORY">&amp;Never save history</control>
     <control lang="hu" key="IDC_OPEN_OUTER_VOLUME">Külső kötet megnyitása</control>
     <control lang="en" key="IDC_PAUSE">&amp;Pause</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="hu" key="IDC_QUICKFORMAT">Gyorsformázás</control>
     <control lang="en" key="IDC_SHOW_PASSWORD">&amp;Display password</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Display password</control>
@@ -118,6 +121,7 @@
     <control lang="hu" key="IDC_CREATE">Létrehoz</control>
     <control lang="hu" key="IDC_CREATE_VOLUME">&amp;Kötet létrehozása</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <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="hu" key="IDC_ENABLE_KEYFILES">Kulcsfájlok használata</control>
     <control lang="hu" key="IDC_ENABLE_NEW_KEYFILES">Kulcsfájlok használata</control>
@@ -132,6 +136,7 @@
     <control lang="en" key="IDC_FAVORITE_MOVE_UP">Move &amp;Up</control>
     <control lang="en" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Open &amp;Explorer window for selected volume when successfully mounted</control>
     <control lang="en" key="IDC_FAVORITE_REMOVE">&amp;Remove</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="en" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Global Settings</control>
     <control lang="en" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Display balloon tooltip after successful hot-key dismount</control>
     <control lang="en" key="IDC_HK_DISMOUNT_PLAY_SOUND">Play system notification sound after successful hot-key dismount</control>
@@ -189,7 +194,7 @@
     <control lang="hu" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="en" key="IDD_PASSWORDCHANGE_DLG">Change Password or Keyfiles</control>
     <control lang="hu" key="IDD_PASSWORD_DLG">VeraCrypt Kötet Jelszavának Megadása</control>
-    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance Options</control>
+    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance and Driver Options</control>
     <control lang="hu" key="IDD_PREFERENCES_DLG">VeraCrypt - Beállítások</control>
     <control lang="en" key="IDD_SYSENC_SETTINGS">VeraCrypt - System Encryption Settings</control>
     <control lang="en" key="IDD_TOKEN_PREFERENCES">VeraCrypt - Security Token Preferences</control>
@@ -235,7 +240,7 @@
     <control lang="en" key="IDM_ONLINE_TUTORIAL">Beginner's Tutorial</control>
     <control lang="en" key="IDM_ORGANIZE_FAVORITES">Organize Favorite Volumes...</control>
     <control lang="en" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organize System Favorite Volumes...</control>
-    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance...</control>
+    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance/Driver Configuration</control>
     <control lang="en" key="IDM_PERMANENTLY_DECRYPT_SYS">Permanently Decrypt System Partition/Drive</control>
     <control lang="hu" key="IDM_PREFERENCES">Beállítások...</control>
     <control lang="hu" key="IDM_REFRESH_DRIVE_LETTERS">Meghajtó betüjelek frissítése</control>
@@ -256,6 +261,7 @@
     <control lang="hu" key="IDM_UNMOUNTALL">Az összes felcsatolt kötet leválasztása</control>
     <control lang="hu" key="IDM_UNMOUNT_VOLUME">Kötet leválasztása</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 Image</control>
     <control lang="hu" key="IDM_VERSION_HISTORY">Verzió történet</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="hu" key="IDM_VOLUME_PROPERTIES">Kötet tulajdonságok</control>
@@ -365,7 +371,7 @@
     <control lang="en" key="IDT_SECURITY_TOKEN">Security token:</control>
     <control lang="hu" key="IDT_SORT_METHOD">Rendezés módja:</control>
     <control lang="en" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Please wait. This process may take a long time...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="en" key="IDT_TEST_BLOCK_NUMBER">Block number:</control>
     <control lang="hu" key="IDT_TEST_CIPHERTEXT">Titkosított szöveg (hexadecimális)</control>
     <control lang="en" key="IDT_TEST_DATA_UNIT_NUMBER">Data unit number (64-bit hexadecimal, data unit size is 512 bytes)</control>
@@ -410,13 +416,13 @@
     <string lang="hu" key="CIPHER_TITLE">Titkosítási beállítások</string>
     <string lang="en" key="CLEAN_WINMRU_FAILED">WARNING: Failed to clear the path of the last selected volume/keyfile (remembered by file selector)!</string>
     <string lang="en" key="COMPRESSION_NOT_SUPPORTED">Error: The container has been compressed at the filesystem level. VeraCrypt does not support compressed containers (note that compression of encrypted data is ineffective and redundant).\n\nPlease disable compression for the container by following these steps:\n1) Right-click the container in Windows Explorer (not in VeraCrypt).\n2) Select 'Properties'.\n3) In the 'Properties' dialog box, click 'Advanced'.\n4) In the 'Advanced Attributes' dialog box, disable the option 'Compress contents to save disk space' and click 'OK'.\n5) In the 'Properties' dialog box, click 'OK'.</string>
-    <string lang="hu" key="CREATE_FAILED">Kötet létrehozás sikertelen: %hs</string>
+    <string lang="hu" key="CREATE_FAILED">Kötet létrehozás sikertelen: %s</string>
-    <string lang="en" key="DEVICE_FREE_BYTES">Size of %hs is %.2f bytes</string>
+    <string lang="en" key="DEVICE_FREE_BYTES">Size of %s is %.2f bytes</string>
-    <string lang="en" key="DEVICE_FREE_KB">Size of %hs is %.2f KB</string>
+    <string lang="en" key="DEVICE_FREE_KB">Size of %s is %.2f KB</string>
-    <string lang="en" key="DEVICE_FREE_MB">Size of %hs is %.2f MB</string>
+    <string lang="en" key="DEVICE_FREE_MB">Size of %s is %.2f MB</string>
-    <string lang="en" key="DEVICE_FREE_GB">Size of %hs is %.2f GB</string>
+    <string lang="en" key="DEVICE_FREE_GB">Size of %s is %.2f GB</string>
-    <string lang="en" key="DEVICE_FREE_TB">Size of %hs is %.2f TB</string>
+    <string lang="en" key="DEVICE_FREE_TB">Size of %s is %.2f TB</string>
-    <string lang="en" key="DEVICE_FREE_PB">Size of %hs is %.2f PB</string>
+    <string lang="en" key="DEVICE_FREE_PB">Size of %s is %.2f PB</string>
     <string lang="en" key="DEVICE_IN_USE_FORMAT">WARNING: The device/partition is in use by the operating system or applications. Formatting the device/partition might cause data corruption and system instability.\n\nContinue?</string>
     <string lang="en" key="DEVICE_IN_USE_INPLACE_ENC">Warning: The partition is in use by the operating system or applications. You should close any applications that might be using the partition (including antivirus software).\n\nContinue?</string>
     <string lang="en" key="FORMAT_CANT_DISMOUNT_FILESYS">Error: The device/partition contains a file system that could not be dismounted. The file system may be in use by the operating system. Formatting the device/partition would very likely cause data corruption and system instability.\n\nTo solve this issue, we recommend that you first delete the partition and then recreate it without formatting. To do so, follow these steps:\n1) Right-click the 'Computer' (or 'My Computer') icon in the 'Start Menu' and select 'Manage'. The 'Computer Management' window should appear.\n2) In the 'Computer Management' window, select 'Storage' &gt; 'Disk Management'.\n3) Right-click the partition you want to encrypt and select either 'Delete Partition', or 'Delete Volume', or 'Delete Logical Drive'.\n4) Click 'Yes'. If Windows asks you to restart the computer, do so. Then repeat the steps 1 and 2 and continue from the step 5.\n5) Right-click the unallocated/free space area and select either 'New Partition', or 'New Simple Volume', or 'New Logical Drive'.\n6) The 'New Partition Wizard' or 'New Simple Volume Wizard' window should appear now; follow its instructions. On the wizard page entitled 'Format Partition', select either 'Do not format this partition' or 'Do not format this volume'. In the same wizard, click 'Next' and then 'Finish'.\n7) Note that the device path you have selected in VeraCrypt may be wrong now. Therefore, exit the VeraCrypt Volume Creation Wizard (if it is still running) and then start it again.\n8) Try encrypting the device/partition again.\n\nIf VeraCrypt repeatedly fails to encrypt the device/partition, you may want to consider creating a file container instead.</string>
@@ -435,15 +441,15 @@
     <string lang="en" key="INPLACE_ENC_INVALID_PATH">Error: VeraCrypt can in-place encrypt only a partition, a dynamic volume, or an entire system drive. Please make sure the specified path is valid.</string>
     <string lang="en" key="CANNOT_RESIZE_FILESYS">Error: Cannot shrink the filesystem (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPossible causes and solutions:\n\n- Not enough free space on the volume. Please make sure no other application is writing to the filesystem.\n\n- Corrupted file system. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
     <string lang="en" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Error: There is not enough free space on the volume and so the filesystem cannot be shrunk (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPlease delete any redundant files and empty the Recycle Bin so as to free at least 256 KB of space and then try again. Note that due to a Windows issue, the amount of free space reported by the Windows Explorer may be incorrect until the operating system is restarted. If restarting the system does not help, the file system may be corrupted. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
-    <string lang="en" key="DISK_FREE_BYTES">Free space on drive %hs is %.2f bytes.</string>
+    <string lang="en" key="DISK_FREE_BYTES">Free space on drive %s is %.2f bytes.</string>
-    <string lang="en" key="DISK_FREE_KB">Free space on drive %hs is %.2f KB</string>
+    <string lang="en" key="DISK_FREE_KB">Free space on drive %s is %.2f KB</string>
-    <string lang="en" key="DISK_FREE_MB">Free space on drive %hs is %.2f MB</string>
+    <string lang="en" key="DISK_FREE_MB">Free space on drive %s is %.2f MB</string>
-    <string lang="en" key="DISK_FREE_GB">Free space on drive %hs is %.2f GB</string>
+    <string lang="en" key="DISK_FREE_GB">Free space on drive %s is %.2f GB</string>
-    <string lang="en" key="DISK_FREE_TB">Free space on drive %hs is %.2f TB</string>
+    <string lang="en" key="DISK_FREE_TB">Free space on drive %s is %.2f TB</string>
-    <string lang="en" key="DISK_FREE_PB">Free space on drive %hs is %.2f PB</string>
+    <string lang="en" key="DISK_FREE_PB">Free space on drive %s is %.2f PB</string>
     <string lang="en" key="DRIVELETTERS">Could not get available drive letters.</string>
     <string lang="en" key="DRIVER_NOT_FOUND">Error: VeraCrypt driver not found.\n\nPlease copy the files 'veracrypt.sys' and 'veracrypt-x64.sys' to the directory where the main VeraCrypt application (VeraCrypt.exe) is located.</string>
-    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall; on Windows XP, select 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
+    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' > Computer > 'Uninstall or change a program' > VeraCrypt > Uninstall; on Windows XP, select 'Start Menu' > Settings > 'Control Panel' > 'Add Or Remove Programs' > VeraCrypt > Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
     <string lang="en" key="ERR_CIPHER_INIT_FAILURE">Error: Cipher initialization failure.</string>
     <string lang="en" key="ERR_CIPHER_INIT_WEAK_KEY">Error: A weak or a potentially weak key has been detected. The key will be discarded. Please try again.</string>
     <string lang="en" key="EXCEPTION_REPORT">A critical error has occurred and VeraCrypt must be terminated. If this is caused by a bug in VeraCrypt, we would like to fix it. To help us, you can send us an automatically generated error report containing the following items:\n\n- Program version\n- Operating system version\n- Type of CPU\n- VeraCrypt component name\n- Checksum of VeraCrypt executable\n- Symbolic name of dialog window\n- Error category\n- Error address\n- VeraCrypt call stack\n\nIf you select 'Yes', the following URL (which contains the entire error report) will be opened in your default Internet browser.\n\n%hs\n\nDo you want to send us the above error report?</string>
@@ -497,7 +503,7 @@
     <string lang="en" key="WIPE_FINISHED">The content of the partition/device has been successfully erased.</string>
     <string lang="en" key="WIPE_FINISHED_DECOY_SYSTEM_PARTITION">The content of the partition where the original system (of which the hidden system is a clone) resided has been successfully erased.</string>
     <string lang="en" key="DECOY_OS_VERSION_WARNING">Please make sure the version of Windows you are going to install (on the wiped partition) is the same as the version of Windows you are currently running. This is required due to the fact that both systems will share a common boot partition.</string>
-    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' &gt; 'Add Mounted Volume to System Favorites').</string>
+    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' > 'Add Mounted Volume to System Favorites').</string>
     <string lang="en" key="SYSTEM_DECRYPTION_FINISHED">The system partition/drive has been successfully decrypted.</string>
     <string lang="en" key="FORMAT_FINISHED_HELP">\n\nThe VeraCrypt volume has been created and is ready for use. If you wish to create another VeraCrypt volume, click Next. Otherwise, click Exit.</string>
     <string lang="en" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nThe hidden VeraCrypt volume has been successfully created (the hidden operating system will reside within this hidden volume).\n\nClick Next to continue.</string>
@@ -524,7 +530,7 @@
     <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 password for this outer volume, and the existence of the hidden volume (and of the hidden operating system) will remain secret.\n\nIMPORTANT: The files you copy to the outer volume should not occupy more than %s. Otherwise, there may not be enough free space on the outer volume for the hidden volume (and you will not be able to continue). After you finish copying, click Next (do not dismount the volume).</string>
     <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 you finish copying, click Next. Do not dismount the volume.\n\nNote: After you click Next, cluster bitmap of the outer volume will be scanned to determine the size of uninterrupted area of free space whose end is aligned with the end of the volume. This area will accommodate the hidden volume, so it will limit its maximum possible size. Cluster bitmap scanning ensures that no data on the outer volume are overwritten by the hidden volume.</string>
     <string lang="en" key="HIDVOL_HOST_FILLING_TITLE">Outer Volume Contents</string>
-    <string lang="en" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nIn the next steps, you will set the options for the outer volume (within which the hidden volume will be created later on). </string>
+    <string lang="en" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nIn the next steps, you will set the options for the outer volume (within which the hidden volume will be created later on).</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>
     <string lang="en" key="HIDVOL_HOST_PRE_CIPHER_TITLE">Outer Volume</string>
     <string lang="en" key="HIDDEN_OS_PRE_CIPHER_HELP">In the following steps, you will set the options and password for the hidden volume, which will contain the hidden operating system.\n\nRemark: The cluster bitmap of the outer volume has been scanned in order to determine the size of uninterrupted area of free space whose end is aligned with the end of the outer volume. This area will accommodate the hidden volume, so it limits its maximum possible size. The maximum possible size of the hidden volume has been determined and confirmed to be greater than the size of the system partition (which is required, because the entire content of the system partition will need to be copied to the hidden volume). This ensures that no data currently stored on the outer volume will be overwritten by data written to the area of the hidden volume.</string>
@@ -561,6 +567,7 @@
     <string lang="en" key="MAX_HIDVOL_SIZE_KB">Maximum possible hidden volume size for this volume is %.2f KB.</string>
     <string lang="en" key="MAX_HIDVOL_SIZE_MB">Maximum possible hidden volume size for this volume is %.2f MB.</string>
     <string lang="en" key="MAX_HIDVOL_SIZE_GB">Maximum possible hidden volume size for this volume is %.2f GB.</string>
+    <string lang="en" key="MAX_HIDVOL_SIZE_TB">Maximum possible hidden volume size for this volume is %.2f TB.</string>
     <string lang="en" key="MOUNTED_NOPWCHANGE">Volume password/keyfiles cannot be changed while the volume is mounted. Please dismount the volume first.</string>
     <string lang="en" key="MOUNTED_NO_PKCS5_PRF_CHANGE">The header key derivation algorithm cannot be changed while the volume is mounted. Please dismount the volume first.</string>
     <string lang="en" key="MOUNT_BUTTON">&amp;Mount</string>
@@ -591,12 +598,12 @@
     <string lang="en" key="SELECT_PKCS11_MODULE">Select PKCS #11 Library</string>
     <string lang="hu" key="OUTOFMEMORY">Nincs több memória</string>
     <string lang="en" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">IMPORTANT: We strongly recommend that inexperienced users create a VeraCrypt file container on the selected device/partition, instead of attempting to encrypt the entire device/partition.\n\nWhen you create a VeraCrypt file container (as opposed to encrypting a device or partition) there is, for example, no risk of destroying a large number of files. Note that a VeraCrypt file container (even though it contains a virtual encrypted disk) is actually just like any normal file. For more information, see the chapter Beginner's Tutorial in the VeraCrypt User Guide.\n\nAre you sure you want to encrypt the entire device/partition?</string>
-    <string lang="en" key="OVERWRITEPROMPT">WARNING: The file '%hs' already exists!\n\nIMPORTANT: VERACRYPT WILL NOT ENCRYPT THE FILE, BUT IT WILL DELETE IT. Are you sure you want to delete the file and replace it with a new VeraCrypt container?</string>
+    <string lang="en" key="OVERWRITEPROMPT">WARNING: The file '%s' already exists!\n\nIMPORTANT: VERACRYPT WILL NOT ENCRYPT THE FILE, BUT IT WILL DELETE IT. Are you sure you want to delete the file and replace it with a new VeraCrypt container?</string>
-    <string lang="en" key="OVERWRITEPROMPT_DEVICE">CAUTION: ALL FILES CURRENTLY STORED ON THE SELECTED %s '%hs'%s WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
+    <string lang="en" key="OVERWRITEPROMPT_DEVICE">CAUTION: ALL FILES CURRENTLY STORED ON THE SELECTED %s '%s'%s WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
-    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%s'%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting/decrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting/decrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting/decrypting, please make sure that you have backup copies of the files you want to encrypt/decrypt.\n\nDo you have such a backup?</string>
-    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%hs'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
+    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%s'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
     <string lang="en" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">WARNING: THE SELECTED PARTITION CONTAINS A LARGE AMOUNT OF DATA! Any files stored on the partition will be erased and lost (they will NOT be encrypted)!</string>
     <string lang="en" key="ERASE_FILES_BY_CREATING_VOLUME">Erase any files stored on the partition by creating a VeraCrypt volume within it</string>
     <string lang="hu" key="PASSWORD">Jelszó</string>
@@ -645,7 +652,7 @@
     <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
     <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
     <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 &gt; Organize &gt; 'Folder and search options' &gt; View).</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="SELECTED_PARTITION_ALREADY_INPLACE_ENC">The selected partition/device is already fully encrypted.\nHeader Flags = 0x%.8X</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="en" key="PREV">&lt; &amp;Back</string>
     <string lang="en" key="RAWDEVICES">Unable to list raw devices installed on your system!</string>
-    <string lang="en" key="READONLYPROMPT">The volume '%hs' exists, and is read-only. Are you sure you want to replace it?</string>
+    <string lang="en" key="READONLYPROMPT">The volume '%s' exists, and is read-only. Are you sure you want to replace it?</string>
     <string lang="hu" key="SELECT_DEST_DIR">Válasszon célkönyvtárat</string>
     <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>
@@ -680,13 +687,13 @@
     <string lang="en" key="TEST_CIPHERTEXT_SIZE">The test ciphertext you have supplied is too long or short.</string>
     <string lang="en" key="TEST_KEY_SIZE">The test key you have supplied is too long or short.</string>
     <string lang="en" key="TEST_PLAINTEXT_SIZE">The test plaintext you have supplied is too long or short.</string>
-    <string lang="en" key="TWO_LAYER_CASCADE_HELP">Two ciphers in a cascade operating in XTS mode. Each block is first encrypted with %hs (%d-bit key) and then with %hs (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
+    <string lang="en" key="TWO_LAYER_CASCADE_HELP">Two ciphers in a cascade operating in XTS mode. Each block is first encrypted with %s (%d-bit key) and then with %s (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
-    <string lang="en" key="THREE_LAYER_CASCADE_HELP">Three ciphers in a cascade operating in XTS mode. Each block is first encrypted with %hs (%d-bit key), then with %hs (%d-bit key), and finally with %hs (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
+    <string lang="en" key="THREE_LAYER_CASCADE_HELP">Three ciphers in a cascade operating in XTS mode. Each block is first encrypted with %s (%d-bit key), then with %s (%d-bit key), and finally with %s (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
     <string lang="en" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Note that, depending on the operating system configuration, these auto-run and auto-mount features may work only when the traveler disk files are created on a non-writable CD/DVD-like medium. Also note that this is not a bug in VeraCrypt (it is a limitation of Windows).</string>
     <string lang="en" key="TRAVELER_DISK_CREATED">VeraCrypt traveler disk has been successfully created.\n\nNote that you need administrator privileges to run VeraCrypt in portable mode. Also note that, after examining the registry file, it may be possible to tell that VeraCrypt was run on a Windows system even if it is run in portable mode.</string>
     <string lang="en" key="TC_TRAVELER_DISK">VeraCrypt Traveler Disk</string>
     <string lang="en" key="TWOFISH_HELP">Designed by Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall, and Niels Ferguson. Published in 1998. 256-bit key, 128-bit block. Mode of operation is XTS. Twofish was one of the AES finalists.</string>
-    <string lang="en" key="MORE_INFO_ABOUT">More information on %hs</string>
+    <string lang="en" key="MORE_INFO_ABOUT">More information on %s</string>
     <string lang="hu" key="UNKNOWN">Ismeretlen</string>
     <string lang="en" key="ERR_UNKNOWN">An unspecified or unknown error occurred (%d).</string>
     <string lang="hu" key="UNMOUNTALL_LOCK_FAILED">Néhány köteten használatban lévő fájlok vagy könyvtárak vannak.\n\nErőszakos leválasztás?</string>
@@ -706,7 +713,7 @@
     <string lang="en" key="WRONG_VOL_TYPE">VeraCrypt cannot change the password for a foreign volume.</string>
     <string lang="en" key="SELECT_FREE_DRIVE">Please select a free drive letter from the list.</string>
     <string lang="en" key="SELECT_A_MOUNTED_VOLUME">Please select a mounted volume in the drive letter list.</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="hu" key="CANT_CREATE_AUTORUN">Hiba: autorun.inf létrhozása nem sikerült</string>
     <string lang="en" key="ERR_PROCESS_KEYFILE">Error while processing keyfile!</string>
     <string lang="en" key="ERR_PROCESS_KEYFILE_PATH">Error processing keyfile path!</string>
@@ -851,7 +858,7 @@
     <string lang="en" key="INSTALL_FAILED">Installation failed.</string>
     <string lang="en" key="UNINSTALL_FAILED">Uninstallation failed.</string>
     <string lang="en" key="DIST_PACKAGE_CORRUPTED">This distribution package is damaged. Please try downloading it again (preferably from the official VeraCrypt website at https://veracrypt.codeplex.com).</string>
-    <string lang="en" key="CANNOT_WRITE_FILE_X">Cannot write file %hs</string>
+    <string lang="en" key="CANNOT_WRITE_FILE_X">Cannot write file %s</string>
     <string lang="en" key="EXTRACTING_VERB">Extracting</string>
     <string lang="en" key="CANNOT_READ_FROM_PACKAGE">Cannot read data from the package.</string>
     <string lang="en" key="CANT_VERIFY_PACKAGE_INTEGRITY">Cannot verify the integrity of this distribution package.</string>
@@ -860,8 +867,8 @@
     <string lang="en" key="INSTALL_OK">VeraCrypt has been successfully installed.</string>
     <string lang="en" key="SETUP_UPDATE_OK">VeraCrypt has been successfully updated.</string>
     <string lang="en" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt has been successfully upgraded. However, before you can start using it, the computer must be restarted.\n\nDo you want to restart it now?</string>
-    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
+    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu > All programs > Accessories > System Tools > System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
-    <string lang="en" key="UNINSTALL_OK">VeraCrypt has been successfully uninstalled.\n\nClick 'Finish' to remove the VeraCrypt installer and the folder %hs. Note that the folder will not be removed if it contains any files that were not installed by the VeraCrypt installer or created by VeraCrypt.</string>
+    <string lang="en" key="UNINSTALL_OK">VeraCrypt has been successfully uninstalled.\n\nClick 'Finish' to remove the VeraCrypt installer and the folder %s. Note that the folder will not be removed if it contains any files that were not installed by the VeraCrypt installer or created by VeraCrypt.</string>
     <string lang="en" key="REMOVING_REG">Removing VeraCrypt registry entries</string>
     <string lang="hu" key="ADDING_REG">Registry bejegyzés hozzáadása</string>
     <string lang="hu" key="REMOVING_APPDATA">Alkalmazás-specifikus adatok eltávolítása</string>
@@ -872,10 +879,10 @@
     <string lang="hu" key="CREATING_SYS_RESTORE">Rendszervisszaállító pont létrehozása</string>
     <string lang="hu" key="FAILED_SYS_RESTORE">Rendszervisszaállító pont létrehozása sikertelen!</string>
     <string lang="en" key="INSTALLER_UPDATING_BOOT_LOADER">Updating boot loader</string>
-    <string lang="en" key="INSTALL_OF_FAILED">Failed to install '%hs'. %hs\nDo you want to continue installing?</string>
+    <string lang="en" key="INSTALL_OF_FAILED">Failed to install '%s'. %s\nDo you want to continue installing?</string>
-    <string lang="en" key="UNINSTALL_OF_FAILED">Failed to uninstall '%hs'. %hs\nDo you want to continue uninstalling?</string>
+    <string lang="en" key="UNINSTALL_OF_FAILED">Failed to uninstall '%s'. %s\nDo you want to continue uninstalling?</string>
     <string lang="hu" key="INSTALL_COMPLETED">A telepítés befejeződött.</string>
-    <string lang="en" key="CANT_CREATE_FOLDER">The folder '%hs' could not be created</string>
+    <string lang="en" key="CANT_CREATE_FOLDER">The folder '%s' could not be created</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="en" key="DISMOUNT_ALL_FIRST">All VeraCrypt volumes must be dismounted before installing or uninstalling 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>
@@ -921,14 +928,14 @@
     <string lang="en" key="SYS_FAVORITE_VOLUMES_SAVED">System favorite volumes saved.\n\nTo enable mounting of system favorite volumes when the system starts, please select 'Settings' &gt; 'System Favorite Volumes' &gt; 'Mount system favorite volumes when Windows starts'.</string>
     <string lang="en" key="FAVORITE_ADD_DRIVE_DEV_WARNING">The volume you are adding to favorites is neither a partition nor a dynamic volume. Therefore, VeraCrypt will be unable to mount this favorite volume if the device number changes.</string>
     <string lang="en" key="FAVORITE_ADD_PARTITION_TYPE_WARNING">The volume you are adding to favorites is a partition not recognized by Windows.\n\nVeraCrypt will be unable to mount this favorite volume if the device number changes. Please set the type of the partition to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then add the partition to favorites again.</string>
-    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings &gt; Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
+    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings > Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_NETWORK_PATH_ERR">A container stored in a remote filesystem shared over a network cannot be automatically mounted when its host device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, the volume hosted on the device cannot be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable the volume hosted on the device to be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_LABEL_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, no label can be assigned to it.</string>
     <string lang="en" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable VeraCrypt to assign a label to the partition.</string>
     <string lang="en" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Due to a Windows limitation, a container stored in a remote filesystem shared over a network cannot be mounted as a system favorite volume (however, it can be mounted as a non-system favorite volume when a user logs on).</string>
-    <string lang="hu" key="ENTER_PASSWORD_FOR">Adja meg a jelszót ehhez: %hs</string>
+    <string lang="hu" key="ENTER_PASSWORD_FOR">Adja meg a jelszót ehhez: %s</string>
     <string lang="en" key="ENTER_PASSWORD_FOR_LABEL">Enter password for '%s'</string>
     <string lang="en" key="ENTER_NORMAL_VOL_PASSWORD">Enter password for the normal/outer volume</string>
     <string lang="en" key="ENTER_HIDDEN_VOL_PASSWORD">Enter password for the hidden volume</string>
@@ -943,8 +950,8 @@
     <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 header backup to restore a header of a different volume, you will be able to mount the volume, but you will NOT be able to decrypt any data stored in the volume (because you will change its master key).</string>
     <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) for the hidden volume.</string>
-    <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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</string>
+    <string lang="en" key="CONFIRM_VOL_HEADER_BAK">Are you sure you want to create volume header backup for %s?\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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</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="CONFIRM_VOL_HEADER_RESTORE">Are you sure you want to restore volume header of %s?\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>
@@ -955,12 +962,14 @@
     <string lang="en" key="VOLUME_HAS_NO_BACKUP_HEADER">There is no backup header embedded in this volume (note that only volumes created by VeraCrypt 6.0 or later contain embedded backup headers).</string>
     <string lang="en" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">You are attempting to back up the header of the system partition/drive. This is not allowed. Backup/restore operations pertaining to the system partition/drive can be performed only using the VeraCrypt Rescue Disk.\n\nDo you want to create a VeraCrypt Rescue Disk?</string>
     <string lang="en" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">You are attempting to restore the header of a virtual VeraCrypt volume but you selected the system partition/drive. This is not allowed. Backup/restore operations pertaining to the system partition/drive can be performed only using the VeraCrypt Rescue Disk.\n\nDo you want to create a VeraCrypt Rescue Disk?</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">After you click OK, you will select a filename for the new VeraCrypt Rescue Disk ISO image and the location where you wish to place it.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">After you click OK, you will select a filename for the new VeraCrypt Rescue Disk image and the location where you wish to place it.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <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_INSERT">Please insert your VeraCrypt Rescue Disk 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 a new Rescue Disk fully compatible with your current configuration, select 'System' &gt; 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk 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' &gt; '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 be used, because it was created for a different master key. You need to burn the newly generated Rescue Disk.</string>
@@ -989,8 +998,8 @@
     <string lang="en" key="DRIVE_LETTER_ITEM">Drive Letter:   </string>
     <string lang="en" key="UNSUPPORTED_CHARS_IN_PWD">Error: Password must contain only ASCII characters.\n\nNon-ASCII characters in password might cause the volume to be impossible to mount when your system configuration changes.\n\nThe following characters are allowed:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="en" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">Warning: Password contains non-ASCII characters. This may cause the volume to be impossible to mount when your system configuration changes.\n\nYou should replace all non-ASCII characters in the password with ASCII characters. To do so, click 'Volumes' -&gt; 'Change Volume Password'.\n\nThe following are ASCII characters:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="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 change it (e.g., to '.tc').\n\nAre you sure you want to use the problematic file extension?</string>
+    <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 change it (e.g., to '.hc').\n\nAre you sure you want to use the problematic file extension?</string>
-    <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 container or change it (e.g., to '.tc') after you dismount the volume.</string>
+    <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 container or change it (e.g., to '.hc') after you dismount the volume.</string>
     <string lang="hu" key="HOMEPAGE">Honlap</string>
     <string lang="en" key="LARGE_IDE_WARNING_XP">WARNING: It appears that you have not applied any Service Pack to your Windows installation. You should not write to IDE disks larger than 128 GB under Windows XP to which you did not apply Service Pack 1 or later! 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 bug in VeraCrypt.</string>
     <string lang="en" key="LARGE_IDE_WARNING_2K">WARNING: It appears that you have not applied Service Pack 3 or later to your Windows installation. You should not write to IDE disks larger than 128 GB under Windows 2000 to which you did not apply Service Pack 3 or later! 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 bug in VeraCrypt.\n\nNote: You may also need to enable the 48-bit LBA support in the registry; for more information, see http://support.microsoft.com/kb/305098/EN-US</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="en" key="CHECKING_FS">Checking the file system on the VeraCrypt volume mounted as %s...</string>
-    <string lang="en" key="REPAIRING_FS">Attempting to repair the file system on the VeraCrypt volume mounted as %hs...</string>
+    <string lang="en" key="REPAIRING_FS">Attempting to repair the file system on the VeraCrypt volume mounted as %s...</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 later.</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 encryption algorithm (e.g., AES, Serpent, Twofish, etc.) and that you move all files from this volume to the new volume.</string>
     <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="en" key="SYS_ASSIGN_DRIVE_LETTER">Please assign a drive letter to the partition/device before proceeding ('Control Panel' &gt; 'System and Maintenance' &gt; 'Administrative Tools' - 'Create and format hard disk partitions').\n\nNote that this is a requirement of the operating system.</string>
@@ -1069,7 +1077,7 @@
     <string lang="en" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt no longer supports encryption of the system partition/drive on Windows Vista with no Service Pack installed. Before upgrading VeraCrypt, please install Service Pack 1 or higher for Windows Vista.</string>
     <string lang="en" key="FEATURE_REQUIRES_INSTALLATION">Error: This feature requires VeraCrypt to be installed on the system (you are running VeraCrypt in portable mode).\n\nPlease install VeraCrypt and then try again.</string>
     <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="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</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' &gt; '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>
@@ -1093,7 +1101,7 @@
     <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 medium (or using a service partition)?</string>
     <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 Hidden Volumes" in the VeraCrypt User's Guide.\n\nImportant: Before proceeding, please make sure you have read the section "Security Requirements and Precautions Pertaining to Hidden Volumes" in the VeraCrypt User's Guide.\n\n\nDoes the currently running operating system meet the above condition?</string>
     <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 from writing to the shared boot partition and from hibernating.\n\n\nDo you want to continue? If you select 'No', instructions for removing the extra boot partition will be displayed.</string>
-    <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' &gt; '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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
+    <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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
     <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>
@@ -1108,8 +1116,8 @@
     <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 you do NOT have a real US keyboard.</string>
     <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 starts.\n\n- The VRD will contain a backup of the present content of the first drive track (which typically contains a system loader or boot manager) and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ISO image will be created in the location specified below.</string>
     <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">The Rescue Disk image has been created and stored in this file:\n%s\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>
+    <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%s\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>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">IMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software. If you do not have any CD/DVD recording software that can write the ISO disk image to a CD/DVD, click the link below to download such free software.\n\n</string>
     <string lang="en" key="LAUNCH_WIN_ISOBURN">Launch Microsoft Windows Disc Image Burner</string>
     <string lang="en" key="RESCUE_DISK_BURN_NO_CHECK_WARN">WARNING: If you already created a VeraCrypt Rescue Disk in the past, it cannot be reused for this system partition/drive because it was created for a different master key! Every time you encrypt a system partition/drive, you must create a new VeraCrypt Rescue Disk for it even if you use the same password.</string>
@@ -1247,7 +1255,7 @@
     <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 system (but not on the decoy system), the decoy system would contain a VeraCrypt driver and VeraCrypt applications whose version numbers are different from the version number of the VeraCrypt Boot Loader. Such a discrepancy might indicate that there is a hidden operating system on this computer.\n\n\nDo you want to continue?</string>
     <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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' &gt; '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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' > 'Create Rescue Disk').</string>
     <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' &gt; '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' &gt; 'Create Rescue Disk'.</string>
     <string lang="en" key="BOOT_LOADER_UPGRADE_FAILED">Failed to upgrade the VeraCrypt Boot Loader.</string>
@@ -1272,7 +1280,7 @@
     <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' &gt; '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>
@@ -1297,8 +1305,8 @@
     <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 system.</string>
     <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' &gt; 'Performance' and enable 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' &gt; 'Performance' and disable 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>
@@ -1372,6 +1380,39 @@
     <string lang="en" key="TB_PER_SEC">TB/s</string>
     <string lang="en" key="PB_PER_SEC">PB/s</string>
     <string lang="en" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.id.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="id" name="Bahasa Indonesia" en-name="Indonesian" version="0.1.0" translators="Tajuddin N. F." />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="en" key="IDC_BROWSE">Bro&amp;wse...</control>
     <control lang="en" key="IDC_DESKTOP_ICON">Add VeraCrypt icon to &amp;desktop</control>
     <control lang="en" key="IDC_DONATE">Donate now...</control>
-    <control lang="en" key="IDC_FILE_TYPE">Associate the .tc file &amp;extension with VeraCrypt</control>
+    <control lang="en" key="IDC_FILE_TYPE">Associate the .hc file &amp;extension with VeraCrypt</control>
     <control lang="en" key="IDC_OPEN_CONTAINING_FOLDER">&amp;Open the destination location when finished</control>
     <control lang="en" key="IDC_PROG_GROUP">Add VeraCrypt to &amp;Start menu</control>
     <control lang="en" key="IDC_SYSTEM_RESTORE">Create System &amp;Restore point</control>
@@ -37,6 +37,7 @@
     <control lang="en" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Download CD/DVD recording software</control>
     <control lang="en" key="IDC_FILE_CONTAINER">Create an encrypted file container</control>
     <control lang="en" key="IDC_GB">&amp;GB</control>
+    <control lang="en" key="IDC_TB">&amp;TB</control>
     <control lang="en" key="IDC_HIDDEN_SYSENC_INFO_LINK">More information</control>
     <control lang="en" key="IDC_HIDDEN_VOL">Hi&amp;dden VeraCrypt volume </control>
     <control lang="en" key="IDC_HIDDEN_VOL_HELP">More information about hidden volumes</control>
@@ -44,6 +45,7 @@
     <control lang="en" key="IDC_HIDVOL_WIZ_MODE_FULL">Normal mode</control>
     <control lang="id" key="IDC_KB">&amp;KB</control>
     <control lang="id" key="IDC_KEYFILES_ENABLE">Gu&amp;nakan file kunci</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="id" key="IDC_KEY_FILES">&amp;File kunci..</control>
     <control lang="en" key="IDC_LINK_HASH_INFO">Information on hash algorithms</control>
@@ -58,7 +60,8 @@
     <control lang="id" key="IDC_NO_HISTORY">&amp;Jangan simpan history</control>
     <control lang="id" key="IDC_OPEN_OUTER_VOLUME">Buka volume luar</control>
     <control lang="en" key="IDC_PAUSE">&amp;Pause</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="id" key="IDC_QUICKFORMAT">Format cepat</control>
     <control lang="id" key="IDC_SHOW_PASSWORD">&amp;Perlihatkan password</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Display password</control>
@@ -118,6 +121,7 @@
     <control lang="id" key="IDC_CREATE">Buat</control>
     <control lang="id" key="IDC_CREATE_VOLUME">&amp;Buat Volume Baru</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <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="id" key="IDC_ENABLE_KEYFILES">Gunakan file kunci</control>
     <control lang="id" key="IDC_ENABLE_NEW_KEYFILES">Gunakan file kunci baru</control>
@@ -132,6 +136,7 @@
     <control lang="en" key="IDC_FAVORITE_MOVE_UP">Move &amp;Up</control>
     <control lang="en" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Open &amp;Explorer window for selected volume when successfully mounted</control>
     <control lang="en" key="IDC_FAVORITE_REMOVE">&amp;Remove</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="en" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Global Settings</control>
     <control lang="en" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Display balloon tooltip after successful hot-key dismount</control>
     <control lang="en" key="IDC_HK_DISMOUNT_PLAY_SOUND">Play system notification sound after successful hot-key dismount</control>
@@ -189,7 +194,7 @@
     <control lang="id" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="en" key="IDD_PASSWORDCHANGE_DLG">Change Password or Keyfiles</control>
     <control lang="id" key="IDD_PASSWORD_DLG">Masukkan password VeraCrypt Volume</control>
-    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance Options</control>
+    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance and Driver Options</control>
     <control lang="id" key="IDD_PREFERENCES_DLG">Pengaturan - VeraCrypt</control>
     <control lang="en" key="IDD_SYSENC_SETTINGS">VeraCrypt - System Encryption Settings</control>
     <control lang="en" key="IDD_TOKEN_PREFERENCES">VeraCrypt - Security Token Preferences</control>
@@ -235,7 +240,7 @@
     <control lang="id" key="IDM_ONLINE_TUTORIAL">Petunjuk untuk pemula</control>
     <control lang="en" key="IDM_ORGANIZE_FAVORITES">Organize Favorite Volumes...</control>
     <control lang="en" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organize System Favorite Volumes...</control>
-    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance...</control>
+    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance/Driver Configuration</control>
     <control lang="en" key="IDM_PERMANENTLY_DECRYPT_SYS">Permanently Decrypt System Partition/Drive</control>
     <control lang="id" key="IDM_PREFERENCES">Pengaturan...</control>
     <control lang="id" key="IDM_REFRESH_DRIVE_LETTERS">Tampilkan Daftar Huruf Drive terbaru</control>
@@ -256,6 +261,7 @@
     <control lang="id" key="IDM_UNMOUNTALL">Putuskan semua Volume yang tersambung</control>
     <control lang="id" key="IDM_UNMOUNT_VOLUME">Putuskan 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 Image</control>
     <control lang="id" key="IDM_VERSION_HISTORY">Sejarah...</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="id" key="IDM_VOLUME_PROPERTIES">Profil Volume</control>
@@ -365,7 +371,7 @@
     <control lang="en" key="IDT_SECURITY_TOKEN">Security token:</control>
     <control lang="en" key="IDT_SORT_METHOD">Sort Method:</control>
     <control lang="en" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Please wait. This process may take a long time...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="en" key="IDT_TEST_BLOCK_NUMBER">Block number:</control>
     <control lang="en" key="IDT_TEST_CIPHERTEXT">Ciphertext (hexadecimal)</control>
     <control lang="en" key="IDT_TEST_DATA_UNIT_NUMBER">Data unit number (64-bit hexadecimal, data unit size is 512 bytes)</control>
@@ -410,13 +416,13 @@
     <string lang="en" key="CIPHER_TITLE">Encryption Options</string>
     <string lang="en" key="CLEAN_WINMRU_FAILED">WARNING: Failed to clear the path of the last selected volume/keyfile (remembered by file selector)!</string>
     <string lang="en" key="COMPRESSION_NOT_SUPPORTED">Error: The container has been compressed at the filesystem level. VeraCrypt does not support compressed containers (note that compression of encrypted data is ineffective and redundant).\n\nPlease disable compression for the container by following these steps:\n1) Right-click the container in Windows Explorer (not in VeraCrypt).\n2) Select 'Properties'.\n3) In the 'Properties' dialog box, click 'Advanced'.\n4) In the 'Advanced Attributes' dialog box, disable the option 'Compress contents to save disk space' and click 'OK'.\n5) In the 'Properties' dialog box, click 'OK'.</string>
-    <string lang="en" key="CREATE_FAILED">Failed to create volume %hs</string>
+    <string lang="en" key="CREATE_FAILED">Failed to create volume %s</string>
-    <string lang="en" key="DEVICE_FREE_BYTES">Size of %hs is %.2f bytes</string>
+    <string lang="en" key="DEVICE_FREE_BYTES">Size of %s is %.2f bytes</string>
-    <string lang="en" key="DEVICE_FREE_KB">Size of %hs is %.2f KB</string>
+    <string lang="en" key="DEVICE_FREE_KB">Size of %s is %.2f KB</string>
-    <string lang="en" key="DEVICE_FREE_MB">Size of %hs is %.2f MB</string>
+    <string lang="en" key="DEVICE_FREE_MB">Size of %s is %.2f MB</string>
-    <string lang="en" key="DEVICE_FREE_GB">Size of %hs is %.2f GB</string>
+    <string lang="en" key="DEVICE_FREE_GB">Size of %s is %.2f GB</string>
-    <string lang="en" key="DEVICE_FREE_TB">Size of %hs is %.2f TB</string>
+    <string lang="en" key="DEVICE_FREE_TB">Size of %s is %.2f TB</string>
-    <string lang="en" key="DEVICE_FREE_PB">Size of %hs is %.2f PB</string>
+    <string lang="en" key="DEVICE_FREE_PB">Size of %s is %.2f PB</string>
     <string lang="en" key="DEVICE_IN_USE_FORMAT">WARNING: The device/partition is in use by the operating system or applications. Formatting the device/partition might cause data corruption and system instability.\n\nContinue?</string>
     <string lang="en" key="DEVICE_IN_USE_INPLACE_ENC">Warning: The partition is in use by the operating system or applications. You should close any applications that might be using the partition (including antivirus software).\n\nContinue?</string>
     <string lang="en" key="FORMAT_CANT_DISMOUNT_FILESYS">Error: The device/partition contains a file system that could not be dismounted. The file system may be in use by the operating system. Formatting the device/partition would very likely cause data corruption and system instability.\n\nTo solve this issue, we recommend that you first delete the partition and then recreate it without formatting. To do so, follow these steps:\n1) Right-click the 'Computer' (or 'My Computer') icon in the 'Start Menu' and select 'Manage'. The 'Computer Management' window should appear.\n2) In the 'Computer Management' window, select 'Storage' &gt; 'Disk Management'.\n3) Right-click the partition you want to encrypt and select either 'Delete Partition', or 'Delete Volume', or 'Delete Logical Drive'.\n4) Click 'Yes'. If Windows asks you to restart the computer, do so. Then repeat the steps 1 and 2 and continue from the step 5.\n5) Right-click the unallocated/free space area and select either 'New Partition', or 'New Simple Volume', or 'New Logical Drive'.\n6) The 'New Partition Wizard' or 'New Simple Volume Wizard' window should appear now; follow its instructions. On the wizard page entitled 'Format Partition', select either 'Do not format this partition' or 'Do not format this volume'. In the same wizard, click 'Next' and then 'Finish'.\n7) Note that the device path you have selected in VeraCrypt may be wrong now. Therefore, exit the VeraCrypt Volume Creation Wizard (if it is still running) and then start it again.\n8) Try encrypting the device/partition again.\n\nIf VeraCrypt repeatedly fails to encrypt the device/partition, you may want to consider creating a file container instead.</string>
@@ -435,15 +441,15 @@
     <string lang="en" key="INPLACE_ENC_INVALID_PATH">Error: VeraCrypt can in-place encrypt only a partition, a dynamic volume, or an entire system drive. Please make sure the specified path is valid.</string>
     <string lang="en" key="CANNOT_RESIZE_FILESYS">Error: Cannot shrink the filesystem (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPossible causes and solutions:\n\n- Not enough free space on the volume. Please make sure no other application is writing to the filesystem.\n\n- Corrupted file system. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
     <string lang="en" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Error: There is not enough free space on the volume and so the filesystem cannot be shrunk (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPlease delete any redundant files and empty the Recycle Bin so as to free at least 256 KB of space and then try again. Note that due to a Windows issue, the amount of free space reported by the Windows Explorer may be incorrect until the operating system is restarted. If restarting the system does not help, the file system may be corrupted. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
-    <string lang="en" key="DISK_FREE_BYTES">Free space on drive %hs is %.2f bytes.</string>
+    <string lang="en" key="DISK_FREE_BYTES">Free space on drive %s is %.2f bytes.</string>
-    <string lang="en" key="DISK_FREE_KB">Free space on drive %hs is %.2f KB</string>
+    <string lang="en" key="DISK_FREE_KB">Free space on drive %s is %.2f KB</string>
-    <string lang="en" key="DISK_FREE_MB">Free space on drive %hs is %.2f MB</string>
+    <string lang="en" key="DISK_FREE_MB">Free space on drive %s is %.2f MB</string>
-    <string lang="en" key="DISK_FREE_GB">Free space on drive %hs is %.2f GB</string>
+    <string lang="en" key="DISK_FREE_GB">Free space on drive %s is %.2f GB</string>
-    <string lang="en" key="DISK_FREE_TB">Free space on drive %hs is %.2f TB</string>
+    <string lang="en" key="DISK_FREE_TB">Free space on drive %s is %.2f TB</string>
-    <string lang="en" key="DISK_FREE_PB">Free space on drive %hs is %.2f PB</string>
+    <string lang="en" key="DISK_FREE_PB">Free space on drive %s is %.2f PB</string>
     <string lang="en" key="DRIVELETTERS">Could not get available drive letters.</string>
     <string lang="en" key="DRIVER_NOT_FOUND">Error: VeraCrypt driver not found.\n\nPlease copy the files 'veracrypt.sys' and 'veracrypt-x64.sys' to the directory where the main VeraCrypt application (VeraCrypt.exe) is located.</string>
-    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall; on Windows XP, select 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
+    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' > Computer > 'Uninstall or change a program' > VeraCrypt > Uninstall; on Windows XP, select 'Start Menu' > Settings > 'Control Panel' > 'Add Or Remove Programs' > VeraCrypt > Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
     <string lang="en" key="ERR_CIPHER_INIT_FAILURE">Error: Cipher initialization failure.</string>
     <string lang="en" key="ERR_CIPHER_INIT_WEAK_KEY">Error: A weak or a potentially weak key has been detected. The key will be discarded. Please try again.</string>
     <string lang="en" key="EXCEPTION_REPORT">A critical error has occurred and VeraCrypt must be terminated. If this is caused by a bug in VeraCrypt, we would like to fix it. To help us, you can send us an automatically generated error report containing the following items:\n\n- Program version\n- Operating system version\n- Type of CPU\n- VeraCrypt component name\n- Checksum of VeraCrypt executable\n- Symbolic name of dialog window\n- Error category\n- Error address\n- VeraCrypt call stack\n\nIf you select 'Yes', the following URL (which contains the entire error report) will be opened in your default Internet browser.\n\n%hs\n\nDo you want to send us the above error report?</string>
@@ -497,7 +503,7 @@
     <string lang="en" key="WIPE_FINISHED">The content of the partition/device has been successfully erased.</string>
     <string lang="en" key="WIPE_FINISHED_DECOY_SYSTEM_PARTITION">The content of the partition where the original system (of which the hidden system is a clone) resided has been successfully erased.</string>
     <string lang="en" key="DECOY_OS_VERSION_WARNING">Please make sure the version of Windows you are going to install (on the wiped partition) is the same as the version of Windows you are currently running. This is required due to the fact that both systems will share a common boot partition.</string>
-    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' &gt; 'Add Mounted Volume to System Favorites').</string>
+    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' > 'Add Mounted Volume to System Favorites').</string>
     <string lang="en" key="SYSTEM_DECRYPTION_FINISHED">The system partition/drive has been successfully decrypted.</string>
     <string lang="en" key="FORMAT_FINISHED_HELP">\n\nThe VeraCrypt volume has been created and is ready for use. If you wish to create another VeraCrypt volume, click Next. Otherwise, click Exit.</string>
     <string lang="en" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nThe hidden VeraCrypt volume has been successfully created (the hidden operating system will reside within this hidden volume).\n\nClick Next to continue.</string>
@@ -524,7 +530,7 @@
     <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 password for this outer volume, and the existence of the hidden volume (and of the hidden operating system) will remain secret.\n\nIMPORTANT: The files you copy to the outer volume should not occupy more than %s. Otherwise, there may not be enough free space on the outer volume for the hidden volume (and you will not be able to continue). After you finish copying, click Next (do not dismount the volume).</string>
     <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 you finish copying, click Next. Do not dismount the volume.\n\nNote: After you click Next, cluster bitmap of the outer volume will be scanned to determine the size of uninterrupted area of free space whose end is aligned with the end of the volume. This area will accommodate the hidden volume, so it will limit its maximum possible size. Cluster bitmap scanning ensures that no data on the outer volume are overwritten by the hidden volume.</string>
     <string lang="en" key="HIDVOL_HOST_FILLING_TITLE">Outer Volume Contents</string>
-    <string lang="en" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nIn the next steps, you will set the options for the outer volume (within which the hidden volume will be created later on). </string>
+    <string lang="en" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nIn the next steps, you will set the options for the outer volume (within which the hidden volume will be created later on).</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>
     <string lang="en" key="HIDVOL_HOST_PRE_CIPHER_TITLE">Outer Volume</string>
     <string lang="en" key="HIDDEN_OS_PRE_CIPHER_HELP">In the following steps, you will set the options and password for the hidden volume, which will contain the hidden operating system.\n\nRemark: The cluster bitmap of the outer volume has been scanned in order to determine the size of uninterrupted area of free space whose end is aligned with the end of the outer volume. This area will accommodate the hidden volume, so it limits its maximum possible size. The maximum possible size of the hidden volume has been determined and confirmed to be greater than the size of the system partition (which is required, because the entire content of the system partition will need to be copied to the hidden volume). This ensures that no data currently stored on the outer volume will be overwritten by data written to the area of the hidden volume.</string>
@@ -561,6 +567,7 @@
     <string lang="en" key="MAX_HIDVOL_SIZE_KB">Maximum possible hidden volume size for this volume is %.2f KB.</string>
     <string lang="en" key="MAX_HIDVOL_SIZE_MB">Maximum possible hidden volume size for this volume is %.2f MB.</string>
     <string lang="en" key="MAX_HIDVOL_SIZE_GB">Maximum possible hidden volume size for this volume is %.2f GB.</string>
+    <string lang="en" key="MAX_HIDVOL_SIZE_TB">Maximum possible hidden volume size for this volume is %.2f TB.</string>
     <string lang="en" key="MOUNTED_NOPWCHANGE">Volume password/keyfiles cannot be changed while the volume is mounted. Please dismount the volume first.</string>
     <string lang="en" key="MOUNTED_NO_PKCS5_PRF_CHANGE">The header key derivation algorithm cannot be changed while the volume is mounted. Please dismount the volume first.</string>
     <string lang="id" key="MOUNT_BUTTON">Sa&amp;mbung</string>
@@ -591,12 +598,12 @@
     <string lang="en" key="SELECT_PKCS11_MODULE">Select PKCS #11 Library</string>
     <string lang="en" key="OUTOFMEMORY">Out of Memory</string>
     <string lang="en" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">IMPORTANT: We strongly recommend that inexperienced users create a VeraCrypt file container on the selected device/partition, instead of attempting to encrypt the entire device/partition.\n\nWhen you create a VeraCrypt file container (as opposed to encrypting a device or partition) there is, for example, no risk of destroying a large number of files. Note that a VeraCrypt file container (even though it contains a virtual encrypted disk) is actually just like any normal file. For more information, see the chapter Beginner's Tutorial in the VeraCrypt User Guide.\n\nAre you sure you want to encrypt the entire device/partition?</string>
-    <string lang="en" key="OVERWRITEPROMPT">WARNING: The file '%hs' already exists!\n\nIMPORTANT: VERACRYPT WILL NOT ENCRYPT THE FILE, BUT IT WILL DELETE IT. Are you sure you want to delete the file and replace it with a new VeraCrypt container?</string>
+    <string lang="en" key="OVERWRITEPROMPT">WARNING: The file '%s' already exists!\n\nIMPORTANT: VERACRYPT WILL NOT ENCRYPT THE FILE, BUT IT WILL DELETE IT. Are you sure you want to delete the file and replace it with a new VeraCrypt container?</string>
-    <string lang="en" key="OVERWRITEPROMPT_DEVICE">CAUTION: ALL FILES CURRENTLY STORED ON THE SELECTED %s '%hs'%s WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
+    <string lang="en" key="OVERWRITEPROMPT_DEVICE">CAUTION: ALL FILES CURRENTLY STORED ON THE SELECTED %s '%s'%s WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
-    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%s'%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting/decrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting/decrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting/decrypting, please make sure that you have backup copies of the files you want to encrypt/decrypt.\n\nDo you have such a backup?</string>
-    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%hs'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
+    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%s'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
     <string lang="en" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">WARNING: THE SELECTED PARTITION CONTAINS A LARGE AMOUNT OF DATA! Any files stored on the partition will be erased and lost (they will NOT be encrypted)!</string>
     <string lang="en" key="ERASE_FILES_BY_CREATING_VOLUME">Erase any files stored on the partition by creating a VeraCrypt volume within it</string>
     <string lang="en" key="PASSWORD">Password</string>
@@ -645,7 +652,7 @@
     <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
     <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
     <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 &gt; Organize &gt; 'Folder and search options' &gt; View).</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="SELECTED_PARTITION_ALREADY_INPLACE_ENC">The selected partition/device is already fully encrypted.\nHeader Flags = 0x%.8X</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="en" key="PREV">&lt; &amp;Back</string>
     <string lang="en" key="RAWDEVICES">Unable to list raw devices installed on your system!</string>
-    <string lang="en" key="READONLYPROMPT">The volume '%hs' exists, and is read-only. Are you sure you want to replace it?</string>
+    <string lang="en" key="READONLYPROMPT">The volume '%s' exists, and is read-only. Are you sure you want to replace it?</string>
     <string lang="en" key="SELECT_DEST_DIR">Select destination directory</string>
     <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>
@@ -680,13 +687,13 @@
     <string lang="en" key="TEST_CIPHERTEXT_SIZE">The test ciphertext you have supplied is too long or short.</string>
     <string lang="en" key="TEST_KEY_SIZE">The test key you have supplied is too long or short.</string>
     <string lang="en" key="TEST_PLAINTEXT_SIZE">The test plaintext you have supplied is too long or short.</string>
-    <string lang="en" key="TWO_LAYER_CASCADE_HELP">Two ciphers in a cascade operating in XTS mode. Each block is first encrypted with %hs (%d-bit key) and then with %hs (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
+    <string lang="en" key="TWO_LAYER_CASCADE_HELP">Two ciphers in a cascade operating in XTS mode. Each block is first encrypted with %s (%d-bit key) and then with %s (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
-    <string lang="en" key="THREE_LAYER_CASCADE_HELP">Three ciphers in a cascade operating in XTS mode. Each block is first encrypted with %hs (%d-bit key), then with %hs (%d-bit key), and finally with %hs (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
+    <string lang="en" key="THREE_LAYER_CASCADE_HELP">Three ciphers in a cascade operating in XTS mode. Each block is first encrypted with %s (%d-bit key), then with %s (%d-bit key), and finally with %s (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
     <string lang="en" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Note that, depending on the operating system configuration, these auto-run and auto-mount features may work only when the traveler disk files are created on a non-writable CD/DVD-like medium. Also note that this is not a bug in VeraCrypt (it is a limitation of Windows).</string>
     <string lang="en" key="TRAVELER_DISK_CREATED">VeraCrypt traveler disk has been successfully created.\n\nNote that you need administrator privileges to run VeraCrypt in portable mode. Also note that, after examining the registry file, it may be possible to tell that VeraCrypt was run on a Windows system even if it is run in portable mode.</string>
     <string lang="en" key="TC_TRAVELER_DISK">VeraCrypt Traveler Disk</string>
     <string lang="en" key="TWOFISH_HELP">Designed by Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall, and Niels Ferguson. Published in 1998. 256-bit key, 128-bit block. Mode of operation is XTS. Twofish was one of the AES finalists.</string>
-    <string lang="en" key="MORE_INFO_ABOUT">More information on %hs</string>
+    <string lang="en" key="MORE_INFO_ABOUT">More information on %s</string>
     <string lang="en" key="UNKNOWN">Unknown</string>
     <string lang="en" key="ERR_UNKNOWN">An unspecified or unknown error occurred (%d).</string>
     <string lang="en" key="UNMOUNTALL_LOCK_FAILED">Some volumes contain files or folders being used by applications or system.\n\nForce dismount?</string>
@@ -706,7 +713,7 @@
     <string lang="en" key="WRONG_VOL_TYPE">VeraCrypt cannot change the password for a foreign volume.</string>
     <string lang="id" key="SELECT_FREE_DRIVE">Pilih dahulu salah satu letter drive yang masih bebas</string>
     <string lang="en" key="SELECT_A_MOUNTED_VOLUME">Please select a mounted volume in the drive letter list.</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="en" key="CANT_CREATE_AUTORUN">Error: Cannot create autorun.inf</string>
     <string lang="en" key="ERR_PROCESS_KEYFILE">Error while processing keyfile!</string>
     <string lang="en" key="ERR_PROCESS_KEYFILE_PATH">Error processing keyfile path!</string>
@@ -851,7 +858,7 @@
     <string lang="en" key="INSTALL_FAILED">Installation failed.</string>
     <string lang="en" key="UNINSTALL_FAILED">Uninstallation failed.</string>
     <string lang="en" key="DIST_PACKAGE_CORRUPTED">This distribution package is damaged. Please try downloading it again (preferably from the official VeraCrypt website at https://veracrypt.codeplex.com).</string>
-    <string lang="en" key="CANNOT_WRITE_FILE_X">Cannot write file %hs</string>
+    <string lang="en" key="CANNOT_WRITE_FILE_X">Cannot write file %s</string>
     <string lang="en" key="EXTRACTING_VERB">Extracting</string>
     <string lang="en" key="CANNOT_READ_FROM_PACKAGE">Cannot read data from the package.</string>
     <string lang="en" key="CANT_VERIFY_PACKAGE_INTEGRITY">Cannot verify the integrity of this distribution package.</string>
@@ -860,8 +867,8 @@
     <string lang="en" key="INSTALL_OK">VeraCrypt has been successfully installed.</string>
     <string lang="en" key="SETUP_UPDATE_OK">VeraCrypt has been successfully updated.</string>
     <string lang="en" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt has been successfully upgraded. However, before you can start using it, the computer must be restarted.\n\nDo you want to restart it now?</string>
-    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
+    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu > All programs > Accessories > System Tools > System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
-    <string lang="en" key="UNINSTALL_OK">VeraCrypt has been successfully uninstalled.\n\nClick 'Finish' to remove the VeraCrypt installer and the folder %hs. Note that the folder will not be removed if it contains any files that were not installed by the VeraCrypt installer or created by VeraCrypt.</string>
+    <string lang="en" key="UNINSTALL_OK">VeraCrypt has been successfully uninstalled.\n\nClick 'Finish' to remove the VeraCrypt installer and the folder %s. Note that the folder will not be removed if it contains any files that were not installed by the VeraCrypt installer or created by VeraCrypt.</string>
     <string lang="en" key="REMOVING_REG">Removing VeraCrypt registry entries</string>
     <string lang="en" key="ADDING_REG">Adding registry entry</string>
     <string lang="en" key="REMOVING_APPDATA">Removing application-specific data</string>
@@ -872,10 +879,10 @@
     <string lang="en" key="CREATING_SYS_RESTORE">Creating System Restore point</string>
     <string lang="en" key="FAILED_SYS_RESTORE">Failed to create System Restore point!</string>
     <string lang="en" key="INSTALLER_UPDATING_BOOT_LOADER">Updating boot loader</string>
-    <string lang="en" key="INSTALL_OF_FAILED">Failed to install '%hs'. %hs\nDo you want to continue installing?</string>
+    <string lang="en" key="INSTALL_OF_FAILED">Failed to install '%s'. %s\nDo you want to continue installing?</string>
-    <string lang="en" key="UNINSTALL_OF_FAILED">Failed to uninstall '%hs'. %hs\nDo you want to continue uninstalling?</string>
+    <string lang="en" key="UNINSTALL_OF_FAILED">Failed to uninstall '%s'. %s\nDo you want to continue uninstalling?</string>
     <string lang="en" key="INSTALL_COMPLETED">Installation completed.</string>
-    <string lang="en" key="CANT_CREATE_FOLDER">The folder '%hs' could not be created</string>
+    <string lang="en" key="CANT_CREATE_FOLDER">The folder '%s' could not be created</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="en" key="DISMOUNT_ALL_FIRST">All VeraCrypt volumes must be dismounted before installing or uninstalling 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>
@@ -921,14 +928,14 @@
     <string lang="en" key="SYS_FAVORITE_VOLUMES_SAVED">System favorite volumes saved.\n\nTo enable mounting of system favorite volumes when the system starts, please select 'Settings' &gt; 'System Favorite Volumes' &gt; 'Mount system favorite volumes when Windows starts'.</string>
     <string lang="en" key="FAVORITE_ADD_DRIVE_DEV_WARNING">The volume you are adding to favorites is neither a partition nor a dynamic volume. Therefore, VeraCrypt will be unable to mount this favorite volume if the device number changes.</string>
     <string lang="en" key="FAVORITE_ADD_PARTITION_TYPE_WARNING">The volume you are adding to favorites is a partition not recognized by Windows.\n\nVeraCrypt will be unable to mount this favorite volume if the device number changes. Please set the type of the partition to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then add the partition to favorites again.</string>
-    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings &gt; Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
+    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings > Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_NETWORK_PATH_ERR">A container stored in a remote filesystem shared over a network cannot be automatically mounted when its host device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, the volume hosted on the device cannot be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable the volume hosted on the device to be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_LABEL_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, no label can be assigned to it.</string>
     <string lang="en" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable VeraCrypt to assign a label to the partition.</string>
     <string lang="en" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Due to a Windows limitation, a container stored in a remote filesystem shared over a network cannot be mounted as a system favorite volume (however, it can be mounted as a non-system favorite volume when a user logs on).</string>
-    <string lang="id" key="ENTER_PASSWORD_FOR">Masukkan password untuk %hs</string>
+    <string lang="id" key="ENTER_PASSWORD_FOR">Masukkan password untuk %s</string>
     <string lang="en" key="ENTER_PASSWORD_FOR_LABEL">Enter password for '%s'</string>
     <string lang="en" key="ENTER_NORMAL_VOL_PASSWORD">Enter password for the normal/outer volume</string>
     <string lang="en" key="ENTER_HIDDEN_VOL_PASSWORD">Enter password for the hidden volume</string>
@@ -943,8 +950,8 @@
     <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 header backup to restore a header of a different volume, you will be able to mount the volume, but you will NOT be able to decrypt any data stored in the volume (because you will change its master key).</string>
     <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) for the hidden volume.</string>
-    <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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</string>
+    <string lang="en" key="CONFIRM_VOL_HEADER_BAK">Are you sure you want to create volume header backup for %s?\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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</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="CONFIRM_VOL_HEADER_RESTORE">Are you sure you want to restore volume header of %s?\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>
@@ -955,12 +962,14 @@
     <string lang="en" key="VOLUME_HAS_NO_BACKUP_HEADER">There is no backup header embedded in this volume (note that only volumes created by VeraCrypt 6.0 or later contain embedded backup headers).</string>
     <string lang="en" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">You are attempting to back up the header of the system partition/drive. This is not allowed. Backup/restore operations pertaining to the system partition/drive can be performed only using the VeraCrypt Rescue Disk.\n\nDo you want to create a VeraCrypt Rescue Disk?</string>
     <string lang="en" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">You are attempting to restore the header of a virtual VeraCrypt volume but you selected the system partition/drive. This is not allowed. Backup/restore operations pertaining to the system partition/drive can be performed only using the VeraCrypt Rescue Disk.\n\nDo you want to create a VeraCrypt Rescue Disk?</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">After you click OK, you will select a filename for the new VeraCrypt Rescue Disk ISO image and the location where you wish to place it.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">After you click OK, you will select a filename for the new VeraCrypt Rescue Disk image and the location where you wish to place it.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <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_INSERT">Please insert your VeraCrypt Rescue Disk 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 a new Rescue Disk fully compatible with your current configuration, select 'System' &gt; 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk 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' &gt; '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 be used, because it was created for a different master key. You need to burn the newly generated Rescue Disk.</string>
@@ -989,8 +998,8 @@
     <string lang="en" key="DRIVE_LETTER_ITEM">Drive Letter:   </string>
     <string lang="en" key="UNSUPPORTED_CHARS_IN_PWD">Error: Password must contain only ASCII characters.\n\nNon-ASCII characters in password might cause the volume to be impossible to mount when your system configuration changes.\n\nThe following characters are allowed:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="en" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">Warning: Password contains non-ASCII characters. This may cause the volume to be impossible to mount when your system configuration changes.\n\nYou should replace all non-ASCII characters in the password with ASCII characters. To do so, click 'Volumes' -&gt; 'Change Volume Password'.\n\nThe following are ASCII characters:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="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 change it (e.g., to '.tc').\n\nAre you sure you want to use the problematic file extension?</string>
+    <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 change it (e.g., to '.hc').\n\nAre you sure you want to use the problematic file extension?</string>
-    <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 container or change it (e.g., to '.tc') after you dismount the volume.</string>
+    <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 container or change it (e.g., to '.hc') after you dismount the volume.</string>
     <string lang="en" key="HOMEPAGE">Homepage</string>
     <string lang="en" key="LARGE_IDE_WARNING_XP">WARNING: It appears that you have not applied any Service Pack to your Windows installation. You should not write to IDE disks larger than 128 GB under Windows XP to which you did not apply Service Pack 1 or later! 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 bug in VeraCrypt.</string>
     <string lang="en" key="LARGE_IDE_WARNING_2K">WARNING: It appears that you have not applied Service Pack 3 or later to your Windows installation. You should not write to IDE disks larger than 128 GB under Windows 2000 to which you did not apply Service Pack 3 or later! 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 bug in VeraCrypt.\n\nNote: You may also need to enable the 48-bit LBA support in the registry; for more information, see http://support.microsoft.com/kb/305098/EN-US</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="en" key="CHECKING_FS">Checking the file system on the VeraCrypt volume mounted as %s...</string>
-    <string lang="en" key="REPAIRING_FS">Attempting to repair the file system on the VeraCrypt volume mounted as %hs...</string>
+    <string lang="en" key="REPAIRING_FS">Attempting to repair the file system on the VeraCrypt volume mounted as %s...</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 later.</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 encryption algorithm (e.g., AES, Serpent, Twofish, etc.) and that you move all files from this volume to the new volume.</string>
     <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="en" key="SYS_ASSIGN_DRIVE_LETTER">Please assign a drive letter to the partition/device before proceeding ('Control Panel' &gt; 'System and Maintenance' &gt; 'Administrative Tools' - 'Create and format hard disk partitions').\n\nNote that this is a requirement of the operating system.</string>
@@ -1069,7 +1077,7 @@
     <string lang="en" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt no longer supports encryption of the system partition/drive on Windows Vista with no Service Pack installed. Before upgrading VeraCrypt, please install Service Pack 1 or higher for Windows Vista.</string>
     <string lang="en" key="FEATURE_REQUIRES_INSTALLATION">Error: This feature requires VeraCrypt to be installed on the system (you are running VeraCrypt in portable mode).\n\nPlease install VeraCrypt and then try again.</string>
     <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="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</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' &gt; '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>
@@ -1093,7 +1101,7 @@
     <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 medium (or using a service partition)?</string>
     <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 Hidden Volumes" in the VeraCrypt User's Guide.\n\nImportant: Before proceeding, please make sure you have read the section "Security Requirements and Precautions Pertaining to Hidden Volumes" in the VeraCrypt User's Guide.\n\n\nDoes the currently running operating system meet the above condition?</string>
     <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 from writing to the shared boot partition and from hibernating.\n\n\nDo you want to continue? If you select 'No', instructions for removing the extra boot partition will be displayed.</string>
-    <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' &gt; '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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
+    <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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
     <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>
@@ -1108,8 +1116,8 @@
     <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 you do NOT have a real US keyboard.</string>
     <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 starts.\n\n- The VRD will contain a backup of the present content of the first drive track (which typically contains a system loader or boot manager) and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ISO image will be created in the location specified below.</string>
     <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">The Rescue Disk image has been created and stored in this file:\n%s\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>
+    <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%s\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>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">IMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software. If you do not have any CD/DVD recording software that can write the ISO disk image to a CD/DVD, click the link below to download such free software.\n\n</string>
     <string lang="en" key="LAUNCH_WIN_ISOBURN">Launch Microsoft Windows Disc Image Burner</string>
     <string lang="en" key="RESCUE_DISK_BURN_NO_CHECK_WARN">WARNING: If you already created a VeraCrypt Rescue Disk in the past, it cannot be reused for this system partition/drive because it was created for a different master key! Every time you encrypt a system partition/drive, you must create a new VeraCrypt Rescue Disk for it even if you use the same password.</string>
@@ -1247,7 +1255,7 @@
     <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 system (but not on the decoy system), the decoy system would contain a VeraCrypt driver and VeraCrypt applications whose version numbers are different from the version number of the VeraCrypt Boot Loader. Such a discrepancy might indicate that there is a hidden operating system on this computer.\n\n\nDo you want to continue?</string>
     <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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' &gt; '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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' > 'Create Rescue Disk').</string>
     <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' &gt; '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' &gt; 'Create Rescue Disk'.</string>
     <string lang="en" key="BOOT_LOADER_UPGRADE_FAILED">Failed to upgrade the VeraCrypt Boot Loader.</string>
@@ -1272,7 +1280,7 @@
     <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' &gt; '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>
@@ -1297,8 +1305,8 @@
     <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 system.</string>
     <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' &gt; 'Performance' and enable 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' &gt; 'Performance' and disable 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>
@@ -1372,6 +1380,39 @@
     <string lang="en" key="TB_PER_SEC">TB/s</string>
     <string lang="en" key="PB_PER_SEC">PB/s</string>
     <string lang="en" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.it.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="it" name="Italiano" en-name="Italian" version="1.0.1" translators="Maurizio Ballo, Consiglio Gaetano" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="it" key="IDC_BROWSE">Sfo&amp;glia...</control>
     <control lang="it" key="IDC_DESKTOP_ICON">Aggiungi icona di VeraCrypt al &amp;desktop</control>
     <control lang="it" key="IDC_DONATE">Donazione...</control>
-    <control lang="it" key="IDC_FILE_TYPE">Associa i file con estensione .tc &amp; con VeraCrypt</control>
+    <control lang="it" key="IDC_FILE_TYPE">Associa i file con estensione .hc &amp; con VeraCrypt</control>
     <control lang="it" key="IDC_OPEN_CONTAINING_FOLDER">&amp;Apri la posizione di destinazione quando terminato</control>
     <control lang="it" key="IDC_PROG_GROUP">Aggiungi VeraCrypt al menu &amp;di avvio</control>
     <control lang="it" key="IDC_SYSTEM_RESTORE">Crea punto di &amp;ripristino del sistema</control>
@@ -37,6 +37,7 @@
     <control lang="it" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Scarica il software di registrazione CD/DVD</control>
     <control lang="it" key="IDC_FILE_CONTAINER">Crea un file contenitore criptato</control>
     <control lang="it" key="IDC_GB">&amp;GB</control>
+    <control lang="it" key="IDC_TB">&amp;TB</control>
     <control lang="it" key="IDC_HIDDEN_SYSENC_INFO_LINK">Altre informazioni</control>
     <control lang="it" key="IDC_HIDDEN_VOL">Volume VeraCrypt nascosto</control>
     <control lang="it" key="IDC_HIDDEN_VOL_HELP">Altre informazioni sui volumi ignoti</control>
@@ -44,6 +45,7 @@
     <control lang="it" key="IDC_HIDVOL_WIZ_MODE_FULL">Modo normale</control>
     <control lang="it" key="IDC_KB">KB</control>
     <control lang="it" key="IDC_KEYFILES_ENABLE">Usa file chiave</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="it" key="IDC_KEY_FILES">File chiave...</control>
     <control lang="it" key="IDC_LINK_HASH_INFO">Info sugli algoritmi confusione</control>
@@ -58,7 +60,8 @@
     <control lang="it" key="IDC_NO_HISTORY">Non salvare la cronologia</control>
     <control lang="it" key="IDC_OPEN_OUTER_VOLUME">Apri il volume esterno</control>
     <control lang="it" key="IDC_PAUSE">&amp;Pausa</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <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">&amp;Mostra password</control>
@@ -118,6 +121,7 @@
     <control lang="it" key="IDC_CREATE">Crea</control>
     <control lang="it" key="IDC_CREATE_VOLUME">Crea un volume...</control>
     <control lang="it" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Non &amp;mostrare nessun testo nello schermo autenticazione di pre-boot(eccetto il messaggio utente in basso)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="it" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelera la codifica/decodifica AES usando le istruzioni AES del processore (se disponibili)</control>
     <control lang="it" key="IDC_ENABLE_KEYFILES">Usa file chiave</control>
     <control lang="it" key="IDC_ENABLE_NEW_KEYFILES">Usa file chiave</control>
@@ -132,6 +136,7 @@
     <control lang="it" key="IDC_FAVORITE_MOVE_UP">Muovi &amp;sù</control>
     <control lang="it" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Aprire la &amp;finestra di explorer per il volume selezionato quando viene montato con successo</control>
     <control lang="it" key="IDC_FAVORITE_REMOVE">&amp;Rimuovi</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="it" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Impostazioni globali</control>
     <control lang="it" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Visualizza messaggio a scomparsa dopo aver correttamente scollegato una hotkey</control>
     <control lang="it" key="IDC_HK_DISMOUNT_PLAY_SOUND">Riproduci un suono di notifica dopo aver scollegato una hotkey correttamente</control>
@@ -189,7 +194,7 @@
     <control lang="it" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="it" key="IDD_PASSWORDCHANGE_DLG">Modifica la password o il file chiave</control>
     <control lang="it" key="IDD_PASSWORD_DLG">Digita la password del volume VeraCrypt</control>
-    <control lang="it" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Opzioni di prestazione</control>
+    <control lang="it" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Opzioni di prestazione e configurazione del driver </control>
     <control lang="it" key="IDD_PREFERENCES_DLG">Preferenze di VeraCrypt</control>
     <control lang="it" key="IDD_SYSENC_SETTINGS">VeraCrypt - Impostazioni codifica di sistema</control>
     <control lang="it" key="IDD_TOKEN_PREFERENCES">VeraCrypt - Preferenze controllo sicurezza</control>
@@ -235,7 +240,7 @@
     <control lang="it" key="IDM_ONLINE_TUTORIAL">Tutorial per principianti</control>
     <control lang="it" key="IDM_ORGANIZE_FAVORITES">Organizza i volumi preferiti...</control>
     <control lang="it" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organizza i volumi preferiti di sistema...</control>
-    <control lang="it" key="IDM_PERFORMANCE_SETTINGS">Prestazioni...</control>
+    <control lang="it" key="IDM_PERFORMANCE_SETTINGS">Prestazioni/Configurazione del driver</control>
     <control lang="it" key="IDM_PERMANENTLY_DECRYPT_SYS">Decodifica definitivamente la partizione/disco di sistema</control>
     <control lang="it" key="IDM_PREFERENCES">Preferenze...</control>
     <control lang="it" key="IDM_REFRESH_DRIVE_LETTERS">Aggiorna le lettere delle unità</control>
@@ -256,6 +261,7 @@
     <control lang="it" key="IDM_UNMOUNTALL">Smonta tutti i volumi montati</control>
     <control lang="it" key="IDM_UNMOUNT_VOLUME">Smonta il volume</control>
     <control lang="it" key="IDM_VERIFY_RESCUE_DISK">Verifica disco di ripristino</control>
+    <control lang="en" key="IDM_VERIFY_RESCUE_DISK_ISO">Verify Rescue Disk Image</control>
     <control lang="it" key="IDM_VERSION_HISTORY">Cronologia delle versioni</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="it" key="IDM_VOLUME_PROPERTIES">Proprietà del volume...</control>
@@ -274,7 +280,7 @@
     <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="IDT_DRIVER_OPTIONS">Configurazione del driver</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>
@@ -365,7 +371,7 @@
     <control lang="it" key="IDT_SECURITY_TOKEN">Misura di sicurezza:</control>
     <control lang="it" key="IDT_SORT_METHOD">Ordinamento:</control>
     <control lang="it" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Attendere. Questo processo può richiedere molto tempo...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="it" key="IDT_TEST_BLOCK_NUMBER">Numero blocchi:</control>
     <control lang="it" key="IDT_TEST_CIPHERTEXT">Testo criptato (esadecimale)</control>
     <control lang="it" key="IDT_TEST_DATA_UNIT_NUMBER">Numero unità dati (64-bit esadecimale, dimensione unità dati=512 byte)</control>
@@ -410,13 +416,13 @@
     <string lang="it" key="CIPHER_TITLE">Opzioni di codifica</string>
     <string lang="it" key="CLEAN_WINMRU_FAILED">ATTENZIONE: impossibile eliminare il percorso dell'ultimo volume/file chiave selezionato (memorizzata dal selettore file)!</string>
     <string lang="it" key="COMPRESSION_NOT_SUPPORTED">ERRORE: il volume è stato compresso a livello di file system. VeraCrypt non supporta i contenitore compressi (comprimere dati Codificati è inutile e ridondante).\n\nDisabilitare la compressione seguendo queste istruzioni: 1) Fare click destro sul contenitore in Esplora Risorse (non in VeraCrypt). 2) Selezionare 'Proprietà'. 3) Nella finestra di dialogo 'Proprietà', cliccare su 'Avanzate'. 4) Nella finestra di dialogo 'Proprietà avanzate', deselezionare l'opzione 'Comprimi i dati per risparmiare spazio' e cliccare 'OK'. 5) Nella finestra di dialogo 'Proprietà', cliccare 'OK'.</string>
-    <string lang="it" key="CREATE_FAILED">La creazione del volume %hs fallita</string>
+    <string lang="it" key="CREATE_FAILED">La creazione del volume %s fallita</string>
-    <string lang="it" key="DEVICE_FREE_BYTES">La dimensione di %hs è %.2f byte</string>
+    <string lang="it" key="DEVICE_FREE_BYTES">La dimensione di %s è %.2f byte</string>
-    <string lang="it" key="DEVICE_FREE_KB">La dimensione di %hs è %.2f KB</string>
+    <string lang="it" key="DEVICE_FREE_KB">La dimensione di %s è %.2f KB</string>
-    <string lang="it" key="DEVICE_FREE_MB">La dimensione di %hs è %.2f MB</string>
+    <string lang="it" key="DEVICE_FREE_MB">La dimensione di %s è %.2f MB</string>
-    <string lang="it" key="DEVICE_FREE_GB">La dimensione di %hs è %.2f GB</string>
+    <string lang="it" key="DEVICE_FREE_GB">La dimensione di %s è %.2f GB</string>
-    <string lang="it" key="DEVICE_FREE_TB">La dimensione di %hs è %.2f TB</string>
+    <string lang="it" key="DEVICE_FREE_TB">La dimensione di %s è %.2f TB</string>
-    <string lang="it" key="DEVICE_FREE_PB">La dimensione di %hs è %.2f PB</string>
+    <string lang="it" key="DEVICE_FREE_PB">La dimensione di %s è %.2f PB</string>
     <string lang="it" key="DEVICE_IN_USE_FORMAT">ATTENZIONE: l’unità/partizione è in uso da parte del sistema operativo o da un'applicazione. La sua formattazione potrebbe causare la perdita dei dati e l'instabilità del sistema.\n\nContinuare?</string>
     <string lang="it" key="DEVICE_IN_USE_INPLACE_ENC">ATTENZIONE: l’unità è in uso da parte del sistema operativo o da un'applicazione. Dovete chiudere qualsiasi applicazione che sta usando la partizione (compreso i software antivirus).\n\nContinuare?</string>
     <string lang="it" key="FORMAT_CANT_DISMOUNT_FILESYS">ERRORE: l’unità/partizione contiene un file system che non può essere smontato. Il file system potrebbe essere in uso. La formattazione della unità/partizione può causare la perdita dei dati e l'instabilità del sistema.\n\nPer risolvere il problema, si raccomanda di cancellare la partizione e di ricrearla senza formattarla, seguendo le seguenti istruzioni: 1) Fare click destro sull'icona 'Risorse del computer' nel menu Start e selezionare 'Gestione'. Dovrebbe comparire la finestra 'Gestione computer'. 2) Nella finestra 'Gestione computer', selezionare 'Gestione disco'. 3) Fare click destro sulla partizione da codificare e selezionare 'Elimina partizione' o 'Elimina volume' oppure 'Elimina unità logica'. 4) Cliccare 'Sì'. Se Windows chiede il riavvio del computer, eseguirlo. Ripetere i passi 1 e 2 e continuare col passo 5. 5) Fare click destro sullo spazio libero/non allocato e selezionare 'Nuova partizione' o 'Nuovo volume' oppure 'Nuova unità logica'. 6) Dovrebbe comparire la finestra 'Creazione guidata nuova partizione' o 'Creazione guidata nuovo volume'; seguire le istruzioni. Nella pagina intitolata 'Formatta partizione', selezionare 'Non formattare questa partizione' o 'Non formattare questo volume'. Cliccare su 'Avanti' e poi su 'Fine'. 7) Ora il percorso del unità selezionato in VeraCrypt potrebbe essere errato. Uscire dalla creazione guidata del volume VeraCrypt (se ancora in esecuzione) e riavviarla. 8) Provare nuovamente a codificare l’unità/partizione.\n\nSe VeraCrypt non riesce ripetutamente a codificare l’unità/partizione, creare un file contenitore.</string>
@@ -435,12 +441,12 @@
     <string lang="it" key="INPLACE_ENC_INVALID_PATH">ERRORE: VeraCrypt può codificare sul posto solo una partizione, un volume dinamico oppure un intero disco di sistema. Assicuratevi che il percorso specificato sia valido.</string>
     <string lang="it" key="CANNOT_RESIZE_FILESYS">Errore: Impossibile comprimere il file system (esso deve essere compresso per la testata del volume e del backup).\n\nCause possibili e soluzioni:\n\n- Spazio libero insufficiente sul volume. Assicuratevi che nessuna altra applicazione stia scrivendo nel file system.\n\n- file system danneggiato. Tentare di verificarlo e correggere qualsiasi errore (fate click con il tasto destro sulla lettera del drive corrispondente nell'elenco 'Risorse del computer', selezionare Proprietà &gt; Strumenti &gt; 'Verifica', assicuratevi che l'opzione 'Correggi automaticamente gli errori nel file system' sia attivata e fate click su Avvia).\n\nSe i passi di cui sopra non vi aiutano, seguire i passi successivi.</string>
     <string lang="it" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Errore: Non c'è spazio libero sufficiente nel volume e quindi il file system non può essere compattato (la compattazione del file system è necessaria per fare spazio per la testata del volume e del backup).\n\nEliminare ogni file ridondante e svuotare il cestino in modo da liberare almeno 256 KB di spazio e quindi ritentare. Notare che, a causa di una istanza di Windows, la quantità di spazio libero rapportata da Windows Explorer può essere inesatta finchè il sistema operativo non viene riavviato. Se riavviando il sistema questo non vi aiuta, il file system può essere danneggiato. Tentare il controllo e correggere qualsiasi errore (fate click destro sulla lettera dell'unità corrispondente nell'elenco 'Risorse del computer', selezionare Proprietà &gt; Strumenti &gt; 'Esegui scandisk'. Assicuratevi che l'opzione 'Correggi automaticamente gli errori del file system' sia attivata e quindi fate click su Avvia).\n\nSe i passi precedenti non vi aiutano, seguire i passi che seguono.</string>
-    <string lang="it" key="DISK_FREE_BYTES">Lo spazio libero sull'unità %hs è di %.2f byte.</string>
+    <string lang="it" key="DISK_FREE_BYTES">Lo spazio libero sull'unità %s è di %.2f byte.</string>
-    <string lang="it" key="DISK_FREE_KB">Lo spazio libero sull'unità %hs è di %.2f KB</string>
+    <string lang="it" key="DISK_FREE_KB">Lo spazio libero sull'unità %s è di %.2f KB</string>
-    <string lang="it" key="DISK_FREE_MB">Lo spazio libero sull'unità %hs è di %.2f MB</string>
+    <string lang="it" key="DISK_FREE_MB">Lo spazio libero sull'unità %s è di %.2f MB</string>
-    <string lang="it" key="DISK_FREE_GB">Lo spazio libero sull'unità %hs è di %.2f GB</string>
+    <string lang="it" key="DISK_FREE_GB">Lo spazio libero sull'unità %s è di %.2f GB</string>
-    <string lang="it" key="DISK_FREE_TB">Lo spazio libero sull'unità %hs è di %.2f TB</string>
+    <string lang="it" key="DISK_FREE_TB">Lo spazio libero sull'unità %s è di %.2f TB</string>
-    <string lang="it" key="DISK_FREE_PB">Lo spazio libero sull'unità %hs è di %.2f PB</string>
+    <string lang="it" key="DISK_FREE_PB">Lo spazio libero sull'unità %s è di %.2f PB</string>
     <string lang="it" key="DRIVELETTERS">Impossibile ottenere lettere di unità libere.</string>
     <string lang="it" key="DRIVER_NOT_FOUND">ERRORE: Driver VeraCrypt non trovato.\n\nCopiare i file 'veracrypt.sys' e 'veracrypt-x64.sys' nella directory dove si trova il file esecutivo di VeraCrypt (VeraCrypt.exe)..</string>
     <string lang="it" key="DRIVER_VERSION">Error: Una versione incompatibile di VeraCrypt è attualmente in esecuzione.\n\nSe stai provando ad avviare VeraCrypt in modalità portabile (cioè senza installarlo) e una versione differente di VeraCrypt è già installata, bisogna prima distinstallarla (o aggiornarla utilizzando l'installer di VeraCrypt). Per disinstallarla, segui questi passi: Su Windows Vista o successivo, seleziona 'Start Menu' &gt; Computer &gt; 'Disinstalla o cambia programma' &gt; VeraCrypt &gt; Disinstalla; su Windows XP, seleziona 'Start Menu' &gt; Impostazioni &gt; 'Pannello di Controllo' &gt; 'Aggiungi o Rimuovi Programmi' &gt; VeraCrypt &gt; Rimuovi.\n\nAllo stesso modo, se stai provando ad avviare VeraCrypt in modalità portabile (cioè senza installarlo) e una versione differente di VeraCrypt è già avviata in modalità portabile, devi riavviare prima il sistema e poi eseguire solo questa nuova versione.</string>
@@ -561,6 +567,7 @@
     <string lang="it" key="MAX_HIDVOL_SIZE_KB">La dimensione massima del volume nascosto per questo volume è di %.2f KB.</string>
     <string lang="it" key="MAX_HIDVOL_SIZE_MB">La dimensione massima del volume nascosto per questo volume è di %.2f MB.</string>
     <string lang="it" key="MAX_HIDVOL_SIZE_GB">La dimensione massima possibile del volume nascosto per questo volume VeraCrypt è %.2f GB.</string>
+    <string lang="it" key="MAX_HIDVOL_SIZE_TB">La dimensione massima possibile del volume nascosto per questo volume VeraCrypt è %.2f TB.</string>
     <string lang="it" key="MOUNTED_NOPWCHANGE">La password o i file chiave per il volume non possono essere modificati mentre questo è montato. E' necessario smontare prima il volume.</string>
     <string lang="it" key="MOUNTED_NO_PKCS5_PRF_CHANGE">L'algoritmo di derivazione per la chiave di testata non può essere cambiato mentre il volume è montato. E' necessario smontare prima il volume.</string>
     <string lang="it" key="MOUNT_BUTTON">Monta</string>
@@ -591,12 +598,12 @@
     <string lang="it" key="SELECT_PKCS11_MODULE">Selezionare la libreria PKCS #11</string>
     <string lang="it" key="OUTOFMEMORY">Memoria esaurita</string>
     <string lang="it" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">IMPORTANTE: Raccomandiamo rigorosamente che gli utenti non esperti creano un file contenitore VeraCrypt contenente la partizione/periferica selezionata invece di tentare la cifratura dell'intera partizione/periferica.\n\nQuando create un file contenitore VeraCrypt (al contrario di cifrare una periferica o partizione) c'è, per esempio, nessun rischio di distruzione di un grande numero di file. Notare che un file contenitore VeraCrypt (anche quando esso contiene un disco virtuale criptato) è attualmente come qualsiasi file normale. Per maggiori informazioni vedere il capitolo Beginner's Tutorial nella guida utente di VeraCrypt User Guide.\n\nSiete sicuri di voler codificare l'intera periferica/partizione?</string>
-    <string lang="it" key="OVERWRITEPROMPT">AVVERTENZA: Il file '%hs' già esiste!\n\nIMPORTANTE: VERACRYPT NON CODIFICHERA’ IL FILE, MA LO CANCELLERA'. Siete sicuri di voler cancellare il file e sostituirlo con un nuovo contenitore VeraCrypt?</string>
+    <string lang="it" key="OVERWRITEPROMPT">AVVERTENZA: Il file '%s' già esiste!\n\nIMPORTANTE: VERACRYPT NON CODIFICHERA’ IL FILE, MA LO CANCELLERA'. Siete sicuri di voler cancellare il file e sostituirlo con un nuovo contenitore VeraCrypt?</string>
-    <string lang="it" key="OVERWRITEPROMPT_DEVICE">ATTENZIONE: QUALSIASI FILE ATTUALMENTE MEMORIZZATO NELLA PARTIZIONE%s '%hs'%s SARA' CANCELLATO E PERSO (ESSI NON SARANNO CODIFICATI)!\n\nSiete sicuri di voler procedere con la formattazione?</string>
+    <string lang="it" key="OVERWRITEPROMPT_DEVICE">ATTENZIONE: QUALSIASI FILE ATTUALMENTE MEMORIZZATO NELLA PARTIZIONE%s '%s'%s SARA' CANCELLATO E PERSO (ESSI NON SARANNO CODIFICATI)!\n\nSiete sicuri di voler procedere con la formattazione?</string>
-    <string lang="it" key="NONSYS_INPLACE_ENC_CONFIRM">AVVERTENZA: Non potrete montare il volume oppure accedere a nessun file memorizzato in esso finché esso è stato criptato interamante.\n\nSiete sicuri di voler avviare la codifica del selezionato %s '%hs'%s?</string>
+    <string lang="it" key="NONSYS_INPLACE_ENC_CONFIRM">AVVERTENZA: Non potrete montare il volume oppure accedere a nessun file memorizzato in esso finché esso è stato criptato interamante.\n\nSiete sicuri di voler avviare la codifica del selezionato %s '%s'%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="it" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">AVVERTENZA: Notate che se l’alimentazione elettrica viene interrotta bruscamente durante la codifica in posto dei dati esistenti, o quando il sistema operativo va in crash a causa di un errore del software o di un malfunzionamento dell’hardware mentre VeraCrypt sta codificando i dati in posto, delle parti di dati possono essere corrotti o persi. Pertanto, prima di avviare la codifica, assicuratevi di aver fatto delle copie di backup dei file da codificare.\n\nAvete fatto tale copia di backup?</string>
-    <string lang="it" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">ATTENZIONE: QUALSIASI FILE ATTUALMENTE MEMORIZZATO NELLA PARTIZIONE '%hs'%s (ESEMPIO NELLA PRIMA PARTIZIONE DIETRO LA PARTIZIONE DI SISTEMA) VERRA' CANCELLATO E PERSO (ESSI NON SARANNO CODIFICATI)!\n\nSiete sicuri di voler procedere con la formattazione?</string>
+    <string lang="it" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">ATTENZIONE: QUALSIASI FILE ATTUALMENTE MEMORIZZATO NELLA PARTIZIONE '%s'%s (ESEMPIO NELLA PRIMA PARTIZIONE DIETRO LA PARTIZIONE DI SISTEMA) VERRA' CANCELLATO E PERSO (ESSI NON SARANNO CODIFICATI)!\n\nSiete sicuri di voler procedere con la formattazione?</string>
     <string lang="it" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">AVVERTENZA: LA PARTIZIONE SELEZIONATA CONTIENE UNA GRANDE QUANTITA’ DI DATI! Qualsiasi file memorizzato nella partizione sarà cancellato e perso (NON SARANNO CODIFICATI)!</string>
     <string lang="it" key="ERASE_FILES_BY_CREATING_VOLUME">Cancella qualsisasi file memorizzato nella partizione creando un volume VeraCrypt al suo interno</string>
     <string lang="it" key="PASSWORD">Password</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="it" key="PREV">&lt;&amp;Indietro</string>
     <string lang="it" key="RAWDEVICES">Impossibile elencare le unità installate sul sistema!</string>
-    <string lang="it" key="READONLYPROMPT">Il volume '%hs' esiste ed è a sola lettura. Si è sicuri di volerlo sostituire?</string>
+    <string lang="it" key="READONLYPROMPT">Il volume '%s' esiste ed è a sola lettura. Si è sicuri di volerlo sostituire?</string>
     <string lang="it" key="SELECT_DEST_DIR">Selezionare una cartella di destinazione</string>
     <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>
@@ -680,13 +687,13 @@
     <string lang="it" key="TEST_CIPHERTEXT_SIZE">Il testo criptato di prova fornito è troppo lungo o troppo corto.</string>
     <string lang="it" key="TEST_KEY_SIZE">La chiave di prova fornita è troppo lunga o troppo corta.</string>
     <string lang="it" key="TEST_PLAINTEXT_SIZE">Il testo di prova normale fornito è troppo lungo o troppo corto.</string>
-    <string lang="it" key="TWO_LAYER_CASCADE_HELP">Due cifre in cascata operano in modalità XTS. Ogni blocco viene prima criptato con %hs (Chiave a %d-bit) e quindi con %hs (Chiave a %d-bit). Ogni Codifica usa la sua propria chiave. Tutte le chiavi sono mutualmente indipendenti.</string>
+    <string lang="it" key="TWO_LAYER_CASCADE_HELP">Due cifre in cascata operano in modalità XTS. Ogni blocco viene prima criptato con %s (Chiave a %d-bit) e quindi con %s (Chiave a %d-bit). Ogni Codifica usa la sua propria chiave. Tutte le chiavi sono mutualmente indipendenti.</string>
-    <string lang="it" key="THREE_LAYER_CASCADE_HELP">Tre cifre in cascata operano in modalità XTS. Ogni blocco viene prima criptato con %hs (Chiave a %d-bit), quindi con %hs (Chiave a %d-bit) ed alla fine con %hs (Chiave a %d-bit). Ogni Codifica usa la sua propria chiave. Tutte le chiavi sono mutuamente indipendenti.</string>
+    <string lang="it" key="THREE_LAYER_CASCADE_HELP">Tre cifre in cascata operano in modalità XTS. Ogni blocco viene prima criptato con %s (Chiave a %d-bit), quindi con %s (Chiave a %d-bit) ed alla fine con %s (Chiave a %d-bit). Ogni Codifica usa la sua propria chiave. Tutte le chiavi sono mutuamente indipendenti.</string>
     <string lang="it" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Notate che, a seconda della configurazione del sistema operativo, queste funzioni auto-run e montaggio automatico possono lavorare solo quando i file del traveler disk sono creati su un supporto tipo CD/DVD non scrivibile. Da notare che questo non è un difetto di VeraCrypt (è una limirazione di Windows).</string>
     <string lang="it" key="TRAVELER_DISK_CREATED">Il traveler disk di VeraCrypt è stato creato.\n\nDa notare che dovete disporre dei privilegi di amministratore per eseguire VeraCrypt in modalità portabile. Da notare pure che, dopo l'esame del file di registro, è possibile chiedere che VeraCrypt venga eseguito in un sistema Windows anche se esso è eseguito in modalità portabile.</string>
     <string lang="it" key="TC_TRAVELER_DISK">Traveler Disk di VeraCrypt</string>
     <string lang="it" key="TWOFISH_HELP">Concepito da Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall e Niels Ferguson. Pubblicato nel 1998. Chiave a 256-bit, blocco a 128-bit. Modalità operativa XTS. Twofish è uno dei finalisti AES.</string>
-    <string lang="it" key="MORE_INFO_ABOUT">Maggiori informazioni su %hs</string>
+    <string lang="it" key="MORE_INFO_ABOUT">Maggiori informazioni su %s</string>
     <string lang="it" key="UNKNOWN">Sconosciuto</string>
     <string lang="it" key="ERR_UNKNOWN">Si è verificato un errore sconosciuto (%d).</string>
     <string lang="it" key="UNMOUNTALL_LOCK_FAILED">Alcuni volumi contengono file o cartelle utilizzati dalle applicazioni o dal sistema.\n\nForzare lo smontaggio?</string>
@@ -851,7 +858,7 @@
     <string lang="it" key="INSTALL_FAILED">Installazione fallita.</string>
     <string lang="it" key="UNINSTALL_FAILED">Disinstallazione fallita.</string>
     <string lang="it" key="DIST_PACKAGE_CORRUPTED">Questo pacchetto di distribuzione è danneggiato. Provare a scaricarlo nuovamente (preferibilmente dal sito ufficiale di VeraCrypt all’indirizzo ww.veracrypt.org).</string>
-    <string lang="it" key="CANNOT_WRITE_FILE_X">Impossibile scrivere il file %hs</string>
+    <string lang="it" key="CANNOT_WRITE_FILE_X">Impossibile scrivere il file %s</string>
     <string lang="it" key="EXTRACTING_VERB">Estrazione</string>
     <string lang="it" key="CANNOT_READ_FROM_PACKAGE">Impossibile leggere i dati dal pacchetto.</string>
     <string lang="it" key="CANT_VERIFY_PACKAGE_INTEGRITY">Impossibile verificare l'integrità del pacchetto.</string>
@@ -861,7 +868,7 @@
     <string lang="it" key="SETUP_UPDATE_OK">VeraCrypt è stato aggiornato con successo.</string>
     <string lang="it" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt è stato aggiornato correttamente. Comunque prima di utilizzarlo il computer deve essere riavviato.\n\nSi desidera riavviare edesso?</string>
     <string lang="it" key="SYS_ENC_UPGRADE_FAILED">Aggiornamento VeraCrypt fallito!\n\nIMPORTANTE: Prima di arrestare o riavviare il sistema, raccomandiamo fortemente di utilizzare la funzione Ripristino Sistema (Start &gt; Tutti i programmi &gt; Accessori &gt; Strumenti di Sistema &gt; Ripristino Sistema) per riportare il sistema al punto di ripristino chiamato 'Installazione VeraCrypt'. Se il Ripristino di Sistema non è disponibile, riprovare a installare la versione originale o nuova di VeraCrypt ancora una volta prima di arrestere o riavviare il sistema.</string>
-    <string lang="it" key="UNINSTALL_OK">VeraCrypt è stato disinstallato con successo.\n\nFate click su 'Terminare' per rimuovere il programma di installazione di VeraCrypt e la cartella %hs. Da notare che La cartella non verrà rimossa se contiene file creati o installati da programmi diversi da VeraCrypt.</string>
+    <string lang="it" key="UNINSTALL_OK">VeraCrypt è stato disinstallato con successo.\n\nFate click su 'Terminare' per rimuovere il programma di installazione di VeraCrypt e la cartella %s. Da notare che La cartella non verrà rimossa se contiene file creati o installati da programmi diversi da VeraCrypt.</string>
     <string lang="it" key="REMOVING_REG">Rimozione delle chiavi di registro di VeraCrypt</string>
     <string lang="it" key="ADDING_REG">Aggiunta delle chiavi di registro</string>
     <string lang="it" key="REMOVING_APPDATA">Rimozione dati specifici dell'applicazione</string>
@@ -872,10 +879,10 @@
     <string lang="it" key="CREATING_SYS_RESTORE">Creazione punto di ripristino di sistema</string>
     <string lang="it" key="FAILED_SYS_RESTORE">Creazione punto di ripristino di sistema fallita!</string>
     <string lang="it" key="INSTALLER_UPDATING_BOOT_LOADER">Aggiornamento del loader di avvio</string>
-    <string lang="it" key="INSTALL_OF_FAILED">Errore nell’intallazione di '%hs'. %hs Volete continuare l’installazione?</string>
+    <string lang="it" key="INSTALL_OF_FAILED">Errore nell’intallazione di '%s'. %s Volete continuare l’installazione?</string>
-    <string lang="it" key="UNINSTALL_OF_FAILED">Errore nella disinstallazione di '%hs'. %hs Volete continuare con la disinstallazione?</string>
+    <string lang="it" key="UNINSTALL_OF_FAILED">Errore nella disinstallazione di '%s'. %s Volete continuare con la disinstallazione?</string>
     <string lang="it" key="INSTALL_COMPLETED">Installazione completata.</string>
-    <string lang="it" key="CANT_CREATE_FOLDER">Impossibile creare la cartella '%hs'</string>
+    <string lang="it" key="CANT_CREATE_FOLDER">Impossibile creare la cartella '%s'</string>
     <string lang="it" key="CLOSE_TC_FIRST">Il driver di VeraCrypt non può essere rimosso.\n\nChiudere tutte le finestre di VeraCrypt. Se non funziona, riavviare Windows e provare di nuovo.</string>
     <string lang="it" key="DISMOUNT_ALL_FIRST">Tutti i volumi devono essere smontati prima di installare o disinstallare VeraCrypt.</string>
     <string lang="it" key="UNINSTALL_OLD_VERSION_FIRST">Una versione obsoleta di VeraCrypt è attualmente installata in questo sistema. Deve essere disinstallata prima di installare questa nuova versione di VeraCrypt.\n\nNon appena avete chiuso questa finestra di messaggio, sarà lanciata la disinstallazione della vecchia versione. Notate che nessun volume sarà decrittata disinstallando VeraCrypt. Dopo la disinstallazione della vecchia versione di VeraCrypt, rilanciare l'installazione della nuova versione del programma.</string>
@@ -928,7 +935,7 @@
     <string lang="it" key="FAVORITE_LABEL_DEVICE_PATH_ERR">La periferica mostrata sotto non è né una partizione né un volume dinamico. Pertanto, non può essere assegnata nessuna etichetta ad essa.</string>
     <string lang="it" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Impostare il tipo di partizione mostrato sotto in un tipo riconosciuto da Windows (usare il comando SETID dello strumento 'diskpart'di Windows). Rimuovere quindi la partizione dai preferiti ed aggiungerla nuovamente. Questo consentirà a VeraCrypt di assegnare una etichetta alla partizione.</string>
     <string lang="it" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">A causa di una limitazione di Windows, un contenitore salvato in un filesystem condiviso in una rete non può essere montato come volume preferito di sistema (pertanto, può essere montato come volume non preferito di sistema quando un utente si connette).</string>
-    <string lang="it" key="ENTER_PASSWORD_FOR">Digitare la password per %hs</string>
+    <string lang="it" key="ENTER_PASSWORD_FOR">Digitare la password per %s</string>
     <string lang="it" key="ENTER_PASSWORD_FOR_LABEL">Digitare password for '%s'</string>
     <string lang="it" key="ENTER_NORMAL_VOL_PASSWORD">Digitare la password per il volume normale/esterno</string>
     <string lang="it" key="ENTER_HIDDEN_VOL_PASSWORD">Digitare la password per il volume nascosto</string>
@@ -943,8 +950,8 @@
     <string lang="it" key="VOL_HEADER_BACKED_UP">Il backup della testa del volume è stato creato con successo.\n\nIMPORTANTE: ripristinare la testa del volume usando questo backup si ripristinerà anche la password attuale. Inoltre, se per montare il volume sono necessari uno o più file chiave, questi saranno necessari per montare nuovamente il volume una volta che la testa è stata ripristinata.\n\nATTENZIONE: questo backup può essere usato per ripristinare SOLO la testa di questo specifico volume. Se si utilizza questo backup per ripristinare la testa di un altro volume, sarà possibile montare il volume ma NON decodificare i dati contenuti (essendo cambiata la chiave master).</string>
     <string lang="it" key="VOL_HEADER_RESTORED">La testa del volume è stata ripristinata con successo.\n\nIMPORTANTE: potrebbe essere stata ripristinata una vecchia password. Inoltre, se al momento della creazione del backup per montare il volume erano necessari dei file chiave, gli stessi file sono necessari per montare nuovamente il volume.</string>
     <string lang="it" key="EXTERNAL_VOL_HEADER_BAK_FIRST_INFO">Per ragioni di sicurezza voi dovete digitare la password corretta (e/o fornire i file chiave corretti) per il volume.\n\nNota: Se il volume contiene un volume nascosto, dovete prima digitare la password corretta (e/o fornire i file chiave corretti) per il volume esterno. In seguito, se voi scegliete di fare il backup della testa del volume nascosto, dovete digitare la password corretta (e/o fornire i file chiave corretti) per il volume nascosto.</string>
-    <string lang="it" key="CONFIRM_VOL_HEADER_BAK">Siete sicuri di voler creare il backup della testa del volume per %hs?\n\nDopo aver fatto click su Si, vi sarà chiesto di digitare un nome per il file di backup.\n\nNota: Sia la testa del volume standard che quella del volume nascosto saranno re-Codificati usando un nuovo valore e memorizzato nel file di backup. Se non esiste nessun volume nascosto al suo interno, l’area riservata per la testa del volume nascosto nel file di backup sarà riempita da dati casuali (per prevenire dei danneggiamenti plausibili). Quando si ripristina un’testata volume dal file di backup, dovete digitare la password corretta (e/o fornire i file chiave corretti) che era stata valida quando il backup della testa volume è stato creato. La password (e/o i file chiave) determineranno automaticamente anche il tipo di testata volume da ripristinare, cioè standard o nascosto (da notare che VeraCrypt determina il tipo attraverso il processo di prova ed errori).</string>
+    <string lang="it" key="CONFIRM_VOL_HEADER_BAK">Siete sicuri di voler creare il backup della testa del volume per %s?\n\nDopo aver fatto click su Si, vi sarà chiesto di digitare un nome per il file di backup.\n\nNota: Sia la testa del volume standard che quella del volume nascosto saranno re-Codificati usando un nuovo valore e memorizzato nel file di backup. Se non esiste nessun volume nascosto al suo interno, l’area riservata per la testa del volume nascosto nel file di backup sarà riempita da dati casuali (per prevenire dei danneggiamenti plausibili). Quando si ripristina un’testata volume dal file di backup, dovete digitare la password corretta (e/o fornire i file chiave corretti) che era stata valida quando il backup della testa volume è stato creato. La password (e/o i file chiave) determineranno automaticamente anche il tipo di testata volume da ripristinare, cioè standard o nascosto (da notare che VeraCrypt determina il tipo attraverso il processo di prova ed errori).</string>
-    <string lang="it" key="CONFIRM_VOL_HEADER_RESTORE">Si è sicuri di voler ripristinare la testa del volume %hs?\n\nATTENZIONE: ripristinando una testata si ripristina anche la password del volume al momento del backup. Inoltre, se al momento della creazione del backup per montare il volume erano necessari uno o più file chiave, gli stessi file saranno necessari per montare nuovamente il volume dopo il ripristino.\n\nDopo aver cliccato su 'Sì', sarà possibile selezionare il file di backup dela testa.</string>
+    <string lang="it" key="CONFIRM_VOL_HEADER_RESTORE">Si è sicuri di voler ripristinare la testa del volume %s?\n\nATTENZIONE: ripristinando una testata si ripristina anche la password del volume al momento del backup. Inoltre, se al momento della creazione del backup per montare il volume erano necessari uno o più file chiave, gli stessi file saranno necessari per montare nuovamente il volume dopo il ripristino.\n\nDopo aver cliccato su 'Sì', sarà possibile selezionare il file di backup dela testa.</string>
     <string lang="it" key="DOES_VOLUME_CONTAIN_HIDDEN">Il volume deve contenere un volume nascosto?</string>
     <string lang="it" key="VOLUME_CONTAINS_HIDDEN">Il volume contiene un volume nascosto</string>
     <string lang="it" key="VOLUME_DOES_NOT_CONTAIN_HIDDEN">Il volume non deve contenere un volume nascosto</string>
@@ -955,12 +962,14 @@
     <string lang="it" key="VOLUME_HAS_NO_BACKUP_HEADER">Non esiste nessun file di backup testa in questo volume (notate che solamente i volumi creati con VeraCrypt 6.0 o successivo contengono il file backup testa volume).</string>
     <string lang="it" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">State tentando di fare il backup della testa della partizione/disco di sistema. Questo non è consentito. Le operazioni di backup/ripristino sono pertinenti alla partizione/disco di sistema e possono essere eseguite solamente con il disco di ripristino di VeraCrypt\n\nVolete creare un disco di ripristino di VeraCrypt?</string>
     <string lang="it" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">State tentando di ripristinare la testa del volume virtuale di VeraCrypt ma avete selezionato la partizione/disco di sistema. Questo non è consentito. Le operazioni di backup/ripristino sono pertinenti alla partizione/disco di sistema e possono essere eseguite solamente con il disco di ripristino di VeraCrypt.\n\nVolete creare un disco di ripristino di VeraCrypt?</string>
-    <string lang="it" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">Dopo aver fatto click su OK, dovete selezionare un nome file per il nuovo file immagine ISO per il disco di ripristino di VeraCrypt ed il percorso dove volete salvarlo.</string>
+    <string lang="it" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">Dopo aver fatto click su OK, dovete selezionare un nome file per il nuovo file immagine per il disco di ripristino di VeraCrypt ed il percorso dove volete salvarlo.</string>
-    <string lang="it" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">L'immagine del disco di ripristino è stata creata e salvata in questo file:\n%hs\n\nDovete ora scrivere l'immagine in un CD o DVD.\n\nIMPORTANTE: Notate che questo file deve essere scritto in CD/DVD come immsgine disco ISO (non come un file individuale). Per informazioni su come fare questo, riferitevi alls documentazione del vostro software registrazione CD/DVD.\n\nDopo la scrittura del disco, selezionare 'Sistema' &gt; 'Verifica disco di emergenza' per verificare che il disco sia stato scritto correttamente.</string>
+    <string lang="it" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">L'immagine del disco di ripristino è stata creata e salvata in questo file:\n%s\n\nDovete ora scrivere l'immagine in un CD o DVD.\n\nIMPORTANTE: Notate che questo file deve essere scritto in CD/DVD come immsgine disco ISO (non come un file individuale). Per informazioni su come fare questo, riferitevi alls documentazione del vostro software registrazione CD/DVD.\n\nDopo la scrittura del disco, selezionare 'Sistema' &gt; 'Verifica disco di emergenza' per verificare che il disco sia stato scritto correttamente.</string>
-    <string lang="it" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">L'immagine del disco di ripristino è stata creata e salvata in questo file:\n%hs\n\nDovete ora scrivere l'immagine in un CD o DVD.\n\nVolete lanciare ora Microsoft Windows Disc Image Burner?\n\nNota: dopo la scrittura del disco, selezionare 'Sistema' &gt; 'Verifica disco di emergenza' per verificare che il disco sia stato scritto correttamente.</string>
+    <string lang="it" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">L'immagine del disco di ripristino è stata creata e salvata in questo file:\n%s\n\nDovete ora scrivere l'immagine in un CD o DVD.\n\nVolete lanciare ora Microsoft Windows Disc Image Burner?\n\nNota: dopo la scrittura del disco, selezionare 'Sistema' &gt; 'Verifica disco di emergenza' per verificare che il disco sia stato scritto correttamente.</string>
-    <string lang="it" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Inserite il vostro disco di ripristino di VeraCrypt nel lettore CD/DVD e fate click su OK per verificarlo.</string>
+    <string lang="it" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Inserite il vostro disco di ripristino di VeraCrypt e fate click su OK per verificarlo.</string>
     <string lang="it" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">Il disco di ripristino di VeraCrypt è stato verificato con successo.</string>
     <string lang="it" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">Non è possibile verificare se il disco di ripristino è stato creato correttamente.\n\nSe avete scritto il disco di ripristino, espellete e reinserite il  CD/DVD e ritentate. Se questo non vi aiuta, provate con altri software di masterizzazione CD/DVD e/o altre apparecchiature.\n\nSe tentate di verificare un disco di ripristino di VeraCrypt creato per una chiave master differente, password, ecc., dovete notare che questo disco di ripristino fallirà sempre questa verifica. Per creare un nuovo disco di ripristino compatibile pienamente con la vostra configurazione corrente selezionate ‘Sistema’&gt;'Crea disco di ripristino'.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk image fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
     <string lang="it" key="ERROR_CREATING_RESCUE_DISK">Errore nella creazione del disco di ripristino.</string>
     <string lang="it" key="CANNOT_CREATE_RESCUE_DISK_ON_HIDDEN_OS">Il disco di ripristino di VeraCrypt non può essere creato quando un sistema operativo nascosto è in esecuzione.\n\nPer creare un disco di ripristino di VeraCrypt, avviate il sistema operativo di richiamo e quindi selezionate 'Sistema'&gt; 'Crea disco di ripristino'.</string>
     <string lang="it" key="RESCUE_DISK_CHECK_FAILED">Impossibile verificare se il disco di ripristino sia stato scritto correttamente.\n\nSe avete scritto il disco di ripristino, espellete e reinserite il CD/DVD; quindi fate clic su Avanti per ritentare. Se questo non vi aiuta, tentare con un altro supporto%s.\n\nSe non avete ancora masterizzato il disco di ripristino, fatelo e quindi fate clic su Avanti.\n\nSe tentate di verificare un disco di ripristino di VeraCrypt creato prima di avviare questa procedura, notare che questo disco non può essere utilizzato in quanto creato per una chiave master differente. Dovete masterizzare il disco di ripristino generato nuovamente.</string>
@@ -989,8 +998,8 @@
     <string lang="it" key="DRIVE_LETTER_ITEM">Lettera unità:</string>
     <string lang="it" key="UNSUPPORTED_CHARS_IN_PWD">ERRORE: la password deve contenere solo caratteri ASCII.\n\nCaratteri non ASCII nella password possono causare l'impossibilità di montare il volume qualora la configurazione del sistema dovesse cambiare.\n\nSono consentiti i seguenti caratteri:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="it" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">ATTENZIONE: la password contiene caratteri non ASCII. Ciò può portare all'impossibilità di montare il volume qualora la configurazione del sistema dovesse cambiare.\n\nE' opportuno sostituire tutti i caratteri non ASCII nella password con caratteri ASCII. Per fare ciò, cliccare su 'Volumi' -&gt; 'Modifica password del volume'.\n\nI seguenti sono caratteri ASCII:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="it" key="EXE_FILE_EXTENSION_CONFIRM">ATTENZIONE: Vi raccomandiamo strettamente di evitare le estensioni dei file che vengono usate per i file eseguibili (come .exe, .sys, o .dll) oppure altre estensioni file problematiche simili. L'uso di queste estensioni causano a Windows ed ai software antivirus di interferire con il file contenitore, che hanno effetto dannoso nelle prestazioni del volume e possono anche causare altri problemi seri.\n\nVi raccomandiamo strettamente di rimuovere l'estensione al file oppure modificarla (ad esempio, a '.tc').\n\nVolete comunque usare le estensioni file problematiche descritte prima?</string>
+    <string lang="it" key="EXE_FILE_EXTENSION_CONFIRM">ATTENZIONE: Vi raccomandiamo strettamente di evitare le estensioni dei file che vengono usate per i file eseguibili (come .exe, .sys, o .dll) oppure altre estensioni file problematiche simili. L'uso di queste estensioni causano a Windows ed ai software antivirus di interferire con il file contenitore, che hanno effetto dannoso nelle prestazioni del volume e possono anche causare altri problemi seri.\n\nVi raccomandiamo strettamente di rimuovere l'estensione al file oppure modificarla (ad esempio, a '.hc').\n\nVolete comunque usare le estensioni file problematiche descritte prima?</string>
-    <string lang="it" key="EXE_FILE_EXTENSION_MOUNT_WARNING">WARNING: Questo contenitore ha un'estensione file usata per file eseguibile (come .exe, .sys o .dll) oppure un'altra estensione file problematica simile. Essa molto probabilmente causa a Windows ed al software antivirus l'interferenza con il file contenitore, e questa ha effetto dannoso nelle prestazioni del volume e puòo anche causare altri problemi seri.\n\nVi raccomandiamo strettamente di rimuovere l'estensione al file oppure modificarla (ad esempio, a '.tc') dopo che voi avete smontato il volume.</string>
+    <string lang="it" key="EXE_FILE_EXTENSION_MOUNT_WARNING">WARNING: Questo contenitore ha un'estensione file usata per file eseguibile (come .exe, .sys o .dll) oppure un'altra estensione file problematica simile. Essa molto probabilmente causa a Windows ed al software antivirus l'interferenza con il file contenitore, e questa ha effetto dannoso nelle prestazioni del volume e puòo anche causare altri problemi seri.\n\nVi raccomandiamo strettamente di rimuovere l'estensione al file oppure modificarla (ad esempio, a '.hc') dopo che voi avete smontato il volume.</string>
     <string lang="it" key="HOMEPAGE">Sito Web</string>
     <string lang="it" key="LARGE_IDE_WARNING_XP">ATTENZIONE: sembra che questa versione di Windows sia priva di Service Pack. E' sconsigliato scrivere su dischi IDE più grandi di 128 GB in Windows XP se non è stato installato il Service Pack 1 o superiore! In caso contrario, i dati sul disco (non importa se si tratta di un volume VeraCrypt oppure no) potrebbero essere corrotti. Questa è una limitazione di Windows, non un difetto di VeraCrypt.</string>
     <string lang="it" key="LARGE_IDE_WARNING_2K">ATTENZIONE: sembra che questa versione di Windows sia priva di Service Pack 3 o superiore. E' sconsigliato scrivere su dischi IDE più grandi di 128 GB in Windows 2000 se non è stato installato il Service Pack 3 o superiore! In caso contrario, i dati sul disco (non importa se si tratta di un volume VeraCrypt oppure no) potrebbero essere corrotti. Questa è una limitazione di Windows, non un bug di di VeraCrypt.\n\nNota: può essere necessario attivare anche il supporto LBA a 48 bit nel registro; per maggiori informazioni si veda http://support.microsoft.com/kb/305098/EN-US</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="it" key="CHECKING_FS">Controllo del file system sul volume VeraCrypt montato come %s...</string>
-    <string lang="it" key="REPAIRING_FS">Tentativo di riparazione del file system sul volume VeraCrypt montato come %hs...</string>
+    <string lang="it" key="REPAIRING_FS">Tentativo di riparazione del file system sul volume VeraCrypt montato come %s...</string>
-    <string lang="it" key="WARN_CBC_MODE">ATTENZIONE: Questo volume è decriptato in modalità CBC. A causa di questa condizione di sicurezza, la modalità CBC è stata deCrittata da VeraCrypt 4.1.\n\nVi raccomandiamo di muovere i dati da questo volume VeraCrypt in un nuovo volume creato da questa versione di VeraCrypt. Dopo aver fatto questo, dovete eliminare o distruggere in maniera sicura il vecchio volume. Per maggiori informazioni, vedere la Cronologia delle versioni nella documentazioni o nelle notizie rilasciate distribuite con VeraCrypt 4.1 o superiore.</string>
     <string lang="it" key="WARN_64_BIT_BLOCK_CIPHER">ATTENZIONE: Questo volume è criptato con un algoritmo con un blocco a 64 bit.\n\nTali algoritmi (es. Blowfish, CAST-128 o Triple DES) sono sconsigliati. Sarà possibile montare questo volume usando versioni successive di VeraCrypt. Tuttavia, non ci saranno ulteriori miglioramenti alle implementazioni di questi algoritmi. Si raccomanda di creare un nuovo volume VeraCrypt criptato con un algoritmo a blocchi di 128 bit (es. AES, Serpent, Twofish etc.) e di spostare i file da questo volume al nuovo.</string>
     <string lang="it" key="SYS_AUTOMOUNT_DISABLED">Il vostro sistema non è configurato per montare automaticamente i nuovi volumi. Può risultare impossibile effettuare il montaggio di volumi VeraCrypt basati su unità. Il montaggio automatico può essere abilitato eseguendo il seguente comando e riavviando il sistema.\n\nmountvol.exe /E</string>
     <string lang="it" key="SYS_ASSIGN_DRIVE_LETTER">Assegnare una lettera all’unità/partizione prima di procedere.\n\nDa notare che questo è richiesto dal sistema operativo.</string>
@@ -1069,7 +1077,7 @@
     <string lang="it" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt non supporta più la codifica della partizione/disco di sistema in Windows Vista con nessun Service Pack installato. Prima di aggiornare VeraCrypt, installare il Service Pack 1 o superiore per Windows Vista.</string>
     <string lang="it" key="FEATURE_REQUIRES_INSTALLATION">Errore: Questa funzione richiede che VeraCrypt sia installato nel sistema (state eseguendo VeraCrypt in modalità portabile).\n\nInstallate VeraCrypt e ritentate.</string>
     <string lang="it" key="WINDOWS_NOT_ON_BOOT_DRIVE_ERROR">AVVERTENZA: Windows non sembra essere installato nel drive dal quale esso viene avviato. Questo non è supportato.\n\nDovete continuare solo se voi siete sicuri che Windows sia installato nel drive dal quale esso viene avviato.\n\nVolete continuare?</string>
-    <string lang="it" key="GPT_BOOT_DRIVE_UNSUPPORTED">Il vostro system drive ha una tabella GUID di partizione (GPT). Attualmente, sono supportati solamente i drive con una tabella di partizione MBR.</string>
+    <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</string>
     <string lang="it" key="TC_BOOT_LOADER_ALREADY_INSTALLED">ATTENZIONE: Il loader di avvio di VeraCrypt Boot già installato nel vostro system drive!\n\nNon è possibile che un altro sistema sul vostro computer sia già criptato.\n\nATTENZIONE: PROCEDERE CON LA CODIFICA DEL SISTEMA ATTUALMENTE IN ESECUZIONE PUO’ RENDERE GLI ALTRI SISTEMI IMPOSSIBILE DA AVVIARE ED I RELATIVI DATI  INACCESSIBILI.\n\nSiete sicuri di voler continuare?</string>
     <string lang="it" key="SYS_LOADER_RESTORE_FAILED">Errore nel ripristino del loader originale di sistema.\n\nDovete usare il vostro disco di ripristino di VeraCrypt ('Opzioni riparazione' &gt; 'Ripristina il loader di sistema originale') oppure il supporto di installazione di Windows per sostituire il loader di avvio di VeraCrypt con il loader di sistema di Windows.</string>
     <string lang="it" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">Il system loader originale non sarà salvato sul disco di ripristino (causa probabile: file di backup mancante).</string>
@@ -1108,8 +1116,8 @@
     <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 ambiente pre-boot) anche se NON avete una vera tastiera americana.</string>
     <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 partizione/drive prima dell'avvio di Windows.\n\n- Il VRD conterrà un backup del contenuto presente della prima traccia del disco (che contiene tipicamente un system loader oppure un boot manager) e vi consentirà di ripristinarli se necessario.\n\nIl file immagine ISO del disco di ripristino di VeraCrypt sarà creato nel percorso specificato sotto.</string>
     <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">L'immagine del disco di ripristino è stata creata e salvata in questo file:\n%s\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>
+    <string lang="it" key="RESCUE_DISK_BURN_INFO_NO_CHECK">L'immagine del disco di ripristino è stata creata e salvata in questo file:\n%s\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>
     <string lang="it" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">IMPORTANTE: Notare che il file deve essere scritto sul CD/DVD come file immagine disco ISO (non come file individuale). Per informazioni su come fare questo, fate riferimento alla documentazione del vostro programma di masterizzazione CD/DVD. Se non disponete di nessun software di scrittura CD/DVD che possa nasterizzare l'immagine ISO del disco su CD/DVD, fate clic sul link sotto per scaricare tale software libero.\n\n</string>
     <string lang="it" key="LAUNCH_WIN_ISOBURN">Lancia Microsoft Windows Disc Image Burner</string>
     <string lang="it" key="RESCUE_DISK_BURN_NO_CHECK_WARN">ATTENZIONE: Se avete già creato in passato un disco di ripristino di VeraCrypt non lo potete riutilizzare per questa partizione/disco di sistema perché è stato creato con una chiave master differente! Ogni volta che codificate una partizione/disco di sistema, dovete creare un nuovo disco di ripristino di VeraCrypt per esso, anche se usate la stessa  password.</string>
@@ -1372,6 +1380,39 @@
     <string lang="it" key="TB_PER_SEC">TB/s</string>
     <string lang="it" key="PB_PER_SEC">PB/s</string>
     <string lang="it" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.ja.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="ja" name="日本語" en-name="Japanese" version="1.0.0" translators="OGOSHI Masayuki" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="ja" key="IDC_BROWSE">参照(&amp;w)...</control>
     <control lang="ja" key="IDC_DESKTOP_ICON">VeraCryptアイコンをデスクトップに作成する(&amp;D)</control>
     <control lang="ja" key="IDC_DONATE">寄付する...</control>
-    <control lang="ja" key="IDC_FILE_TYPE">拡張子「.tc」をVeraCryptに関連づける(&amp;e)</control>
+    <control lang="ja" key="IDC_FILE_TYPE">拡張子「.hc」をVeraCryptに関連づける(&amp;e)</control>
     <control lang="ja" key="IDC_OPEN_CONTAINING_FOLDER">完了時にフォルダを開く(&amp;O)</control>
     <control lang="ja" key="IDC_PROG_GROUP">VeraCryptをスタートメニューに追加(&amp;S)</control>
     <control lang="ja" key="IDC_SYSTEM_RESTORE">システム復元ポイントの作成(&amp;R)</control>
@@ -37,13 +37,15 @@
     <control lang="ja" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">CD/DVDライティングソフトをダウンロード</control>
     <control lang="ja" key="IDC_FILE_CONTAINER">暗号化されたファイルコンテナを作成</control>
     <control lang="ja" key="IDC_GB">&amp;GB</control>
+    <control lang="ja" key="IDC_TB">&amp;TB</control>
     <control lang="ja" key="IDC_HIDDEN_SYSENC_INFO_LINK">詳細情報</control>
-    <control lang="ja" key="IDC_HIDDEN_VOL">VeraCrypt隠しボリューム(&amp;d)</control>
+    <control lang="ja" key="IDC_HIDDEN_VOL">VeraCrypt隠しボリューム(&amp;d) </control>
     <control lang="ja" key="IDC_HIDDEN_VOL_HELP">隠しボリュームについて</control>
     <control lang="ja" key="IDC_HIDVOL_WIZ_MODE_DIRECT">ダイレクトモード</control>
     <control lang="ja" key="IDC_HIDVOL_WIZ_MODE_FULL">通常モード</control>
     <control lang="ja" key="IDC_KB">&amp;KB</control>
     <control lang="ja" key="IDC_KEYFILES_ENABLE">キーファイルを使用(&amp;S)</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="ja" key="IDC_KEY_FILES">キーファイル(&amp;K)</control>
     <control lang="ja" key="IDC_LINK_HASH_INFO">ハッシュアルゴリズムについて</control>
@@ -58,7 +60,8 @@
     <control lang="ja" key="IDC_NO_HISTORY">履歴を保存しない(&amp;N)</control>
     <control lang="ja" key="IDC_OPEN_OUTER_VOLUME">外殻ボリュームを開く</control>
     <control lang="ja" key="IDC_PAUSE">ポーズ(&amp;P)</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="ja" key="IDC_QUICKFORMAT">クイックフォーマット</control>
     <control lang="ja" key="IDC_SHOW_PASSWORD">パスワード表示(&amp;D)</control>
     <control lang="ja" key="IDC_SHOW_PASSWORD_SINGLE">パスワードを表示(&amp;D)</control>
@@ -71,19 +74,19 @@
     <control lang="ja" key="IDC_SYS_PARTITION">Windowsシステムパーティションを暗号化</control>
     <control lang="ja" key="IDC_WHOLE_SYS_DRIVE">ドライブ全体の暗号化</control>
     <control lang="ja" key="IDD_VOL_CREATION_WIZARD_DLG">VeraCryptボリューム作成ウィザード</control>
-    <control lang="ja" key="IDT_CLUSTER">クラスター</control>
+    <control lang="ja" key="IDT_CLUSTER">クラスター </control>
     <control lang="ja" key="IDT_COLLECTING_RANDOM_DATA_NOTE">重要：このウィンドウ内にてできるかぎりランダムにマウスを動かしてください。これにより暗号鍵の強度を大幅に上げられます。長く動かすほど良い結果を得られます。終わったら「次へ」をクリックしてください。</control>
     <control lang="ja" key="IDT_CONFIRM">確認入力(&amp;C)：</control>
-    <control lang="ja" key="IDT_DONE">完了 </control>
+    <control lang="ja" key="IDT_DONE">完了</control>
     <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="ja" key="IDT_ENCRYPTION_ALGO">暗号化アルゴリズム</control>
-    <control lang="ja" key="IDT_FILESYSTEM">ファイルシステム</control>
+    <control lang="ja" key="IDT_FILESYSTEM">ファイルシステム </control>
     <control lang="ja" key="IDT_FILE_CONTAINER">ファイルとして仮想暗号化ディスクを作成します。\n初心者にはこちらを推奨します。</control>
     <control lang="ja" key="IDT_FORMAT_OPTIONS">オプション</control>
     <control lang="ja" key="IDT_HASH_ALGO">ハッシュアルゴリズム</control>
-    <control lang="ja" key="IDT_HEADER_KEY">ヘッダーキー：</control>
+    <control lang="ja" key="IDT_HEADER_KEY">ヘッダーキー： </control>
-    <control lang="ja" key="IDT_LEFT">残り </control>
+    <control lang="ja" key="IDT_LEFT">残り</control>
-    <control lang="ja" key="IDT_MASTER_KEY">マスターキー：</control>
+    <control lang="ja" key="IDT_MASTER_KEY">マスターキー： </control>
     <control lang="ja" key="IDT_MULTI_BOOT">このマシンに複数のOSがインストールされている場合はこのオプションを選択してください。\n\n例：\n- Windows XP + Windows XP\n- Windows XP + Windows Vista\n- Windows + Mac OS X\n- Windows + Linux\n- Windows + Linux + Mac OS X</control>
     <control lang="ja" key="IDT_NON_SYS_DEVICE">内蔵あるいは外付けの、システムを含まないパーティション（例：フラッシュドライブ）を暗号化します。隠しボリュームも作れます。</control>
     <control lang="ja" key="IDT_PARTIAL_POOL_CONTENTS">カレントプールの内容（部分）</control>
@@ -92,9 +95,9 @@
     <control lang="en" key="IDT_PIM">Volume PIM:</control>
     <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
     <control lang="ja" key="IDT_PROGRESS">進行状況:</control>
-    <control lang="ja" key="IDT_RANDOM_POOL">ランダムプール：</control>
+    <control lang="ja" key="IDT_RANDOM_POOL">ランダムプール： </control>
     <control lang="ja" key="IDT_SINGLE_BOOT">このマシンにインストールされたOSが一つだけの場合はこのオプションを選択してください（複数ユーザーで使っていても同様）。</control>
-    <control lang="ja" key="IDT_SPEED">スピード </control>
+    <control lang="ja" key="IDT_SPEED">スピード</control>
     <control lang="ja" key="IDT_STATUS">ステータス</control>
     <control lang="ja" key="IDT_SYSENC_KEYS_GEN_INFO">暗号鍵、ソルト、その他のデータの生成に成功しました。新しい暗号鍵を生成したい場合は「戻る」をクリックして「次へ」をクリックしてください。それ以外は「次へ」をクリックしてください。</control>
     <control lang="ja" key="IDT_SYS_DEVICE">Windowsがインストールされているパーティションあるいはドライブを暗号化します。このシステム上のファイルを読み書きするためには、Windowsを起動するたびに正しいパスワードを入力しなければならなくなります。隠しシステムを作ることもできます。</control>
@@ -118,6 +121,7 @@
     <control lang="ja" key="IDC_CREATE">作成</control>
     <control lang="ja" key="IDC_CREATE_VOLUME">ボリュームの作成(&amp;C)</control>
     <control lang="ja" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">起動前認証画面で一切の文字を表示しない(以下のカスタムメッセージを除く)(&amp;s)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="ja" key="IDC_ENABLE_HARDWARE_ENCRYPTION">可能ならCPUのAES処理命令セットを利用してAESによる暗号化/復号処理を高速化する</control>
     <control lang="ja" key="IDC_ENABLE_KEYFILES">キーファイルを使用</control>
     <control lang="ja" key="IDC_ENABLE_NEW_KEYFILES">キーファイルを使用</control>
@@ -132,6 +136,7 @@
     <control lang="ja" key="IDC_FAVORITE_MOVE_UP">上へ(&amp;U)</control>
     <control lang="ja" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">選択したボリュームのマウントに成功したらエクスプローラーを開く(&amp;E)</control>
     <control lang="ja" key="IDC_FAVORITE_REMOVE">登録解除(&amp;R)</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="ja" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">全体設定</control>
     <control lang="ja" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">ホットキーでのアンマウントに成功したときバルーンを表示</control>
     <control lang="ja" key="IDC_HK_DISMOUNT_PLAY_SOUND">ホットキーでのアンマウントに成功したとき音を鳴らす</control>
@@ -219,7 +224,7 @@
     <control lang="ja" key="IDM_ENCRYPT_SYSTEM_DEVICE">システムパーティション/ドライブの暗号化...</control>
     <control lang="ja" key="IDM_FAQ">よくある質問と答え</control>
     <control lang="ja" key="IDM_HELP">ユーザーズガイド</control>
-    <control lang="ja" key="IDM_HOMEPAGE">ホームページ(&amp;H)</control>
+    <control lang="ja" key="IDM_HOMEPAGE">ホームページ(&amp;H) </control>
     <control lang="ja" key="IDM_HOTKEY_SETTINGS">ホットキー...</control>
     <control lang="ja" key="IDM_KEYFILE_GENERATOR">キーファイル生成</control>
     <control lang="ja" key="IDM_LANGUAGE">言語...</control>
@@ -256,6 +261,7 @@
     <control lang="ja" key="IDM_UNMOUNTALL">全てのボリュームをアンマウント</control>
     <control lang="ja" key="IDM_UNMOUNT_VOLUME">ボリュームをアンマウント</control>
     <control lang="ja" key="IDM_VERIFY_RESCUE_DISK">レスキューディスクのベリファイ</control>
+    <control lang="en" key="IDM_VERIFY_RESCUE_DISK_ISO">Verify Rescue Disk Image</control>
     <control lang="ja" key="IDM_VERSION_HISTORY">バージョン履歴</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="ja" key="IDM_VOLUME_PROPERTIES">ボリュームのプロパティ</control>
@@ -365,7 +371,7 @@
     <control lang="ja" key="IDT_SECURITY_TOKEN">セキュリティトークン:</control>
     <control lang="ja" key="IDT_SORT_METHOD">並び替え：</control>
     <control lang="ja" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">このままお待ちください。長時間かかるものと思われます。</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="ja" key="IDT_TEST_BLOCK_NUMBER">ブロック番号:</control>
     <control lang="ja" key="IDT_TEST_CIPHERTEXT">暗号文(16進)</control>
     <control lang="ja" key="IDT_TEST_DATA_UNIT_NUMBER">データユニット番号(64ビット16進, データユニットサイズ:512バイト)</control>
@@ -379,7 +385,7 @@
     <control lang="ja" key="MENU_TOOLS">ツール(&amp;O)</control>
     <control lang="ja" key="MENU_SETTINGS">設定(&amp;g)</control>
     <control lang="ja" key="MENU_HELP">ヘルプ(&amp;H)</control>
-    <control lang="ja" key="MENU_WEBSITE">ホームページ(&amp;P)</control>
+    <control lang="ja" key="MENU_WEBSITE">   ホームページ(&amp;P)   </control>
     <!-- Strings -->
     <string lang="ja" key="ABOUTBOX">バージョン情報(&amp;A)...</string>
     <string lang="ja" key="ACCESSMODEFAIL">古いボリュームの読み取り専用属性を変更できません。ファイルのアクセス許可を確認してください。</string>
@@ -410,13 +416,13 @@
     <string lang="ja" key="CIPHER_TITLE">暗号化オプション</string>
     <string lang="ja" key="CLEAN_WINMRU_FAILED">警告：(ファイル選択ダイアログが記憶している)最後に選択したボリュームあるいはキーファイルの場所の消去に失敗しました！</string>
     <string lang="ja" key="COMPRESSION_NOT_SUPPORTED">エラー：このコンテナはファイルシステムレベルで圧縮されています。VeraCryptは圧縮されたコンテナには対応していません（暗号化されたデータを圧縮するのは冗長であり、効果がありません）。\n\n次の方法で圧縮を解除してください。\n\n1) エクスプローラ上で(VeraCrypt上ではありません)コンテナを右クリック\n\n2) プロパティを選択\n\n3) プロパティダイアログで「詳細設定」をクリック\n\n4) 属性の詳細ダイアログで「内容を圧縮してディスク領域を節約する」のチェックを外し「OK」をクリック\n\n5) プロパティダイアログに戻るので「OK」をクリック</string>
-    <string lang="ja" key="CREATE_FAILED">ボリューム %hs の作成に失敗しました</string>
+    <string lang="ja" key="CREATE_FAILED">ボリューム %s の作成に失敗しました</string>
-    <string lang="ja" key="DEVICE_FREE_BYTES">%hs のサイズは %.2f バイト</string>
+    <string lang="ja" key="DEVICE_FREE_BYTES">%s のサイズは %.2f バイト</string>
-    <string lang="ja" key="DEVICE_FREE_KB">%hs のサイズは %.2f KB</string>
+    <string lang="ja" key="DEVICE_FREE_KB">%s のサイズは %.2f KB</string>
-    <string lang="ja" key="DEVICE_FREE_MB">%hs のサイズは %.2f MB</string>
+    <string lang="ja" key="DEVICE_FREE_MB">%s のサイズは %.2f MB</string>
-    <string lang="ja" key="DEVICE_FREE_GB">%hs のサイズは %.2f GB</string>
+    <string lang="ja" key="DEVICE_FREE_GB">%s のサイズは %.2f GB</string>
-    <string lang="ja" key="DEVICE_FREE_TB">%hs のサイズは %.2f TB</string>
+    <string lang="ja" key="DEVICE_FREE_TB">%s のサイズは %.2f TB</string>
-    <string lang="ja" key="DEVICE_FREE_PB">%hs のサイズは %.2f PB</string>
+    <string lang="ja" key="DEVICE_FREE_PB">%s のサイズは %.2f PB</string>
     <string lang="ja" key="DEVICE_IN_USE_FORMAT">警告：指定されたデバイスあるいはパーティションは、OSあるいはアプリケーションで使用されています。このデバイスあるいはパーティションをフォーマットすると、そのデータが破壊されてシステムが不安定になるかもしれません。\n\nフォーマットを続けますか？</string>
     <string lang="ja" key="DEVICE_IN_USE_INPLACE_ENC">警告：そのパーティションはOSかアプリケーションで使用中です。まず使用されているパーティション上のすべてのアプリケーションを終了してください(アンチウィルスソフトも含みます)。\n\n続けますか？</string>
     <string lang="ja" key="FORMAT_CANT_DISMOUNT_FILESYS">エラー：指定されたデバイスあるいはパーティションに、アンマウントできないファイルシステムが含まれています。このファイルシステムはおそらくOSで使用されており、このデバイスあるいはパーティションをフォーマットすると、そのデータが破壊されてシステムが不安定になる可能性が高いです。\n\nこの問題を解決するためには、まず最初にパーティションを削除し、フォーマットをせずにパーティションを再作成することをお勧めします。そのためには以下の手順を行ってください。\n\n1) コンピュータ（マイコンピュータ）アイコンを右クリックして「管理」を選択し、「コンピュータの管理」画面を開く。 2) 「記憶域」＞「ディスクの管理」を選択。 3) 暗号化したいパーティションを選んで右クリックし、「パーティションの削除」「ボリュームの削除」「論理ドライブの削除」のいずれかを選択。 4) 「はい」をクリック。もし再起動を要求されたら再起動し、手順(1)と(2)を行い(5)に進む。 5) 空き領域／未割り当て領域を右クリックし、「新しいパーティション」「新しいシンプルボリューム」「新しい論理ドライブ」のいずれかを選択。 6) 「新しいパーティションウィザード」か「新しいシンプルボリュームウィザード」が開くので、表示された内容に従って進める。ウィザードが「パーティションのフォーマット」まで進んだら、「このパーティションをフォーマットしない」「このボリュームをフォーマットしない」のいずれかを選択する。続いて「次へ」をクリックし、最後に「終了」をクリック。 7)この時点でVeraCryptで指定されているデバイスの位置がずれていると思われるので、（もしまだ実行中なら）VeraCryptボリューム作成ウィザードをいったん終了し、再び実行する。 8) VeraCryptに戻って、再びデバイスあるいはパーティションの暗号化を試す。\n\nもしVeraCryptが再度暗号化に失敗したときは、代わりにコンテナファイルの作成を検討してください。</string>
@@ -435,12 +441,12 @@
     <string lang="ja" key="INPLACE_ENC_INVALID_PATH">エラー：その場での暗号化が可能なのは、パーティション、ダイナミックボリューム、あるいはシステムドライブ全体を暗号化するときに限られます。指定されたパスが有効かどうか確認してください。</string>
     <string lang="ja" key="CANNOT_RESIZE_FILESYS">エラー：ファイルシステムを縮小できません。ファイルシステムを縮小するためにはボリュームヘッダとバックアップヘッダのための領域が必要です。\n\n想定される原因と解決方法は次のとおりです。\n\n- ボリュームに十分な空きスペースがありません。他のアプリケーションがファイルを書き込んでいないか確認してください。\n\n- ファイルシステムが壊れています。次の方法でエラーをチェックし修復してみてください（該当ドライブを右クリックして「プロパティ」を選択→「ツール」タブを選び「チェックする」をクリック→「ファイルシステムエラーを自動的に修復する」オプションにチェックを入れて「開始」）。\n\nもし上記の手順でうまくいかなければ、以下の手順に従ってください。</string>
     <string lang="ja" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">エラー：このボリュームに充分な空き容量がないため、ファイルシステムを縮小できません。ファイルシステムを縮小するためにはボリュームヘッダとバックアップヘッダのための領域が必要です。\n\n不要なファイルを削除したり「ごみ箱」を空にしたりして、空き容量を少なくとも256KBは確保した上でもう一度試してみてください。なおWindows自体の問題により、OSを再起動するまでエクスプローラは正しくない空き容量を報告してくることに注意してください。再起動してもうまくいかない場合は、ファイルシステムが壊れているものと思われます。次の方法でエラーをチェックし修復してみてください（該当ドライブを右クリックして「プロパティ」を選択→「ツール」タブを選び「チェックする」をクリック→「ファイルシステムエラーを自動的に修復する」オプションにチェックを入れて「開始」）。\n\nもし上記の手順でうまくいかなければ、以下の手順に従ってください。</string>
-    <string lang="ja" key="DISK_FREE_BYTES">ドライブ %hs の空き容量は %.2f バイトです。</string>
+    <string lang="ja" key="DISK_FREE_BYTES">ドライブ %s の空き容量は %.2f バイトです。</string>
-    <string lang="ja" key="DISK_FREE_KB">ドライブ %hs の空き容量は %.2f KB</string>
+    <string lang="ja" key="DISK_FREE_KB">ドライブ %s の空き容量は %.2f KB</string>
-    <string lang="ja" key="DISK_FREE_MB">ドライブ %hs の空き容量は %.2f MB</string>
+    <string lang="ja" key="DISK_FREE_MB">ドライブ %s の空き容量は %.2f MB</string>
-    <string lang="ja" key="DISK_FREE_GB">ドライブ %hs の空き容量は %.2f GB</string>
+    <string lang="ja" key="DISK_FREE_GB">ドライブ %s の空き容量は %.2f GB</string>
-    <string lang="ja" key="DISK_FREE_TB">ドライブ %hs の空き容量は %.2f TB</string>
+    <string lang="ja" key="DISK_FREE_TB">ドライブ %s の空き容量は %.2f TB</string>
-    <string lang="ja" key="DISK_FREE_PB">ドライブ %hs の空き容量は %.2f PB</string>
+    <string lang="ja" key="DISK_FREE_PB">ドライブ %s の空き容量は %.2f PB</string>
     <string lang="ja" key="DRIVELETTERS">有効なドライブ名を取得できませんでした。</string>
     <string lang="ja" key="DRIVER_NOT_FOUND">エラー：VeraCryptのドライバが見つかりません。\n\nVeraCrypt.exeと同じフォルダに、'veracrypt.sys' および 'veracrypt-x64.sys' ファイルをコピーしてください。</string>
     <string lang="ja" key="DRIVER_VERSION">エラー：違うバージョンのVeraCryptデバイスドライバが作動中です。\n\nもしVeraCryptをポータブルモードで動作させようとしており、かつ違うバージョンのVeraCryptが既にインストールされているのであれば、先にそれをアンインストール（あるいはインストーラーでアップグレード）する必要があります。VeraCryptのアンインストールは次の手順で行ってください：[Vista以降] スタートメニュー→コンピュータ→プログラムのアンインストールと変更→VeraCrypt→アンインストール [Win XP] スタートメニュー→設定→コントロールパネル→プログラムの追加と削除→VeraCrypt→削除\n\n同じように、もしVeraCryptをポータブルモードで動作させようとしていて、すでに違うバージョンのVeraCryptがポータブルモードで起動しているのであれば、まずシステムを再起動した後に新しいバージョンのみを起動してください。</string>
@@ -458,7 +464,7 @@
     <string lang="ja" key="SYSTEM_CRASH_ANALYSIS_INFO">「OK」をクリックするとシステムクラッシュの解析を始めます。これには数分かかる見込みです。</string>
     <string lang="ja" key="DEBUGGER_NOT_FOUND">環境変数「PATH」に 'kd.exe' (Kernel Debugger) へのパスが含まれているか確認してください。</string>
     <string lang="ja" key="SYSTEM_CRASH_NO_VERACRYPT">十中八九、VeraCryptはシステムクラッシュの原因ではないようです。システムがクラッシュした理由には様々な原因が考えられます。例えばハードウェアの故障、デバイスドライバのバグなどです。</string>
-    <string lang="ja" key="SYSTEM_CRASH_UPDATE_DRIVER">解析結果によると、以下のドライバーをアップデートすることで問題が解決するかもしれません：</string>
+    <string lang="ja" key="SYSTEM_CRASH_UPDATE_DRIVER">解析結果によると、以下のドライバーをアップデートすることで問題が解決するかもしれません： </string>
     <string lang="ja" key="SYSTEM_CRASH_REPORT">私たちがVeraCryptにバグがあるのかを確認できるよう、以下の事項が含まれた自動生成のエラーレポートを送信することができます。\n- プログラムのバージョン\n- OSのバージョン\n- CPUの種類\n- エラーのカテゴリー\n- ドライバーの名前とバージョン\n- システムコールスタック\n\nもし「はい」を選択すると、下記のURL(エラーレポートの全項目が含まれる)がデフォルトのインターネットブラウザーで開かれます。</string>
     <string lang="ja" key="ASK_SEND_ERROR_REPORT">上記のエラーレポートを送信しますか？</string>
     <string lang="ja" key="ENCRYPT">暗号化(&amp;E)</string>
@@ -484,7 +490,7 @@
     <string lang="ja" key="DEVICE_TRANSFORM_MODE_PAGE_TITLE">ボリューム作成モード</string>
     <string lang="ja" key="DEVICE_TRANSFORM_MODE_PAGE_FORMAT_HELP">これがパーティション型あるいはデバイス型のVeraCryptボリュームを作成するための最速の方法です（別オプションのその場での暗号化は、セクタごとに読み込み、暗号化し、書き込みを行うためにより時間がかかります）。選択されたパーティション/デバイス上の既存のデータはすべて削除されます（既存データは暗号化されるわけではなくランダムなデータで上書きされます）。このパーティション上の既存データを暗号化したいのであれば、別のオプションを選択してください。</string>
     <string lang="ja" key="DEVICE_TRANSFORM_MODE_PAGE_INPLACE_HELP">選択されたパーティション上の全データがその場で暗号化されます。もしパーティションが空なら別のオプションを選択すべきです（より速くボリュームが作成されます）。</string>
-    <string lang="ja" key="NOTE_BEGINNING">注：</string>
+    <string lang="ja" key="NOTE_BEGINNING">注： </string>
     <string lang="ja" key="RESUME">レジューム(&amp;R)</string>
     <string lang="ja" key="DEFER">保留(&amp;D)</string>
     <string lang="ja" key="START">開始(&amp;S)</string>
@@ -524,7 +530,7 @@
     <string lang="ja" key="HIDVOL_HOST_FILLING_HELP_SYSENC">外殻ボリュームが作成され、%hc: ドライブとしてマウントされました。この外殻ボリュームには、本当は隠す必要はないが、一見、秘密のように見えるファイルをいくつかコピーしてください。これは、システムパーティションのすぐ後にあるパーティション（外殻ボリュームと隠しボリュームを含んでいる）のパスワードの開示を強要されたときのためのものです。外殻ボリューム用のパスワードが漏れても、隠しボリューム（とその中の隠しOS）の存在は隠されたままです。\n\n重要：外殻ボリュームにコピーするファイルの総サイズは %s を越えてはいけません。さもなければ隠しボリュームのために十分な領域を確保できなくなり、その後の処理が継続できなくなるでしょう。ファイルのコピーが終了したら「次へ」をクリックしてください。外殻ボリュームはアンマウントしないでください。</string>
     <string lang="ja" key="HIDVOL_HOST_FILLING_HELP">外殻ボリュームが %hc:ドライブに無事に作成されました。このボリュームには、本当は隠す必要はないが、見た目は他人に隠したいように見えるファイルをいくつかコピーしておくべきです。それらのファイルは誰かがあなたにパスワードを明かすよう強要してきたときのためにあります。外殻ボリュームのパスワードは明かしても構いませんが、隠しボリュームのパスワードを明かしてはいけません。本当に大事なファイルは、この後、隠しボリュームを作ってからそこに入れてください。外殻ボリュームへのコピーが終わったら「次へ」をクリックしてください。このボリュームはアンマウントしないでください。\n\n注：「次へ」がクリックされると、ボリュームの終端まで連続する空き領域のサイズを調べるために外殻ボリュームのクラスタービットマップをスキャンします。その領域に隠しボリュームが置かれるため、そのサイズが隠しボリュームの最大サイズとなります。クラスタービットマップをスキャンすることで、外殻ボリュームのデータが隠しボリュームを上書きしないことを保証します。</string>
     <string lang="ja" key="HIDVOL_HOST_FILLING_TITLE">外殻ボリュームの内容</string>
-    <string lang="ja" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\n次のステップで、まず外殻ボリュームのオプションを設定します（中に入れる隠しボリュームは後で作成されます）。 </string>
+    <string lang="ja" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\n次のステップで、まず外殻ボリュームのオプションを設定します（中に入れる隠しボリュームは後で作成されます）。</string>
     <string lang="ja" key="HIDVOL_HOST_PRE_CIPHER_HELP_SYSENC">\n\n次のステップで、外殻ボリュームと呼ばれるものを作成します。前のステップで説明したとおり、これはシステムパーティションのすぐ次のパーティションに作成されます。</string>
     <string lang="ja" key="HIDVOL_HOST_PRE_CIPHER_TITLE">外殻ボリューム</string>
     <string lang="ja" key="HIDDEN_OS_PRE_CIPHER_HELP">次の手順で隠しOSを格納する隠しボリュームのパスワードとオプションを設定してください。\n\n注：外殻ボリュームのクラスタービットマップが、外殻ボリュームの終端から連続した空き領域のサイズを調べるために走査されます。この空き領域が隠しボリューム用になるため、その容量が隠しボリュームとして可能な最大サイズとなります。また隠しボリュームのサイズは、システムパーティションより大きくなるように決定されます（システムパーティションの内容全体を隠しボリュームにコピーする必要があるからです）。この確認によって、隠しボリュームのデータで外殻ボリューム上のデータが上書きされないようにしています。</string>
@@ -561,6 +567,7 @@
     <string lang="ja" key="MAX_HIDVOL_SIZE_KB">このボリュームに格納できる隠しボリュームの最大サイズは %.2f KB です。</string>
     <string lang="ja" key="MAX_HIDVOL_SIZE_MB">このボリュームに格納できる隠しボリュームの最大サイズは %.2f MB です。</string>
     <string lang="ja" key="MAX_HIDVOL_SIZE_GB">このボリュームに格納できる隠しボリュームの最大サイズは %.2f GB です。</string>
+    <string lang="ja" key="MAX_HIDVOL_SIZE_TB">このボリュームに格納できる隠しボリュームの最大サイズは %.2f TB です。</string>
     <string lang="ja" key="MOUNTED_NOPWCHANGE">ボリュームのマウント中には、そのパスワードやキーファイルを変更できません。 まず先にそのボリュームをアンマウントしてください。</string>
     <string lang="ja" key="MOUNTED_NO_PKCS5_PRF_CHANGE">ボリュームのマウント中には、そのヘッダキー導出アルゴリズムを変更できません。 まず先にそのボリュームをアンマウントしてください。</string>
     <string lang="ja" key="MOUNT_BUTTON">マウント(&amp;M)</string>
@@ -591,12 +598,12 @@
     <string lang="ja" key="SELECT_PKCS11_MODULE">PKCS #11 ライブラリを選択</string>
     <string lang="ja" key="OUTOFMEMORY">メモリ不足</string>
     <string lang="ja" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">重要：慣れていない方は、デバイスあるいはパーティション全体を暗号化しようとするのではなく、選択されたパーティションあるいはデバイス上にVeraCryptコンテナファイルを作成することを強く推奨します。\n\nデバイスあるいはパーティション全体を暗号化する方法に対し、コンテナファイルを作成する方法は、たとえば大量のファイルを破壊してしまうような危険性がありません。VeraCryptコンテナファイルは、これは仮想的な暗号化ディスクでありながら、それ自体は普通のファイルと変わりありません。より詳しい情報は「ユーザーズガイド」の「初心者のためのチュートリアル」をご覧ください。\n\n本当にデバイスあるいはパーティション全体を暗号化しますか？</string>
-    <string lang="ja" key="OVERWRITEPROMPT">警告：そのファイル '%hs' はすでに存在しています！\n\n重要：VeraCryptはそのファイル自体を暗号化するのではなく、消去して上書きします。 本当にそのファイルを消去して新しいVeraCryptコンテナで置き換えますか？</string>
+    <string lang="ja" key="OVERWRITEPROMPT">警告：そのファイル '%s' はすでに存在しています！\n\n重要：VeraCryptはそのファイル自体を暗号化するのではなく、消去して上書きします。 本当にそのファイルを消去して新しいVeraCryptコンテナで置き換えますか？</string>
-    <string lang="ja" key="OVERWRITEPROMPT_DEVICE">注意：選択された %s '%hs'%s に存在しているすべてのファイルは消去され失われます（暗号化されるのではありません）！\n\n本当にフォーマットを続けてよいですか？</string>
+    <string lang="ja" key="OVERWRITEPROMPT_DEVICE">注意：選択された %s '%s'%s に存在しているすべてのファイルは消去され失われます（暗号化されるのではありません）！\n\n本当にフォーマットを続けてよいですか？</string>
-    <string lang="ja" key="NONSYS_INPLACE_ENC_CONFIRM">警告：暗号化が完全に終了するまで、このボリューム上のファイルにはアクセスできなくなります。\n\n選択された %s '%hs'%s の暗号化を開始して良いですか？</string>
+    <string lang="ja" key="NONSYS_INPLACE_ENC_CONFIRM">警告：暗号化が完全に終了するまで、このボリューム上のファイルにはアクセスできなくなります。\n\n選択された %s '%s'%s の暗号化を開始して良いですか？</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="ja" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">警告：既存データをその場で暗号化している最中に、電源が突然落ちたり、ソフトウェアエラーやハードウェア障害等によってOSがクラッシュした場合、データの一部が壊れたり失われたりする可能性があります。そのため、暗号化を開始する前に、必ず暗号化したいファイルのバックアップがあるかを確認してください。\n\nそのようなバックアップがありますか？</string>
-    <string lang="ja" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">注意：このパーティション '%hs'%s （つまりシステムパーティションのすぐ次のパーティション）上に存在するすべてのファイルが削除され、失われます（暗号化されるわけではありません）！。\n\nこのままフォーマットを進めて良いですか？</string>
+    <string lang="ja" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">注意：このパーティション '%s'%s （つまりシステムパーティションのすぐ次のパーティション）上に存在するすべてのファイルが削除され、失われます（暗号化されるわけではありません）！。\n\nこのままフォーマットを進めて良いですか？</string>
     <string lang="ja" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">警告：選択されたパーティションには大量のデータがあります！ そのパーティションにあるすべてのデータが削除され、失われます。それらのファイルは暗号化されません！</string>
     <string lang="ja" key="ERASE_FILES_BY_CREATING_VOLUME">このパーティションにVeraCryptボリュームを作成して、既存データすべてを削除する</string>
     <string lang="ja" key="PASSWORD">パスワード</string>
@@ -616,8 +623,8 @@
     <string lang="ja" key="NONSYS_INPLACE_ENC_RESUME_VOL_SELECT_HELP">ボリュームリストから一つ選択してください。このリストには、暗号化処理が中断されていて、与えられたパスワードあるいはキーファイルで復号できるすべての非システムボリュームが含まれています。</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="ja" key="PASSWORD_HELP">質の良いパスワードにすることが非常に重要です。辞書に載っているような単語一つだけにしたり、あるいはそれを三つ四つ組み合わせた程度のものは避けるべきです。また何らかの名前や誕生日なども含ませるべきではありません。それは簡単に推測されてしまいます。 良いパスワードとは、大文字や小文字、数字や記号（ @ ^ = $ * + など）をランダムに組み合わせたものです。またパスワードの長さは20文字以上を推奨します（長い方がより良いです）。設定可能な最大長は64文字です。</string>
-    <string lang="ja" key="PASSWORD_HIDDENVOL_HELP">隠しボリューム用のパスワードを入力してください</string>
+    <string lang="ja" key="PASSWORD_HIDDENVOL_HELP">隠しボリューム用のパスワードを入力してください </string>
-    <string lang="ja" key="PASSWORD_HIDDEN_OS_HELP">隠しOS用のパスワードを入力してください（つまり隠しボリューム用です）。</string>
+    <string lang="ja" key="PASSWORD_HIDDEN_OS_HELP">隠しOS用のパスワードを入力してください（つまり隠しボリューム用です）。 </string>
     <string lang="ja" key="PASSWORD_HIDDEN_OS_NOTE">重要：このステップで設定される隠しOS用のパスワードは、他の二つのパスワード（つまり外殻ボリュームおよび囮OS用のもの）とは大幅に変えておく必要があります。</string>
     <string lang="ja" key="PASSWORD_HIDDENVOL_HOST_DIRECT_HELP">隠しボリュームを作って入れたいボリュームのパスワードを入力してください。\n\n「次へ」をクリックすると、VeraCryptはそのボリュームのマウントを試みます。ボリュームがマウントされるとすぐにクラスタービットマップが走査され、ボリューム終端からどれだけ連続した空き領域があるのかが測定されます。その領域は隠しボリュームの格納場所であり、これによって隠しボリュームの上限サイズが決まります。クラスターマップの走査は、隠しボリュームによって外殻ボリュームのデータが上書きされてしまわないために必要です。</string>
     <string lang="ja" key="PASSWORD_HIDDENVOL_HOST_HELP">\n外殻ボリューム用のパスワードを入力してください。これはあなたが誰かにパスワードを明かすよう強要されたときなどのためのものです。\n\n重要：このパスワードは隠しボリューム用のものとは大幅に変えておく必要があります。\n\n注：パスワードの最大文字数は64文字です。</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="ja" key="PREV">&lt; 戻る(&amp;B)</string>
     <string lang="ja" key="RAWDEVICES">このシステムのデバイスを列挙できません！</string>
-    <string lang="ja" key="READONLYPROMPT">ボリューム '%hs' は読み取り専用としてすでに存在しています。本当に置き換えますか？</string>
+    <string lang="ja" key="READONLYPROMPT">ボリューム '%s' は読み取り専用としてすでに存在しています。本当に置き換えますか？</string>
     <string lang="ja" key="SELECT_DEST_DIR">フォルダの選択</string>
     <string lang="ja" key="SELECT_KEYFILE">キーファイルの選択</string>
     <string lang="ja" key="SELECT_KEYFILE_PATH">キーファイルを探すフォルダを選択してください。 警告：記憶されるのはフォルダであり、ファイル名ではありません！</string>
@@ -680,13 +687,13 @@
     <string lang="ja" key="TEST_CIPHERTEXT_SIZE">入力されたテスト用暗号文は長すぎるか、あるいは短すぎます。</string>
     <string lang="ja" key="TEST_KEY_SIZE">入力されたテスト用キーは長すぎるか、あるいは短すぎます。</string>
     <string lang="ja" key="TEST_PLAINTEXT_SIZE">入力されたテスト用平文は長すぎるか、あるいは短すぎます。</string>
-    <string lang="ja" key="TWO_LAYER_CASCADE_HELP">暗号化がXTSモードの二段のカスケードで実行されます。いずれのブロックも最初に %hs（%d-bit key）で、次に %hs（%d-bit key）で暗号化されます。いずれの暗号化でもそれ自身の鍵が使われ、全ての鍵が互いに独立しています。</string>
+    <string lang="ja" key="TWO_LAYER_CASCADE_HELP">暗号化がXTSモードの二段のカスケードで実行されます。いずれのブロックも最初に %s（%d-bit key）で、次に %s（%d-bit key）で暗号化されます。いずれの暗号化でもそれ自身の鍵が使われ、全ての鍵が互いに独立しています。</string>
-    <string lang="ja" key="THREE_LAYER_CASCADE_HELP">暗号化がXTSモードの三段のカスケードで実行されます。いずれのブロックも最初に %hs（%d-bit key）で、次に %hs（%d-bit key）で、そして最後に %hs（%d-bit key）で暗号化されます。いずれの暗号化でもそれ自身の鍵が使われ、全ての鍵が互いに独立しています。</string>
+    <string lang="ja" key="THREE_LAYER_CASCADE_HELP">暗号化がXTSモードの三段のカスケードで実行されます。いずれのブロックも最初に %s（%d-bit key）で、次に %s（%d-bit key）で、そして最後に %s（%d-bit key）で暗号化されます。いずれの暗号化でもそれ自身の鍵が使われ、全ての鍵が互いに独立しています。</string>
     <string lang="ja" key="AUTORUN_MAY_NOT_ALWAYS_WORK">OSの設定によっては、これらのオートランあるいはオートマウントの機能が、書き込みのできないCDやDVDのようなメディア上にトラベラーディスクのファイルがあるときにしか働かないことに注意してください。これはVeraCryptのバグではなく、Windowsの制限です。</string>
     <string lang="ja" key="TRAVELER_DISK_CREATED">VeraCryptトラベラーディスクは無事が作成されました。\n\nVeraCryptをポータブルモードで動作させるためには管理者権限が必要であることに注意してください。 また、たとえポータブルモードで動作させたとしても、 レジストリファイルを調べられると、そのWindowsでVeraCryptが動作したことがあると判ってしまうでしょう。</string>
     <string lang="ja" key="TC_TRAVELER_DISK">VeraCryptトラベラーディスク</string>
     <string lang="ja" key="TWOFISH_HELP">Bruce Schneier、John Kelsey、Doug Whiting、David Wagner、Chris Hall、そしてNiels Fergusonによって開発され、1998年に公開されました。256ビットキー、128ビットブロックを使用します。動作モードはXTSです。Twofishは、AES制定時の最終候補の一つでした。</string>
-    <string lang="ja" key="MORE_INFO_ABOUT">%hsについての詳細</string>
+    <string lang="ja" key="MORE_INFO_ABOUT">%sについての詳細</string>
     <string lang="ja" key="UNKNOWN">未知</string>
     <string lang="ja" key="ERR_UNKNOWN">詳細不明あるいは未知のエラーが発生しました。(%d)</string>
     <string lang="ja" key="UNMOUNTALL_LOCK_FAILED">いくつかのボリュームに、アプリケーションかシステムが使用中のファイルあるいはフォルダがあります。\n\n強制的にアンマウントしますか？</string>
@@ -694,7 +701,7 @@
     <string lang="ja" key="UNMOUNT_FAILED">アンマウントに失敗しました！</string>
     <string lang="ja" key="UNMOUNT_LOCK_FAILED">ボリュームに、アプリケーションかシステムが使用中のファイルあるいはフォルダがあります。\n\n強制的にアンマウントしますか？</string>
     <string lang="ja" key="NO_VOLUME_MOUNTED_TO_DRIVE">指定されたドライブレターにはボリュームがマウントされませんでした。</string>
-    <string lang="ja" key="VOL_ALREADY_MOUNTED">マウントしようとしたボリュームはすでにマウントされています。</string>
+    <string lang="ja" key="VOL_ALREADY_MOUNTED">マウントしようとしたボリュームはすでにマウントされています。 </string>
     <string lang="ja" key="VOL_MOUNT_FAILED">ボリュームのマウント中にエラーが発生しました。</string>
     <string lang="ja" key="VOL_SEEKING">ボリューム内のシーク中にエラーが発生しました。</string>
     <string lang="ja" key="VOL_SIZE_WRONG">エラー：ボリュームのサイズが正しくありません。</string>
@@ -812,7 +819,7 @@
     <string lang="ja" key="PKCS5_ITERATIONS">PKCS#5 反復回数</string>
     <string lang="ja" key="VOLUME_CREATE_DATE">ボリューム作成日時</string>
     <string lang="ja" key="VOLUME_HEADER_DATE">ヘッダ最終更新日時</string>
-    <string lang="ja" key="VOLUME_HEADER_DAYS">（%I64d 日前）</string>
+    <string lang="ja" key="VOLUME_HEADER_DAYS"> （%I64d 日前）</string>
     <string lang="ja" key="VOLUME_FORMAT_VERSION">ボリュームフォーマットバージョン</string>
     <string lang="ja" key="BACKUP_HEADER">埋込バックアップヘッダ</string>
     <string lang="ja" key="VC_BOOT_LOADER_VERSION">VeraCryptブートローダーバージョン</string>
@@ -851,7 +858,7 @@
     <string lang="ja" key="INSTALL_FAILED">インストールに失敗しました。</string>
     <string lang="ja" key="UNINSTALL_FAILED">アンインストールに失敗しました。</string>
     <string lang="ja" key="DIST_PACKAGE_CORRUPTED">この配布パッケージは破損しています。（なるべくVeraCryptの公式サイト https://veracrypt.codeplex.com から）もう一度ダウンロードしてみてください。</string>
-    <string lang="ja" key="CANNOT_WRITE_FILE_X">ファイル %hs を書き込めません。</string>
+    <string lang="ja" key="CANNOT_WRITE_FILE_X">ファイル %s を書き込めません。</string>
     <string lang="ja" key="EXTRACTING_VERB">展開</string>
     <string lang="ja" key="CANNOT_READ_FROM_PACKAGE">パッケージからデータを読み込めません。</string>
     <string lang="ja" key="CANT_VERIFY_PACKAGE_INTEGRITY">この配布パッケージの完全性を検証できません。</string>
@@ -861,7 +868,7 @@
     <string lang="ja" key="SETUP_UPDATE_OK">VeraCryptの更新に成功しました。</string>
     <string lang="ja" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCryptのアップグレードに成功しました。ただし使用を開始するためにはコンピュータを再起動する必要があります。\n\nすぐに再起動しますか？</string>
     <string lang="ja" key="SYS_ENC_UPGRADE_FAILED">VeraCryptのアップグレードに失敗しました！\n\n重要：システムをシャットダウンあるいは再起動する前に、システムの復元（スタート→すべてのプログラム→アクセサリ→システムツール→システムの復元）で「VeraCrypt installation」と名付けられた復元ポイントまでシステムをリストアすることを強くお勧めします。もし「システムの復元」が使えない場合は、代わりにVeraCryptの元の（あるいは新しい）バージョンの再インストールを、システムをシャットダウンあるいは再起動する前に行ってみてください。</string>
-    <string lang="ja" key="UNINSTALL_OK">VeraCryptのアンインストールに成功しました。\n\n「終了」をクリックするとVeraCryptのインストーラーおよび %hs フォルダが削除されます。ただしこのフォルダの中に「VeraCryptが作成したファイル」あるいは「VeraCryptインストーラーが入れたものではないファイル」があった場合は削除されません。</string>
+    <string lang="ja" key="UNINSTALL_OK">VeraCryptのアンインストールに成功しました。\n\n「終了」をクリックするとVeraCryptのインストーラーおよび %s フォルダが削除されます。ただしこのフォルダの中に「VeraCryptが作成したファイル」あるいは「VeraCryptインストーラーが入れたものではないファイル」があった場合は削除されません。</string>
     <string lang="ja" key="REMOVING_REG">VeraCryptのレジストリエントリを削除しています</string>
     <string lang="ja" key="ADDING_REG">レジストリにエントリを追加しています</string>
     <string lang="ja" key="REMOVING_APPDATA">アプリケーションに固有のデータを削除しています</string>
@@ -872,10 +879,10 @@
     <string lang="ja" key="CREATING_SYS_RESTORE">システム復元ポイントを作成しています</string>
     <string lang="ja" key="FAILED_SYS_RESTORE">システム復元ポイントの作成に失敗しました！</string>
     <string lang="ja" key="INSTALLER_UPDATING_BOOT_LOADER">ブートローダーを更新しました</string>
-    <string lang="ja" key="INSTALL_OF_FAILED">'%hs'. %hs へのインストールに失敗しました。 インストール作業を続けますか？</string>
+    <string lang="ja" key="INSTALL_OF_FAILED">'%s'. %s へのインストールに失敗しました。 インストール作業を続けますか？</string>
-    <string lang="ja" key="UNINSTALL_OF_FAILED">'%hs'. %hs からのアンインストールに失敗しました。 アンインストール作業を続けますか？</string>
+    <string lang="ja" key="UNINSTALL_OF_FAILED">'%s'. %s からのアンインストールに失敗しました。 アンインストール作業を続けますか？</string>
     <string lang="ja" key="INSTALL_COMPLETED">インストールが完了しました。</string>
-    <string lang="ja" key="CANT_CREATE_FOLDER">フォルダ '%hs' を作成できませんでした</string>
+    <string lang="ja" key="CANT_CREATE_FOLDER">フォルダ '%s' を作成できませんでした</string>
     <string lang="ja" key="CLOSE_TC_FIRST">VeraCryptのデバイスドライバをメモリ上から解放できませんでした。\n\nまず先にVeraCryptのウィンドウをすべて閉じてください。うまくいかないようでしたら、Windowsを再起動してからもう一度試してみてください。</string>
     <string lang="ja" key="DISMOUNT_ALL_FIRST">インストールあるいはアンインストールを続ける前に、VeraCryptのすべてのボリュームをアンマウントしなくてはなりません。</string>
     <string lang="ja" key="UNINSTALL_OLD_VERSION_FIRST">VeraCryptの古いバージョンがこのシステムにインストールされています。VeraCryptの新しいバージョンをインストールする前に古いバージョンをアンインストールする必要があります。\n\nこのメッセージウィンドウを閉じると、古いバージョンのアンインストーラーがすぐに起動します。なおVeraCryptのアンインストール中に暗号化ボリュームが復号されることはありません。古いVeraCryptをアンインストールしてから、再びこの新しいバージョンのVeraCryptインストーラーを実行してください。</string>
@@ -928,7 +935,7 @@
     <string lang="ja" key="FAVORITE_LABEL_DEVICE_PATH_ERR">以下に表示されているデバイスはパーティションでも非ダイナミックボリュームでもありません。したがってラベルを割り当てることはできません。</string>
     <string lang="ja" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">まず以下に表示されているパーティションのタイプをWindowsが認識できるタイプに設定してください（Windowsの 'diskpart' ツールでSETIDコマンドを使ってください）。その後、そのパーティションをお気に入りから削除し、追加しなおしてください。これによってそのパーティションにラベルを設定できるようになります。</string>
     <string lang="ja" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Windowsの制限により、ネットワーク越しに共有されているリモートファイルシステム上のコンテナはシステムお気に入りボリュームとしてマウントはできません。ただしユーザーがログオンすれば普通のお気に入りボリュームとしてマウントできます。</string>
-    <string lang="ja" key="ENTER_PASSWORD_FOR">%hs のパスワードを入力してください。</string>
+    <string lang="ja" key="ENTER_PASSWORD_FOR">%s のパスワードを入力してください。</string>
     <string lang="ja" key="ENTER_PASSWORD_FOR_LABEL">'%s' のパスワードを入力してください。</string>
     <string lang="ja" key="ENTER_NORMAL_VOL_PASSWORD">標準/外殻ボリュームのパスワードを入力してください。</string>
     <string lang="ja" key="ENTER_HIDDEN_VOL_PASSWORD">隠しボリュームのパスワードを入力してください。</string>
@@ -943,8 +950,8 @@
     <string lang="ja" key="VOL_HEADER_BACKED_UP">ボリュームヘッダのバックアップを無事に作成しました。\n\n重要：このバックアップを使ってボリュームヘッダをリストアすることは、現在のボリュームのパスワードも同様に復元します。さらに、もしこのボリュームのマウントにキーファイルが必要だったのなら、同じキーファイルがこのボリュームのマウントのために必要です。\n\n警告：このボリュームヘッダのバックアップは、このボリュームにのみリストアできます。もし他のボリュームにこのヘッダのバックアップをリストアした場合、そのボリュームのマウントはできますが、格納されていたデータの復号化ができなくなります（マスターキーを変更したため）。</string>
     <string lang="ja" key="VOL_HEADER_RESTORED">ボリュームヘッダのリストアに成功しました。\n\n重要：古いパスワードも同様に復元されました。さらに、もしこのボリュームのマウントにキーファイルが必要だったのなら、同じキーファイルがこのボリュームのマウントのために必要です。</string>
     <string lang="ja" key="EXTERNAL_VOL_HEADER_BAK_FIRST_INFO">セキュリティ上の理由により、このボリュームの正しいパスワードを入力する必要があります（キーファイルがあるならそれも正しく指定してください）。\n\n注：もしこのボリュームに隠しボリュームが含まれているなら、まず外殻ボリュームのパスワードを先に入力してください（キーファイルも同様）。隠しボリュームのヘッダをバックアップするのであれば、その後に、隠しボリュームの正しいパスワードを入力する必要があります（キーファイルも同様）。</string>
-    <string lang="ja" key="CONFIRM_VOL_HEADER_BAK">ボリューム %hs のボリュームヘッダを本当にバックアップしますか？\n\n「はい」をクリックすると、ヘッダのバックアップを保存するファイル名を尋ねられます。\n\n注：標準および隠しのボリュームヘッダが新しいソルトによって再暗号化されてバックアップファイルに保存されます。もし隠しボリュームが存在していなくても、見せかけの拒否を守るため、バックアップファイルには隠しボリューム用の領域が確保されて、その領域はランダムなデータで充填されます。ボリュームヘッダをリストアするときには、ボリュームヘッダのバックアップを作成した時点の正しいパスワードを入力（および正しいキーファイルを指定）する必要があります。VeraCryptは入力されたパスワードによって、自動的に標準か隠しかどちらのボリュームヘッダをリストアするのかを決定します。</string>
+    <string lang="ja" key="CONFIRM_VOL_HEADER_BAK">ボリューム %s のボリュームヘッダを本当にバックアップしますか？\n\n「はい」をクリックすると、ヘッダのバックアップを保存するファイル名を尋ねられます。\n\n注：標準および隠しのボリュームヘッダが新しいソルトによって再暗号化されてバックアップファイルに保存されます。もし隠しボリュームが存在していなくても、見せかけの拒否を守るため、バックアップファイルには隠しボリューム用の領域が確保されて、その領域はランダムなデータで充填されます。ボリュームヘッダをリストアするときには、ボリュームヘッダのバックアップを作成した時点の正しいパスワードを入力（および正しいキーファイルを指定）する必要があります。VeraCryptは入力されたパスワードによって、自動的に標準か隠しかどちらのボリュームヘッダをリストアするのかを決定します。</string>
-    <string lang="ja" key="CONFIRM_VOL_HEADER_RESTORE">ボリューム %hs のボリュームヘッダを本当にリストアしますか？\n\n警告：ボリュームヘッダをリストアすると、パスワードもバックアップ作成時のものに復元されます。また、もしこのバックアップを作成した時点でこのボリュームのマウントにキーファイルが必要だったのなら、リストア後には同じキーファイルがマウントのために必要になります。\n\n「はい」をクリックした後、ヘッダのバックアップを選択してください。</string>
+    <string lang="ja" key="CONFIRM_VOL_HEADER_RESTORE">ボリューム %s のボリュームヘッダを本当にリストアしますか？\n\n警告：ボリュームヘッダをリストアすると、パスワードもバックアップ作成時のものに復元されます。また、もしこのバックアップを作成した時点でこのボリュームのマウントにキーファイルが必要だったのなら、リストア後には同じキーファイルがマウントのために必要になります。\n\n「はい」をクリックした後、ヘッダのバックアップを選択してください。</string>
     <string lang="ja" key="DOES_VOLUME_CONTAIN_HIDDEN">このボリュームは隠しボリュームを含んでいますか？</string>
     <string lang="ja" key="VOLUME_CONTAINS_HIDDEN">このボリュームは隠しボリュームを含んでいます。</string>
     <string lang="ja" key="VOLUME_DOES_NOT_CONTAIN_HIDDEN">このボリュームは隠しボリュームを含んでいません。</string>
@@ -956,15 +963,17 @@
     <string lang="ja" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">システムパーティション/ドライブのヘッダのバックアップは拒否されました。システムパーティション/ドライブに関するバックアップおよびリストアの操作は、VeraCryptレスキューディスクを使用したときのみ可能です。\n\nVeraCryptレスキューディスクを作成しますか？</string>
     <string lang="ja" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">VeraCrypt仮想ボリュームのヘッダをシステムパーティション/ドライブにリストアしようとしましたが拒否されました。システムパーティション/ドライブに関するバックアップおよびリストアの操作は、VeraCryptレスキューディスクを使用したときのみ可能です。\n\nVeraCryptレスキューディスクを作成しますか？</string>
     <string lang="ja" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">「OK」をクリックして、VeraCryptレスキューディスクのISOイメージの新しいファイル名、および保存場所を指定してください。</string>
-    <string lang="ja" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">レスキューディスクのイメージファイルが次の名前で作成されました： %hs\n\n次にレスキューディスクをCDかDVDに書き込む必要があります。\n\n重要：このファイルは個別のファイルとしてではなく、ISOディスクイメージとしてCD/DVDに書き込まなければなりません。具体的な方法はお使いのレコーディングソフトのマニュアルを参照してください。\n\nレスキューディスクを作成後、メニューから[システム]-[レスキューディスクの検証]を選択し、正しく作成されたかを検証してください。</string>
+    <string lang="ja" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">レスキューディスクのイメージファイルが次の名前で作成されました： %s\n\n次にレスキューディスクをCDかDVDに書き込む必要があります。\n\n重要：このファイルは個別のファイルとしてではなく、ISOディスクイメージとしてCD/DVDに書き込まなければなりません。具体的な方法はお使いのレコーディングソフトのマニュアルを参照してください。\n\nレスキューディスクを作成後、メニューから[システム]-[レスキューディスクの検証]を選択し、正しく作成されたかを検証してください。</string>
-    <string lang="ja" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">レスキューディスクのイメージファイルが次の名前で作成されました： %hs\n\n次にレスキューディスクをCDかDVDに書き込む必要があります。\n\nWindowsディスクイメージ書き込みツールを起動しますか？\n\n注：レスキューディスクを作成後、メニューから[システム]-[レスキューディスクの検証]を選択し、正しく作成されたかを検証してください。</string>
+    <string lang="ja" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">レスキューディスクのイメージファイルが次の名前で作成されました： %s\n\n次にレスキューディスクをCDかDVDに書き込む必要があります。\n\nWindowsディスクイメージ書き込みツールを起動しますか？\n\n注：レスキューディスクを作成後、メニューから[システム]-[レスキューディスクの検証]を選択し、正しく作成されたかを検証してください。</string>
-    <string lang="ja" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">VeraCryptレスキューディスクをCD/DVDドライブに挿入してから「OK」を押すと検証します。</string>
+    <string lang="ja" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">VeraCryptレスキューディスクをから「OK」を押すと検証します。</string>
     <string lang="ja" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">VeraCryptレスキューディスクの検証に成功しました。</string>
     <string lang="ja" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">レスキューディスクが正しく作成されているか検証できませんでした。\n\nレスキューディスクをお持ちなら、CD/DVDをいったん排出してから再度挿入してみてください。もしこの方法でダメなら、他のレコーディングソフトあるいはメディアを使ってみてください。\n\nもし別のマスターキー、パスワード、ソルトを設定して作られたレスキューディスクを検証しようとしているのであれば、これは常に検証に失敗します。現在の設定に適合したレスキューディスクを作成するには、メニューから[システム]-[レスキューディスクの作成]を選択してください。</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk image fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
     <string lang="ja" key="ERROR_CREATING_RESCUE_DISK">VeraCryptレスキューディスクの作成中にエラーが発生しました。</string>
     <string lang="ja" key="CANNOT_CREATE_RESCUE_DISK_ON_HIDDEN_OS">隠しOSの起動中はVeraCryptレスキューディスクを作成することができません。\n\nレスキューディスクを作成するためには、囮用OSを起動し、[システム]-[レスキューディスク作成]を選択してください。</string>
     <string lang="ja" key="RESCUE_DISK_CHECK_FAILED">レスキューディスクが正しく作成されているか検証できませんでした。\n\nもしレスキューディスクを作成したばかりであれば、CD/DVDをいったん排出してから再度挿入し「次へ」をクリックしてみてください。もしこの方法でダメなら、他のメディア%sを使ってみてください。\n\nもしまだレスキューディスクを作成していないのであれば、作成してから「次へ」をクリックしてください。\n\nもしこのウィザードを開始する前に作成されたVeraCryptレスキューディスクを検証しようとしているのであれば、そのようなディスクは使えません。それは異なるマスターキーのために作成されたものだからです。この場合は新たにレスキューディスクを作成する必要があります。</string>
-    <string lang="ja" key="RESCUE_DISK_CHECK_FAILED_SENTENCE_APPENDIX">（あるいは他のレコーディングソフト）</string>
+    <string lang="ja" key="RESCUE_DISK_CHECK_FAILED_SENTENCE_APPENDIX"> （あるいは他のレコーディングソフト）</string>
     <string lang="ja" key="SYSTEM_FAVORITES_DLG_TITLE">VeraCrypt - システムお気に入りボリューム</string>
     <string lang="ja" key="SYS_FAVORITES_HELP_LINK">システムお気に入りボリュームとは？</string>
     <string lang="ja" key="SYS_FAVORITES_REQUIRE_PBA">システムパーティション/ドライブは暗号化されてないようです。\n\nシステムお気に入りボリュームは起動前認証用のパスワードでのみマウントできます。したがって、システムお気に入りボリュームを使用するためには、先にシステムパーティション/ドライブを暗号化しておく必要があります。</string>
@@ -989,8 +998,8 @@
     <string lang="ja" key="DRIVE_LETTER_ITEM">ドライブレター:   </string>
     <string lang="ja" key="UNSUPPORTED_CHARS_IN_PWD">エラー：パスワードにはASCII文字しか使えません。\n\nASCII文字以外を使うと、システムの設定が変更されたときにボリュームがマウントできなくなる可能性があります。\n\n次の文字を使うことができます：\n\n! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="ja" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">警告：パスワードにASCII文字以外の文字が含まれています。このことによって、システムの設定が変更されたときに、ボリュームのマウントが不可能になる可能性があります。\n\n全ての非ASCII文字をASCII文字に置き換えてください。 そのためには、[ボリューム]-[パスワードの変更]とクリックしてください。\n\n次の文字を使うことができます：\n\n! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="ja" key="EXE_FILE_EXTENSION_CONFIRM">警告：ファイル名の拡張子として、実行可能なもの（例：.exe, .sys, .dll）や、その他問題を起こしそうなものを使わないように強く推奨します。そのような拡張子のファイルはWindowsやアンチウィルスソフトのチェック対象になるため、パフォーマンスを悪化させたり、その他深刻な問題を引き起こす要因となります。\n\nこのような拡張子は消すかあるいは変更する（例えば .tc へ）ことを強く推奨します。\n\nこのような問題となりうる拡張子を本当に使用しますか？</string>
+    <string lang="ja" key="EXE_FILE_EXTENSION_CONFIRM">警告：ファイル名の拡張子として、実行可能なもの（例：.exe, .sys, .dll）や、その他問題を起こしそうなものを使わないように強く推奨します。そのような拡張子のファイルはWindowsやアンチウィルスソフトのチェック対象になるため、パフォーマンスを悪化させたり、その他深刻な問題を引き起こす要因となります。\n\nこのような拡張子は消すかあるいは変更する（例えば .hc へ）ことを強く推奨します。\n\nこのような問題となりうる拡張子を本当に使用しますか？</string>
-    <string lang="ja" key="EXE_FILE_EXTENSION_MOUNT_WARNING">警告；このコンテナファイルには、実行可能（例：.exe, .sys, .dll）あるいは、同様に問題を引き起こしそうな種類の拡張子が使われています。そのような拡張子のコンテナファイルはWindowsやアンチウィルスソフトのチェック対象になるため、パフォーマンスを悪化させたり、その他深刻な問題を引き起こす要因となります。\n\nこのボリュームをアンマウントした後、このような拡張子を消すかあるいは変更する（例えば .tc へ）ことを強く推奨します。</string>
+    <string lang="ja" key="EXE_FILE_EXTENSION_MOUNT_WARNING">警告；このコンテナファイルには、実行可能（例：.exe, .sys, .dll）あるいは、同様に問題を引き起こしそうな種類の拡張子が使われています。そのような拡張子のコンテナファイルはWindowsやアンチウィルスソフトのチェック対象になるため、パフォーマンスを悪化させたり、その他深刻な問題を引き起こす要因となります。\n\nこのボリュームをアンマウントした後、このような拡張子を消すかあるいは変更する（例えば .hc へ）ことを強く推奨します。</string>
     <string lang="ja" key="HOMEPAGE">ホームページ</string>
     <string lang="ja" key="LARGE_IDE_WARNING_XP">警告：この Windows にはサービスパックが適用されていません。 サービスパック１以降が適用されていない WindowsXP では、128 GB を超えるサイズの IDE ハードディスクに書き込みができません！ もし書き込もうとすると（VeraCryptボリュームであろうとなかろうと）ディスク上のデータが壊れてしまうでしょう。なお、これは Windows 自体の制限であって、VeraCryptのバグではありません。</string>
     <string lang="ja" key="LARGE_IDE_WARNING_2K">警告：この Windows にはサービスパック３以降が適用されていません。 サービスパック３以降が適用されていない Windows2000 では、128 GB を超えるサイズの IDE ハードディスクに書き込みができません！ もし書き込もうとすると（VeraCryptボリュームであろうとなかろうと）ディスク上のデータが壊れてしまうでしょう。なお、これは Windows 自体の制限であって、VeraCryptのバグではありません。\n\n注：レジストリの設定で 48ビットLBAを扱えるようにする必要があります。詳しくは http://support.microsoft.com/kb/305098/JA を参照してください。</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="ja" key="CHECKING_FS">%s ドライブとしてマウントされた VeraCryptボリュームのファイルシステムをチェック中です...</string>
-    <string lang="ja" key="REPAIRING_FS">%hs ドライブとしてマウントされた VeraCryptボリュームのファイルシステム修復を試みています...</string>
+    <string lang="ja" key="REPAIRING_FS">%s ドライブとしてマウントされた VeraCryptボリュームのファイルシステム修復を試みています...</string>
-    <string lang="ja" key="WARN_CBC_MODE">警告：このボリュームはCBCモードで暗号化されています。セキュリティ上の問題によりCBCモードはバージョン4.1以降は非推奨となっています。\n\nこの新しいバージョンのVeraCryptで新しいボリュームを作成し、現在のボリュームからデータを移動するように強く推奨します。データの移動後は古いボリュームは抹消あるいは破壊すべきです。詳しい情報については、ユーザーズガイドのバージョン履歴や、VeraCrypt4.1以降のリリースノートをご覧ください。</string>
     <string lang="ja" key="WARN_64_BIT_BLOCK_CIPHER">警告：このボリュームは旧式の暗号化アルゴリズムで暗号化されています。\n\nすべての64ビットブロックの暗号化アルゴリズム(例：Blowfish, CAST-128, Triple DES)は非推奨です。VeraCryptの将来のバージョンでも、このボリュームをマウントすることはできるでしょう。ただしこれら旧式の暗号化アルゴリズムの実装については今後の拡張予定はありません。128ビットブロックの暗号化アルゴリズム(AES, Serpent, Twofish など)を使ったVeraCryptボリュームを新しく作成し、今のこのボリュームにあるすべてのファイルを、新しいボリュームに移すことをお勧めします。</string>
     <string lang="ja" key="SYS_AUTOMOUNT_DISABLED">このシステムは新しいボリュームの自動マウントができるようには設定されていません。 このことによりデバイス型のVeraCryptボリュームのマウントは不可能でしょう。 次のコマンドを実行してから再起動することで、自動マウントを有効にできます。\n\nmountvol.exe /E</string>
     <string lang="ja" key="SYS_ASSIGN_DRIVE_LETTER">作業を進める前に、先にパーティションあるいはデバイスにドライブレターを割り当ててください（Vistaならコントロールパネルから「システムとメンテナンス」→「管理ツール」とたどり、「ハードディスクパーティションの作成とフォーマット」を開きます）。\n\n注：これはオペレーティングシステム側の要請です。</string>
@@ -1069,7 +1077,7 @@
     <string lang="ja" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">サービスパックが適用されていないWindows Vistaのシステムパーティション/ドライブの暗号化はもうサポートされません。VeraCryptをアップグレードする前にVistaにSP1以上を適用してください。</string>
     <string lang="ja" key="FEATURE_REQUIRES_INSTALLATION">エラー：この機能はVeraCryptがこのシステムにインストールされている必要があります（現在はポータブルモードです）。\n\nVeraCryptをインストールしてもう一度試してみてください。</string>
     <string lang="ja" key="WINDOWS_NOT_ON_BOOT_DRIVE_ERROR">エラー：起動しようとしたドライブにWindowsがインストールされているか確認できません。この状態には対応していません。\n\n起動しようとしたドライブにWindowsがインストールされていることを確認してから続けるべきです。\n\n処理を続けますか？</string>
-    <string lang="ja" key="GPT_BOOT_DRIVE_UNSUPPORTED">システムドライブにGPT(GUIDパーティションテーブル)があります。現在はMBRパーティションテーブルのドライブのみ対応しています。</string>
+    <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</string>
     <string lang="ja" key="TC_BOOT_LOADER_ALREADY_INSTALLED">注意：VeraCryptブートローダーがすでにシステムドライブにインストールされています！\n\nこれはこのマシン上の別のシステムがすでに暗号化されている可能性を示唆しています。\n\n警告：現在実行中のシステムで暗号化処理を継続すると、その別のシステムを起動できなくなったり、そのデータを参照できなくなったりするでしょう。\n\n本当に処理を続けますか？</string>
     <string lang="ja" key="SYS_LOADER_RESTORE_FAILED">元システムのブートローダーの復帰に失敗しました。\n\nVeraCryptブートローダーをWindowsのブートローダーに置き換えるには、VeraCryptレスキューディスクで 'Repair Options'→'Restore original system loader' を実行するか、Windowsのインストールディスクを使用してください。</string>
     <string lang="ja" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">元システムのブートローダーがレスキューディスクに保存されていないようです。おそらくバックアップファイルが失われています。</string>
@@ -1089,7 +1097,7 @@
     <string lang="ja" key="USER_PROFILE_NOT_ON_SYS_PARTITION">ユーザープロファイルがシステムパーティションに置かれていません。\n\nユーザープロファイルはシステムパーティションにのみ置いてください。</string>
     <string lang="ja" key="PAGING_FILE_NOT_ON_SYS_PARTITION">ページングファイルが非システムパーティションに置かれています。\n\nページングファイルはシステムパーティションにのみ置いてください。</string>
     <string lang="ja" key="RESTRICT_PAGING_FILES_TO_SYS_PARTITION">Windowsのページングファイルを、Windowsのパーティション上のみに作成するよう設定を変更しますか？\n\n「はい」をクリックするとコンピュータは再起動されます。その後VeraCryptを起動し、隠しOSをもう一度作成してください。</string>
-    <string lang="ja" key="LEAKS_OUTSIDE_SYSPART_UNIVERSAL_EXPLANATION">さもなければ、隠しOSに対する「みせかけの拒否」に影響を及ぼすでしょう。\n\n注：もし敵対者が非システムパーティションにあるページングファイルを解析したなら、あなたがこのウィザードを隠しシステム作成モードで使用したことが判明し、それはすなわちこのコンピュータに隠しシステムがあることを示してしまうことになります。そのためVeraCryptは、システムパーティション上のすべてのファイルについて、隠しOSの作成中に安全に抹消します。</string>
+    <string lang="ja" key="LEAKS_OUTSIDE_SYSPART_UNIVERSAL_EXPLANATION"> さもなければ、隠しOSに対する「みせかけの拒否」に影響を及ぼすでしょう。\n\n注：もし敵対者が非システムパーティションにあるページングファイルを解析したなら、あなたがこのウィザードを隠しシステム作成モードで使用したことが判明し、それはすなわちこのコンピュータに隠しシステムがあることを示してしまうことになります。そのためVeraCryptは、システムパーティション上のすべてのファイルについて、隠しOSの作成中に安全に抹消します。</string>
     <string lang="ja" key="DECOY_OS_REINSTALL_WARNING">警告：隠しOSの作成処理中、囮OSを安全に作成するために、現在起動中のシステムを再インストールする必要があります。\n\n注：隠しシステムを作成するために、現在起動中のシステムおよびシステムパーティション上のすべてのファイルは、隠しボリュームにコピーされます。\n\n\nWindowsをインストール可能なインストール用メディア（あるいはサービスパーティション）はお手元にありますか？</string>
     <string lang="ja" key="DECOY_OS_REQUIREMENTS">セキュリティ上の理由により、現在起動中のシステムにアクティベーションが必要な場合、処理を進める前にアクティベーションを済ませておく必要があります。隠しOSはシステムパーティションから隠しボリュームへファイルをコピーして作成されることに注意してください。現在起動中のシステムが未アクティベーションであるなら、隠しOSも同様に未アクティベーションとなります。より詳細な情報はユーザーズガイドの「隠しボリュームの安全に関する必要事項と予防策」をご覧ください。\n\n重要：処理を進める前に「隠しボリュームの安全に関する必要事項と予防策」をよくお読みください。\n\n\n現在起動中のシステムは上記の条件を満たしていますか？</string>
     <string lang="ja" key="CONFIRM_HIDDEN_OS_EXTRA_BOOT_PARTITION">このシステムは追加のブートパーティションを使用しています。VeraCryptは追加のブートパーティションを利用する隠しOSでの休止状態をサポートしていません（囮システムではそのような問題なく休止状態に入れます）。\n\nブートパーティションは囮と隠しの両システムで共用されることに留意してください。データの漏出防止と休止状態からの復帰時の問題に対処するため、VeraCryptは隠しシステムについて共用ブートパーティションへの書き込みおよびシステム休止を禁止する必要があるのです。\n\n\n処理を続けますか？ 「いいえ」を選択した場合、追加ブートパーティションを消去する手順が表示されます。</string>
@@ -1108,8 +1116,8 @@
     <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レスキューディスク(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">レスキューディスクのイメージファイルが次の場所に作成されました: %s\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>
+    <string lang="ja" key="RESCUE_DISK_BURN_INFO_NO_CHECK">レスキューディスクのイメージファイルが次の場所に作成されました: %s\n\nこのディスクイメージをCDやDVDに書き込むか、後で利用するために安全な場所に移動してください。\n\n%ls「次へ」で処理を続けます。</string>
     <string lang="ja" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">重要：このファイルは個別のファイルではなくISOイメージとしてCD/DVDに書き込む必要があります。詳しい方法についてはご使用中のレコーディングソフトのマニュアルを参照してください。もしISOイメージとして書き込めるCD/DVDレコーディングソフトをお持ちでない場合は、以下のリンク先からフリーソフトをダウンロードできます。\n\n</string>
     <string lang="ja" key="LAUNCH_WIN_ISOBURN">Windowsディスクイメージ書き込みツールを起動</string>
     <string lang="ja" key="RESCUE_DISK_BURN_NO_CHECK_WARN">警告：もし以前にVeraCryptレスキューディスクをすでに作成していたのであれば、異なるマスターキーが作成されたため、このシステムパーティション/ドライブ用には使えなくなります！ システムパーティション/ドライブを暗号化するときは常に、たとえ以前と同じパスワードを使うのであっても、新しいVeraCryptレスキューディスクを作成する必要があります。</string>
@@ -1372,6 +1380,39 @@
     <string lang="ja" key="TB_PER_SEC">TB/s</string>
     <string lang="ja" key="PB_PER_SEC">PB/s</string>
     <string lang="ja" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="ja" key="CAMELLIA_HELP">Camellia（カメリア）とは、2000年にNTTと三菱電機により共同開発されたブロック暗号です。 256ビットキー、128ビットブロックを使用します。動作モードはXTSです。 Camelliaは解読可能なラウンド数と最低限安全性を保てるラウンド数を元にした指標であるセキュリティーマージンにてAESを上回る1.8～2.0を確保しています。これに加え、CRYPTRECおよびNESSIEにおいてAESと同等の安全性と効率を兼ね備えているという評価もされています。</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.ka.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="ka" name="ქართული" en-name="Georgian" version="0.1.0" translators="Kakha Lomiashvili" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="ka" key="IDC_BROWSE">ძებნა...</control>
     <control lang="ka" key="IDC_DESKTOP_ICON">VeraCrypt-ის ხატულა სამუშაო ეკრანზე</control>
     <control lang="en" key="IDC_DONATE">Donate now...</control>
-    <control lang="ka" key="IDC_FILE_TYPE">დააკავშირე .tc გაფართოება VeraCrypt-თან</control>
+    <control lang="ka" key="IDC_FILE_TYPE">დააკავშირე .hc გაფართოება VeraCrypt-თან</control>
     <control lang="ka" key="IDC_OPEN_CONTAINING_FOLDER">დასრულებისას გახსენი მისამართი</control>
     <control lang="ka" key="IDC_PROG_GROUP">VeraCrypt-ის Start მენიუში ჩამატება</control>
     <control lang="ka" key="IDC_SYSTEM_RESTORE">სისტემის აღდგენის წერტილის შექმნა</control>
@@ -37,6 +37,7 @@
     <control lang="ka" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">CD/DVD ჩამწერი პროგრამების ჩამოტვირთვა</control>
     <control lang="en" key="IDC_FILE_CONTAINER">Create an encrypted file container</control>
     <control lang="en" key="IDC_GB">&amp;GB</control>
+    <control lang="en" key="IDC_TB">&amp;TB</control>
     <control lang="en" key="IDC_HIDDEN_SYSENC_INFO_LINK">More information</control>
     <control lang="ka" key="IDC_HIDDEN_VOL">VeraCrypt-ის ფარული ტომი </control>
     <control lang="ka" key="IDC_HIDDEN_VOL_HELP">ფარული ტომების შესახებ დამატებითი ინფორმაცია</control>
@@ -44,6 +45,7 @@
     <control lang="ka" key="IDC_HIDVOL_WIZ_MODE_FULL">ნორმალური რეჟიმი</control>
     <control lang="ka" key="IDC_KB">კბ</control>
     <control lang="ka" key="IDC_KEYFILES_ENABLE">გასაღების ფაილები</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="ka" key="IDC_KEY_FILES">ფაილები</control>
     <control lang="ka" key="IDC_LINK_HASH_INFO">ჰეშ-ალგორითმების შესახებ</control>
@@ -58,7 +60,8 @@
     <control lang="ka" key="IDC_NO_HISTORY">არ იქნას შენახული ისტორია</control>
     <control lang="ka" key="IDC_OPEN_OUTER_VOLUME">გარე ტომის გახსნა</control>
     <control lang="ka" key="IDC_PAUSE">პაუზა</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="ka" key="IDC_QUICKFORMAT">სწრაფი ფორმატირება</control>
     <control lang="ka" key="IDC_SHOW_PASSWORD">პაროლის ჩვენება</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Display password</control>
@@ -118,6 +121,7 @@
     <control lang="ka" key="IDC_CREATE">შექმნა</control>
     <control lang="ka" key="IDC_CREATE_VOLUME">ტომის შექმნა</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <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="ka" key="IDC_ENABLE_KEYFILES">გასაღების ფაილები</control>
     <control lang="ka" key="IDC_ENABLE_NEW_KEYFILES">გასაღების ფაილები</control>
@@ -132,6 +136,7 @@
     <control lang="en" key="IDC_FAVORITE_MOVE_UP">Move &amp;Up</control>
     <control lang="en" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Open &amp;Explorer window for selected volume when successfully mounted</control>
     <control lang="en" key="IDC_FAVORITE_REMOVE">&amp;Remove</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="en" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Global Settings</control>
     <control lang="en" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Display balloon tooltip after successful hot-key dismount</control>
     <control lang="en" key="IDC_HK_DISMOUNT_PLAY_SOUND">Play system notification sound after successful hot-key dismount</control>
@@ -189,7 +194,7 @@
     <control lang="ka" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="ka" key="IDD_PASSWORDCHANGE_DLG">პაროლის ან გასაღების ფაილების შეცვლა</control>
     <control lang="ka" key="IDD_PASSWORD_DLG">შეიტანეთ VeraCrypt-ის ტომის პაროლი</control>
-    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance Options</control>
+    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance and Driver Options</control>
     <control lang="ka" key="IDD_PREFERENCES_DLG">VeraCrypt - პარამეტრები</control>
     <control lang="en" key="IDD_SYSENC_SETTINGS">VeraCrypt - System Encryption Settings</control>
     <control lang="en" key="IDD_TOKEN_PREFERENCES">VeraCrypt - Security Token Preferences</control>
@@ -235,7 +240,7 @@
     <control lang="ka" key="IDM_ONLINE_TUTORIAL">სახელმძღვანელო დამწყებთათვის</control>
     <control lang="en" key="IDM_ORGANIZE_FAVORITES">Organize Favorite Volumes...</control>
     <control lang="en" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organize System Favorite Volumes...</control>
-    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance...</control>
+    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance/Driver Configuration</control>
     <control lang="ka" key="IDM_PERMANENTLY_DECRYPT_SYS">სისტემური განაყოფის/დისკის სამუდამოდ დეშიფრაცია</control>
     <control lang="ka" key="IDM_PREFERENCES">პარამეტრები</control>
     <control lang="ka" key="IDM_REFRESH_DRIVE_LETTERS">დისკების ასოების განახლება</control>
@@ -256,6 +261,7 @@
     <control lang="ka" key="IDM_UNMOUNTALL">ყველა ტომის გამოერთება</control>
     <control lang="ka" key="IDM_UNMOUNT_VOLUME">ტომის გამოერთება</control>
     <control lang="ka" key="IDM_VERIFY_RESCUE_DISK">აღმდგენი დისკის შემოწმება</control>
+    <control lang="en" key="IDM_VERIFY_RESCUE_DISK_ISO">Verify Rescue Disk Image</control>
     <control lang="ka" key="IDM_VERSION_HISTORY">ვერსიების ისტორია</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="ka" key="IDM_VOLUME_PROPERTIES">ტომის მახასიათებლები</control>
@@ -365,7 +371,7 @@
     <control lang="en" key="IDT_SECURITY_TOKEN">Security token:</control>
     <control lang="ka" key="IDT_SORT_METHOD">სორტირება:</control>
     <control lang="en" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Please wait. This process may take a long time...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="ka" key="IDT_TEST_BLOCK_NUMBER">ბლოკის ნომერი:</control>
     <control lang="ka" key="IDT_TEST_CIPHERTEXT">დაშიფრული ტექსტი (თექვსმეტნიშნა)</control>
     <control lang="ka" key="IDT_TEST_DATA_UNIT_NUMBER">მონაცემთა ერთეულის ნომერი (64-ბიტი თექვსმეტობითი, ერთეულის ზომაა 512 ბაიტი)</control>
@@ -410,13 +416,13 @@
     <string lang="ka" key="CIPHER_TITLE">შიფრაციის პარამეტრები</string>
     <string lang="ka" key="CLEAN_WINMRU_FAILED">ყურადღება: ბოლო არჩეული ტომის ან გასაღების ფაილის მისამართის წაშლის შეცდომა.</string>
     <string lang="ka" key="COMPRESSION_NOT_SUPPORTED">შეცდომა: კონტეინერი შეკუმშულია ფაილური სისტემის დონეზე. VeraCrypt მხარ არ უჭერს კონტეინერის შეკუმშვას (დაშიფრული მონაცემების შეკუმშვა არაეფექტურია).\n\nგამორთეთ კონტეინერის კუმშვა, შემდეგი ინსტრუქციით: 1) კონტეინერზე მაუსის მარჯვენა ღილაკით დაწკაპეთ 2) აირჩიეთ მენიუ Properties.3) დიალოგურ ფანჯარაში Properties დააჭირეთ ღილაკს Advanced 4) დიალოგურ ფანჯარაში Advanced გამორთეთ ატრიბუტიი "Compress contents to save disk space"  დააჭირეთ ღილაკს OK'. 5) დააჭირეთ ღილაკს OK დიალოგურ ფანჯარაში Properties.</string>
-    <string lang="ka" key="CREATE_FAILED">%hs ტომის შექმნის შეცდომა</string>
+    <string lang="ka" key="CREATE_FAILED">%s ტომის შექმნის შეცდომა</string>
-    <string lang="ka" key="DEVICE_FREE_BYTES">%hs-ის ზომა - %.2f ბაიტი</string>
+    <string lang="ka" key="DEVICE_FREE_BYTES">%s-ის ზომა - %.2f ბაიტი</string>
-    <string lang="ka" key="DEVICE_FREE_KB">%hs-ის ზომა - %.2f კბ</string>
+    <string lang="ka" key="DEVICE_FREE_KB">%s-ის ზომა - %.2f კბ</string>
-    <string lang="ka" key="DEVICE_FREE_MB">%hs-ის ზომა - %.2f მბ</string>
+    <string lang="ka" key="DEVICE_FREE_MB">%s-ის ზომა - %.2f მბ</string>
-    <string lang="en" key="DEVICE_FREE_GB">Size of %hs is %.2f GB</string>
+    <string lang="en" key="DEVICE_FREE_GB">Size of %s is %.2f GB</string>
-    <string lang="en" key="DEVICE_FREE_TB">Size of %hs is %.2f TB</string>
+    <string lang="en" key="DEVICE_FREE_TB">Size of %s is %.2f TB</string>
-    <string lang="en" key="DEVICE_FREE_PB">Size of %hs is %.2f PB</string>
+    <string lang="en" key="DEVICE_FREE_PB">Size of %s is %.2f PB</string>
     <string lang="ka" key="DEVICE_IN_USE_FORMAT">ყურადღება: მოწყობილობა/განაყოფი გამოიყენება ოპერაციული სისტემის ან პროგრამის მიერ. ფორმატირებამ შეიძლება გამოიწვიოს მონაცემთა დაკარგვა ან სისტემის არასტაბილურობა.\n\nგსურთ გაგრძელება?</string>
     <string lang="en" key="DEVICE_IN_USE_INPLACE_ENC">Warning: The partition is in use by the operating system or applications. You should close any applications that might be using the partition (including antivirus software).\n\nContinue?</string>
     <string lang="ka" key="FORMAT_CANT_DISMOUNT_FILESYS">შეცდომა: მოწყობილობა/განაყოფი შეიცავს ფაილურ სისტემას, რომლის გამოერთებაც შეუძლებელია. ეს ფაილური სისტემა შესაძლოა გამოიყენება ოპერაციული სისტემის მიერ. მოწყობილობა/განაყოფის ფორმატირება გამოიწვევს მონაცემთა დაკარგვას და სისტემის არასტაბილურობას.\n\n პრობლემის გადასაჭრელად რეკომენდირებულია ამ განაყოფის გაუქმება, შემდეგ მისი კვლავ შექმნა ფორმატირების გარეშე. ინსტრუქცია: 1) მაუსის მარჯვენა ღილაკით დაწკაპეთ ხატულაზე "My computer" და აირჩიეთ მენიუ "Manage". 2) ფანჯარაში "Computer Management" აირჩიეთ "Storage"&gt; "Disk Management". 3) მაუსის დაწკაპეთ იმ განაყოფზე, რომლის დაშიფრვაც გსურთ და  აირჩიეთ ან "Delete Partition" ან "Delete volume" ან  Delete logical volume". 4) დაწკაპეთ "Yes". 5) მაუსის მარჯვენა ღილაკით დაწკაპეთ დისკის ცარიელ ადგილზე (წარწერით "Unmounted")  და აირჩიეთ "ძირითადი განაყოფი", "დამატებითი განაყოფი" ან "ლოგიკური დისკი". 6) გამოჩნდება განაყოფებისა და ტომების შექმნის ოსტატი, მიყევით მის ინსტრუქციებს. 7) დამხმარის გვერდზე სახელით "Formatting Partition" აირჩიეთ "Do not format partition" ან "Do not format volume". დაწკაპეთ "Next". 8) დაწკაპეთ "Finish". 9) VeraCrypt-ში ხელახლა სცადეთ ამ მოწყობილობის/განაყოფის დაშიფრვა.\n\nთუ VeraCrypt ისევ უარს იტყვის ამ მოწყობილობის/განაყოფის დაშიფრვაზე,მაშინ მოწყობილობის ბაზაზე კონტეინერის ნაცვლად შექმენით ფაილური კონტეინერი.</string>
@@ -435,15 +441,15 @@
     <string lang="en" key="INPLACE_ENC_INVALID_PATH">Error: VeraCrypt can in-place encrypt only a partition, a dynamic volume, or an entire system drive. Please make sure the specified path is valid.</string>
     <string lang="en" key="CANNOT_RESIZE_FILESYS">Error: Cannot shrink the filesystem (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPossible causes and solutions:\n\n- Not enough free space on the volume. Please make sure no other application is writing to the filesystem.\n\n- Corrupted file system. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
     <string lang="en" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Error: There is not enough free space on the volume and so the filesystem cannot be shrunk (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPlease delete any redundant files and empty the Recycle Bin so as to free at least 256 KB of space and then try again. Note that due to a Windows issue, the amount of free space reported by the Windows Explorer may be incorrect until the operating system is restarted. If restarting the system does not help, the file system may be corrupted. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
-    <string lang="ka" key="DISK_FREE_BYTES">დისკზე %hs თავისუფალია %.2f ბაიტი</string>
+    <string lang="ka" key="DISK_FREE_BYTES">დისკზე %s თავისუფალია %.2f ბაიტი</string>
-    <string lang="en" key="DISK_FREE_KB">Free space on drive %hs is %.2f KB</string>
+    <string lang="en" key="DISK_FREE_KB">Free space on drive %s is %.2f KB</string>
-    <string lang="en" key="DISK_FREE_MB">Free space on drive %hs is %.2f MB</string>
+    <string lang="en" key="DISK_FREE_MB">Free space on drive %s is %.2f MB</string>
-    <string lang="en" key="DISK_FREE_GB">Free space on drive %hs is %.2f GB</string>
+    <string lang="en" key="DISK_FREE_GB">Free space on drive %s is %.2f GB</string>
-    <string lang="en" key="DISK_FREE_TB">Free space on drive %hs is %.2f TB</string>
+    <string lang="en" key="DISK_FREE_TB">Free space on drive %s is %.2f TB</string>
-    <string lang="en" key="DISK_FREE_PB">Free space on drive %hs is %.2f PB</string>
+    <string lang="en" key="DISK_FREE_PB">Free space on drive %s is %.2f PB</string>
     <string lang="ka" key="DRIVELETTERS">დისკის თავისუფალი ასოების მიღება ვერ ხერხდება.</string>
     <string lang="ka" key="DRIVER_NOT_FOUND">შეცდომა: VeraCrypt-ის დრაივერი ვერ მოიძებნა.\n\nგადაწერეთ ფაილები 'veracrypt.sys' და 'veracrypt-x64.sys' დირექტორიაში, სადაც VeraCrypt-ის პროგრამაა (VeraCrypt.exe) განთავსებული.</string>
-    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall; on Windows XP, select 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
+    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' > Computer > 'Uninstall or change a program' > VeraCrypt > Uninstall; on Windows XP, select 'Start Menu' > Settings > 'Control Panel' > 'Add Or Remove Programs' > VeraCrypt > Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
     <string lang="ka" key="ERR_CIPHER_INIT_FAILURE">შიფრის ინციალიზაციის შეცდომა.</string>
     <string lang="ka" key="ERR_CIPHER_INIT_WEAK_KEY">შეცდომა: სუსტი ან პოტენციურად სუსტი გასაღები! ეს გასაღები არ იქნა მიღებული. გაიმეორეთ.</string>
     <string lang="en" key="EXCEPTION_REPORT">A critical error has occurred and VeraCrypt must be terminated. If this is caused by a bug in VeraCrypt, we would like to fix it. To help us, you can send us an automatically generated error report containing the following items:\n\n- Program version\n- Operating system version\n- Type of CPU\n- VeraCrypt component name\n- Checksum of VeraCrypt executable\n- Symbolic name of dialog window\n- Error category\n- Error address\n- VeraCrypt call stack\n\nIf you select 'Yes', the following URL (which contains the entire error report) will be opened in your default Internet browser.\n\n%hs\n\nDo you want to send us the above error report?</string>
@@ -497,7 +503,7 @@
     <string lang="en" key="WIPE_FINISHED">The content of the partition/device has been successfully erased.</string>
     <string lang="en" key="WIPE_FINISHED_DECOY_SYSTEM_PARTITION">The content of the partition where the original system (of which the hidden system is a clone) resided has been successfully erased.</string>
     <string lang="en" key="DECOY_OS_VERSION_WARNING">Please make sure the version of Windows you are going to install (on the wiped partition) is the same as the version of Windows you are currently running. This is required due to the fact that both systems will share a common boot partition.</string>
-    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' &gt; 'Add Mounted Volume to System Favorites').</string>
+    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' > 'Add Mounted Volume to System Favorites').</string>
     <string lang="ka" key="SYSTEM_DECRYPTION_FINISHED">სისტემური განაყოფის/მოწყობილობის დეშიფრაცია წარმატებით დასრულდა..</string>
     <string lang="ka" key="FORMAT_FINISHED_HELP">\n\nVeraCrypt-ის ტომი შექმნილია და გამოყენებისათვის მზადაა. თუ გსურთ სხვა ტომის შექმნა, დააჭირეთ ღილაკს "შემდეგ".</string>
     <string lang="en" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nThe hidden VeraCrypt volume has been successfully created (the hidden operating system will reside within this hidden volume).\n\nClick Next to continue.</string>
@@ -561,6 +567,7 @@
     <string lang="ka" key="MAX_HIDVOL_SIZE_KB">ამ ტომზე ფარული ტომის მაქსიმალური ზომა შეადგენს %.2f კბ-ს</string>
     <string lang="ka" key="MAX_HIDVOL_SIZE_MB">ამ ტომზე ფარული ტომის მაქსიმალური ზომა შეადგენს %.2f მბ-ს</string>
     <string lang="en" key="MAX_HIDVOL_SIZE_GB">Maximum possible hidden volume size for this volume is %.2f GB.</string>
+    <string lang="en" key="MAX_HIDVOL_SIZE_TB">Maximum possible hidden volume size for this volume is %.2f TB.</string>
     <string lang="ka" key="MOUNTED_NOPWCHANGE">მიერთებული ტომის პაროლის/გასაღების ფაილების შეცვლა შეუძლებელია. გამოაერთეთ ტომი.</string>
     <string lang="ka" key="MOUNTED_NO_PKCS5_PRF_CHANGE">სანამ ტომი მიერთებულია, ამ ტომის სათაურის გასაღების დერივაციის ალგორითმის შეცვლა არ შეიძლება. ჯერ გამოაერთეთ ტომი.</string>
     <string lang="ka" key="MOUNT_BUTTON">მიერთება</string>
@@ -591,12 +598,12 @@
     <string lang="en" key="SELECT_PKCS11_MODULE">Select PKCS #11 Library</string>
     <string lang="ka" key="OUTOFMEMORY">მეხსიერება არასაკმარისია</string>
     <string lang="en" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">IMPORTANT: We strongly recommend that inexperienced users create a VeraCrypt file container on the selected device/partition, instead of attempting to encrypt the entire device/partition.\n\nWhen you create a VeraCrypt file container (as opposed to encrypting a device or partition) there is, for example, no risk of destroying a large number of files. Note that a VeraCrypt file container (even though it contains a virtual encrypted disk) is actually just like any normal file. For more information, see the chapter Beginner's Tutorial in the VeraCrypt User Guide.\n\nAre you sure you want to encrypt the entire device/partition?</string>
-    <string lang="ka" key="OVERWRITEPROMPT">გაფრთხილება: ფაილი '%hs' უკვე არსებობს!\n\nVeraCrypt არ დაშიფრავს ფაილს, იგი წაიშლება. დარწმუნებული ხართ, რომ გსურთ ამ ფაილის წაშლა და ახალი ფაილ-კონტეინერის შექმნა?</string>
+    <string lang="ka" key="OVERWRITEPROMPT">გაფრთხილება: ფაილი '%s' უკვე არსებობს!\n\nVeraCrypt არ დაშიფრავს ფაილს, იგი წაიშლება. დარწმუნებული ხართ, რომ გსურთ ამ ფაილის წაშლა და ახალი ფაილ-კონტეინერის შექმნა?</string>
-    <string lang="ka" key="OVERWRITEPROMPT_DEVICE">გაფრთხილება: %s '%hs'%s -ზე შენახული ყველა ფაილი წაიშლება!\n\nნამდვილად გსურთ ფორმატირების გაგრძელება?</string>
+    <string lang="ka" key="OVERWRITEPROMPT_DEVICE">გაფრთხილება: %s '%s'%s -ზე შენახული ყველა ფაილი წაიშლება!\n\nნამდვილად გსურთ ფორმატირების გაგრძელება?</string>
-    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%s'%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting/decrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting/decrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting/decrypting, please make sure that you have backup copies of the files you want to encrypt/decrypt.\n\nDo you have such a backup?</string>
-    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%hs'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
+    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%s'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
     <string lang="en" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">WARNING: THE SELECTED PARTITION CONTAINS A LARGE AMOUNT OF DATA! Any files stored on the partition will be erased and lost (they will NOT be encrypted)!</string>
     <string lang="en" key="ERASE_FILES_BY_CREATING_VOLUME">Erase any files stored on the partition by creating a VeraCrypt volume within it</string>
     <string lang="ka" key="PASSWORD">პაროლი</string>
@@ -645,7 +652,7 @@
     <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
     <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
     <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 &gt; Organize &gt; 'Folder and search options' &gt; View).</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="SELECTED_PARTITION_ALREADY_INPLACE_ENC">The selected partition/device is already fully encrypted.\nHeader Flags = 0x%.8X</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="ka" key="PREV">უკან</string>
     <string lang="ka" key="RAWDEVICES">სისტემაში არსებული raw-მოწყობილობების სიის ჩვენება შეუძლებელია.</string>
-    <string lang="ka" key="READONLYPROMPT">ტომი '%hs' არსებობს და წვდომადია მხოლოდ კითხვისათვის. ნამდვილად გსურთ მისი შეცვლა?</string>
+    <string lang="ka" key="READONLYPROMPT">ტომი '%s' არსებობს და წვდომადია მხოლოდ კითხვისათვის. ნამდვილად გსურთ მისი შეცვლა?</string>
     <string lang="ka" key="SELECT_DEST_DIR">აირჩიეთ მიზნობრივი ფოლდერი</string>
     <string lang="ka" key="SELECT_KEYFILE">აირჩიეთ გასაღების ფაილი</string>
     <string lang="ka" key="SELECT_KEYFILE_PATH">აირჩიეთ გასაღების ფაილების ძიების მისამართი. ყურადღება: შეინახება მხოლოდ მისამართი, და არა ფაილების სახელები.</string>
@@ -680,13 +687,13 @@
     <string lang="ka" key="TEST_CIPHERTEXT_SIZE">სატესტო დაშიფრული ტექსტის სიგრძე არასწორია.</string>
     <string lang="ka" key="TEST_KEY_SIZE">სატესტო გასაღების სიგრძე არასწორია.</string>
     <string lang="ka" key="TEST_PLAINTEXT_SIZE">სატესტო ღია ტექსტის სიგრძე არასწორია.</string>
-    <string lang="ka" key="TWO_LAYER_CASCADE_HELP">ორი შიფრი, მოქმედი კასკადურად XTS რეჟიმში. ყოველი ბლოკი იშიფრება ჯერ %hs-ით (%d-ბიტი გასაღები) და შემდგომ %hs-ით (%d-ბიტი გასაღები). ყოველი შიფრი იყენებს დამოუკიდებელ გასაღებს.</string>
+    <string lang="ka" key="TWO_LAYER_CASCADE_HELP">ორი შიფრი, მოქმედი კასკადურად XTS რეჟიმში. ყოველი ბლოკი იშიფრება ჯერ %s-ით (%d-ბიტი გასაღები) და შემდგომ %s-ით (%d-ბიტი გასაღები). ყოველი შიფრი იყენებს დამოუკიდებელ გასაღებს.</string>
-    <string lang="ka" key="THREE_LAYER_CASCADE_HELP">სამი შიფრი, მოქმედი კასკადურად XTS რეჟიმში. ყოველი ბლოკი იშიფრება %hs-ით (%d-ბიტი გასაღები), %hs-ით (%d-ბიტი გასაღები), და %hs-ით (%d-ბიტი გასაღები). ყოველი შიფრი იყენებს დამოუკიდებელ გასაღებს.</string>
+    <string lang="ka" key="THREE_LAYER_CASCADE_HELP">სამი შიფრი, მოქმედი კასკადურად XTS რეჟიმში. ყოველი ბლოკი იშიფრება %s-ით (%d-ბიტი გასაღები), %s-ით (%d-ბიტი გასაღები), და %s-ით (%d-ბიტი გასაღები). ყოველი შიფრი იყენებს დამოუკიდებელ გასაღებს.</string>
     <string lang="en" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Note that, depending on the operating system configuration, these auto-run and auto-mount features may work only when the traveler disk files are created on a non-writable CD/DVD-like medium. Also note that this is not a bug in VeraCrypt (it is a limitation of Windows).</string>
     <string lang="en" key="TRAVELER_DISK_CREATED">VeraCrypt traveler disk has been successfully created.\n\nNote that you need administrator privileges to run VeraCrypt in portable mode. Also note that, after examining the registry file, it may be possible to tell that VeraCrypt was run on a Windows system even if it is run in portable mode.</string>
     <string lang="ka" key="TC_TRAVELER_DISK">VeraCrypt-ის მოგზაური დისკი</string>
     <string lang="ka" key="TWOFISH_HELP">შემუშავებულია ბრუს შნეიერის, ჯონ კელსის, დაგ ვაითინგის, დევიდ ვაგნერის, კრის ჰოლის და ნილს ფერგიუსონის მიერ. გამოქვეყნდა 1998წ. 256-ბიტი გასაღები, 128-ბიტი ბლოკი. ქმედების რეჟიმი-XTS. AES ფინალისტი.</string>
-    <string lang="ka" key="MORE_INFO_ABOUT">დამატებით ინფორმაცია იხ. %hs</string>
+    <string lang="ka" key="MORE_INFO_ABOUT">დამატებით ინფორმაცია იხ. %s</string>
     <string lang="ka" key="UNKNOWN">უცნობია</string>
     <string lang="en" key="ERR_UNKNOWN">An unspecified or unknown error occurred (%d).</string>
     <string lang="ka" key="UNMOUNTALL_LOCK_FAILED">ზოგიერთი ტომი შეიცავს ფაილებს ან ფოლდერებს, რომლებიც გამოიყენება სისტემის ან პროგრამების მიერ.\n\nმაინც გსურთ გამოერთება?</string>
@@ -706,7 +713,7 @@
     <string lang="ka" key="WRONG_VOL_TYPE">VeraCrypt ვერ შეცვლის მისთვის უცნობი ტიპის ტომის პაროლს.</string>
     <string lang="ka" key="SELECT_FREE_DRIVE">აირჩიეთ სიიდან დისკის თავისუფალი ასო.</string>
     <string lang="ka" key="SELECT_A_MOUNTED_VOLUME">აირჩიეთ დისკების ასოების სიაში მიერთებული ტომი.</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="ka" key="CANT_CREATE_AUTORUN">შეცდომა: autorun.inf ფაილის შექმნა შეუძლებელია</string>
     <string lang="ka" key="ERR_PROCESS_KEYFILE">შეცდომა გასაღების ფაილის დამუშავებისას.</string>
     <string lang="ka" key="ERR_PROCESS_KEYFILE_PATH">შეცდომა გასაღების ფაილის მისამართის დამუშავებისას.</string>
@@ -851,7 +858,7 @@
     <string lang="ka" key="INSTALL_FAILED">ინსტალაცია ჩაიშალა.</string>
     <string lang="ka" key="UNINSTALL_FAILED">დეინსტალაცია ჩაიშალა.</string>
     <string lang="ka" key="DIST_PACKAGE_CORRUPTED">ეს საინსტალაციო პაკეტი დაზიანებულია. გთხოვთ, ხელახლან ჩამოტვირთოთ (უმჯობესია ოფიციალური საიტიდან https://veracrypt.codeplex.com).</string>
-    <string lang="ka" key="CANNOT_WRITE_FILE_X">ფაილის %hs ჩაწერა არ ხერხდება</string>
+    <string lang="ka" key="CANNOT_WRITE_FILE_X">ფაილის %s ჩაწერა არ ხერხდება</string>
     <string lang="ka" key="EXTRACTING_VERB">დეარქივაცია</string>
     <string lang="ka" key="CANNOT_READ_FROM_PACKAGE">პაკეტიდან მონაცემთა წაკითხვა არ ხერხდება.</string>
     <string lang="ka" key="CANT_VERIFY_PACKAGE_INTEGRITY">საინსტალაციო პაკეტის მთლიანობის შემოწმება არ ხერხდება.</string>
@@ -860,8 +867,8 @@
     <string lang="ka" key="INSTALL_OK">პროგრამა VeraCrypt წარმატებით ინსტალირებულია.</string>
     <string lang="en" key="SETUP_UPDATE_OK">VeraCrypt has been successfully updated.</string>
     <string lang="en" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt has been successfully upgraded. However, before you can start using it, the computer must be restarted.\n\nDo you want to restart it now?</string>
-    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
+    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu > All programs > Accessories > System Tools > System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
-    <string lang="ka" key="UNINSTALL_OK">პროგრამა VeraCrypt წარმატებით დეინსტალირებულია.\n\nდააჭირეთ ღილაკს "მზადაა", რათა წაიშალოს VeraCrypt-ის ინსტალატორი და ფოლდერი %hs. ფოლდერი არ წაიშლება, თუ იგი შეიცავს ფაილებს, რომლებიც ინსტალატორის ან VeraCrypt-ის მიერ არაა შექმნილი.</string>
+    <string lang="ka" key="UNINSTALL_OK">პროგრამა VeraCrypt წარმატებით დეინსტალირებულია.\n\nდააჭირეთ ღილაკს "მზადაა", რათა წაიშალოს VeraCrypt-ის ინსტალატორი და ფოლდერი %s. ფოლდერი არ წაიშლება, თუ იგი შეიცავს ფაილებს, რომლებიც ინსტალატორის ან VeraCrypt-ის მიერ არაა შექმნილი.</string>
     <string lang="ka" key="REMOVING_REG">რეესტრიდან VeraCrypt-ის ჩანაწერების წაშლა</string>
     <string lang="ka" key="ADDING_REG">რეესტრში ელემენტის დამატება</string>
     <string lang="ka" key="REMOVING_APPDATA">პროგრამასთან დაკავშირებული მონაცემების წაშლა</string>
@@ -872,10 +879,10 @@
     <string lang="ka" key="CREATING_SYS_RESTORE">სისტემის აღდგენის წერტილის შექმნა</string>
     <string lang="ka" key="FAILED_SYS_RESTORE">შეცდომა სისტემის აღდგენის წერტილის შექმნისას.</string>
     <string lang="en" key="INSTALLER_UPDATING_BOOT_LOADER">Updating boot loader</string>
-    <string lang="ka" key="INSTALL_OF_FAILED">"%hs"-ის ინსტალაცია ჩაიშალა. %hs გსურთ ინსტალაციია გაგრძელება?</string>
+    <string lang="ka" key="INSTALL_OF_FAILED">"%s"-ის ინსტალაცია ჩაიშალა. %s გსურთ ინსტალაციია გაგრძელება?</string>
-    <string lang="ka" key="UNINSTALL_OF_FAILED">"%hs"-ის დეინსტალაცია ჩაიშალა. %hs გსურთ დეინსტალაციის გაგრძელება?</string>
+    <string lang="ka" key="UNINSTALL_OF_FAILED">"%s"-ის დეინსტალაცია ჩაიშალა. %s გსურთ დეინსტალაციის გაგრძელება?</string>
     <string lang="ka" key="INSTALL_COMPLETED">ინსტალაცია დასრულებულია.</string>
-    <string lang="ka" key="CANT_CREATE_FOLDER">%hs' ფოლდერის შექმნა არ მოხდა.</string>
+    <string lang="ka" key="CANT_CREATE_FOLDER">%s' ფოლდერის შექმნა არ მოხდა.</string>
     <string lang="ka" key="CLOSE_TC_FIRST">VeraCrypt-ის დრაივერის ამოტვირთვა შეუძლებელია.\n\nდახურეთ VeraCrypt-ის ყველა გახსნილი ფანჯარა. თუ შედეგი არ არის, გადატვირთეთ Windows და სცადეთ ხელახლა.</string>
     <string lang="ka" key="DISMOUNT_ALL_FIRST">ინსტალაციის გაგრძელებამდე, საჭიროა 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>
@@ -921,14 +928,14 @@
     <string lang="en" key="SYS_FAVORITE_VOLUMES_SAVED">System favorite volumes saved.\n\nTo enable mounting of system favorite volumes when the system starts, please select 'Settings' &gt; 'System Favorite Volumes' &gt; 'Mount system favorite volumes when Windows starts'.</string>
     <string lang="en" key="FAVORITE_ADD_DRIVE_DEV_WARNING">The volume you are adding to favorites is neither a partition nor a dynamic volume. Therefore, VeraCrypt will be unable to mount this favorite volume if the device number changes.</string>
     <string lang="en" key="FAVORITE_ADD_PARTITION_TYPE_WARNING">The volume you are adding to favorites is a partition not recognized by Windows.\n\nVeraCrypt will be unable to mount this favorite volume if the device number changes. Please set the type of the partition to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then add the partition to favorites again.</string>
-    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings &gt; Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
+    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings > Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_NETWORK_PATH_ERR">A container stored in a remote filesystem shared over a network cannot be automatically mounted when its host device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, the volume hosted on the device cannot be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable the volume hosted on the device to be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_LABEL_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, no label can be assigned to it.</string>
     <string lang="en" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable VeraCrypt to assign a label to the partition.</string>
     <string lang="en" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Due to a Windows limitation, a container stored in a remote filesystem shared over a network cannot be mounted as a system favorite volume (however, it can be mounted as a non-system favorite volume when a user logs on).</string>
-    <string lang="ka" key="ENTER_PASSWORD_FOR">შეიტანეთ პაროლი %hs-თვის</string>
+    <string lang="ka" key="ENTER_PASSWORD_FOR">შეიტანეთ პაროლი %s-თვის</string>
     <string lang="en" key="ENTER_PASSWORD_FOR_LABEL">Enter password for '%s'</string>
     <string lang="en" key="ENTER_NORMAL_VOL_PASSWORD">Enter password for the normal/outer volume</string>
     <string lang="en" key="ENTER_HIDDEN_VOL_PASSWORD">Enter password for the hidden volume</string>
@@ -943,8 +950,8 @@
     <string lang="ka" key="VOL_HEADER_BACKED_UP">ტომის სათაურის სარეზერვო ასლი წარმატებით შეიქმნა.\n\nმნიშვნელოვანია: ამ ასლიდან სათაურის აღდგენისას ასევე აღდგება ტომის მიმდინარე პაროლი. მეტიც, თუ ტომის მიერთებისას გამოიყენება გასაღების ფაილები, მაშინ სათაურის აღდგენის შემდეგ ტომის მისაერთებლად საჭირო იქნება იგივე გასაღების ფაილები.\n\nყურადღება: სათაურის ეს ასლი შეიძლება გამოყენებულ იქნას მხოლოდ ამ კონკრეტული ტომისათვის. სხვა ტომისათვის ამ ასლის გამოყენების შემდეგ ტომის მიერთება შესაძლებელი იქნება, მაგრამ ტომიდან რაიმე მონაცემის წაკითხვა - შეუძლებელი (რადგან შეიცვლება მისი გასაღები).</string>
     <string lang="ka" key="VOL_HEADER_RESTORED">ტომის სათაური წარმატებით აღდგა.\n\nმნიშვნელოვანია: გაიტვალისწინეთ, რომ სათაურის აღდგენით შესაძლოა აღდგა ძველი პაროლიც. მეტიც, თუ ტომის მიერთებისას გამოიყენება გასაღების ფაილები, მაშინ სათაურის აღდგენის შემდეგ ტომის მისაერთებლად საჭირო იქნება იგივე გასაღების ფაილები</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) for the hidden volume.</string>
-    <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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</string>
+    <string lang="en" key="CONFIRM_VOL_HEADER_BAK">Are you sure you want to create volume header backup for %s?\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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</string>
-    <string lang="ka" key="CONFIRM_VOL_HEADER_RESTORE">ნამდვილად გსურთ %hs ტომის სათაურის აღდგენა?\n\nყურადღება: სათაურის აღდგენისას ასევე აღდგება პაროლი, რომელიც მოქმედებდა სარეზერვო ასლის შენახვის დროს. მეტიც, თუ ტომის მიერთებისას გამოიყენება გასაღების ფაილები, მაშინ სათაურის აღდგენის შემდეგ ტომის მისაერთებლად საჭირო იქნება იგივე გასაღების ფაილები.\n\nდააჭირეთ "დიახ"-ს, რათა აირჩიოთ სათაურის სარეზერვო ასლის ფაილი.</string>
+    <string lang="ka" key="CONFIRM_VOL_HEADER_RESTORE">ნამდვილად გსურთ %s ტომის სათაურის აღდგენა?\n\nყურადღება: სათაურის აღდგენისას ასევე აღდგება პაროლი, რომელიც მოქმედებდა სარეზერვო ასლის შენახვის დროს. მეტიც, თუ ტომის მიერთებისას გამოიყენება გასაღების ფაილები, მაშინ სათაურის აღდგენის შემდეგ ტომის მისაერთებლად საჭირო იქნება იგივე გასაღების ფაილები.\n\nდააჭირეთ "დიახ"-ს, რათა აირჩიოთ სათაურის სარეზერვო ასლის ფაილი.</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>
@@ -956,11 +963,13 @@
     <string lang="ka" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">თქვენ ცდილობთ სისტემური განაყოფის/მოწყობილობის სათაურის რეზერვირებას. ეს არ არის ნებადართული. სისტემური დისკის რეზევირება/აღდგენის ოპერაციები შიძლება განხორციელდეს მხოლოდ VeraCrypt-ის აღმდგენი დისკის გამოყენებით.\n\nგსურთ VeraCrypt-ის აღმდგენი დისკის შექმნა?</string>
     <string lang="ka" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">თქვენ ცდილობთ VeraCrypt-ის ვირტუალური ტომის სათაურის აღდგენას, მაგრამ არჩეულია სისტემური განაყოფი/მოწყობილობა. ეს არ არის ნებადართული. სისტემური დისკის რეზევირება/აღდგენის ოპერაციები შიძლება განხორციელდეს მხოლოდ VeraCrypt-ის აღმდგენი დისკის გამოყენებით.\n\nგსურთ VeraCrypt-ის აღმდგენი დისკის შექმნა?</string>
     <string lang="ka" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">OK-ის დაწკაპების შემდეგ აირჩიეთ VeraCrypt-ის ახალი აღმდგენი დისკის ISO ფაილის სახელი და მისამართი.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
     <string lang="ka" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">მოათავსეთ VeraCrypt-ის აღმდგენი დისკი CD/DVD მოწყობილობაში და დაწკაპეთ OK.</string>
     <string lang="ka" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">VeraCrypt-ის აღმდგენი დისკი წარმატებით შემოწმდა.</string>
     <string lang="ka" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">აღმდგენი დისკის ჩაწერის სისწორის შემოწმება ვერ მოხერხდა.\n\nთუ აღმდგენი დისკი ჩაწერილია, დისკი გამოიღეთ და ხელახლა ჩადეთ CD/DVD მოწყობილობაში. თუ ეს არ შველის, მაშინ გამოიყენეთ სხვა დისკი ან/და სხვა ჩამწერი პროგრამა.\n\nთუ ამოწმებთ სხვა მთავარი გასაღებისათვის, მარილისათვის და ა.შ. შექმნილ აღმდგენ დისკს, შემოწმება ყოველთვის მცდარ შედეგს აჩვენებს. მიმდინარე კონფიგურაციის თავსებადი აღმდგენი დისკის შექმნისათვის, აირჩიეთ სისტემა&gt;აღმდგენი დისკის შექმნა.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk image fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
     <string lang="ka" key="ERROR_CREATING_RESCUE_DISK">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' &gt; '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 be used, because it was created for a different master key. You need to burn the newly generated Rescue Disk.</string>
@@ -989,8 +998,8 @@
     <string lang="en" key="DRIVE_LETTER_ITEM">Drive Letter:   </string>
     <string lang="ka" key="UNSUPPORTED_CHARS_IN_PWD">შეცდომა! პაროლი უნდა შეიცავდეს მხოლოდ სტანდარტულ ASCII სიმბოლოებს.\n\nარა-ASCII სიმბოლოების გამოყენება შეუძლებელს გახდის ტომის მიერთებას, თუ სისტემის კონფიგურაცია შეიცვლება.\n\nნებადართულია შემდეგი სიმბოლოების გამოყენება:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4  5 6 7 8 9 : ; &lt; = &gt; ? @ 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="ka" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">ყურადღება! პაროლი შეიცავს არა-ASCII სიმბოლოებს. ეს შეუძლებელს გახდის ტომის მიერთებას, თუ სისტემის კონფიგურაცია შეიცვლება..\n\nშეცვალეთ ყველა არა-ASCII სიმბოლო ASCII სიმბოლოებით.\n\nASCII სიმბოლოებია:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4  5 6 7 8 9 : ; &lt; = &gt; ? @ 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="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 change it (e.g., to '.tc').\n\nAre you sure you want to use the problematic file extension?</string>
+    <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 change it (e.g., to '.hc').\n\nAre you sure you want to use the problematic file extension?</string>
-    <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 container or change it (e.g., to '.tc') after you dismount the volume.</string>
+    <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 container or change it (e.g., to '.hc') after you dismount the volume.</string>
     <string lang="ka" key="HOMEPAGE">ვებ-გვერდი</string>
     <string lang="ka" key="LARGE_IDE_WARNING_XP">ყურადღება: სისტემაში არ არის ინსტალირებული Windows-ის არცერთი განახლების პაკეტი (Service Pack).თუ Windows XP-ზე არ არის ინსტალირებული Service Pack 1 (ან უფრო ახალი), 128გბ-ზე მეტი მოცულობის IDE დისკებზე ჩაწერა არ არის რეკომენდებული, რადგან ეს გამოიწვევს მონაცემთა დაზიანებას (მიუხედავად იმისა, ეხება ეს VeraCrypt-ის ტომს თუ არა). ეს Windows-ის შეზღუდვაა და არა შეცდომა VeraCrypt-ში.</string>
     <string lang="ka" key="LARGE_IDE_WARNING_2K">ყურადღება: სისტემაში არ არის ინსტალირებულიWindows-ის განახლების პაკეტი Service Pack 3 (ან ახალი). თუ Windows 2000-ზე არ არის ინსტალირებულია Service Pack 3 (ან ახალი), 128გბ-ზე მეტი მოცულობის IDE დისკებზე ჩაწერა არ არის რეკომენდებული, რადგან ეს გამოიწვევს მონაცემთა დაზიანებას (მიუხედავად იმისა, ეხება ეს VeraCrypt-ის ტომს თუ არა). ეს Windows-ის შეზღუდვაა და არა შეცდომა VeraCrypt-ში. ამის გარდა, შესაძლოა საჭირო გახდეს რეესტრში LBA-ს 48 ბიტიანი ადრესაციის მხარდაჭერის ჩართვა; დაწვრილებით იხ. http://support.microsoft.com/kb/305098/EN-US</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="ka" key="CHECKING_FS">მიმდინარეობს %s-ად მიერთებული ტომის ფაილური სისტემის შემოწმება...</string>
-    <string lang="ka" key="REPAIRING_FS">მიმდინარეობს %hs-ად მიერთებული ტომის ფაილური სისტემის აღდგენა...</string>
+    <string lang="ka" key="REPAIRING_FS">მიმდინარეობს %s-ად მიერთებული ტომის ფაილური სისტემის აღდგენა...</string>
-    <string lang="ka" key="WARN_CBC_MODE">გაფრთხილება: ეს ტომი დაშიფრულია CBC რეჟიმში. CBC რეჟიმი უარყოფილია VeraCrypt 4.1 ვერსიის შემდგომ.\n\nრეკომენდებულია გადაიტანოთ ამ ტომიდან ყველა მონაცემი ახალი ვერსიის VeraCrypt-ის ტომში. ამის შემდეგ, ძველი ტომი დაცულად უნდა განადგურდეს. დამატებითი ინფორმაციისათვის, მიმართეთ მიმართეთ VeraCrypt 4.1 ან შემდგომი გამოშვების დოკუმენტაციას.</string>
     <string lang="ka" key="WARN_64_BIT_BLOCK_CIPHER">ყურადღება: ეს ტომი დაშიფრულია 64-ბიტი ბლოკიანი შიფრაციის ალგორითმით.\n\n64-ბიტი ბლოკიანი დაშიფრვის ალგორითმები (Blowfish, CAST-128, and Triple DES) მოძველებულია. ამ ტომის მიერთება VeraCrypt 5.0-ით ან  შემდგომი ვერსიებით შეუძლებელია. რეკომენდებულია შექმნათ VeraCrypt-ის ახალი ტომი 128 ბიტი ბლოკიანი სიფრაციის ალგორითმით (მაგ. AES, Serpent, Twofish) და შემდეგ გადაიტანოთ ამ ტომიდან ფაილები ახალ ტომში.</string>
     <string lang="ka" key="SYS_AUTOMOUNT_DISABLED">სისტემა არაა კონფიგურირებული ახალი ტომების ავტომიერთებისათვის. მოწყობილობის ბაზაზე არსებული ტომების მიერთება შესაძლოა ვერ მოხდეს. ავტომიერთების ჩართვა შეიძლება შემდეგი ბრძანების შესრულებით და სისტემის გადატვირთვით.\n\nmountvol.exe /E</string>
     <string lang="ka" key="SYS_ASSIGN_DRIVE_LETTER">გთხოვთ განაყოფს/მოწყობილობას მიანიჭოთ დისკის ასო (Control Panel&gt;System and Maintenance&gt;Administrative Tools - Create and format hard disk partitions).\n\nგაითვალისწინეთ, რომ ეს ოპერაციული სისტემის მოთხოვნაა.</string>
@@ -1069,7 +1077,7 @@
     <string lang="en" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt no longer supports encryption of the system partition/drive on Windows Vista with no Service Pack installed. Before upgrading VeraCrypt, please install Service Pack 1 or higher for Windows Vista.</string>
     <string lang="en" key="FEATURE_REQUIRES_INSTALLATION">Error: This feature requires VeraCrypt to be installed on the system (you are running VeraCrypt in portable mode).\n\nPlease install VeraCrypt and then try again.</string>
     <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="ka" key="GPT_BOOT_DRIVE_UNSUPPORTED">თქვენს სისტემურ დისკს GUID განაყოფთა ცხრილი (GPT). ამჟამად მხოლოდ MBR განაყოფთა ცხრილებია თავსებადი.</string>
+    <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</string>
     <string lang="ka" key="TC_BOOT_LOADER_ALREADY_INSTALLED">VeraCrypt-ის საწყისი ჩამტვირთავი ამ სისტემურ დისკზე უკვე ინსტალირებულია!\n\nშესაძლებელია თქვენს სისტემაში არსებული სხვა ოპერაციული სისტემა უკვე დაშიფრულია.\n\nგაფრთხილება: მიმდინარე სისტემის შიფრაციის მცდელობამ შესაძლოა გამოიწვიოს სხვა სისტემის ჩატვირთვის შეუძლებლობა და მისი მონაცემების დაკარგვა.\n\nნამდვილად გსურთ გაგრძელება?</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' &gt; 'Restore original system loader') or Windows installation medium to replace the VeraCrypt Boot Loader with the Windows system loader.</string>
     <string lang="ka" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">სისტემის ორიგინალი ჩამტვირთი არ შეინახება აღმდგენ დისკზე (შესაძლო მიზეზი: დაკარგულია სარეზერვო ფაილი).</string>
@@ -1093,7 +1101,7 @@
     <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 medium (or using a service partition)?</string>
     <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 Hidden Volumes" in the VeraCrypt User's Guide.\n\nImportant: Before proceeding, please make sure you have read the section "Security Requirements and Precautions Pertaining to Hidden Volumes" in the VeraCrypt User's Guide.\n\n\nDoes the currently running operating system meet the above condition?</string>
     <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 from writing to the shared boot partition and from hibernating.\n\n\nDo you want to continue? If you select 'No', instructions for removing the extra boot partition will be displayed.</string>
-    <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' &gt; '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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
+    <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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
     <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="ka" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">სისტემის შიფრაციისათვის ეს ალგორითმი ჯერჯერობით არათავსებადია.</string>
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
@@ -1108,8 +1116,8 @@
     <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 (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 starts.\n\n- The VRD will contain a backup of the present content of the first drive track (which typically contains a system loader or boot manager) and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ISO image will be created in the location specified below.</string>
     <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">The Rescue Disk image has been created and stored in this file:\n%s\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>
+    <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%s\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>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">IMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software. If you do not have any CD/DVD recording software that can write the ISO disk image to a CD/DVD, click the link below to download such free software.\n\n</string>
     <string lang="en" key="LAUNCH_WIN_ISOBURN">Launch Microsoft Windows Disc Image Burner</string>
     <string lang="en" key="RESCUE_DISK_BURN_NO_CHECK_WARN">WARNING: If you already created a VeraCrypt Rescue Disk in the past, it cannot be reused for this system partition/drive because it was created for a different master key! Every time you encrypt a system partition/drive, you must create a new VeraCrypt Rescue Disk for it even if you use the same password.</string>
@@ -1247,7 +1255,7 @@
     <string lang="ka" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">თუ რომელიმე ზემოთ აღწერილი პრობლემა შეგხვდათ, განაყოფს/დისკს გაუკეთეთ დეშიფრაცია და შემდეგ დაშიფრეტ არაკასკადური შიფრების გამოყენებით (მაგ. 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 system (but not on the decoy system), the decoy system would contain a VeraCrypt driver and VeraCrypt applications whose version numbers are different from the version number of the VeraCrypt Boot Loader. Such a discrepancy might indicate that there is a hidden operating system on this computer.\n\n\nDo you want to continue?</string>
     <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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' &gt; '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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' > 'Create Rescue Disk').</string>
     <string lang="ka" key="BOOT_LOADER_UPGRADE_OK">VeraCrypt ჩამტვირთი მოდული განახლდა.\n\nრეკომენდებულია შექმნათ VeraCrypt-ის ახალი აღმდგენი დისკი (რომელშიც ჩამტვირთი მოდულის ახალი ვერსია იქნება), აირჩიეთ მენიუში "სისტემა"&gt;"აღმდგენი დისკის შექმნა" კომპიუტერის რესტარტის შემდეგ.</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' &gt; 'Create Rescue Disk'.</string>
     <string lang="ka" key="BOOT_LOADER_UPGRADE_FAILED">VeraCrypt-ის ჩამტვირთი მოდულის განახლება ჩაიშალა.</string>
@@ -1272,7 +1280,7 @@
     <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' &gt; '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>
@@ -1297,8 +1305,8 @@
     <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 system.</string>
     <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' &gt; 'Performance' and enable 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' &gt; 'Performance' and disable 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>
@@ -1372,6 +1380,39 @@
     <string lang="ka" key="TB_PER_SEC">ტბ/წმ</string>
     <string lang="ka" key="PB_PER_SEC">პბ/წმ</string>
     <string lang="en" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.ko.xml

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
-    <language langid="ko" name="한국어" en-name="Korean" version="0.1.0" translators="Kim Young" />
+    <language langid="ko" name="한국어" en-name="Korean" version="0.1.1" translators="Kim Young, Herbert Shin" />
     <!-- Fonts -->
     <font lang="ko" class="normal" size="11" face="default" />
     <font lang="ko" class="bold" size="13" face="Arial" />
@@ -13,8 +13,8 @@
     <control lang="ko" key="IDC_ALL_USERS">모든 사용자를 위해 설치(&amp;F)</control>
     <control lang="ko" key="IDC_BROWSE">탐색(&amp;W)...</control>
     <control lang="ko" key="IDC_DESKTOP_ICON">바탕화면에 VeraCrypt 아이콘 추가</control>
-    <control lang="en" key="IDC_DONATE">Donate now...</control>
+    <control lang="ko" key="IDC_DONATE">기부하기...</control>
-    <control lang="ko" key="IDC_FILE_TYPE">VeraCrypt와 “.tc” 파일 확장자를 연결</control>
+    <control lang="ko" key="IDC_FILE_TYPE">VeraCrypt와 “.hc” 파일 확장자를 연결</control>
     <control lang="ko" key="IDC_OPEN_CONTAINING_FOLDER">완료시 타겟 위치 열기(&amp;O)</control>
     <control lang="ko" key="IDC_PROG_GROUP">시작 메뉴에 VeraCrypt 추가</control>
     <control lang="ko" key="IDC_SYSTEM_RESTORE">시스템 복구 시점 만들기</control>
@@ -28,7 +28,7 @@
     <control lang="ko" key="IDT_INSTALL_DESTINATION">VeraCrypt 프로그램 파일을 설치할 위치를 선택하거나 입력해 주세요. 지정한 폴더가 존재하지 않는 경우, 자동으로 폴더가 생성됩니다.</control>
     <control lang="ko" key="IDT_UNINSTALL_DIR">현재 시스템에서 VeraCrypt를 제거하려면 “제거”를 클릭하세요.</control>
     <control lang="ko" key="IDC_ABORT_BUTTON">중지</control>
-    <control lang="en" key="IDC_BENCHMARK">&amp;Benchmark</control>
+    <control lang="ko" key="IDC_BENCHMARK">&amp;벤치마크 테스트</control>
     <control lang="ko" key="IDC_CIPHER_TEST">테스트(&amp;T)</control>
     <control lang="ko" key="IDC_DEVICE_TRANSFORM_MODE_FORMAT">암호화된 볼륨을 만든 후 포맷</control>
     <control lang="ko" key="IDC_DEVICE_TRANSFORM_MODE_INPLACE">파티션 자체 암호화</control>
@@ -37,6 +37,7 @@
     <control lang="ko" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">CD/DVD 리코딩 소프트웨어 다운로드</control>
     <control lang="ko" key="IDC_FILE_CONTAINER">암호화된 파일 보관소 만들기</control>
     <control lang="ko" key="IDC_GB">GB(&amp;G)</control>
+    <control lang="ko" key="IDC_TB">TB(&amp;T)</control>
     <control lang="ko" key="IDC_HIDDEN_SYSENC_INFO_LINK">추가 정보</control>
     <control lang="ko" key="IDC_HIDDEN_VOL">숨긴 VeraCrypt 볼륨(&amp;D) </control>
     <control lang="ko" key="IDC_HIDDEN_VOL_HELP">숨긴 볼륨에 대한 추가 정보</control>
@@ -44,11 +45,12 @@
     <control lang="ko" key="IDC_HIDVOL_WIZ_MODE_FULL">표준 방식</control>
     <control lang="ko" key="IDC_KB">KB(&amp;K)</control>
     <control lang="ko" key="IDC_KEYFILES_ENABLE">키파일 사용(&amp;S)</control>
-    <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
+    <control lang="ko" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">빈 비밀번호를 먼저 사용</control>
-    <control lang="ko" key="IDC_KEY_FILES">키파일(&amp;K)...</control>
+    <control lang="ko" key="IDC_KEYFILES_RANDOM_SIZE">키파일 랜덤 사이즈 (64 &lt;-&gt; 1048576 바이트)</control>
+    <control lang="ko" key="IDC_KEY_FILES">키파일(&amp;k)...</control>
     <control lang="ko" key="IDC_LINK_HASH_INFO">해시 알고리듬에 대한 정보</control>
     <control lang="ko" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">추가 정보</control>
-    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
+    <control lang="ko" key="IDC_LINK_PIM_INFO">PIM에 대한 정보</control>
     <control lang="ko" key="IDC_MB">MB(&amp;M)</control>
     <control lang="ko" key="IDC_MORE_INFO_ON_CONTAINERS">추가 정보</control>
     <control lang="ko" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">시스템 암호화에 대한 추가 정보</control>
@@ -58,11 +60,12 @@
     <control lang="ko" key="IDC_NO_HISTORY">히스토리 저장 안함</control>
     <control lang="ko" key="IDC_OPEN_OUTER_VOLUME">외부 볼륨 열기</control>
     <control lang="ko" key="IDC_PAUSE">정지(&amp;P)</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="ko" key="IDC_PIM_ENABLE">P&amp;IM 사용하기</control>
+    <control lang="ko" key="IDC_NEW_PIM_ENABLE">PIM 사용하기</control>
     <control lang="ko" key="IDC_QUICKFORMAT">빠른 포맷</control>
     <control lang="ko" key="IDC_SHOW_PASSWORD">비밀번호 표시(&amp;D)</control>
     <control lang="ko" key="IDC_SHOW_PASSWORD_SINGLE">비밀번호 표시(&amp;D)</control>
-    <control lang="en" key="IDC_SHOW_PIM">&amp;Display PIM</control>
+    <control lang="ko" key="IDC_SHOW_PIM">&amp;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">숨김(&amp;D)</control>
@@ -75,7 +78,7 @@
     <control lang="ko" key="IDT_COLLECTING_RANDOM_DATA_NOTE">중요: 이 창 안에서 마우스를 가능한 한 무작위로 움직이세요. 마우스를 더 오래 움직일수록 더욱 좋습니다. 이 작업은 암호키의 암호력을 상당히 증대시킵니다. 계속하려면 "다음"을 클릭하세요.</control>
     <control lang="ko" key="IDT_CONFIRM">확인(&amp;C):</control>
     <control lang="ko" key="IDT_DONE">완료</control>
-    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
+    <control lang="ko" key="IDT_DRIVE_LETTER">드라이브 문자:</control>
     <control lang="ko" key="IDT_ENCRYPTION_ALGO">암호 알고리듬</control>
     <control lang="ko" key="IDT_FILESYSTEM">파일시스템 </control>
     <control lang="ko" key="IDT_FILE_CONTAINER">파일 안에 가상의 암호화된 디스크를 만듭니다. 경험 없는 사용자에게 권장합니다.</control>
@@ -89,8 +92,8 @@
     <control lang="ko" key="IDT_PARTIAL_POOL_CONTENTS">현재의 풀(Pool) 내용 (부분)</control>
     <control lang="ko" key="IDT_PASS">패스</control>
     <control lang="ko" key="IDT_PASSWORD">비밀번호:</control>
-    <control lang="en" key="IDT_PIM">Volume PIM:</control>
+    <control lang="ko" key="IDT_PIM">볼륨 PIM:</control>
-    <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
+    <control lang="ko" key="IDT_OLD_PIM">볼륨 PIM:</control>
     <control lang="ko" key="IDT_PROGRESS">진행:</control>
     <control lang="ko" key="IDT_RANDOM_POOL">무작위 풀: </control>
     <control lang="ko" key="IDT_SINGLE_BOOT">현재 컴퓨터에 설치된 운영체제가 한 개인 경우 (비록 사용자가 여럿 있는 경우라 하더라도) 이 옵션을 선택합니다.</control>
@@ -99,7 +102,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_VOLUME_LABEL">윈도우 볼륨 표찰:</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 키를 눌러 부팅-전 인증을 건너뛸 수 있습니다(* 부트 관리자 사용)(&amp;A)</control>
@@ -113,50 +116,52 @@
     <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">볼륨이 성공적으로 삽입된 후 토큰 세션 닫기(* 로그 아웃)(&amp;C)</control>
-    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
+    <control lang="ko" key="IDC_COPY_EXPANDER">VeraCrypt 볼륨확장기를 포함</control>
     <control lang="ko" key="IDC_COPY_WIZARD">VeraCrypt 볼륨 만들기 마법사 포함</control>
     <control lang="ko" key="IDC_CREATE">만들기</control>
     <control lang="ko" key="IDC_CREATE_VOLUME">볼륨 만들기(&amp;C)</control>
     <control lang="ko" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">부팅-전 인증 화면에 어떠한 텍스트도 표시 안함(* 하단의 사용자 메시지는 제외)(&amp;S)</control>
+    <control lang="ko" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">"Evil Maid" 탐지를 사용 안함</control>
     <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="ko" key="IDC_ENABLE_KEYFILES">키파일 사용</control>
     <control lang="ko" key="IDC_ENABLE_NEW_KEYFILES">키파일 사용</control>
     <control lang="ko" key="IDC_EXIT">종료(&amp;X)</control>
-    <control lang="en" key="IDC_FAVORITES_HELP_LINK">Help on favorite volumes</control>
+    <control lang="ko" key="IDC_FAVORITES_HELP_LINK">즐겨찾기 도움</control>
-    <control lang="en" key="IDC_FAVORITE_DISABLE_HOTKEY">Do not mount selected volume when 'Mount Favorite Volumes' &amp;hot key is pressed</control>
+    <control lang="ko" key="IDC_FAVORITE_DISABLE_HOTKEY">선택된 볼륨을 마운트하지 않기 ('즐겨찾기' 핫키를 눌럿을 경우)</control>
-    <control lang="en" key="IDC_FAVORITE_MOUNT_ON_ARRIVAL">Mount selected volume when its host device gets &amp;connected</control>
+    <control lang="ko" key="IDC_FAVORITE_MOUNT_ON_ARRIVAL">선택된 볼륨을 호스트 장치가 연결될때 마운트하기</control>
-    <control lang="en" key="IDC_FAVORITE_MOUNT_ON_LOGON">Mount selected volume upon log&amp;on</control>
+    <control lang="ko" key="IDC_FAVORITE_MOUNT_ON_LOGON">선택된 볼륨을 로그인때 마운트하기</control>
-    <control lang="en" key="IDC_FAVORITE_MOUNT_READONLY">Mount selected volume as read-o&amp;nly</control>
+    <control lang="ko" key="IDC_FAVORITE_MOUNT_READONLY">선택된 볼륨을 읽기 전용으로 마운트하기</control>
-    <control lang="en" key="IDC_FAVORITE_MOUNT_REMOVABLE">Mount selected volume as remo&amp;vable medium</control>
+    <control lang="ko" key="IDC_FAVORITE_MOUNT_REMOVABLE">선택된 볼륨을 이동식 매체로 마운트하기</control>
-    <control lang="en" key="IDC_FAVORITE_MOVE_DOWN">Move &amp;Down</control>
+    <control lang="ko" key="IDC_FAVORITE_MOVE_DOWN">아래로 &amp; 이동</control>
-    <control lang="en" key="IDC_FAVORITE_MOVE_UP">Move &amp;Up</control>
+    <control lang="ko" key="IDC_FAVORITE_MOVE_UP">위로 &amp; 이동</control>
-    <control lang="en" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Open &amp;Explorer window for selected volume when successfully mounted</control>
+    <control lang="ko" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">탐색기 창을 선택한 볼륨들이 성공적으로 마운트될때 열기</control>
-    <control lang="en" key="IDC_FAVORITE_REMOVE">&amp;Remove</control>
+    <control lang="ko" key="IDC_FAVORITE_REMOVE">&amp;제거</control>
-    <control lang="en" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Global Settings</control>
+    <control lang="ko" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">'즐겨찾기'의 표시를 탐색기 드라이브의 표시로 사용하기</control>
-    <control lang="en" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Display balloon tooltip after successful hot-key dismount</control>
+    <control lang="ko" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">전역 설정</control>
-    <control lang="en" key="IDC_HK_DISMOUNT_PLAY_SOUND">Play system notification sound after successful hot-key dismount</control>
+    <control lang="ko" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">풍선 툴탑을 성공적인 핫키 마운트 해재때 표시하기</control>
-    <control lang="ko" key="IDC_HK_MOD_ALT">ALT</control>
+    <control lang="ko" key="IDC_HK_DISMOUNT_PLAY_SOUND">시스템 소리를 성공적인 핫키 마운트 해재때 재생하기</control>
+    <control lang="en" key="IDC_HK_MOD_ALT">ALT</control>
     <control lang="en" key="IDC_HK_MOD_CTRL">Ctrl</control>
-    <control lang="ko" key="IDC_HK_MOD_SHIFT">SHIFT</control>
+    <control lang="en" key="IDC_HK_MOD_SHIFT">SHIFT</control>
-    <control lang="ko" key="IDC_HK_MOD_WIN">Win</control>
+    <control lang="en" key="IDC_HK_MOD_WIN">Win</control>
     <control lang="ko" key="IDC_HOTKEY_ASSIGN">할당</control>
     <control lang="ko" key="IDC_HOTKEY_REMOVE">제거</control>
     <control lang="ko" key="IDC_KEYFILES">키파일...</control>
-    <control lang="en" key="IDC_LIMIT_ENC_THREAD_POOL">Do not use the following number of processors for encryption/decryption:</control>
+    <control lang="ko" key="IDC_LIMIT_ENC_THREAD_POOL">암호화/복호화에 다음의 프로세서의 재한수 (예: 2 = 2개의 프로세서만 사용가능):</control>
-    <control lang="en" key="IDC_MORE_INFO_ON_HW_ACCELERATION">More information</control>
+    <control lang="ko" key="IDC_MORE_INFO_ON_HW_ACCELERATION">자세한 내용</control>
-    <control lang="en" key="IDC_MORE_INFO_ON_THREAD_BASED_PARALLELIZATION">More information</control>
+    <control lang="ko" key="IDC_MORE_INFO_ON_THREAD_BASED_PARALLELIZATION">자세한 내용</control>
     <control lang="ko" key="IDC_MORE_SETTINGS">다른 설정...</control>
     <control lang="ko" key="IDC_MOUNTALL">장치 자동삽입(&amp;A)</control>
     <control lang="ko" key="IDC_MOUNT_OPTIONS">삽입 옵션(&amp;O)...</control>
     <control lang="ko" key="IDC_MOUNT_READONLY">볼륨을 읽기-전용으로 삽입(&amp;O)</control>
     <control lang="ko" key="IDC_NEW_KEYFILES">키파일...</control>
-    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="ko" key="IDC_OLD_PIM_HELP">(빈값 아니면 0은 기본 반복갚을 사용함)</control>
-    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
+    <control lang="ko" key="IDC_PIM_HELP">(빈값 아니면 0은 기본 반복갚을 사용함)</control>
     <control lang="ko" key="IDC_PREF_BKG_TASK_ENABLE">사용</control>
     <control lang="ko" key="IDC_PREF_CACHE_PASSWORDS">드라이버 메모리에 비밀번호 보관</control>
     <control lang="ko" key="IDC_PREF_DISMOUNT_INACTIVE">어떤 데이터가 읽기/쓰기된 후 볼륨 자동 꺼내기</control>
     <control lang="ko" key="IDC_PREF_DISMOUNT_LOGOFF">사용자 로그오프할 때</control>
-    <control lang="en" key="IDC_PREF_DISMOUNT_SESSION_LOCKED">User session locked</control>
+    <control lang="ko" key="IDC_PREF_DISMOUNT_SESSION_LOCKED">사용자 세션이 잠겨있을 때</control>
     <control lang="ko" key="IDC_PREF_DISMOUNT_POWERSAVING">절전 모드로 들어갈 때</control>
     <control lang="ko" key="IDC_PREF_DISMOUNT_SCREENSAVER">화면보호기가 실행될 때</control>
     <control lang="ko" key="IDC_PREF_FORCE_AUTO_DISMOUNT">볼륨에 열린 파일 또는 디렉토리가 있어도 강제로 꺼내기</control>
@@ -165,8 +170,8 @@
     <control lang="ko" key="IDC_PREF_MOUNT_READONLY">볼륨을 읽기-전용으로 삽입</control>
     <control lang="ko" key="IDC_PREF_MOUNT_REMOVABLE">볼륨을 이동식 디스크로 삽입</control>
     <control lang="ko" key="IDC_PREF_OPEN_EXPLORER">성공적으로 삽입된 볼륨을 위한 탐색기 창 열기</control>
-    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</control>
+    <control lang="ko" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">'즐겨찾기' 볼륨의 작업중에 암호를 임시 캐시(cache) 하기</control>
-    <control lang="en" key="IDC_PREF_USE_DIFF_TRAY_ICON_IF_VOL_MOUNTED">Use a different taskbar icon when there are mounted volumes</control>
+    <control lang="ko" key="IDC_PREF_USE_DIFF_TRAY_ICON_IF_VOL_MOUNTED">볼륨이 장착될때 다른 작업 아이콘을 사용함</control>
     <control lang="ko" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">“자동 꺼냄”시 보관된 비밀번호 삭제</control>
     <control lang="ko" key="IDC_PREF_WIPE_CACHE_ON_EXIT">“종료”시 보관된 비밀번호 삭제</control>
     <control lang="ko" key="IDC_PRESERVE_TIMESTAMPS">파일 보관소의 수정 타임스탬프 보존</control>
@@ -178,18 +183,18 @@
     <control lang="ko" key="IDC_SHOW_PASSWORD_CHPWD_ORI">비밀번호 표시</control>
     <control lang="ko" key="IDC_TRAVEL_OPEN_EXPLORER">삽입된 볼륨을 위한 탐색기 창 열기</control>
     <control lang="ko" key="IDC_TRAV_CACHE_PASSWORDS">드라이버 메모리에 비밀번호 보관(&amp;C)</control>
-    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="ko" key="IDC_TRUECRYPT_MODE">TrueCrypt 모드</control>
     <control lang="ko" key="IDC_UNMOUNTALL">모두 꺼내기(&amp;S)</control>
     <control lang="ko" key="IDC_VOLUME_PROPERTIES">볼륨 속성(&amp;V)...</control>
     <control lang="ko" key="IDC_VOLUME_TOOLS">볼륨 도구(&amp;T)...</control>
     <control lang="ko" key="IDC_WIPE_CACHE">캐시 지우기(&amp;W)</control>
-    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
+    <control lang="ko" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - 마운트 변수</control>
-    <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
+    <control lang="ko" key="IDD_FAVORITE_VOLUMES">VeraCrypt - 즐겨찾기 볼륨</control>
     <control lang="ko" key="IDD_HOTKEYS_DLG">VeraCrypt - 시스템 일반 단축키</control>
     <control lang="ko" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="ko" key="IDD_PASSWORDCHANGE_DLG">비밀번호 또는 키파일 변경</control>
     <control lang="ko" key="IDD_PASSWORD_DLG">VeraCrypt 볼륨 비밀번호 입력</control>
-    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance Options</control>
+    <control lang="ko" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - 성능과 드라이버 설정</control>
     <control lang="ko" key="IDD_PREFERENCES_DLG">VeraCrypt - 옵션</control>
     <control lang="ko" key="IDD_SYSENC_SETTINGS">VeraCrypt - 시스템 암호화 설정</control>
     <control lang="ko" key="IDD_TOKEN_PREFERENCES">VeraCrypt - 보안 토큰 설정</control>
@@ -197,9 +202,9 @@
     <control lang="ko" key="IDD_VOLUME_PROPERTIES">VeraCrypt 볼륨 속성</control>
     <control lang="ko" key="IDM_ABOUT">정보...</control>
     <control lang="ko" key="IDM_ADD_REMOVE_VOL_KEYFILES">볼륨에 키파일 추가/삭제...</control>
-    <control lang="en" key="IDM_ADD_VOLUME_TO_FAVORITES">Add Mounted Volume to Favorites...</control>
+    <control lang="ko" key="IDM_ADD_VOLUME_TO_FAVORITES">장착됀 볼륨을 즐겨찾기에 추가하기...</control>
-    <control lang="en" key="IDM_ADD_VOLUME_TO_SYSTEM_FAVORITES">Add Mounted Volume to System Favorites...</control>
+    <control lang="ko" key="IDM_ADD_VOLUME_TO_SYSTEM_FAVORITES">장착됀 볼륨을 시스템 즐겨찾기에 추가하기...</control>
-    <control lang="en" key="IDM_ANALYZE_SYSTEM_CRASH">Analyze a System Crash...</control>
+    <control lang="ko" key="IDM_ANALYZE_SYSTEM_CRASH">시스템 충돌을 분석하기...</control>
     <control lang="ko" key="IDM_BACKUP_VOL_HEADER">볼륨 헤더 백업...</control>
     <control lang="ko" key="IDM_BENCHMARK">벤치마크...</control>
     <control lang="ko" key="IDM_CHANGE_HEADER_KEY_DERIV_ALGO">헤더 키 도출 알고리듬 설정...</control>
@@ -212,10 +217,10 @@
     <control lang="ko" key="IDM_CREATE_HIDDEN_OS">숨긴 운영체제 만들기...</control>
     <control lang="ko" key="IDM_CREATE_RESCUE_DISK">응급복구 디스크 만들기...</control>
     <control lang="ko" key="IDM_CREATE_VOLUME">새 볼륨 만들기...</control>
-    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
+    <control lang="ko" key="IDM_DECRYPT_NONSYS_VOL">볼륨을 복호화 하기...</control>
     <control lang="ko" key="IDM_DEFAULT_KEYFILES">기본 키파일...</control>
-    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
+    <control lang="ko" key="IDM_DEFAULT_MOUNT_PARAMETERS">디폴트 삽입 변수...</control>
-    <control lang="en" key="IDM_DONATE">Donate now...</control>
+    <control lang="ko" key="IDM_DONATE">기부하기...</control>
     <control lang="ko" key="IDM_ENCRYPT_SYSTEM_DEVICE">시스템 파티션/드라이브 암호화...</control>
     <control lang="ko" key="IDM_FAQ">자주 묻는 질문</control>
     <control lang="ko" key="IDM_HELP">사용 안내서</control>
@@ -233,9 +238,9 @@
     <control lang="ko" key="IDM_NEWS">뉴스</control>
     <control lang="ko" key="IDM_ONLINE_HELP">온라인 도움말</control>
     <control lang="ko" key="IDM_ONLINE_TUTORIAL">초보자 안내서</control>
-    <control lang="en" key="IDM_ORGANIZE_FAVORITES">Organize Favorite Volumes...</control>
+    <control lang="ko" key="IDM_ORGANIZE_FAVORITES">즐겨찾기를 정리하기...</control>
-    <control lang="en" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organize System Favorite Volumes...</control>
+    <control lang="ko" key="IDM_ORGANIZE_SYSTEM_FAVORITES">시스템 즐겨찻기를 정리하기...</control>
-    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance...</control>
+    <control lang="ko" key="IDM_PERFORMANCE_SETTINGS">성능/드라이버 옵션</control>
     <control lang="ko" key="IDM_PERMANENTLY_DECRYPT_SYS">시스템 파티션/드라이브 영구적 암호해제...</control>
     <control lang="ko" key="IDM_PREFERENCES">설정...</control>
     <control lang="ko" key="IDM_REFRESH_DRIVE_LETTERS">드라이브 문자 새로 고침</control>
@@ -256,8 +261,9 @@
     <control lang="ko" key="IDM_UNMOUNTALL">삽입된 모든 볼륨 꺼내기</control>
     <control lang="ko" key="IDM_UNMOUNT_VOLUME">볼륨 꺼내기</control>
     <control lang="ko" key="IDM_VERIFY_RESCUE_DISK">응급복구 디스크 검증</control>
+    <control lang="ko" key="IDM_VERIFY_RESCUE_DISK_ISO">응급복구 디스크 검증</control>
     <control lang="ko" key="IDM_VERSION_HISTORY">버전 히스토리</control>
-    <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
+    <control lang="ko" key="IDM_VOLUME_EXPANDER">볼륨확장기</control>
     <control lang="ko" key="IDM_VOLUME_PROPERTIES">볼륨 속성</control>
     <control lang="ko" key="IDM_VOLUME_WIZARD">볼륨 만들기 마법사</control>
     <control lang="ko" key="IDM_WEBSITE">VeraCrypt 웹사이트</control>
@@ -274,12 +280,12 @@
     <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="ko" key="IDT_DRIVER_OPTIONS">드라이버 설정</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_FAVORITE_LABEL">택된 볼륨의 레이블:</control>
     <control lang="ko" key="IDT_FILE_SETTINGS">파일 설정</control>
     <control lang="ko" key="IDT_HOTKEY_KEY">할당할 키:</control>
-    <control lang="en" key="IDT_HW_AES_SUPPORTED_BY_CPU">Processor (CPU) in this computer supports hardware acceleration for AES:</control>
+    <control lang="ko" key="IDT_HW_AES_SUPPORTED_BY_CPU">이 컴퓨터의 프로세서는(CPU) AES의 하드웨어 가속(Hardware Acceleration)을 지원합니다:</control>
     <control lang="ko" key="IDT_LOGON">윈도우에 로그온할 때 수행할 작업</control>
     <control lang="ko" key="IDT_MINUTES">분</control>
     <control lang="ko" key="IDT_MOUNT_LETTER">특정 드라이브 문자로 삽입:</control>
@@ -326,7 +332,7 @@
     <control lang="ko" key="IDC_RESET">초기화(&amp;R)</control>
     <control lang="ko" key="IDC_SHOW_PASSWORD_MO">비밀번호 표시(&amp;D)</control>
     <control lang="ko" key="IDC_TOKEN_FILES_ADD">토큰 파일 추가(&amp;T)...</control>
-    <control lang="ko" key="IDC_USE_EMBEDDED_HEADER_BAK">볼륨에 내장된 백업 헤더 사용 (가능한 경우)(&amp;V) </control>
+    <control lang="ko" key="IDC_USE_EMBEDDED_HEADER_BAK">볼륨에 내장된 백업 헤더 사용 (가능한 경우)(&amp;V)</control>
     <control lang="ko" key="IDC_XTS_MODE_ENABLED">XTS 모드</control>
     <control lang="ko" key="IDD_ABOUT_DLG">VeraCrypt 정보</control>
     <control lang="ko" key="IDD_BENCHMARK_DLG">VeraCrypt - 암호 알고리듬 벤치마크</control>
@@ -339,7 +345,7 @@
     <control lang="ko" key="IDD_NEW_TOKEN_KEYFILE">새 보안 토큰 키파일 속성</control>
     <control lang="ko" key="IDD_RANDOM_POOL_ENRICHMENT">VeraCrypt - 무작위 풀 향상</control>
     <control lang="ko" key="IDD_RAWDEVICES_DLG">파티션 또는 장치 선택</control>
-    <control lang="en" key="IDD_STATIC_MODELESS_WAIT_DLG">VeraCrypt</control>
+    <control lang="ko" key="IDD_STATIC_MODELESS_WAIT_DLG">VeraCrypt</control>
     <control lang="ko" key="IDD_TOKEN_KEYFILES">보안 토큰 키파일</control>
     <control lang="ko" key="IDD_TOKEN_PASSWORD">보안 토큰 비밀번호/PIN이 요구됨</control>
     <control lang="ko" key="IDT_ACTIVE_LANG_PACK">현재의 언어팩</control>
@@ -348,13 +354,13 @@
     <control lang="ko" key="IDT_CIPHER">암호:</control>
     <control lang="ko" key="IDT_HIDDEN_PROT_PASSWD">숨긴 볼륨에 대한 비밀번호:\n(비어 있는 경우, 캐시 사용)</control>
     <control lang="ko" key="IDT_HIDDEN_VOL_PROTECTION">숨긴 볼륨 보호</control>
-    <control lang="ko" key="IDT_KEY">키 크기:</control>
+    <control lang="ko" key="IDT_KEY">키(key) 크기:</control>
     <control lang="ko" key="IDT_KEYFILE_GENERATOR_NOTE">중요: 이 창 안에서 마우스를 가능한 한 무작위로 움직이세요. 마우스를 더 오래 움직일수록 더욱 좋습니다. 이 작업은 키파일의 암호력을 상당히 증대시킵니다.</control>
     <control lang="ko" key="IDT_KEYFILE_WARNING">주의: 키파일을 분실하거나 키파일의 첫번째 1024KB가 변경되면, 키파일을 이용해서 볼륨을 삽입할 수 없게 됩니다!</control>
     <control lang="ko" key="IDT_KEY_UNIT">비트</control>
-    <control lang="en" key="IDT_NUMBER_KEYFILES">Number of keyfiles:</control>
+    <control lang="ko" key="IDT_NUMBER_KEYFILES">키파일 수:</control>
-    <control lang="en" key="IDT_KEYFILES_SIZE">Keyfiles size (in Bytes):</control>
+    <control lang="ko" key="IDT_KEYFILES_SIZE">키파일 사이즈 (Byte):</control>
-    <control lang="en" key="IDT_KEYFILES_BASE_NAME">Keyfiles base name:</control>
+    <control lang="ko" key="IDT_KEYFILES_BASE_NAME">키파일 배이스 이름:</control>
     <control lang="ko" key="IDT_LANGPACK_AUTHORS">번역자:</control>
     <control lang="ko" key="IDT_PLAINTEXT">단순텍스트 크기:</control>
     <control lang="ko" key="IDT_PLAINTEXT_SIZE_UNIT">비트</control>
@@ -364,8 +370,8 @@
     <control lang="ko" key="IDT_SECONDARY_KEY">보조 키(16진법)</control>
     <control lang="ko" key="IDT_SECURITY_TOKEN">보안 토큰:</control>
     <control lang="ko" key="IDT_SORT_METHOD">정렬 방법:</control>
-    <control lang="en" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Please wait. This process may take a long time...</control>
+    <control lang="ko" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">진행이 되는동한 기다려주세요.</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="ko" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">진행이 되는동한 기다려주세요 - VeraCrypt가 잠시 멈칠수도 있습니다.</control>
     <control lang="ko" key="IDT_TEST_BLOCK_NUMBER">블록 수:</control>
     <control lang="ko" key="IDT_TEST_CIPHERTEXT">암호문(16진법)</control>
     <control lang="ko" key="IDT_TEST_DATA_UNIT_NUMBER">데이터 단위 수 (64-비트 16진법, 데이터 단위 크기는 512 바이트)</control>
@@ -375,7 +381,7 @@
     <control lang="ko" key="IDT_XTS_MODE">XTS 모드</control>
     <control lang="ko" key="MENU_SYSTEM_ENCRYPTION">시스템(&amp;Y)</control>
     <control lang="ko" key="MENU_VOLUMES">볼륨(&amp;V)</control>
-    <control lang="en" key="MENU_FAVORITES">Favor&amp;ites</control>
+    <control lang="ko" key="MENU_FAVORITES">즐겨찾기</control>
     <control lang="ko" key="MENU_TOOLS">도구(&amp;O)</control>
     <control lang="ko" key="MENU_SETTINGS">설정(&amp;G)</control>
     <control lang="ko" key="MENU_HELP">도움말(&amp;H)</control>
@@ -410,13 +416,13 @@
     <string lang="ko" key="CIPHER_TITLE">암호 옵션</string>
     <string lang="ko" key="CLEAN_WINMRU_FAILED">주의: (파일 선택기에 의해 기억된) 선택한 볼륨/키파일의 최근 경로를 삭제하는 데 실패했습니다!</string>
     <string lang="ko" key="COMPRESSION_NOT_SUPPORTED">오류: 보관소가 파일 시스템 레벨로 압축되어 있습니다. VeraCrypt는 압축된 보관소를 지원하지 않습니다(→ 암호화된 데이터 압축은 비효율적이고 중복되기만 합니다).\n\n다음 단계에 따라 보관소의 압축을 해제합니다: 1) (VeraCrypt가 아닌) 윈도우 탐색기에서 보관소를 오른쪽 클릭합니다. 2) “속성”을 선택합니다. 3) “속성” 대화창에서 “고급”을 클릭합니다. 4) “고급 속성” 대화창에서, “드라이브를 압축하여 디스크 공간 절약” 옵션을 체크해제하고 “확인”을 클릭합니다. 5) “속성” 대화창에서 “확인”을 클릭합니다.</string>
-    <string lang="ko" key="CREATE_FAILED">%hs 볼륨을 만드는데 실패했습니다.</string>
+    <string lang="ko" key="CREATE_FAILED">%s 볼륨을 만드는데 실패했습니다.</string>
-    <string lang="ko" key="DEVICE_FREE_BYTES">드라이브 %hs의 크기 ▷ %.2f bytes</string>
+    <string lang="ko" key="DEVICE_FREE_BYTES">드라이브 %s의 크기 ▷ %.2f bytes</string>
-    <string lang="ko" key="DEVICE_FREE_KB">드라이브 %hs의 크기 ▷ %.2f KB</string>
+    <string lang="ko" key="DEVICE_FREE_KB">드라이브 %s의 크기 ▷ %.2f KB</string>
-    <string lang="ko" key="DEVICE_FREE_MB">드라이브 %hs의 크기 ▷ %.2f MB</string>
+    <string lang="ko" key="DEVICE_FREE_MB">드라이브 %s의 크기 ▷ %.2f MB</string>
-    <string lang="ko" key="DEVICE_FREE_GB">드라이브 %hs의 크기 ▷ %.2f GB</string>
+    <string lang="ko" key="DEVICE_FREE_GB">드라이브 %s의 크기 ▷ %.2f GB</string>
-    <string lang="ko" key="DEVICE_FREE_TB">드라이브 %hs의 크기 ▷ %.2f TB</string>
+    <string lang="ko" key="DEVICE_FREE_TB">드라이브 %s의 크기 ▷ %.2f TB</string>
-    <string lang="ko" key="DEVICE_FREE_PB">드라이브 %hs의 크기 ▷ %.2f PB</string>
+    <string lang="ko" key="DEVICE_FREE_PB">드라이브 %s의 크기 ▷ %.2f PB</string>
     <string lang="ko" key="DEVICE_IN_USE_FORMAT">주의: 장치/파티션이 운영체제나 프로그램에 의해 사용 중입니다. 장치/파티션을 포맷하면 데이터 손실 또는 시스템 불안정 등을 초래할 수 있습니다.\n\n계속하시겠습니까?</string>
     <string lang="ko" key="DEVICE_IN_USE_INPLACE_ENC">주의: 파티션이 운영체제나 프로그램에 의해 사용 중입니다. 파티션을 사용 중인 프로그램(* 안티바이러스 소프트웨어 포함)을 종료해야 합니다.\n\n계속하시겠습니까?</string>
     <string lang="ko" key="FORMAT_CANT_DISMOUNT_FILESYS">오류: 장치/파티션에 꺼낼 수 없는 파일 시스템이 있습니다. 파일 시스템이 운영체제에 의해 사용 중일 수도 있습니다. 장치/파티션을 포맷하면 데이터 손실 또는 시스템 불안정의 결과를 초래할 수도 있습니다.\n\n이 문제점의 해결책으로 먼저 파티션을 삭제하고, 포맷하지 않은 상태에서 파티션을 다시 만들 것을 권장합니다. 다음 단계를 따라야 합니다. 1) “시작 메뉴”에서 “내 컴퓨터”를 오른쪽 클릭한 다음 “관리”를 선택합니다. “컴퓨터 관리”창이 뜰 것입니다. 2) “컴퓨터 관리” 창에서 “저장소” ▶ “디스크 관리”를 선택합니다. 3) 암호화할 파티션을 오른쪽 클릭한 다음 “파티션 삭제”, “볼륨 삭제” 또는 “논리 드라이브 삭제” 중 하나를 선택합니다. 4) “예”를 클릭합니다. 윈도우가 컴퓨터를 재시작할 것인지 물으면 그렇게 해야 합니다. 그런 다음 1단계와 2단계를 반복한 후 5단계부터 계속합니다. 5) 빈 공간 영역(“할당 안됨”으로 표시됨)을 오른쪽 클릭한 다음 “새 파티션”, “새 단순 볼륨” 또는 “새 논리 드라이브”를 선택합니다. 6) “새 파티션 마법사” 또는 “새 단순 볼륨 마법사” 창이 뜨면 거기의 지침을 따릅니다. “파티션 포맷”이란 제목이 붙은 마법사에서, “현재 파티션 포맷 안함” 또는 “현재 볼륨 포맷 안함” 중 하나를 선택합니다. 동일한 마법사에서 “다음”을 클릭하고 “마침”을 클릭합니다. 7) VeraCrypt에서 선택했던 장치 경로가 지금은 틀릴 수도 있습니다. 이제 VeraCrypt 볼륨 만들기 마법사가 실행 중이라면 종료하고 다시 시작합니다. 8) VeraCrypt에서 장치/파티션 암호화를 다시 시도합니다.\n\n장치/파티션 암호화에 계속 실패할 경우, 암호화 대신에 “파일 보관소”를 만들 것을 고려해 봐야 합니다.</string>
@@ -435,15 +441,15 @@
     <string lang="ko" key="INPLACE_ENC_INVALID_PATH">오류: VeraCrypt는 파티션, 동적(dynamic) 볼륨 또는 전체 시스템 드라이브만을 자체 암호화할 수 있습니다. 지정한 경로가 올바른지 확인해 주십시오.</string>
     <string lang="ko" key="CANNOT_RESIZE_FILESYS">오류: 파일시스템의 크기를 줄일 수 없습니다(* 파일시스템은 볼륨 헤더 및 백업 헤더를 위한 공간을 만들기 위해 축소되어야 할 필요가 있습니다).\n\n가능한 원인 및 해결책:\n\n- 볼륨에 충분한 여유 공간이 없음. 다른 프로그램이 파일시스템에 작성을 하고 있는 것은 아닌지 확인해 주시기 바랍니다.\n\n- 손상된 파일 시스템. 시스템을 검사해서 오류를 바로 잡습니다(* “컴퓨터” 목록에 있는 해당 드라이브 문자를 오른쪽-클릭한 후 속성 &gt; 도구 &gt; “지금 검사”를 선택한 해서 “파일 시스템 오류 자동 수정” 옵션을 체크한 후 “시작”을 클릭합니다).\n\n이렇게 해도 도움이 되지 않는 경우, 아래 단계를 따라주시기 바랍니다.</string>
     <string lang="ko" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">오류: 볼륨에 충분한 여유 공간이 없고 파일시스템을 줄일 수 없습니다(* 파일시스템은 볼륨 헤더 및 백업 헤더를 위한 공간을 만들기 위해 축소되어야 할 필요가 있습니다).\n\n중복되는 파일들을 삭제하고 휴지통을 비워서 적어도 256KB의 여유 공간을 만든 후 다시 시도해 주십시오. 윈도우의 문제점으로 인해, 운영체제를 다시 시작하기 전에는 여유 공간의 양을 윈도우 탐색기에서 올바르지 않게 보고할 수 있습니다. 시스템을 다시 시작해도 도움이 되지 않는 경우, 파일 시스템이 손상되었을 수도 있습니다. 시스템을 검사해서 오류를 바로 잡습니다(* “컴퓨터” 목록에 있는 해당 드라이브 문자를 오른쪽-클릭한 후 속성 &gt; 도구 &gt; “지금 검사”를 선택한 해서 “파일 시스템 오류 자동 수정” 옵션을 체크한 후 “시작”을 클릭합니다).\n\n이렇게 해도 도움이 되지 않는 경우, 아래 단계를 따라주시기 바랍니다.</string>
-    <string lang="ko" key="DISK_FREE_BYTES">드라이브 %hs의 여유 공간 ▷ %.2f bytes</string>
+    <string lang="ko" key="DISK_FREE_BYTES">드라이브 %s의 여유 공간 ▷ %.2f bytes</string>
-    <string lang="ko" key="DISK_FREE_KB">드라이브 %hs의 여유 공간 ▷ %.2f KB</string>
+    <string lang="ko" key="DISK_FREE_KB">드라이브 %s의 여유 공간 ▷ %.2f KB</string>
-    <string lang="ko" key="DISK_FREE_MB">드라이브 %hs의 여유 공간 ▷ %.2f MB</string>
+    <string lang="ko" key="DISK_FREE_MB">드라이브 %s의 여유 공간 ▷ %.2f MB</string>
-    <string lang="ko" key="DISK_FREE_GB">드라이브 %hs의 여유 공간 ▷ %.2f GB</string>
+    <string lang="ko" key="DISK_FREE_GB">드라이브 %s의 여유 공간 ▷ %.2f GB</string>
-    <string lang="ko" key="DISK_FREE_TB">드라이브 %hs의 여유 공간 ▷ %.2f TB</string>
+    <string lang="ko" key="DISK_FREE_TB">드라이브 %s의 여유 공간 ▷ %.2f TB</string>
-    <string lang="ko" key="DISK_FREE_PB">드라이브 %hs의 여유 공간 ▷ %.2f PB</string>
+    <string lang="ko" key="DISK_FREE_PB">드라이브 %s의 여유 공간 ▷ %.2f PB</string>
     <string lang="ko" key="DRIVELETTERS">이용가능한 드라이브 문자가 없습니다.</string>
     <string lang="ko" key="DRIVER_NOT_FOUND">오류: VeraCrypt 드라이버를 찾을 수 없습니다!\n\n프로그램(VeraCrypt.exe)이 위치한 디렉토리에 “veracrypt.sys” 및 “turecrypt-x64.sys” 파일을 복사해 주세요.</string>
-    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall; on Windows XP, select 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
+    <string lang="ko" key="DRIVER_VERSION">오류: 호환되지 않는 VeraCrypt 드라이버 버전이 실행되고 있습니다.\n\n만약에 VeraCrypt를 휴대용 모드 (예: 설치하지않은 상태), 다른 버전의 VeraCrypt가 이미 설치가 되었으면, 먼저 제거 (아니면 VeraCrypt의 업데이트 옵션으로 업그레이드) 할 필요가 있습니다. 제거 할경우, 다음과 같은 단계를 따르세요: Windows Vista 그리고 후의 버전들은, 시작 메뉴 &gt; 나의 컴퓨터 &gt; '프로그램 밋 제거' &gt; VeraCrypt &gt; 제거; Windows XP는, 시작 메뉴 &gt; 설정 &gt; '제어판' &gt; '프로그램 밋 제거' &gt; VeraCrypt &gt; 제거.\n\n비슷한 방식으로, 휴대용으로 사용한 결과 (그리고 다른 버전이 설치된후) 컴퓨터를 재시작후 새로운 최근버전의 VeraCrypt로 실행하세요.</string>
     <string lang="ko" key="ERR_CIPHER_INIT_FAILURE">오류: 암호를 초기화하는데 실패했습니다.</string>
     <string lang="ko" key="ERR_CIPHER_INIT_WEAK_KEY">오류: 강력하지 않은 키가 탐지되었습니다. 이 키는 무시되었습니다. 다시 시도하세요.</string>
     <string lang="ko" key="EXCEPTION_REPORT">치명적인 오류가 발생해서 VeraCrypt를 종료해야 합니다. 만약 원인이 VeraCrypt의 버그라면, 이것을 고치고자 합니다. 우리를 돕고자 한다면, 다음 항목들을 포함해서 자동으로 생성된 오류 보고서를 저희에게 보내주시면 고맙겠습니다:\n\n- 프로그램 버전\n- 운영체제 버전\n- CPU 형식\n- VeraCrypt 콤포넌트 이름\n- VeraCrypt 실행파일 체크섬\n- VeraCrypt 대화창 식별기\n- 오류 카테고리\n- 오류 주소\n- VeraCrypt 콜 스택(call stack)\n\n“예”를 선택하면, (전체 오류 보고서를 포함한) 다음 URL이 기본 인터넷 브라우저에서 열립니다.\n\n%hs\n\n오류 보고서를 저희에게 보내시겠습니까?</string>
@@ -451,16 +457,16 @@
     <string lang="en" key="EXCEPTION_REPORT_EXT_FILESEL">A critical error has occurred in your system, which requires VeraCrypt to be terminated.\n\nIf this problem persists, you may want to try disabling or uninstalling applications that could potentially be causing this issue, such as antivirus or Internet security software, system "enhancers", "optimizers" or "tweakers", etc. If it does not help, you may want to try reinstalling your operating system (this problem may also be caused by malware).</string>
     <string lang="ko" key="EXCEPTION_REPORT_TITLE">VeraCrypt 치명적 오류</string>
     <string lang="en" key="SYSTEM_CRASHED_ASK_REPORT">VeraCrypt detected that the operating system recently crashed. There are many potential reasons why the system could have crashed (for example, a failing hardware component, a bug in a device driver, etc.)\n\nDo you want VeraCrypt to check whether a bug in VeraCrypt could have caused the system crash?</string>
-    <string lang="en" key="ASK_KEEP_DETECTING_SYSTEM_CRASH">Do you want VeraCrypt to continue detecting system crashes?</string>
+    <string lang="ko" key="ASK_KEEP_DETECTING_SYSTEM_CRASH">VeraCrypt가 계속 시스템 충돌을 검출하기를 원하십니까?</string>
-    <string lang="en" key="NO_MINIDUMP_FOUND">VeraCrypt found no system crash minidump file.</string>
+    <string lang="ko" key="NO_MINIDUMP_FOUND">VeraCrypt 미니덤프를 찻지 못했습니다.</string>
-    <string lang="en" key="ASK_DELETE_KERNEL_CRASH_DUMP">Do you want to delete the Windows crash dump file to free up disk space?</string>
+    <string lang="ko" key="ASK_DELETE_KERNEL_CRASH_DUMP">디스크의 공간을 확보하기 위해서 시스템 충돌파일을 지우는것을 원하십니까?</string>
-    <string lang="en" key="ASK_DEBUGGER_INSTALL">In order to analyze the system crash, VeraCrypt needs to install Microsoft Debugging Tools for Windows first.\n\nAfter you click OK, the Windows installer will download the Microsoft Debugging Tools installation package (16 MB) from a Microsoft server and install it (the Windows installer will be forwarded to the Microsoft server URL from the veracrypt.org server, which ensures that this feature works even if Microsoft changes the location of the installation package).</string>
+    <string lang="ko" key="ASK_DEBUGGER_INSTALL">시스템 충돌을 분석하기에 VeraCrypt가 Microsoft Debugging Tools를 Windows에 설치해야합니다.\n\nOK를 클릭하신후 Microsoft에서 Microsoft Debugging Tools (16 MB)를 다운로드를한후 설치를 실행합니다. (Windows installer가 Microsoft 서버에서부터 veracrypt.org 서버로 전송을 해서 Microsoft의 설치프로그램의 장소가 바뀌어도 실행을 할수있습니다).</string>
-    <string lang="en" key="SYSTEM_CRASH_ANALYSIS_INFO">After you click OK, VeraCrypt will analyze the system crash. This may take up to several minutes.</string>
+    <string lang="ko" key="SYSTEM_CRASH_ANALYSIS_INFO">OK를 클릭하시면 VeraCrypt의 시스템분석이 시작됩니다. 몇분이 될수있으니 기다려주세요.</string>
-    <string lang="en" key="DEBUGGER_NOT_FOUND">Please make sure the environment variable 'PATH' includes the path to 'kd.exe' (Kernel Debugger).</string>
+    <string lang="ko" key="DEBUGGER_NOT_FOUND">시스템 패스(PATH)가 커넬디버거를 (kd.exe, Kernel Debugger) 포함한것을 체크해주세요.</string>
-    <string lang="en" key="SYSTEM_CRASH_NO_VERACRYPT">It appears that VeraCrypt most likely did not cause the system crash. There are many potential reasons why the system could have crashed (for example, a failing hardware component, a bug in a device driver, etc.)</string>
+    <string lang="ko" key="SYSTEM_CRASH_NO_VERACRYPT">시스템 충돌을 검사한 결과 VeraCrypt가 아닌 다른원인의 가능성이 있습니다 (예: 하드웨어의 오류, 장치 드라이버, etc.)</string>
-    <string lang="en" key="SYSTEM_CRASH_UPDATE_DRIVER">Results of the analysis indicate that updating the following driver might solve this issue: </string>
+    <string lang="ko" key="SYSTEM_CRASH_UPDATE_DRIVER">시스템 충돌을 검사한 결과 다음의 드라이버들을 업데이트를 한후 다시 시도하세요: </string>
-    <string lang="en" key="SYSTEM_CRASH_REPORT">To help us determine whether there is a bug in VeraCrypt, you can send us an automatically generated error report containing the following items:\n- Program version\n- Operating system version\n- Type of CPU\n- Error category\n- Driver name and version\n- System call stack\n\nIf you select 'Yes', the following URL (which contains the entire error report) will be opened in your default Internet browser.</string>
+    <string lang="ko" key="SYSTEM_CRASH_REPORT">버그가 있슴을 확인을 결정하기 위해서 VeraCrypt에 자동으로 생성된 에러보고서를 보고서를 보네겟습니까? 보고서에는 다음과 같은 정보가 포함이 되어있습니다:\n- Program version\n- Operating system version\n- Type of CPU\n- Error category\n- Driver name and version\n- System call stack\n\n만약 'YES'를 클릭하시면 다음과같은 URL이 열립니다.</string>
-    <string lang="en" key="ASK_SEND_ERROR_REPORT">Do you want to send us the above error report?</string>
+    <string lang="ko" key="ASK_SEND_ERROR_REPORT">위에 보이는 에러보고서를 VeraCrypt에게 보내고 싶습니까?</string>
     <string lang="ko" key="ENCRYPT">암호화(&amp;E)</string>
     <string lang="ko" key="DECRYPT">암호해제(&amp;D)</string>
     <string lang="ko" key="PERMANENTLY_DECRYPT">영구적 암호해제</string>
@@ -469,8 +475,8 @@
     <string lang="ko" key="FILE_HELP">(하드 디스크, USB 플래시 드라이브 등에 위치할 수 있는) VeraCrypt 보관소로 불리는 파일 안에 VeraCrypt 볼륨을 둘 수 있습니다. VeraCrypt 보관소는 일반의 보통 파일과 같습니다(* 예컨대 보통의 파일처럼 이동 또는 삭제가 가능합니다). 보관소를 위한 파일이름을 선택하고, 보관소가 만들어질 위치를 선택하려면 “파일 선택”을 클릭합니다.\n\n주의: 만약 기존의 파일을 선택하게 되면, VeraCrypt는 이 파일을 암호화하지 않습니다. 또한 이 파일은 삭제되고 “새롭게 생성된 VeraCrypt 보관소”로 교체됩니다. 기존의 파일을, 지금 만들려고 하는 VeraCrypt 보관소로 (나중에) 이동시켜서, 암호화할 수 있습니다.</string>
     <string lang="ko" key="FILE_HELP_HIDDEN_HOST_VOL">생성될 외부 볼륨의 위치를 선택합니다. 나중에 외부 볼륨 안에 “숨긴 볼륨”이 만들어집니다.\n\nVeraCrypt 볼륨은 하드 디스크, USB 플래시 드라이브 등에 위치할 수 있는 파일(→ VeraCrypt 보관소) 안에 둘 수 있습니다. VeraCrypt 보관소는 보통의 파일처럼 이동 또는 삭제가 가능합니다. 보관소를 위한 파일이름을 선택하고, 보관소가 만들어질 위치를 선택하려면 “파일 선택”을 클릭합니다. 만약 기존의 파일을 선택하게 되면, VeraCrypt는 이 파일을 암호화하지 않습니다. 또한 이 파일은 삭제되고 새롭게 생성된 VeraCrypt 보관소로 교체됩니다. 기존의 파일을, 지금 만들려고 하는 VeraCrypt 보관소로 (나중에) 이동시켜서, 암호화할 수 있습니다.</string>
     <string lang="ko" key="DEVICE_HELP">암호화된 장치-기반의 VeraCrypt 볼륨은 ① 하드 디스크의 파티션, ② SSD(Solid State Drive), ③ USB 메모리 스틱 및 ④ 기타 지원되는 저장 장치 안에 만들어질 수 있습니다. 또한 파티션 자체를 암호화할 수도 있습니다.\n\n게다가 암호화된 장치-기반의 VeraCrypt 볼륨은 파티션을 포함하고 있지 않은 장치(* 하드 디스크 및 SSD 포함) 내에도 만들어질 수 있습니다.\n\n참고: 파티션을 포함하고 있는 장치 자체를 (단 한 개의 키로써) 완전히 암호화할 수 있습니다. 다만 윈도우가 설치되어 있고 그곳에서 부팅이 가능한 드라이브인 경우에 가능합니다.</string>
-    <string lang="ko" key="DEVICE_HELP_NO_INPLACE">장치-기반의 VeraCrypt 볼륨은 ① 하드 디스크 파티션, ② SSD(Solid State Drive), ③ USB 메모리 스틱 및 ④ 기타 저장 장치 안에 만들어질 수 있습니다.\n\n주의: 파티션/장치가 포맷되고 현재 이곳에 저장된 모든 데이터를 잃게 됩니다. </string>
+    <string lang="ko" key="DEVICE_HELP_NO_INPLACE">장치-기반의 VeraCrypt 볼륨은 ① 하드 디스크 파티션, ② SSD(Solid State Drive), ③ USB 메모리 스틱 및 ④ 기타 저장 장치 안에 만들어질 수 있습니다.\n\n주의: 파티션/장치가 포맷되고 현재 이곳에 저장된 모든 데이터를 잃게 됩니다.</string>
-    <string lang="ko" key="DEVICE_HELP_HIDDEN_HOST_VOL">\n생성될 “외부 볼륨”의 위치를 선택합니다. 나중에 외부 볼륨 안에 “숨긴 볼륨”이 만들어집니다.\n\n외부 볼륨은 ① 하드 디스크 파티션, ② SSD(Solid State Drive), ③ USB 메모리 스틱 및 ④ 기타 지원되는 저장 장치 안에 만들어질 수 있습니다. 외부 볼륨은 파티션을 포함하고 있지 않은 장치(* 하드 디스크 및 SSD 포함) 내에도 만들어질 수 있습니다.\n\n주의: 파티션/장치가 포맷되고 현재 이곳에 저장된 모든 데이터를 잃게 됩니다. </string>
+    <string lang="ko" key="DEVICE_HELP_HIDDEN_HOST_VOL">\n생성될 “외부 볼륨”의 위치를 선택합니다. 나중에 외부 볼륨 안에 “숨긴 볼륨”이 만들어집니다.\n\n외부 볼륨은 ① 하드 디스크 파티션, ② SSD(Solid State Drive), ③ USB 메모리 스틱 및 ④ 기타 지원되는 저장 장치 안에 만들어질 수 있습니다. 외부 볼륨은 파티션을 포함하고 있지 않은 장치(* 하드 디스크 및 SSD 포함) 내에도 만들어질 수 있습니다.\n\n주의: 파티션/장치가 포맷되고 현재 이곳에 저장된 모든 데이터를 잃게 됩니다.</string>
     <string lang="ko" key="FILE_HELP_HIDDEN_HOST_VOL_DIRECT">\n숨긴 볼륨을 생성할 VeraCrypt 외부 볼륨의 위치를 선택해 주세요.</string>
     <string lang="ko" key="FILE_IN_USE">주의: 호스트 파일/장치가 이미 사용 중입니다!\n\n이것을 무시하면 시스템 불안정 등의 원하지 않는 결과를 초래할 수 있습니다. 호스트 파일/장치를 사용하는 모든 프로그램(예: 안티바이러스 또는 백업 프로그램)을 “볼륨이 삽입하기 전”에 닫아야 합니다.\n\n그래도 계속 하시겠습니까?</string>
     <string lang="ko" key="FILE_IN_USE_FAILED">오류: 볼륨을 삽입할 수 없습니다. 호스트 파일/장치가 이미 사용 중입니다. 접근권한 없는 삽입의 시도는 실패했습니다.</string>
@@ -497,14 +503,14 @@
     <string lang="ko" key="WIPE_FINISHED">파티션/장치의 내용을 성공적으로 지웠습니다.</string>
     <string lang="ko" key="WIPE_FINISHED_DECOY_SYSTEM_PARTITION">원래의 시스템(* 이 시스템의 숨겨진 시스템은 복제된 것임)이 존재했던 파티션의 내용을 성공적으로 지웠습니다.</string>
     <string lang="ko" key="DECOY_OS_VERSION_WARNING">(지워진 파티션에) 설치하려는 윈도우 버전이 현재 실행 중인 윈도우 버전과 동일한 것인가를 확인해 주세요. 이 작업은 두 시스템이 부트 파티션을 공통으로 공유하기 때문에 필요합니다.</string>
-    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' &gt; 'Add Mounted Volume to System Favorites').</string>
+    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' > 'Add Mounted Volume to System Favorites').</string>
     <string lang="ko" key="SYSTEM_DECRYPTION_FINISHED">시스템 파티션/드라이브를 성공적으로 암호해제했습니다.</string>
     <string lang="ko" key="FORMAT_FINISHED_HELP">\n\n볼륨이 성공적으로 만들어졌고, 사용할 준비가 되었습니다. 또 다른 VeraCrypt 볼륨을 만들려면 “다음”을 클릭하세요. 마법사를 끝내려면 “종료”를 클릭하세요.</string>
     <string lang="ko" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\n숨겨진 VeraCrypt 볼륨을 성공적으로 만들었습니다(* 숨겨진 운영체제는 이 숨겨진 볼륨에 존재하게 됩니다).\n\n계속하려면 “다음”을 클릭합니다.</string>
     <string lang="ko" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">볼륨이 완전히 암호화됨</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
+    <string lang="ko" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">볼륨이 완전히 암호해제됨</string>
     <string lang="ko" key="NONSYS_INPLACE_ENC_FINISHED_INFO">중요: 새롭게 만들어진 VeraCrypt 볼륨을 삽입해서 이에 저장된 데이터에 접근하려면, VeraCrypt 메인 창에서 “장치 자동삽입”을 클릭합니다. 올바른 비밀번호 또는 키파일을 입력한 이후 사용자가 VeraCrypt 메인 창에 있는 목록에서 선택한 드라이브 문자에 볼륨이 삽입됩니다(* 선택한 드라이브 문자를 통해 암호화된 데이터에 접근할 수 있게 됩니다).\n\n위에서 언급한 단계를 기억해 두거나 작성해 주십시오. 볼륨을 삽입하거나 그곳에 저장된 데이터에 접근하려 할 때마다 이 단계를 반드시 따라야 합니다. 대체방법은 VeraCrypt 메인 창에서 “장치 선택”을 클릭한 후 해당 파티션/볼륨을 선택해서 “삽입”을 클릭하는 것입니다.\n\n파티션/볼륨이 성공적으로 암호화되었고(* 완전히 암호화된 VeraCrypt 볼륨 포함) 사용할 준비가 되었습니다.</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="ko" key="NONSYS_INPLACE_DEC_FINISHED_INFO">VeraCrypt 볼륨이 성공적으로 암호가 해제되고, 사용할 준비가 되었습니다.</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="ko" key="FORMAT_FINISHED_INFO">볼륨이 성공적으로 만들어졌고, 사용할 준비가 되었습니다.</string>
@@ -524,7 +530,7 @@
     <string lang="ko" key="HIDVOL_HOST_FILLING_HELP_SYSENC">외부 볼륨이 만들어졌고, 드라이브 %hc:에 삽입되었습니다:. 실제로는 숨기고 싶지 않지만 겉으로 보기에 상당히 민감하게 보이는 파일들을 이 외부 볼륨에 지금 복사해야 합니다. 이러한 파일들은 노출을 강요하는 자에게 공개되어도 상관이 없는 “시스템 파티션 뒤의 첫번째 파티션에 대한 비밀번호용”입니다. 시스템 파티션에는 ① 외부 볼륨 및 ② 숨긴 볼륨(→ 숨긴 운영체제 포함)이 자리잡고 있습니다. 이러한 외부 볼륨용 비밀번호는 공개될 수 있지만, 숨긴 볼륨 (및 숨긴 운영체제)의 존재는 여전히 비밀로 남습니다.\n\n중요: 외부 볼륨에 복사한 파일이 %s 이상을 차지해선 안됩니다. 그렇지 않으면 외부 볼륨에 “숨긴 볼륨을 위한 충분한 공간”이 확보되지 않기 때문입니다. 이런 경우 계속 진행할 수 없게 됩니다. 복사 작업을 마친 후 “다음”을 클릭합니다(→ 볼륨을 꺼내지 마세요).</string>
     <string lang="ko" key="HIDVOL_HOST_FILLING_HELP">외부 볼륨이 성공적으로 만들어졌고, 드라이브 %hc:에 삽입되었습니다. 실제로는 숨기고 싶지 않지만 겉으로 보기에 상당히 민감한 파일을 이 볼륨에 지금 복사해야 합니다. 강요에 의해 비밀번호를 노출해야만 하는 경우, 거기에 있는 파일들이 표시됩니다. 외부 볼륨에 대한 비밀번호만 노출될 뿐, 숨긴 볼륨은 안전합니다. 나중에 만들어질 “숨긴 볼륨”에 진짜 소중한 파일을 저장하면 됩니다. 복사 작업이 끝나면 “다음”을 클릭하세요. 볼륨을 꺼내지 마세요.\n\n참고: “다음”을 클릭하면, 여유 공간(이 공간의 끝이 볼륨의 끝과 정렬됨)의 간섭받지 않는 영역의 크기를 결정하기 위해, 외부 볼륨의 클러스터 비트맵을 스캔하게 됩니다. 이 영역은 숨긴 볼륨을 위한 것이기 때문에, 숨긴 볼륨의 가능한 최대 크기를 제한하게 됩니다. 클러스터 비트맵 스캔은 “숨긴 볼륨”이 외부 볼륨을 데이터로 덮어쓰지 못하도록 하는 것입니다.</string>
     <string lang="ko" key="HIDVOL_HOST_FILLING_TITLE">외부 볼륨 내용</string>
-    <string lang="ko" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\n다음 단계에서 외부 볼륨에 대한 옵션을 설정하게 됩니다(→ 외부 볼륨 안에 숨긴 볼륨이 나중에 만들어집니다). </string>
+    <string lang="ko" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\n다음 단계에서 외부 볼륨에 대한 옵션을 설정하게 됩니다(→ 외부 볼륨 안에 숨긴 볼륨이 나중에 만들어집니다).</string>
     <string lang="ko" key="HIDVOL_HOST_PRE_CIPHER_HELP_SYSENC">\n\n다음 단계에서, (이전 단계에서 설명했듯이) 시스템 파티션 뒤의 첫번째 파티션 안에 이른바 “외부 VeraCrypt 볼륨”을 만들게 됩니다.</string>
     <string lang="ko" key="HIDVOL_HOST_PRE_CIPHER_TITLE">외부 볼륨</string>
     <string lang="ko" key="HIDDEN_OS_PRE_CIPHER_HELP">다음 단계에서 (숨긴 운영체제를 포함하고 있는) 숨긴 볼륨에 대한 옵션 및 비밀번호를 설정하게 됩니다.\n\n참고: 여유 공간(→ 이 공간의 끝이 볼륨의 끝과 정렬됨)의 간섭받지 않는 영역의 크기를 결정하기 위해, 외부 볼륨의 클러스터 비트맵을 스캔하게 됩니다. 이 영역은 숨긴 볼륨을 위한 것이기 때문에 “숨긴 볼륨의 가능한 최대 크기”를 제한하게 됩니다. 숨긴 볼륨의 가능한 최대 크기는 시스템 파티션의 것보다 더 크게 정해지게 됩니다. 이는 시스템 파티션의 전체 내용이 숨긴 볼륨에 복사될 필요가 있기 때문입니다. 이를 통해 숨긴 볼륨 영역에 쓰여진 데이터가 “외부 볼륨에 현재 저장되어 있는 데이터”를 덮어쓰지 못하도록 방지합니다.</string>
@@ -534,26 +540,26 @@
     <string lang="ko" key="HIDVOL_PROT_WARN_AFTER_MOUNT">이제 외부 볼륨을 꺼내기 전에는 숨긴 볼륨이 손상으로부터 보호됩니다.\n\n주의: 만약 어떤 데이터를 숨긴 볼륨 영역에 쓰고자 시도한다면, 볼륨이 꺼내지기 전까지 VeraCrypt는 전체 볼륨(외부/숨긴 볼륨)을 쓰기금지로 보호합니다. 이는 외부 볼륨에 대한 파일시스템 손상으로 이어질 수 있습니다. 또한 이것이 반복되면 “숨긴 볼륨의 효과적인 거부방법”에 악영향을 미치게 됩니다. 그러므로 여러분은 숨긴 볼륨 영역에의 쓰기작업을 피하기 위해 노력을 해야만 합니다. 숨긴 볼륨 영역에 저장되어 있는 데이터는 저장되지도 않고 손실되지도 않습니다. 윈도우는 이를 “쓰기 오류”로 보고하게 됩니다(“지연된 쓰기 실패” 또는 “변수가 올바르지 않습니다”).</string>
     <string lang="ko" key="HIDVOL_PROT_WARN_AFTER_MOUNT_PLURAL">이제 새로 삽입된 볼륨의 내부에 위치한 각 숨긴 볼륨은 꺼내지기 전까지는 손상으로부터 보호됩니다.\n\n주의: 만약 어떤 데이터를 보호된 숨긴 볼륨 영역에 쓰고자 시도한다면, 볼륨이 꺼내지기 전까지 VeraCrypt는 전체 볼륨(외부/숨긴 볼륨)을 쓰기금지로 보호합니다. 이는 외부 볼륨에 대한 파일시스템 손상으로 이어질 수 있습니다. 또한 이것이 반복되면 “숨긴 볼륨의 효과적인 거부방법”에 악영향을 미치게 됩니다. 그러므로 여러분은 숨긴 볼륨 영역에의 쓰기작업을 피하기 위해 노력을 해야만 합니다. 보호된 숨긴 볼륨 영역에 저장되어 있는 데이터는 저장되지도 않고 손실되지도 않습니다. 윈도우는 이를 “쓰기 오류”로 보고하게 됩니다(“지연된 쓰기 실패” 또는 “변수가 올바르지 않습니다”).</string>
     <string lang="ko" key="DAMAGE_TO_HIDDEN_VOLUME_PREVENTED">주의: %c:로서 삽입된 볼륨의 숨긴 볼륨 영역에 데이터를 저장되는 작업이 시도되고 있습니다! 숨긴 볼륨을 보호하기 위해 VeraCrypt가 이러한 데이터 저장 작업을 방지했습니다. 이는 외부 볼륨에 대한 파일 시스템 손상을 초래할 수 있고, 윈도우는 이를 “쓰기 오류”로 보고하게 됩니다(“지연된 쓰기 실패” 또는 “변수가 올바르지 않습니다”). 볼륨이 꺼내지기 전까지 VeraCrypt는 전체 볼륨(외부 및 숨긴 볼륨)을 쓰기금지로 보호합니다. 만약 VeraCrypt가 이 볼륨의 숨긴 볼륨 영역에 데이터를 저장하는 작업을 방해한 것이 처음이 아니라면, 숨긴 볼륨의 그럴싸한 거부방법은 악영향을 받았을 수도 있습니다(→ 외부 볼륨 파일 시스템 내에서의 특이하게 관련된 불일치가 원인일 수 있음). 그러므로 새로운 VeraCrypt 볼륨을 (빠른 포맷을 사용하지 않고) 만들고, 이 볼륨의 파일들을 새 볼륨으로 이동시키는 것을 고려해 봐야 합니다. 이 볼륨은 안전하게 (외부 및 숨긴 부분 둘다) 지워져야 합니다. 지금 운영체제를 다시 시작할 것을 적극권장합니다.</string>
-    <string lang="en" key="CANNOT_SATISFY_OVER_4G_FILE_SIZE_REQ">You have indicated intent to store files larger than 4 GB on the volume. This requires the volume to be formatted as NTFS, which, however, will not be possible.</string>
+    <string lang="ko" key="CANNOT_SATISFY_OVER_4G_FILE_SIZE_REQ">볼륨에 4GB 이상의 파일을 저장할려는 위도를 발견햇습니다. 이상의 파일을 저장을 할려면 지정된 볼륨은 NTFS로 포맷이 필요합니다. 하지만 지금은 불가능 합니다.</string>
-    <string lang="en" key="CANNOT_CREATE_NON_HIDDEN_NTFS_VOLUMES_UNDER_HIDDEN_OS">Please note that when a hidden operating system is running, non-hidden VeraCrypt volumes cannot be formatted as NTFS. The reason is that the volume would need to be temporarily mounted without write protection in order to allow the operating system to format it as NTFS (whereas formatting as FAT is performed by VeraCrypt, not by the operating system, and without mounting the volume). For further technical details, see below. You can create a non-hidden NTFS volume from within the decoy operating system.</string>
+    <string lang="ko" key="CANNOT_CREATE_NON_HIDDEN_NTFS_VOLUMES_UNDER_HIDDEN_OS">참고: 숨긴 운영체제가 실행 중인 경우, 숨긴 볼륨이 아는 볼륨은 NTFS로 포맷을 할수 없습니다 (* 왜냐하면 외부 볼륨은 일시적으로 쓰기 보호 없이 삽입이 되서 운영체제가 볼륨을 NTFS로 포맷이 가능할수있기 때문입니다 - 하지만 FAT은 운영체제가 아닌 VeraCrypt로 포멧이 가능합니다). 더 기술적인 자세한 내용은 아래를 참조하십시오.</string>
     <string lang="ko" key="HIDDEN_VOL_CREATION_UNDER_HIDDEN_OS_HOWTO">보안상의 이유로 숨긴 운영체제가 실행 중인 경우, 숨긴 볼륨은 “직접” 모드에서만 만들어질 수 있습니다(* 왜냐하면 외부 볼륨은 항상 읽기-전용으로만 삽입되기 때문입니다). 숨긴 볼륨을 안전하게 만드려면, 다음 지침을 따릅니다:\n\n1) 미끼용 시스템을 부팅합니다.\n\n2) 표준 VeraCrypt 볼륨을 만들고 이 볼륨 안에 민감한 파일처럼 보이지만 실제로는 숨기고 싶지 않은 일부 파일들을 복사합니다. 이 볼륨은 외부 볼륨이 됩니다.\n\n3) 숨긴 시스템을 부팅한 후 “VeraCrypt 볼륨 만들기 마법사”를 시작합니다. 파일-기반의 볼륨인 경우, 이 볼륨을 시스템 파티션 또는 다른 숨겨진 볼륨으로 이동시킵니다. 그렇지 않으면 새롭게 생성된 숨긴 볼륨이 읽기-전용으로 삽입되거나 이를 포맷할 수 없게 됩니다. 마법사의 지침에서 숨긴 볼륨 만들기 “직접 방식”을 선택합니다.\n\n4) 마법사의 2단계에서 여러분이 만든 볼륨을 선택한 다음 이 안에 “숨긴 볼륨”을 만들도록 지침을 따릅니다.</string>
     <string lang="ko" key="HIDDEN_OS_WRITE_PROTECTION_BRIEF_INFO">보안상의 이유로, 숨긴 운영체제가 실행 중일 때, ① 암호화되지 않은 로컬 파일 시스템 및 ② 숨긴 볼륨이 아닌 VeraCrypt 볼륨은 읽기-전용으로 삽입됩니다. 어떠한 데이터도 그러한 파일 시스템 또는 VeraCrypt 볼륨에 쓰여질 수 없습니다.\n\n데이터는 숨긴 VeraCrypt 볼륨 내에 있는 파일 시스템에 쓰여지도록 되어 있습니다(* 숨긴 볼륨이 암호화되지 않은 파일시스템 또는 다른 읽기-전용 파일시스템에 저장되어 있는 보관소에 위치하지 않은 경우에 한함).</string>
     <string lang="ko" key="HIDDEN_OS_WRITE_PROTECTION_EXPLANATION">이러한 대응책이 만들어진 주요한 3가지 이유가 있습니다:\n\n- 숨긴 VeraCrypt 볼륨의 삽입에 대한 안전한 플랫폼의 생성을 가능하게 합니다. 우리는 공식적으로 숨긴 운영 시스템이 실행 중일 때만 “숨긴 볼륨을 삽입할 것”을 권장하고 있습니다. (더 자세한 정보는 문서의 “Security Requirements and Precautions Pertaining to Hidden Volumes” 부분을 참고하세요.\n\n- 가끔 ① 특정 파일 시스템이 특정 운영 시스템에서는 삽입되지 않거나 ② 파일 시스템의 특정 파일이 특정 시스템에서 저장되지 않거나 접근할 수 없는 경우를 발견할 수 있습니다. 이는 컴퓨터에 “숨긴 운영체제”가 설치되어 있다는 것을 나타냅니다. 대응책은 이러한 문제점을 방지합니다.\n\n- 이를 통해 데이터 손상을 방지하고 최대 절전 모드로 안전하게 진입할 수 있게 합니다. 최대 절전 모드에서 윈도우가 다시 시작될 때, 윈도우는 (삽입된 모든 파일 시스템들이) 최대 절전 모드에 들어갈 때의 상태와 동일한 상태에 있다고 가정을 합니다. VeraCrypt는 미끼용 및 숨겨진 시스템 내에 접근가능한 파일 시스템의 쓰기를 금지합니다. 이러한 보호책이 없는 경우, 다른 시스템이 최대 절전 모드 상태로 진입하는 동안 또다른 시스템이 삽입(mount)될 때 파일 시스템이 손상될 수 있습니다.</string>
     <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="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="ko" key="ERR_PASSWORD_MISSING">오류: 명령 프롬프트에 지정된 암호가 없습니다. 볼륨을 만들 수 없습니다.</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="ko" key="ERR_SIZE_MISSING">오류: 명령 프롬프트에 지정된 볼륨이 없습니다. 볼륨을 만들 수 없습니다.</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="ko" key="ERR_NTFS_INVALID_VOLUME_SIZE">오류: 명령 프롬프트에 지정된 볼륨 사이즈는 선택된 NTFS 파일 시스템과 호환이 되지 않습니다.</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="ko" key="ERR_FAT_INVALID_VOLUME_SIZE">오류: 명령 프롬프트에 지정된 볼륨 사이즈는 선택된 FAT32 파일 시스템과 호환이 되지 않습니다.</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="ko" key="ERR_DYNAMIC_NOT_SUPPORTED">오류: 대상 드라이브의 파일 시스템은 변경(dynamic)되는 볼륨에 필요한 파일의 제작을 호환이 되지 않습니다.</string>
-    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="ko" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">오류: 명령 프롬프트로 컨테이너 파일들만 만들어 질수 있습니다.</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="ko" key="ERR_CONTAINER_SIZE_TOO_BIG">오류: 명령 프롬프트에 지정된 볼륨 사이즈는 디스크에서 사용 가능한 크기보다 큽니다. 볼륨을 만들 수 없습니다.</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="ko" key="ERR_VOLUME_SIZE_TOO_SMALL">오류: 명령 프롬프트에 지정된 볼륨 사이즈는 최소갚 보다 적습니다. 볼륨을 만들 수 없습니다.</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="ERR_VOLUME_SIZE_TOO_BIG">오류: 명령 프롬프트에 지정된 볼륨 사이즈는 최고갚 보다 큽니다. 볼륨을 만들 수 없습니다.</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>
+    <string lang="ko" key="CAPI_RAND">윈도우의 암호화 API가 실패했습니다!\n\n\n(만약 버그보고를 보낼경우 다음과 같은 내용을 포함하십시오:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="ko" key="INIT_REGISTER">프로그램을 초기화할 수 없습니다. 다이얼로그 클래스 등록에 실패했습니다.</string>
     <string lang="ko" key="INIT_RICHEDIT">오류: Rich Edit 시스템 라이브러리를 로드하는데 실패했습니다.</string>
     <string lang="ko" key="INTRO_TITLE">VeraCrypt 볼륨 만들기 마법사</string>
@@ -561,12 +567,13 @@
     <string lang="ko" key="MAX_HIDVOL_SIZE_KB">이 볼륨에 대한 숨긴 볼륨의 가능한 최대 크기 ▷ %.2f KB</string>
     <string lang="ko" key="MAX_HIDVOL_SIZE_MB">이 볼륨에 대한 숨긴 볼륨의 가능한 최대 크기 ▷ %.2f MB</string>
     <string lang="ko" key="MAX_HIDVOL_SIZE_GB">이 볼륨에 대한 숨긴 볼륨의 가능한 최대 크기 ▷ %.2f GB</string>
+    <string lang="ko" key="MAX_HIDVOL_SIZE_TB">이 볼륨에 대한 숨긴 볼륨의 가능한 최대 크기 ▷ %.2f TB</string>
     <string lang="ko" key="MOUNTED_NOPWCHANGE">볼륨이 삽입된 상태에서 “비밀번호/키파일”을 변경할 수 없습니다. 먼저 볼륨을 꺼내야 합니다.</string>
     <string lang="ko" key="MOUNTED_NO_PKCS5_PRF_CHANGE">볼륨이 삽입된 상태에서 “헤더 키 도출 알고리듬”을 변경할 수 없습니다. 먼저 볼륨을 꺼내야 합니다.</string>
     <string lang="ko" key="MOUNT_BUTTON">삽입(&amp;M)</string>
     <string lang="ko" key="NEW_VERSION_REQUIRED">이 볼륨을 삽입하려면 최신 버전의 VeraCrypt가 필요합니다.</string>
     <string lang="ko" key="VOL_CREATION_WIZARD_NOT_FOUND">오류: 볼륨 만들기 마법사를 찾을 수 없습니다.\n\n“VeraCrypt.exe”가 실행된 폴더에서 “VeraCrypt Format.exe” 파일을 찾아보시기 바랍니다. 만약 없으면 VeraCrypt를 다시 설치하거나, 디스크에서 “VeraCrypt Format.exe” 파일의 위치를 지정한 실행하세요.</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>
+    <string lang="ko" key="VOL_EXPANDER_NOT_FOUND">오류: 볼륨확장기을 찾을수 없습니다.\n\n'VeraCryptExpander.exe'가 'VeraCrypt.exe'을 실행한 폴더에 있는지 확인하시길 바랍니다. 그렇지 않을 경우 VeraCrypt를 다시 설치하거나 'VeraCryptExpander.exe'를 찾아 폴더에 포함하세요.</string>
     <string lang="ko" key="NEXT">다음(&amp;N) &gt;</string>
     <string lang="ko" key="FINALIZE">마침(&amp;F)</string>
     <string lang="ko" key="INSTALL">설치(&amp;I)</string>
@@ -574,7 +581,7 @@
     <string lang="ko" key="NODRIVER">VeraCrypt 장치 드라이버에 연결할 수 없습니다. 장치 드라이버가 실행 중이 아니라면 VeraCrypt가 작동하지 않습니다.\n\n(윈도우의 문제로 인해) 장치 드라이버를 로드하기 전에 시스템을 로그오프하거나 다시 시작해야 합니다.</string>
     <string lang="ko" key="NOFONT">글꼴을 로딩/준비할 때 오류가 발생했습니다.</string>
     <string lang="ko" key="NOT_FOUND">드라이브 문자를 찾을 수 없거나 지정한 드라이브 문자가 없습니다.</string>
-    <string lang="en" key="ERR_CANNOT_ASSIGN_DRIVE_LETTER_NONSYS_DEC">Error: Cannot assign drive letter.\n\nUntil a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.\n\nRetry?</string>
+    <string lang="ko" key="ERR_CANNOT_ASSIGN_DRIVE_LETTER_NONSYS_DEC">오류: 드라이브 문자를 지정할수 없습니다.\n\n볼륨의 드라이브 문자가 지정될때까지 저장된 데이터를 액세스 할수 없습니다.\n\n시도를 다시 하겟습니까?</string>
     <string lang="ko" key="DRIVE_LETTER_UNAVAILABLE">드라이브 문자를 사용할 수 없습니다.</string>
     <string lang="ko" key="NO_FILE_SELECTED">선택한 파일이 없습니다!</string>
     <string lang="ko" key="NO_FREE_DRIVES">이용가능한 드라이브 문자가 없습니다.</string>
@@ -591,12 +598,12 @@
     <string lang="ko" key="SELECT_PKCS11_MODULE">PKCS #11 라이브러리 선택</string>
     <string lang="ko" key="OUTOFMEMORY">메모리 부족</string>
     <string lang="ko" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">중요: 경험이 없는 사용자는 모든 장치/파티션을 암호화하는 대신에 선택한 장치/파티션에 “VeraCrypt 파일 보관소”를 만들 것을 권장합니다.\n\nVeraCrypt 파일 보관소를 만들게 되면 수많은 파일을 파괴할지도 모르는 위험을 피할 수 있습니다. VeraCrypt 파일 보관소는 (비록 가상의 암호화된 디스크를 포함할지라도) 실제로 보통 파일과 같습니다. 추가 정보를 보려면, VeraCrypt 사용자 안내서에서 Beginner´s Tutorial을 읽어보세요.\n\n정말로 모든 장치/파티션을 암호화하시겠습니까?</string>
-    <string lang="ko" key="OVERWRITEPROMPT">주의: “%hs” 파일이 이미 존재합니다! 중요: VeraCrypt는 파일을 암호화하지 않고, 삭제합니다. 파일을 삭제하고, 그 파일을 새로운 VeraCrypt 보관소로 교체하시겠습니까?</string>
+    <string lang="ko" key="OVERWRITEPROMPT">주의: “%s” 파일이 이미 존재합니다! 중요: VeraCrypt는 파일을 암호화하지 않고, 삭제합니다. 파일을 삭제하고, 그 파일을 새로운 VeraCrypt 보관소로 교체하시겠습니까?</string>
-    <string lang="ko" key="OVERWRITEPROMPT_DEVICE">주의: 선택한 %s “%hs”%s에 현재 저장되어 있는 모든 파일이 삭제되고 사라지게 됩니다(이 파일들은 암호화되지 않습니다)!\n\n정말로 포맷을 계속 진행하시겠습니까?</string>
+    <string lang="ko" key="OVERWRITEPROMPT_DEVICE">주의: 선택한 %s “%s”%s에 현재 저장되어 있는 모든 파일이 삭제되고 사라지게 됩니다(이 파일들은 암호화되지 않습니다)!\n\n정말로 포맷을 계속 진행하시겠습니까?</string>
-    <string lang="ko" key="NONSYS_INPLACE_ENC_CONFIRM">주의: 볼륨이 완전히 암호화되기 전에는 이 볼륨을 삽입하거나 볼륨에 저장된 파일에 접근할 수 없습니다.\n\n선택한 %s “%hs”%s의 암호화 작업을 시작하시겠습니까?</string>
+    <string lang="ko" key="NONSYS_INPLACE_ENC_CONFIRM">주의: 볼륨이 완전히 암호화되기 전에는 이 볼륨을 삽입하거나 볼륨에 저장된 파일에 접근할 수 없습니다.\n\n선택한 %s “%s”%s의 암호화 작업을 시작하시겠습니까?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="ko" key="NONSYS_INPLACE_DEC_CONFIRM">주의: 볼륨이 완전히 암호화해독되기 전에는 이 볼륨을 삽입하거나 볼륨에 저장된 파일에 접근할 수 없습니다.\n\n선택한 %s “%s”%s의 암호화 작업을 시작하시겠습니까?</string>
     <string lang="ko" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">주의: 기존의 자체 데이터를 암호화하는 동안 ① 전력 공급이 갑자기 중단되거나 ② 소프트웨어 또는 하드웨어의 문제때문에 운영체제가 충돌을 일으키면, 일부 데이터가 손상되거나 유실될 수 있습니다. 그러므로 암호화 작업을 시작하기 전에 암호화하고자 하는 파일의 복사본을 백업해 두었는지 확인해야 합니다.\n\n파일의 백업이 있습니까?</string>
-    <string lang="ko" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">주의: “%hs”%s 파티션(→ 예: 시스템 파티션 뒤에 있는 첫번째 파티션)에 현재 저장되어 있는 모든 파일이 삭제되고 사라지게 됩니다(이 파일들은 암호화되지 않습니다)!\n\n정말로 포맷을 계속 진행하시겠습니까?</string>
+    <string lang="ko" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">주의: “%s”%s 파티션(→ 예: 시스템 파티션 뒤에 있는 첫번째 파티션)에 현재 저장되어 있는 모든 파일이 삭제되고 사라지게 됩니다(이 파일들은 암호화되지 않습니다)!\n\n정말로 포맷을 계속 진행하시겠습니까?</string>
     <string lang="ko" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">주의: 선택한 파티션에 큰 규모의 데이터가 포함되어 있습니다! 파티션에 저장되어 있는 파일들은 지워지고 손실됩니다(* 이들은 암호화되지 않습니다)!</string>
     <string lang="ko" key="ERASE_FILES_BY_CREATING_VOLUME">VeraCrypt 볼륨을 파티션 내에 만들면서 이 파티션에 저장되어 있는 파일들은 지워집니다.</string>
     <string lang="ko" key="PASSWORD">비밀번호</string>
@@ -645,7 +652,7 @@
     <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
     <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
     <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 &gt; Organize &gt; 'Folder and search options' &gt; View).</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="ko" key="HIDDEN_VOL_PROT_PASSWORD_US_KEYB_LAYOUT">숨긴 시스템을 포함하고 있는 숨긴 볼륨을 보호하려는 경우, 숨긴 볼륨에 대한 비밀번호를 입력할 때 “표준 US 키보드 레이아웃”을 사용하고 있는지 확인해 주십시오. (윈도우 시작 전에) US가 아닌 윈도우 키보드 레이아웃을 사용할 수 없는 부팅 전 환경에서 비밀번호를 입력할 필요가 있기 때문입니다.</string>
     <string lang="ko" key="FOUND_NO_PARTITION_W_DEFERRED_INPLACE_ENC">① 암호화 과정이 중단된 곳에서의 비-시스템 볼륨 및 ② 제공된 비밀번호/키파일을 사용해서 VeraCrypt 볼륨 헤더의 암호를 해제할 수 있는 곳에서의 비-시스템 볼륨을 찾지 못했습니다.\n\n비밀번호/키파일이 올바른지 확인해 주시고, 파티션/볼륨이 시스템 또는 프로그램(* 안티바이러스 소프트웨어 포함)에 의해 사용되고 있는지를 확인해 주십시오.</string>
     <string lang="en" key="SELECTED_PARTITION_ALREADY_INPLACE_ENC">The selected partition/device is already fully encrypted.\nHeader Flags = 0x%.8X</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="ko" key="PREV">&lt; 뒤로(&amp;B)</string>
     <string lang="ko" key="RAWDEVICES">시스템에 설치된 RAW 장치를 나열할 수 없습니다!</string>
-    <string lang="ko" key="READONLYPROMPT">“%hs” 볼륨이 존재하고, 읽기전용 상태입니다. 그래도 교체하시겠습니까?</string>
+    <string lang="ko" key="READONLYPROMPT">“%s” 볼륨이 존재하고, 읽기전용 상태입니다. 그래도 교체하시겠습니까?</string>
     <string lang="ko" key="SELECT_DEST_DIR">대상 디렉토리 선택</string>
     <string lang="ko" key="SELECT_KEYFILE">키파일 선택</string>
     <string lang="ko" key="SELECT_KEYFILE_PATH">키파일 찾기 경로를 선택하세요. 주의: 경로만 기억되고, 파일 이름은 기억되지 않습니다!</string>
@@ -680,13 +687,13 @@
     <string lang="ko" key="TEST_CIPHERTEXT_SIZE">제공한 테스트 암호가 너무 길거나 짧습니다.</string>
     <string lang="ko" key="TEST_KEY_SIZE">제공한 테스트 키가 너무 길거나 짧습니다.</string>
     <string lang="ko" key="TEST_PLAINTEXT_SIZE">제공한 “테스트 단순텍스트”가 너무 길거나 짧습니다.</string>
-    <string lang="ko" key="TWO_LAYER_CASCADE_HELP">2개의 암호가 층계적으로 XTS 모드에서 작동. 각 블록은 처음에 %hs (%d-비트 키)로 암호화되고, 이어서 %hs (%d-비트 키)로 암호화됩니다. 각 암호는 각각의 키를 사용합니다. 모든 키는 상호 독립적입니다.</string>
+    <string lang="ko" key="TWO_LAYER_CASCADE_HELP">2개의 암호가 층계적으로 XTS 모드에서 작동. 각 블록은 처음에 %s (%d-비트 키)로 암호화되고, 이어서 %s (%d-비트 키)로 암호화됩니다. 각 암호는 각각의 키를 사용합니다. 모든 키는 상호 독립적입니다.</string>
-    <string lang="ko" key="THREE_LAYER_CASCADE_HELP">3개의 암호가 층계적으로 XTS 모드에서 작동. 각 블록은 처음에 %hs (%d-비트 키)로 암호화되고, 이어서 %hs (%d-비트 키)로 암호화됩니다. 마지막으로 %hs (%d-비트 키)로 암호화됩니다. 각 암호는 각각의 키를 사용합니다. 모든 키는 상호 독립적입니다.</string>
+    <string lang="ko" key="THREE_LAYER_CASCADE_HELP">3개의 암호가 층계적으로 XTS 모드에서 작동. 각 블록은 처음에 %s (%d-비트 키)로 암호화되고, 이어서 %s (%d-비트 키)로 암호화됩니다. 마지막으로 %s (%d-비트 키)로 암호화됩니다. 각 암호는 각각의 키를 사용합니다. 모든 키는 상호 독립적입니다.</string>
     <string lang="ko" key="AUTORUN_MAY_NOT_ALWAYS_WORK">운영체제의 설정에 의존하는 이러한 자동-실행 및 자동-삽입 기능은 “휴대용 디스크 파일”이 작성이 불가능한 CD/DVD 같은 매체에 생성될 경우에만 작동된다는 것을 참고해 주십시오. 이는 윈도우의 제한사항이지, VeraCrypt의 버그가 아닙니다.</string>
     <string lang="ko" key="TRAVELER_DISK_CREATED">VeraCrypt 휴대용 디스크가 성공적으로 만들어졌습니다.\n\n휴대용 모드에서 VeraCrypt를 실행하려면 관리자(administrator) 권한이 필요합니다. 레지스트리 파일을 검사한 후에, 비록 휴대용 모드로 실행될지라도 VeraCrypt가 윈도우 시스템에서 실행된 것으로 간주될 수도 있다는 것을 참고하세요.</string>
     <string lang="ko" key="TC_TRAVELER_DISK">VeraCrypt 휴대용 디스크</string>
     <string lang="ko" key="TWOFISH_HELP">Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall, 및 Niels Ferguson에 의해 디자인됨. 1998년 발표됨. 256-비트 키, 128-비트 블록. 작업 모드는 XTS입니다. Twofish는 AES 결선작 중의 하나였습니다.</string>
-    <string lang="ko" key="MORE_INFO_ABOUT">%hs에 대한 추가 정보</string>
+    <string lang="ko" key="MORE_INFO_ABOUT">%s에 대한 추가 정보</string>
     <string lang="ko" key="UNKNOWN">알 수 없음</string>
     <string lang="en" key="ERR_UNKNOWN">An unspecified or unknown error occurred (%d).</string>
     <string lang="ko" key="UNMOUNTALL_LOCK_FAILED">일부 볼륨은 “프로그램 또는 시스템에 의해 사용되는” 파일 또는 폴더를 포함하고 있습니다.\n\n강제로 꺼내시겠습니까?</string>
@@ -706,7 +713,7 @@
     <string lang="ko" key="WRONG_VOL_TYPE">외계 볼륨에 대해 비밀번호를 변경할 수 없습니다.</string>
     <string lang="ko" key="SELECT_FREE_DRIVE">비어 있는 드라이브 문자를 목록에서 선택해 주세요.</string>
     <string lang="ko" key="SELECT_A_MOUNTED_VOLUME">드라이브 문자 목록에서 삽입된 볼륨을 선택해 주세요.</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="ko" key="CANT_CREATE_AUTORUN">오류: autorun.inf를 만들 수 없습니다.</string>
     <string lang="ko" key="ERR_PROCESS_KEYFILE">키파일을 처리하는 동안 오류가 발생했습니다!</string>
     <string lang="ko" key="ERR_PROCESS_KEYFILE_PATH">키파일 경로를 처리하는 동안 오류가 발생했습니다!</string>
@@ -736,7 +743,7 @@
     <string lang="ko" key="VOLUME">볼륨</string>
     <string lang="ko" key="VOLUME_LOWER_CASE">볼륨</string>
     <string lang="ko" key="VOLUME_UPPER_CASE">볼륨</string>
-    <string lang="en" key="LABEL">Label</string>
+    <string lang="ko" key="LABEL">레이블</string>
     <string lang="ko" key="CLUSTER_TOO_SMALL">선택한 클러스터 크기는 이 볼륨 크기에 비해 너무 작습니다. 대신 더 큰 클러스터 크기가 사용될 것입니다.</string>
     <string lang="ko" key="CANT_GET_VOLSIZE">오류: 볼륨 크기를 가져올 수 없습니다!\n\n선택한 볼륨이 시스템이나 프로그램에 의해 사용 중인지 확인해 주세요.</string>
     <string lang="en" key="HIDDEN_VOL_HOST_SPARSE">Hidden volumes must not be created within dynamic (sparse file) containers. To achieve plausible deniability, the hidden volume needs to be created within a non-dynamic container.</string>
@@ -830,18 +837,18 @@
     <string lang="ko" key="SETUP_OPTIONS_INFO">여기에서 설치 과정을 제어할 수 있는 다양한 옵션을 설정할 수 있습니다.</string>
     <string lang="ko" key="SETUP_PROGRESS_TITLE">설치 중</string>
     <string lang="ko" key="SETUP_PROGRESS_INFO">VeraCrypt가 설치되는 동안 잠시 기다려 주세요.</string>
-    <string lang="en" key="SETUP_FINISHED_TITLE_DON">VeraCrypt has been successfully installed</string>
+    <string lang="ko" key="SETUP_FINISHED_TITLE_DON">VeraCrypt가 성공적으로 설치 되었습니다</string>
-    <string lang="en" key="SETUP_FINISHED_UPGRADE_TITLE_DON">VeraCrypt has been successfully upgraded</string>
+    <string lang="ko" key="SETUP_FINISHED_UPGRADE_TITLE_DON">VeraCrypt가 성공적으로 업그레이드 되었습니다</string>
-    <string lang="en" key="SETUP_FINISHED_INFO_DON">Please consider making a donation. You can click Finish anytime to close the installer.</string>
+    <string lang="ko" key="SETUP_FINISHED_INFO_DON">기부금을 고려하시기 바랍니다. 설치가 완료됬으니 프로그램을 언제든지 닫을수 있습니다.</string>
     <string lang="ko" key="EXTRACTION_OPTIONS_TITLE">추출 옵션</string>
     <string lang="ko" key="EXTRACTION_OPTIONS_INFO">여기에서 추출 과정을 제어할 수 있는 다양한 옵션을 설정할 수 있습니다.</string>
     <string lang="ko" key="EXTRACTION_PROGRESS_INFO">파일이 추출되는 동안 잠시 기다려 주세요.</string>
-    <string lang="en" key="EXTRACTION_FINISHED_TITLE_DON">Files successfully extracted</string>
+    <string lang="ko" key="EXTRACTION_FINISHED_TITLE_DON">파일이 성공적으로 추출되었습니다.</string>
     <string lang="ko" key="EXTRACTION_FINISHED_INFO">타겟 위치에 모든 파일이 성공적으로 추출되었습니다.</string>
     <string lang="ko" key="AUTO_FOLDER_CREATION">지정한 폴더가 존재하지 않는 경우, 자동으로 폴더가 생성됩니다.</string>
     <string lang="ko" key="SETUP_UPGRADE_DESTINATION">VeraCrypt가 설치된 위치에서 VeraCrypt 프로그램 파일들이 업그레이드됩니다. 다른 위치를 선택할 필요가 있는 경우, 먼저 VeraCrypt를 제거해 주십시오.</string>
     <string lang="ko" key="AFTER_UPGRADE_RELEASE_NOTES">VeraCrypt 최신 버전의 배포 정보를 보시겠습니까?</string>
-    <string lang="ko" key="AFTER_INSTALL_TUTORIAL">이전에 VeraCrypt를 사용해 본 적이 없는 경우, VeraCrypt 사용자 안내서에서 Beginner’s Tutorial을 읽어볼 것을 권장합니다. 지금 읽어 보시겠습니까? </string>
+    <string lang="ko" key="AFTER_INSTALL_TUTORIAL">이전에 VeraCrypt를 사용해 본 적이 없는 경우, VeraCrypt 사용자 안내서에서 Beginner’s Tutorial을 읽어볼 것을 권장합니다. 지금 읽어 보시겠습니까?</string>
     <string lang="ko" key="SELECT_AN_ACTION">아래에서 실행한 동작을 선택해 주세요:</string>
     <string lang="ko" key="REPAIR_REINSTALL">수리/재설치</string>
     <string lang="ko" key="UPGRADE">업그레이드</string>
@@ -851,7 +858,7 @@
     <string lang="ko" key="INSTALL_FAILED">설치 실패.</string>
     <string lang="ko" key="UNINSTALL_FAILED">제거 실패.</string>
     <string lang="ko" key="DIST_PACKAGE_CORRUPTED">배포 패키지가 손상되었습니다. 다시 다운로드해 보시기 바랍니다(VeraCrypt 공식 웹사이트 - https://veracrypt.codeplex.com).</string>
-    <string lang="ko" key="CANNOT_WRITE_FILE_X">%hs 파일을 쓸 수 없습니다.</string>
+    <string lang="ko" key="CANNOT_WRITE_FILE_X">%s 파일을 쓸 수 없습니다.</string>
     <string lang="ko" key="EXTRACTING_VERB">추출 중</string>
     <string lang="ko" key="CANNOT_READ_FROM_PACKAGE">패키지에서 데이터를 읽을 수 없습니다.</string>
     <string lang="ko" key="CANT_VERIFY_PACKAGE_INTEGRITY">현재 배포 패키지의 완전성(무결성)을 검증할 수 없습니다.</string>
@@ -860,8 +867,8 @@
     <string lang="ko" key="INSTALL_OK">VeraCrypt를 성공적으로 설치했습니다.</string>
     <string lang="ko" key="SETUP_UPDATE_OK">VeraCrypt를 성공적으로 업데이트했습니다.</string>
     <string lang="en" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt has been successfully upgraded. However, before you can start using it, the computer must be restarted.\n\nDo you want to restart it now?</string>
-    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
+    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu > All programs > Accessories > System Tools > System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
-    <string lang="ko" key="UNINSTALL_OK">VeraCrypt를 성공적으로 제거했습니다.\n\nVeraCrypt 설치기와 %hs 폴더를 제거하려면 “마침”을 클릭하세요. VeraCrypt 설치기에 의해 설치되거나 VeraCrypt에 의해 생성된 것이 아닌 파일을 포함하고 있는 폴더는 제거되지 않는다는 것을 참고하세요.</string>
+    <string lang="ko" key="UNINSTALL_OK">VeraCrypt를 성공적으로 제거했습니다.\n\nVeraCrypt 설치기와 %s 폴더를 제거하려면 “마침”을 클릭하세요. VeraCrypt 설치기에 의해 설치되거나 VeraCrypt에 의해 생성된 것이 아닌 파일을 포함하고 있는 폴더는 제거되지 않는다는 것을 참고하세요.</string>
     <string lang="ko" key="REMOVING_REG">VeraCrypt 레지스트리 항목을 제거하는 중</string>
     <string lang="ko" key="ADDING_REG">레지스트리 항목 추가 중</string>
     <string lang="ko" key="REMOVING_APPDATA">지정된 프로그램 데이터 제거 중</string>
@@ -872,10 +879,10 @@
     <string lang="ko" key="CREATING_SYS_RESTORE">시스템 복구 시점 만들기</string>
     <string lang="ko" key="FAILED_SYS_RESTORE">시스템 복원 시점을 만들 수 없습니다!</string>
     <string lang="ko" key="INSTALLER_UPDATING_BOOT_LOADER">부트 로더를 업데이트하는 중</string>
-    <string lang="ko" key="INSTALL_OF_FAILED">“%hs”을(를) 설치하는 데 실패했습니다. %hs 설치를 계속하시겠습니까?</string>
+    <string lang="ko" key="INSTALL_OF_FAILED">“%s”을(를) 설치하는 데 실패했습니다. %s 설치를 계속하시겠습니까?</string>
-    <string lang="ko" key="UNINSTALL_OF_FAILED">“%hs”을(를) 제거하는 데 실패했습니다. %hs 제거 작업을 계속하시겠습니까?</string>
+    <string lang="ko" key="UNINSTALL_OF_FAILED">“%s”을(를) 제거하는 데 실패했습니다. %s 제거 작업을 계속하시겠습니까?</string>
     <string lang="ko" key="INSTALL_COMPLETED">설치를 마쳤습니다.</string>
-    <string lang="ko" key="CANT_CREATE_FOLDER">“%hs” 폴더를 만들 수 없습니다.</string>
+    <string lang="ko" key="CANT_CREATE_FOLDER">“%s” 폴더를 만들 수 없습니다.</string>
     <string lang="ko" key="CLOSE_TC_FIRST">VeraCrypt 장치 드라이버를 언로드할 수 없습니다.\n\n먼저 열려 있는 VeraCrypt 창을 모두 닫아 주세요. 창을 닫아도 도움이 되지 않으면, 윈도우를 다시 시작해 보세요.</string>
     <string lang="ko" key="DISMOUNT_ALL_FIRST">설치 또는 제거를 계속하려면 모든 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>
@@ -917,34 +924,34 @@
     <string lang="ko" key="PROGRESS_STATUS_PAUSED">정지됨</string>
     <string lang="ko" key="PROGRESS_STATUS_FINISHED">완료됨</string>
     <string lang="ko" key="PROGRESS_STATUS_ERROR">오류</string>
-    <string lang="en" key="FAVORITE_DISCONNECTED_DEV">Device disconnected</string>
+    <string lang="ko" key="FAVORITE_DISCONNECTED_DEV">장치 연결끊김</string>
     <string lang="ko" key="SYS_FAVORITE_VOLUMES_SAVED">시스템 즐겨찾기 볼륨이 저장되었습니다.\n\n시스템이 시작될 때 “시스템 즐겨찾기 볼륨”이 삽입되게 하려면, “설정” &gt; “시스템 즐겨찾기 볼륨” &gt; “윈도우 시작시 시스템 볼륨 삽입”을 선택해 주십시오.</string>
     <string lang="en" key="FAVORITE_ADD_DRIVE_DEV_WARNING">The volume you are adding to favorites is neither a partition nor a dynamic volume. Therefore, VeraCrypt will be unable to mount this favorite volume if the device number changes.</string>
     <string lang="en" key="FAVORITE_ADD_PARTITION_TYPE_WARNING">The volume you are adding to favorites is a partition not recognized by Windows.\n\nVeraCrypt will be unable to mount this favorite volume if the device number changes. Please set the type of the partition to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then add the partition to favorites again.</string>
-    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings &gt; Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
+    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings > Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_NETWORK_PATH_ERR">A container stored in a remote filesystem shared over a network cannot be automatically mounted when its host device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, the volume hosted on the device cannot be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable the volume hosted on the device to be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_LABEL_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, no label can be assigned to it.</string>
     <string lang="en" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable VeraCrypt to assign a label to the partition.</string>
     <string lang="en" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Due to a Windows limitation, a container stored in a remote filesystem shared over a network cannot be mounted as a system favorite volume (however, it can be mounted as a non-system favorite volume when a user logs on).</string>
-    <string lang="ko" key="ENTER_PASSWORD_FOR">비밀번호 입력▷ %hs</string>
+    <string lang="ko" key="ENTER_PASSWORD_FOR">비밀번호 입력▷ %s</string>
-    <string lang="en" key="ENTER_PASSWORD_FOR_LABEL">Enter password for '%s'</string>
+    <string lang="ko" key="ENTER_PASSWORD_FOR_LABEL">'%s'의 비밀번호 입력</string>
     <string lang="ko" key="ENTER_NORMAL_VOL_PASSWORD">표준/외부 볼륨을 위한 비밀번호 입력</string>
     <string lang="ko" key="ENTER_HIDDEN_VOL_PASSWORD">숨긴 볼륨을 위한 비밀번호 입력</string>
     <string lang="ko" key="ENTER_HEADER_BACKUP_PASSWORD">백업 파일에 저장된 헤더를 위한 비밀번호 입력</string>
     <string lang="ko" key="KEYFILE_CREATED">키파일이 성공적으로 만들어졌습니다.</string>
-    <string lang="en" key="KEYFILE_INCORRECT_NUMBER">The number of keyfiles you supplied is invalid.</string>
+    <string lang="ko" key="KEYFILE_INCORRECT_NUMBER">제공된 키파일의 개수가 잘못되었습니다.</string>
-    <string lang="en" key="KEYFILE_INCORRECT_SIZE">The keyfile size must be comprized between 64 and 1048576 bytes.</string>
+    <string lang="ko" key="KEYFILE_INCORRECT_SIZE">키파일의 크기는 64 &lt;-&gt; 1048576 바이트만 입력이 됩니다.</string>
-    <string lang="en" key="KEYFILE_EMPTY_BASE_NAME">Please enter a name for the keyfile(s) to be generated</string>
+    <string lang="ko" key="KEYFILE_EMPTY_BASE_NAME">생성되는 키파일(들)의 이름을 입력 해주세요.</string>
-    <string lang="en" key="KEYFILE_INVALID_BASE_NAME">The base name of the keyfile(s) is invalid</string>
+    <string lang="ko" key="KEYFILE_INVALID_BASE_NAME">키파일(들)의 기본 이름이 잘못되었습니다</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="ko" key="KEYFILE_ALREADY_EXISTS">키파일 '%s'가 이미 존재합니다.\n덮어 쓰시겠습니까? 'No'일경우 생성 과정은 중지됩니다</string>
     <string lang="ko" key="HEADER_DAMAGED_AUTO_USED_HEADER_BAK">주의: 이 볼륨의 헤더가 손상되었습니다! VeraCrypt는 볼륨에 포함된 볼륨 헤더의 백업을 자동으로 사용했습니다.\n\n“도구” ▶ “볼륨 헤더 복구”를 선택해서 볼륨 헤더를 수리해야 합니다.</string>
     <string lang="ko" key="VOL_HEADER_BACKED_UP">볼륨 헤더 백업을 성공적으로 만들었습니다.\n\n중요: 이 백업을 이용해서 볼륨 헤더를 복구하게 되면 볼륨의 현재 비밀번호도 같이 복구합니다. 또한 볼륨을 삽입하는데 키파일이 필요한 경우, 볼륨 헤더가 복구되었을 때 볼륨을 다시 삽입하려면 동일한 키파일이 필요합니다.\n\n주의: 이 볼륨 헤더 백업은 현재의 특정 볼륨의 헤더만 복구하는 데 사용됩니다. 만약 이 헤더 백업으로 다른 볼륨의 헤더를 복구할 경우에 그 볼륨을 삽입할 수는 있지만, (그 볼륨의 마스터 키가 변경되기 때문에) 볼륨에 저장된 데이터의 암호해제는 할 수 없습니다.</string>
-    <string lang="ko" key="VOL_HEADER_RESTORED">볼륨 헤더가 성공적으로 복구되었습니다.\n\n중요: 이전 비밀번호도 같이 복구되었다는 것을 참고하세요. 또한 백업이 만들어졌을 당시 볼륨을 삽입하는데 키파일이 필요했다면, 볼륨을 다시 삽입하고자 할 때도 동일한 키파일이 필요합니다. </string>
+    <string lang="ko" key="VOL_HEADER_RESTORED">볼륨 헤더가 성공적으로 복구되었습니다.\n\n중요: 이전 비밀번호도 같이 복구되었다는 것을 참고하세요. 또한 백업이 만들어졌을 당시 볼륨을 삽입하는데 키파일이 필요했다면, 볼륨을 다시 삽입하고자 할 때도 동일한 키파일이 필요합니다.</string>
     <string lang="ko" key="EXTERNAL_VOL_HEADER_BAK_FIRST_INFO">보안상의 이유로 볼륨에 대한 올바른 비밀번호(또는 올바른 키파일)을 입력 또는 제공해야 합니다.\n\n참고: 볼륨에 숨긴 볼륨이 있는 경우, 먼저 “외부 볼륨”에 대한 올바른 비밀번호(또는 올바른 키파일)을 입력 또는 제공해야 합니다. 나중에 숨긴 볼륨 헤더의 백업을 선택한 경우, “숨긴 볼륨”에 대한 올바른 비밀번호(또는 올바른 키파일)을 입력 또는 제공해야 합니다.</string>
-    <string lang="ko" key="CONFIRM_VOL_HEADER_BAK">%hs에 대한 볼륨 헤더 백업을 만드시겠습니까?\n\n“예”를 클릭하면, 헤더 백업의 파일 이름을 묻게 됩니다.\n\n참고: 새로운 소금(→ 무작위 문자열)을 이용해서 ① 표준 볼륨 헤더 및 ② 숨긴 볼륨 헤더는 재암호화되고 백업 파일에 저장됩니다. 현재 볼륨 안에 “숨긴 볼륨”이 없을지라도, 백업 파일에 있는 숨긴 볼륨 헤더를 위해 남겨진 공간은 무작위 데이터로 채워지게 됩니다(→ 숨긴 볼륨의 효과적인 방법방법). 백업 파일에서 볼륨 헤더를 복구할 때, 볼륨 헤더 백업이 생성된 당시에 타당했던 ① 올바른 비밀번호 입력 또는 ② 올바른 키파일을 제공해야 합니다. 또한 비밀번호(또는 키파일)은 복구할 볼륨 헤더의 형식(→ 표준 또는 숨김)을 자동을 결정합니다. VeraCrypt는 시행착오를 거쳐 그 형식을 결정하게 됩니다.</string>
+    <string lang="ko" key="CONFIRM_VOL_HEADER_BAK">%s에 대한 볼륨 헤더 백업을 만드시겠습니까?\n\n“예”를 클릭하면, 헤더 백업의 파일 이름을 묻게 됩니다.\n\n참고: 새로운 소금(→ 무작위 문자열)을 이용해서 ① 표준 볼륨 헤더 및 ② 숨긴 볼륨 헤더는 재암호화되고 백업 파일에 저장됩니다. 현재 볼륨 안에 “숨긴 볼륨”이 없을지라도, 백업 파일에 있는 숨긴 볼륨 헤더를 위해 남겨진 공간은 무작위 데이터로 채워지게 됩니다(→ 숨긴 볼륨의 효과적인 방법방법). 백업 파일에서 볼륨 헤더를 복구할 때, 볼륨 헤더 백업이 생성된 당시에 타당했던 ① 올바른 비밀번호 입력 또는 ② 올바른 키파일을 제공해야 합니다. 또한 비밀번호(또는 키파일)은 복구할 볼륨 헤더의 형식(→ 표준 또는 숨김)을 자동을 결정합니다. VeraCrypt는 시행착오를 거쳐 그 형식을 결정하게 됩니다.</string>
-    <string lang="ko" key="CONFIRM_VOL_HEADER_RESTORE">%hs의 볼륨 헤더를 복구하시겠습니까?\n\n주의: 볼륨 헤더의 복구는 “백업이 만들어졌을 당시의 볼륨 비밀번호”도 동시에 복구합니다. 또한 백업이 만들어졌을 당시 볼륨을 삽입하는데 키파일이 필요했다면, 볼륨 헤더가 복구된 후 다시 볼륨을 삽입하고자 할 때도 동일한 키파일이 필요합니다.\n\n“예”를 클릭하면, 헤더 백업 파일을 선택할 수 있습니다.</string>
+    <string lang="ko" key="CONFIRM_VOL_HEADER_RESTORE">%s의 볼륨 헤더를 복구하시겠습니까?\n\n주의: 볼륨 헤더의 복구는 “백업이 만들어졌을 당시의 볼륨 비밀번호”도 동시에 복구합니다. 또한 백업이 만들어졌을 당시 볼륨을 삽입하는데 키파일이 필요했다면, 볼륨 헤더가 복구된 후 다시 볼륨을 삽입하고자 할 때도 동일한 키파일이 필요합니다.\n\n“예”를 클릭하면, 헤더 백업 파일을 선택할 수 있습니다.</string>
     <string lang="ko" key="DOES_VOLUME_CONTAIN_HIDDEN">볼륨에 “숨긴 볼륨”이 포함되어 있습니까?</string>
     <string lang="ko" key="VOLUME_CONTAINS_HIDDEN">볼륨에 “숨긴 볼륨”이 포함되어 있습니다.</string>
     <string lang="ko" key="VOLUME_DOES_NOT_CONTAIN_HIDDEN">볼륨에 “숨긴 볼륨”이 포함되어 있지 않습니다.</string>
@@ -956,11 +963,13 @@
     <string lang="ko" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">사용자가 시스템 파티션/드라이브의 헤더를 백업하려고 합니다. 이것은 허용되지 않습니다. 시스템 파티션/드라이브에 관계된 백업/복구 작업은 VeraCrypt 응급복구 디스크를 사용해서만 실행될 수 있습니다.\n\nVeraCrypt 응급복구 디스크를 만드시겠습니까?</string>
     <string lang="ko" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">사용자가 가상의 VeraCrypt 볼륨 헤더를 복구하려고 시도하면서 시스템 파티션/드라이브를 선택했습니다. 이것은 허용되지 않습니다. 시스템 파티션/드라이브에 관계된 백업/복구 작업은 VeraCrypt 응급복구 디스크를 사용해서만 실행될 수 있습니다.\n\nVeraCrypt 응급복구 디스크를 만드시겠습니까?</string>
     <string lang="ko" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">확인을 클릭한 다음, 새로운 VeraCrypt 응급복구 디스크 ISO 이미지를 위한 파일 이름 및 그 파일을 둘 위치를 선택하게 됩니다.</string>
-    <string lang="ko" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">응급복구 디스크 이미지가 생성되어 다음 파일에 저장되었습니다: %hs\n\n이제 응급복구 디스크를 CD 또는 DVD에 구울 필요가 있습니다.\n\n중요: 파일은 (개별 파일이 아닌) ISO 디스크 이미지로 CD/DVD에 구워져야 합니다. 작업 방법에 대한 자세한 정보는 CD/DVD 리코딩 소프트웨어의 문서를 참고하세요.\n\n응급복구 디스크를 구운 후에 “시스템 ▶ 응급복구 디스크 검증”을 선택해서 응급복구 디스크가 올바르게 구워졌는지를 확인합니다.</string>
+    <string lang="ko" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">응급복구 디스크 이미지가 생성되어 다음 파일에 저장되었습니다: %s\n\n이제 응급복구 디스크를 CD 또는 DVD에 구울 필요가 있습니다.\n\n중요: 파일은 (개별 파일이 아닌) ISO 디스크 이미지로 CD/DVD에 구워져야 합니다. 작업 방법에 대한 자세한 정보는 CD/DVD 리코딩 소프트웨어의 문서를 참고하세요.\n\n응급복구 디스크를 구운 후에 “시스템 ▶ 응급복구 디스크 검증”을 선택해서 응급복구 디스크가 올바르게 구워졌는지를 확인합니다.</string>
-    <string lang="ko" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">응급복구 디스크 이미지가 생성되어 다음 파일에 저장되었습니다: %hs\n\n이제 응급복구 디스크를 CD 또는 DVD에 구울 필요가 있습니다.\n\n지금 Microsoft Windows Disc Image Burner를 실행하시겠습니까?\n\n참고: 응급복구 디스크를 구운 후에 “시스템 ▶ 응급복구 디스크 검증”을 선택해서 응급복구 디스크가 올바르게 구워졌는지를 확인합니다.</string>
+    <string lang="ko" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">응급복구 디스크 이미지가 생성되어 다음 파일에 저장되었습니다: %s\n\n이제 응급복구 디스크를 CD 또는 DVD에 구울 필요가 있습니다.\n\n지금 Microsoft Windows Disc Image Burner를 실행하시겠습니까?\n\n참고: 응급복구 디스크를 구운 후에 “시스템 ▶ 응급복구 디스크 검증”을 선택해서 응급복구 디스크가 올바르게 구워졌는지를 확인합니다.</string>
     <string lang="ko" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">검증하려면 VeraCrypt 응급복구 디스크를 CD/DVD 드라이브에 삽입한 다음 “확인”을 클릭하세요.</string>
     <string lang="ko" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">VeraCrypt 응급복구 디스크를 성공적으로 검증했습니다.</string>
     <string lang="ko" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">응급복구 디스크가 올바르게 구워졌는지를 검증할 수 없습니다.\n\n응급복구 디스크를 구웠다면, CD/DVD를 꺼내서 다시 삽입한 다음 다시 시도해 주세요. 이것이 도움이 되지 않는 경우, 다른 CD/DVD 리코딩 소프트웨어 및 매체로 시도해 주세요.\n\n다른 마스터 키, 비밀번호, 소금 등을 위해 생성된 응급복구 디스크를 검증하려고 하는 경우, 그러한 응급복구 디스크는 항상 검증작업에 실패하게 됩니다. 현재 설정과 완전히 호환되는 새로운 응급복구 디스크를 만들려면, “시스템” ▶ “응급복구 디스크 만들기”를 선택하세요.</string>
+    <string lang="ko" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">VeraCrypt 응급복구 디스크 가 성공적으로 확인되었습니다.</string>
+    <string lang="ko" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">VeraCrypt 응급복구 디스크 의 확인이 실패했습니다.\n\n만약 VeraCrypt의 응급복구 디스크를 다른 마스터 키, 비밀번호, 또한 소금(Salt) 등을 사용할 경우, 확인이 실패할경우를 주의하시기 바랍니다.</string>
     <string lang="ko" key="ERROR_CREATING_RESCUE_DISK">VeraCrypt 응급복구 디스크 만들기 오류.</string>
     <string lang="ko" key="CANNOT_CREATE_RESCUE_DISK_ON_HIDDEN_OS">숨긴 운영체제가 실행 중일 때 VeraCrypt 응급복구 디스크를 만들 수 없습니다.\n\nVeraCrypt 응급복구 디스크를 만들려면 미끼용 운영체제를 부팅한 다음 “시스템” ▶ “응급복구 디스크 만들기”를 선택하세요.</string>
     <string lang="ko" key="RESCUE_DISK_CHECK_FAILED">응급복구 디스크가 올바르게 구워졌는지를 검증할 수 없습니다.\n\n응급복구 디스크를 구웠다면, CD/DVD를 꺼내서 다시 삽입한 다음, “다음”을 클릭해서 다시 시도해 주세요. 이것이 도움이 되지 않는 경우, 다른 매체%s로 시도해 주십시오.\n\n아직 응급복구 디스크를 굽지 않았다면, 다음을 클릭하세요.\n\n이 마법사를 시작하기 전에 VeraCrypt 응급복구 디스크를 검증하려고 할 경우, 이러한 응급복구 디스크는 (다른 마스터 키를 위해 생성되었기 때문에) 사용될 수 없습니다. 새롭게 생성된 응급복구 디스크를 구울 필요가 있습니다.</string>
@@ -972,25 +981,25 @@
     <string lang="ko" key="CANNOT_SET_TIMER">오류: 타이머를 설정할 수 없습니다.</string>
     <string lang="ko" key="IDPM_CHECK_FILESYS">파일시스템 체크</string>
     <string lang="ko" key="IDPM_REPAIR_FILESYS">파일시스템 수리</string>
-    <string lang="en" key="IDPM_ADD_TO_FAVORITES">Add to Favorites...</string>
+    <string lang="ko" key="IDPM_ADD_TO_FAVORITES">즐겨찾기에 포함하기...</string>
-    <string lang="en" key="IDPM_ADD_TO_SYSTEM_FAVORITES">Add to System Favorites...</string>
+    <string lang="ko" key="IDPM_ADD_TO_SYSTEM_FAVORITES">시스템 즐겨찾기에 포함하기...</string>
-    <string lang="en" key="IDPM_PROPERTIES">P&amp;roperties...</string>
+    <string lang="en" key="IDPM_PROPERTIES">Properties...</string>
     <string lang="ko" key="HIDDEN_VOL_PROTECTION">숨긴 볼륨 보호</string>
     <string lang="ko" key="NOT_APPLICABLE_OR_NOT_AVAILABLE">N/A</string>
     <string lang="ko" key="UISTR_YES">예</string>
     <string lang="ko" key="UISTR_NO">아니오</string>
-    <string lang="en" key="UISTR_DISABLED">Disabled</string>
+    <string lang="ko" key="UISTR_DISABLED">비활성화</string>
     <string lang="ko" key="DIGIT_ONE">1</string>
     <string lang="ko" key="TWO_OR_MORE">2 또는 그 이상</string>
     <string lang="ko" key="MODE_OF_OPERATION">작업 모드</string>
-    <string lang="ko" key="LABEL_ITEM">라벨:   </string>
+    <string lang="ko" key="LABEL_ITEM">레이블:   </string>
     <string lang="ko" key="SIZE_ITEM">크기:   </string>
     <string lang="ko" key="PATH_ITEM">경로:   </string>
     <string lang="ko" key="DRIVE_LETTER_ITEM">드라이브 문자:   </string>
     <string lang="ko" key="UNSUPPORTED_CHARS_IN_PWD">오류: 비밀번호는 ASCII 문자만을 포함해야 합니다.\n\n비밀번호에 ASCII 아닌 문자가 있는 경우, 시스템 설정의 변경이 있으면 볼륨을 삽입할 수 없게 될 수도 있습니다.\n\n다음 문자는 허용됩니다:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="ko" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">주의: 비밀번호에 ASCII 아닌 문자가 포함되어 있습니다. 이 경우 시스템 설정의 변경이 있으면 볼륨을 삽입할 수 없게 될 수도 있습니다.\n\nASCII 아닌 문자를 ASCII 문자로 모두 교체해야 합니다. 이렇게 하려면, “볼륨” ▶ “볼륨 비밀번호 변경”을 클릭하세요.\n\n다음은 ASCII 문자입니다:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="ko" key="EXE_FILE_EXTENSION_CONFIRM">주의: 실행 파일로 사용되는 확장자(예: .exe, .sys, .dll) 및 문제를 일으키는 유사한 파일 확장자는 사용하지 않길 권장합니다. 이런 파일 확장자를 사용하게 되면 윈도우와 안티바이러스 소프트웨어가 보관소에 간섭을 하게 될 수도 있고 결국 볼륨의 성능에 악영향을 초래하고 다른 중대한 문제를 일으킬 수도 있습니다.\n\n파일 확장자를 제거하거나 (예컨대 “.tc”) 등으로 변경할 것을 적극권장합니다.\n\n문제가 될 만한 파일 확장자를 정말로 사용하시겠습니까?</string>
+    <string lang="ko" key="EXE_FILE_EXTENSION_CONFIRM">주의: 실행 파일로 사용되는 확장자(예: .exe, .sys, .dll) 및 문제를 일으키는 유사한 파일 확장자는 사용하지 않길 권장합니다. 이런 파일 확장자를 사용하게 되면 윈도우와 안티바이러스 소프트웨어가 보관소에 간섭을 하게 될 수도 있고 결국 볼륨의 성능에 악영향을 초래하고 다른 중대한 문제를 일으킬 수도 있습니다.\n\n파일 확장자를 제거하거나 (예컨대 “.hc”) 등으로 변경할 것을 적극권장합니다.\n\n문제가 될 만한 파일 확장자를 정말로 사용하시겠습니까?</string>
-    <string lang="ko" key="EXE_FILE_EXTENSION_MOUNT_WARNING">주의: 이 보관소는 실행 파일로 사용되는 확장자(예: .exe, .sys, .dll) 또는 유사한 문제를 일으킬 수 있는 파일 확장자를 가지고 있습니다. 이런 파일 확장자를 사용하게 되면 윈도우와 안티바이러스 소프트웨어가 보관소에 간섭을 하게 될 수도 있고 결국 볼륨의 성능에 악영향을 초래하고 다른 중대한 문제를 일으킬 수도 있습니다.\n\n(볼륨을 꺼낸 후에) 보관소의 확장자를 변경(예: “.tc”)하거나 제거할 것을 권장합니다.</string>
+    <string lang="ko" key="EXE_FILE_EXTENSION_MOUNT_WARNING">주의: 이 보관소는 실행 파일로 사용되는 확장자(예: .exe, .sys, .dll) 또는 유사한 문제를 일으킬 수 있는 파일 확장자를 가지고 있습니다. 이런 파일 확장자를 사용하게 되면 윈도우와 안티바이러스 소프트웨어가 보관소에 간섭을 하게 될 수도 있고 결국 볼륨의 성능에 악영향을 초래하고 다른 중대한 문제를 일으킬 수도 있습니다.\n\n(볼륨을 꺼낸 후에) 보관소의 확장자를 변경(예: “.hc”)하거나 제거할 것을 권장합니다.</string>
     <string lang="ko" key="HOMEPAGE">홈페이지</string>
     <string lang="ko" key="LARGE_IDE_WARNING_XP">주의: 윈도우 설치에 서비스팩을 적용하지 않은 것으로 보입니다. 서비스팩 1 또는 그 이상을 적용하지 않은 Windows XP를 사용하는 경우, 128 GB보다 큰 IDE 디스크에 데이터를 쓰면 안됩니다! 만약 그 디스크(VeraCrypt 볼륨인지 여부에 상관없음)에 데이터를 쓰게 되면, 데이터가 손상될 수도 있습니다. 이는 윈도우의 버그이지, VeraCrypt의 버그가 아닙니다.</string>
     <string lang="ko" key="LARGE_IDE_WARNING_2K">주의: 윈도우 설치에 서비스팩 3 또는 그 이상을 적용하지 않은 것으로 보입니다. 서비스팩 3 또는 그 이상을 적용하지 않은 Windows 2000을 사용하는 경우, 128 GB보다 큰 IDE 디스크에 데이터를 쓰면 안됩니다! 만약 그 디스크(VeraCrypt 볼륨인지 여부에 상관없음)에 데이터를 쓰게 되면, 데이터가 손상될 수도 있습니다. 이는 윈도우의 제한이지, VeraCrypt의 버그가 아닙니다.\n\n참고: 레지스트리에서 48-비트 LBA 지원을 사용가능하게 해야 할지도 모릅니다. 추가정보 → http://support.microsoft.com/kb/305098/EN-US</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="ko" key="CHECKING_FS">%s로 삽입된 VeraCrypt 볼륨에 대한 파일 시스템을 체크하는 중...</string>
-    <string lang="ko" key="REPAIRING_FS">%hs로 삽입된 VeraCrypt 볼륨에 대한 파일 시스템의 수리를 시도하는 중...</string>
+    <string lang="ko" key="REPAIRING_FS">%s로 삽입된 VeraCrypt 볼륨에 대한 파일 시스템의 수리를 시도하는 중...</string>
-    <string lang="ko" key="WARN_CBC_MODE">주의: 이 볼륨은 CBC 모드로 암호화되었습니다. 보안상의 문제로 CBC 모드는 VeraCrypt 4.1 이후로 비난받고 있습니다.\n\n그래서 이 VeraCrypt 볼륨의 데이터를 현재 버전의 VeraCrypt에 의해 만들어진 새 볼륨으로 이동할 것을 적극권장합니다. 이동작업을 마친 후에 이전 볼륨을 안전하게 삭제 또는 파괴해야 합니다. 자세한 정보는 문서에서 버전 내역을 확인하거나 VeraCrypt 4.1 또는 그 이상에서 배포된 배포 공지를 참고하시기 바랍니다.</string>
     <string lang="ko" key="WARN_64_BIT_BLOCK_CIPHER">주의: 이 볼륨은 64-비트-블록 레거시 알고리듬으로 암호화되어 있습니다.\n\n모든 64-비트-블록 알고리듬(Blowfish, CAST-128, 및 Triple DES)은 비난받고 있습니다. 앞으로 나올 VeraCrypt 버전으로 이 볼륨을 삽입할 수 있을 것입니다. 그러나 이러한 레거시 암호화 알고리듬의 구현에 전혀 향상이 없는 상태입니다. 128-비트-블록 알고리듬(예: AES, Serpent, Twofish)으로 새로운 VeraCrypt 볼륨을 만들고, 모든 파일을 이 볼륨에서 새로운 볼륨으로 옮길 것을 권장합니다.</string>
     <string lang="ko" key="SYS_AUTOMOUNT_DISABLED">새 볼륨을 자동으로 삽입하도록 시스템 설정이 되어 있지 않습니다. 장치-기반의 VeraCrypt 볼륨을 삽입할 수 없습니다. “자동삽입”은 다음 명령을 실행하고 시스템을 다시 시작하면 사용할 수 있습니다.\n\nmountvol.exe /E</string>
     <string lang="ko" key="SYS_ASSIGN_DRIVE_LETTER">계속하기 전에 드라이브 문자를 파티션/장치에 할당해 주세요 (제어판 → 시스템 관리 → 관리자 도구 - 하드 디스크 파티션 생성 및 포맷)\n\n이것은 운영체제의 요구사항입니다.</string>
@@ -1069,7 +1077,7 @@
     <string lang="en" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt no longer supports encryption of the system partition/drive on Windows Vista with no Service Pack installed. Before upgrading VeraCrypt, please install Service Pack 1 or higher for Windows Vista.</string>
     <string lang="ko" key="FEATURE_REQUIRES_INSTALLATION">오류: 이 기능은 (현재 VeraCrypt가 포터블 모드로 실행 되고 있는) 시스템에 VeraCrypt가 설치되어 있을 것을 요구합니다.\n\nVeraCrypt를 다시 설치한 후 다시 시도해 주십시오.</string>
     <string lang="ko" key="WINDOWS_NOT_ON_BOOT_DRIVE_ERROR">주의: 부팅이 되는 드라이브에 윈도우가 설치되지 않은 것으로 보입니다. 이 작업은 지원되지 않습니다.\n\n부팅이 되는 드라이브에 윈도우가 설치된 경우에만 계속 진행해야 합니다.\n\n계속하시겠습니까?</string>
-    <string lang="ko" key="GPT_BOOT_DRIVE_UNSUPPORTED">시스템 드라이브에 GUID 파티션 테이블(GPT)이 있습니다. 현재 MBR 파티션 테이블을 가진 드라이브만 지원합니다.</string>
+    <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</string>
     <string lang="ko" key="TC_BOOT_LOADER_ALREADY_INSTALLED">주의: VeraCrypt 부트 로더가 이미 시스템 드라이브에 설치되어 있습니다!\n\n컴퓨터 상의 다른 시스템이 이미 암호화되어 있을 수도 있습니다.\n\n주의: 현재 실행 중인 시스템의 암호화로 진행하면 다른 시스템이 시작이 안되고 관련 데이터에 접근할 수 없게될 지도 모릅니다.\n\n그래도 계속하시겠습니까?</string>
     <string lang="ko" key="SYS_LOADER_RESTORE_FAILED">원래의 시스템 로더를 복구하는 데 실패했습니다.\n\nVeraCrypt 응급복구 디스크를 사용하거나(→ “Repair Options” 메뉴에서 “Restore original system loader”를 선택), VeraCrypt 부트 로더를 윈도우 시스템 로더로 교체하려면 윈도우 설치 매체를 사용해 주십시오.</string>
     <string lang="ko" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">원래의 시스템 로더가 응급복구 디스크에 저장되지 않을 것입니다 (원인: 백업 파일 분실).</string>
@@ -1093,7 +1101,7 @@
     <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 medium (or using a service partition)?</string>
     <string lang="ko" key="DECOY_OS_REQUIREMENTS">보안상의 이유로, 현재 실행 중인 운영체제가 인증을 요구할 경우, 진행하기 전에 인증을 해야 합니다. 왜냐하면 “숨긴 운영체제”는 시스템 파티션의 내용을 숨긴 볼륨에 복사함으로써 생성되기 때문입니다. 만약 이러한 운영체제가 인증되지 않은 경우에는 숨긴 운영체제 또한 인증되지 않습니다. 더 자세한 정보를 보려면 VeraCrypt 사용자 안내서의 “Security Requirements and Precautions Pertaning to Hidden Volumes” 장을 참고하시기 바랍니다.\n\n중요: 진행하기 전에 VeraCrypt 사용자 안내서에 있는 “Security Requirements and Precautions Pertaining to Hidden Volumes”(숨긴 볼륨에 관련된 보안 지침)의 내용을 읽어보시길 권장합니다.\n\n\n현재 운영체제가 위 조건들을 충족시키고 있습니까?</string>
     <string lang="ko" key="CONFIRM_HIDDEN_OS_EXTRA_BOOT_PARTITION">사용자의 시스템이 별도의 부트 파티션을 사용하고 있습니다. VeraCrypt는 별도의 부트 파티션을 사용하는 숨겨진 운영체제에서의 최대 절전 모드를 지원하지 않습니다(* 미끼용 시스템에서는 별 문제없이 최대 절전 모드 기능을 사용할 수 있습니다).\n\n부트 파티션이 미끼용 및 숨겨진 시스템에 의해 공유되는 것은 아닌지 확인해 주십시오. 그래서 최대 절전 모드 상태에서 깨어날 때 데이터 누수 및 문제점을 방지하기 위해, VeraCrypt는 숨겨진 시스템이 공유된 부트 파티션에 쓰는 것을 방지하고 또한 이 시스템이 최대 절전 모드로 진입하는 것을 막게 되는 것입니다.\n\n계속하시겠습니까? “아니오”를 선택하면, 별도의 부트 파티션을 제거하기 위한 지침이 표시됩니다.</string>
-    <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' &gt; '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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
+    <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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
     <string lang="ko" key="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">주의: 시스템 파티션과 그 뒤에 있는 첫번쩨 파티션 사이에 할당되지 않은 공간이 있습니다. 숨긴 운영체제를 생성한 후에, 이러한 미할당 공간에 새로운 파티션을 만들어선 안됩니다. 그렇지 않으면 (새롭게 만들어진 파티션을 제거하기 전까지는) 숨긴 운영체제로 부팅을 할 수 없게 됩니다.</string>
     <string lang="ko" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">이 알고리듬은 현재 시스템 암호화에 지원되지 않습니다.</string>
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
@@ -1108,8 +1116,8 @@
     <string lang="ko" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">참고: (윈도우 시작 전에) US가 아닌 윈도우 키보드 레이아웃을 사용할 수 없는 부팅-전 환경에서 비밀번호를 입력할 필요가 있다는 것을 참고하세요. 그래서 표준 US 키보드 레이아웃을 사용해서 항상 비밀번호를 입력해야 합니다. 그러나 실제 US 키보드가 필요하지 않다는 사실을 명심하세요. 실제 US 키보드가 없는 경우일지라도, VeraCrypt는 (현재 및 부팅-전 환경에서) 사용자가 안전하게 비밀번호를 입력했는지를 자동으로 확인합니다.</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">응급복구 디스크 이미지가 생성되어 다음 파일에 저장되었습니다: %s\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>
+    <string lang="ko" key="RESCUE_DISK_BURN_INFO_NO_CHECK">응급복구 디스크 이미지가 생성되어 다음 파일에 저장되었습니다: %s\n\n이제 응급복구 디스크를 CD/DVD에 굽거나 나중에 사용하기 위해 안전한 위치에 ISO 이미지를 이동해야 합니다.\n\n%ls계속하려면 “다음”을 클릭합니다.</string>
     <string lang="ko" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">중요: 파일은 (개별 파일이 아닌) ISO 디스크 이미지로 CD/DVD에 구워져야 합니다. 굽기 작업에 대한 정보는 CD/DVD 리코딩 소프트웨어에 대한 문서를 참고해 주세요. ISO 디스크 이미지를 CD/DVD에 작성할 리코딩 소프트웨어가 없는 경우, 아래 링크를 클릭해서 무료 소프트웨어를 다운로드합니다.\n\n</string>
     <string lang="ko" key="LAUNCH_WIN_ISOBURN">Microsoft Windows Disc Image Burner 실행</string>
     <string lang="ko" key="RESCUE_DISK_BURN_NO_CHECK_WARN">주의: 과거에 VeraCrypt 응급복구 디스크를 이미 만든 경우, 이 디스크를 현재 시스템 파티션/드라이브에 다시 사용할 수 없습니다. 왜냐하면 서로 다른 마스터 키로 디스크가 생성되었기 때문입니다. 시스템 파티션/드라이브를 암호화할 때마다, 비록 동일한 비밀번호를 사용할지라도, 새로운 VeraCrypt 응급복구 디스크를 만들어야 합니다.</string>
@@ -1163,10 +1171,10 @@
     <string lang="ko" key="SYS_ENCRYPTION_SPAN_WHOLE_SYS_DRIVE_HELP">현재 실행 중인 윈도우 시스템이 설치된 드라이브 전체를 암호화하려면 이 옵션을 선택합니다. 전체 드라이브(→ 모든 파티션 포함)가 암호화됩니다만, VeraCrypt 부트 로더가 자리잡는 첫번째 트랙은 암호화에서 제외됩니다. 드라이브에 설치된 시스템 또는 드라이브에 저장된 파일에 접근하려는 사람은 시스템 시작 전에 매번 올바른 비밀번호를 입력해야 합니다. 이 옵션은 윈도우가 설치되지 않았고 또한 부팅이 되지 않는 두번째 또는 외부 드라이브를 암호화하는 데 사용될 수 없습니다.</string>
     <string lang="ko" key="COLLECTING_RANDOM_DATA_TITLE">무작위 데이터를 수집 중</string>
     <string lang="ko" key="KEYS_GEN_TITLE">키가 생성됨</string>
-    <string lang="en" key="CD_BURNER_NOT_PRESENT">VeraCrypt has found no CD/DVD burner connected to your computer. VeraCrypt needs a CD/DVD burner to burn a bootable VeraCrypt Rescue Disk containing a backup of the encryption keys, VeraCrypt boot loader, original system loader, etc.\n\nWe strongly recommend that you burn the VeraCrypt Rescue Disk.</string>
+    <string lang="ko" key="CD_BURNER_NOT_PRESENT">VeraCrypt가 컴퓨터에 연결된 CD/DVD 버너를 발견하지 못햇습니다.\n\nCD/DVD 버너로 응급 복구 디스크 이미지 (암호화 키, VeraCrypt 부트 로더, 원래의 시스템 로더 등)를 작성하거나 적어도 백업을 하는게 좋습니다.</string>
-    <string lang="en" key="CD_BURNER_NOT_PRESENT_WILL_STORE_ISO">I have no CD/DVD burner but I will store the Rescue Disk ISO image on a removable drive (e.g. USB flash drive).</string>
+    <string lang="ko" key="CD_BURNER_NOT_PRESENT_WILL_STORE_ISO">CD/DVD 버너가 없지만 이동식 드라이브 (예: USB 플래시 드라이브) 에 응급 복구 디스크 이미지를 저장합니다.</string>
-    <string lang="en" key="CD_BURNER_NOT_PRESENT_WILL_CONNECT_LATER">I will connect a CD/DVD burner to my computer later. Terminate the process now.</string>
+    <string lang="ko" key="CD_BURNER_NOT_PRESENT_WILL_CONNECT_LATER">나중에 내 컴퓨터에 CD/DVD 버너를 연결합니다. 프로세스를 종료합니다.</string>
-    <string lang="en" key="CD_BURNER_NOT_PRESENT_CONNECTED_NOW">A CD/DVD burner is connected to my computer now. Continue and write the Rescue Disk.</string>
+    <string lang="ko" key="CD_BURNER_NOT_PRESENT_CONNECTED_NOW">지금 내 컴퓨터에 CD/DVD 버너가 연결되어 있습니다. 계속 응급 복구 디스크를 작성합니다.</string>
     <string lang="en" key="CD_BURNER_NOT_PRESENT_WILL_STORE_ISO_INFO">Please follow these steps:\n\n1) Connect a removable drive, such as a USB flash drive, to your computer now.\n\n2) Copy the VeraCrypt Rescue Disk image file (%s) to the removable drive.\n\nIn case you need to use the VeraCrypt Rescue Disk in the future, you will be able to connect your removable drive (containing the VeraCrypt Rescue Disk image) to a computer with a CD/DVD burner and create a bootable VeraCrypt Rescue Disk by burning the image to a CD or DVD. IMPORTANT: Note that the VeraCrypt Rescue Disk image file must be written to the CD/DVD as an ISO disk image (not as an individual file).</string>
     <string lang="ko" key="RESCUE_DISK_RECORDING_TITLE">응급복구 디스크 굽기</string>
     <string lang="ko" key="RESCUE_DISK_CREATED_TITLE">응급복구 디스크가 생성됨</string>
@@ -1247,7 +1255,7 @@
     <string lang="ko" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">이전에 설명된 문제점을 만날 경우, (암호화된 경우라면) 파티션/드라이브를 암호해제한 다음 비-층계적 암호 알고리듬(예: 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 system (but not on the decoy system), the decoy system would contain a VeraCrypt driver and VeraCrypt applications whose version numbers are different from the version number of the VeraCrypt Boot Loader. Such a discrepancy might indicate that there is a hidden operating system on this computer.\n\n\nDo you want to continue?</string>
     <string lang="ko" key="UPDATE_TC_IN_HIDDEN_OS_TOO">현재 운영체제를 부팅시켰던 VeraCrypt 부트 로더의 버전 번호는 “현재 시스템에 설치된 VeraCrypt 드라이버 및 VeraCrypt 프로그램의 버전 번호”와 서로 다릅니다.\n\n현재 운영체제에 있는 VeraCrypt를 업데이트하려면 (버전 번호가 VeraCrypt 부트 로더의 것과 동일한) VeraCrypt 설치기를 실행해야 합니다.</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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' &gt; '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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' > 'Create Rescue Disk').</string>
     <string lang="ko" key="BOOT_LOADER_UPGRADE_OK">VeraCrypt 부트 로더가 업그레이드되었습니다.\n\n(VeraCrypt 부트 로더의 새 버전을 포함할) 새로운 VeraCrypt 응급복구 디스크를 만들 것을 권장합니다(→ 컴퓨터를 다시 시작한 다음 “시스템” ▶ “응급복구 디스크 만들기” 선택).</string>
     <string lang="ko" key="BOOT_LOADER_UPGRADE_OK_HIDDEN_OS">VeraCrypt 부트 로더가 업그레이드되었습니다.\n\n미끼용 운영체제로 부팅한 다음 “시스템” ▶ “응급복구 디스크 만들기” 선택해서 (VeraCrypt 부트 로더의 새 버전을 포함할) 새로운 VeraCrypt 응급복구 디스크를 만들 것을 권장합니다.</string>
     <string lang="ko" key="BOOT_LOADER_UPGRADE_FAILED">VeraCrypt 부트 로더를 업그레이드하는 데 실패했습니다.</string>
@@ -1272,23 +1280,23 @@
     <string lang="ko" key="INVALID_TOKEN_KEYFILE_PATH">보안 토큰 키파일의 경로가 올바르지 않습니다.</string>
     <string lang="ko" key="SECURITY_TOKEN_ERROR">보안 토큰 오류</string>
     <string lang="ko" key="CKR_PIN_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' &gt; 'Keyfile Generator').</string>
+    <string lang="ko" key="CKR_DEVICE_MEMORY">보안 토큰이 요청한 작업을 수행하기에 충분한 메모리/공간이 없습니다.\n\n키파일을 가져오는 작업이엿다면, 작은 키파일을 선택하거나 VeraCrypt에서 생성된 파일을 ('도구' &gt; '키파일 생성기') 사용해주세요.</string>
     <string lang="ko" key="ALL_TOKEN_SESSIONS_CLOSED">열려 있는 모든 토큰 세션을 닫았습니다.</string>
     <string lang="ko" key="SELECT_TOKEN_KEYFILES">보안 토큰 키파일 선택</string>
     <string lang="ko" key="TOKEN_SLOT_ID">슬롯</string>
     <string lang="ko" key="TOKEN_NAME">토큰 이름</string>
-    <string lang="ko" key="TOKEN_DATA_OBJECT_LABEL">파일 이름</string>
+    <string lang="ko" key="TOKEN_DATA_OBJECT_LABEL">토큰 레이블</string>
     <string lang="ko" key="BOOT_PASSWORD_CACHE_KEYBOARD_WARNING">중요: 부팅-전 인증 비밀번호를 입력할 때는 항상 “표준 US 키보드 레이아웃”을 사용해야 합니다. 그러므로 다른 키보드 레이아웃을 사용해서 입력된 비밀번호를 사용하는 볼륨은 “캐시로 보관된 부팅-전 인증 비밀번호”를 사용해서 삽입될 수 없습니다(* 이는 VeraCrypt의 버그가 아닙니다). 이러한 볼륨을 부팅-전 인증 비밀번호를 사용해서 삽입하려면, 다음 지침을 따릅니다:\n\n1) “파일 선택” 또는 “장치 선택”을 클릭한 후 볼륨을 선택합니다. 2) “볼륨” ▶ “볼륨 비밀번호 변경”을 선택합니다. 3) 볼륨을 위한 현재 비밀번호를 입력합니다. 4) 키보드 레이아웃을 English (US)로 변경합니다(* 윈도우 작업 표시줄의 언어 바 아이콘을 클릭한 후 “EN English (United States)” 선택) 5) Truerypt의 새 비밀번호 필드에 부팅-전 인증 비밀번호를 입력합니다. 6) 비밀번호 재입력 필드에 새 비밀번호를 다시 입력한 후 “확인”을 클릭합니다. 주의: 이러한 단계들을 따른 경우, 볼륨 비밀번호는 항상 US 키보드 레이아웃을 이용해서 입력되어야 합니다(* 부팅-전 환경에서는 자동으로 이 레이아웃이 사용됩니다).</string>
     <string lang="ko" key="SYS_FAVORITES_KEYBOARD_WARNING">시스템 즐겨찾기 볼륨은 부팅-전 인증 비밀번호를 이용해서 삽입됩니다. 특정 시스템 즐겨찾기 볼륨이 다른 비밀번호를 사용하는 경우, 이 볼륨은 삽입되지 않습니다.</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 the drive letter list in the main VeraCrypt application window.</string>
     <string lang="ko" key="SYS_FAVORITES_ADMIN_ONLY_WARNING">중요: 이 옵션을 선택하고 VeraCrypt가 관리자 권한을 갖지 못한 경우, 삽입된 시스템 즐겨찾기 볼륨이 VeraCrypt 프로그램 창에 표시되지 않고 또한 이를 꺼낼 수도 없습니다. 그러므로 예컨대 시스템 즐겨찾기 볼륨을 꺼내려면, (시작 메뉴에서) VeraCrypt 아이콘을 오른쪽-클릭한 후 “관리한 권한으로 실행”을 선택해야 합니다. 동일한 제한은 “모두 꺼냄” 기능, “자동-꺼냄” 기능, “모두 꺼냄” 단축키 등에 적용됩니다.</string>
-    <string lang="en" key="SETTING_REQUIRES_REBOOT">Note that this setting takes effect only after the operating system is restarted.</string>
+    <string lang="ko" key="SETTING_REQUIRES_REBOOT">이 설정은 운영 체제가 다시 시작된 후에만 효과가 있습니다.</string>
     <string lang="ko" key="COMMAND_LINE_ERROR">명령 줄을 분석하는 동안 오류가 발생했습니다.</string>
     <string lang="ko" key="RESCUE_DISK">응급복구 디스크</string>
     <string lang="ko" key="SELECT_FILE_AND_MOUNT">파일 선택 후 삽입(&amp;F)...</string>
     <string lang="ko" key="SELECT_DEVICE_AND_MOUNT">장치 선택 후 삽입(&amp;D)...</string>
-    <string lang="en" key="DISABLE_NONADMIN_SYS_FAVORITES_ACCESS">Allow only administrators to view and dismount system favorite volumes in VeraCrypt</string>
+    <string lang="ko" key="DISABLE_NONADMIN_SYS_FAVORITES_ACCESS">시스템 관리자만 VeraCrypt의 즐겨찾기에 해당되는 볼륨을 확인하고 마운트 해제를 허용</string>
-    <string lang="en" key="MOUNT_SYSTEM_FAVORITES_ON_BOOT">Mount system favorite volumes when Windows starts (in the initial phase of the startup procedure)</string>
+    <string lang="ko" key="MOUNT_SYSTEM_FAVORITES_ON_BOOT">윈도우가 시작될때 시스템 즐겨찾기에 해당되는 볼륨을 마운트 (초기 단계)</string>
     <string lang="ko" key="MOUNTED_VOLUME_DIRTY">주의: “%s”로 삽입된 볼륨에 있는 파일 시스템이 제대로 꺼내지지 않아 오류를  포함하고 있습니다. 손상된 파일 시스템을 사용하면 데이터 손실이나 데이터의 손상이 발생할 수 있습니다.\n\n참고: 삽입된 VeraCrypt 볼륨이 위치하는 장치(예: USB 플래시 드라이브 또는 외장 하드 드라이브)를 물리적으로 제거하거나 시스템에서 중지하기 전에, VeraCrypt에서 VeraCrypt 볼륨을 먼저 꺼내줘야 합니다.\n\n\n윈도우를 통해 파일 시스템의 오류를 탐지해서 이를 수리하시겠습니까?</string>
     <string lang="ko" key="SYS_FAVORITE_VOLUME_DIRTY">주의: 한 개 또는 수 개의 시스템 즐겨찾기 볼륨이 제대로 꺼내지지 않았기 때문에 파일시스템 오류를 포함하고 있을 수도 있습니다. 자세한 정보를 보려면 시스템 이벤트 로그를 참고해 주세요.\n\n손상된 파일시스템의 사용은 데이터 손실 또는 데이터 손상을 초래할 수 있습니다. 오류가 발생했을지도 모르는 시스템 즐겨찾기 볼륨을 체크해야 합니다(* VeraCrypt에서 각 볼륨을 오른쪽-클릭한 후 “파일시스템 수리”를 선택합니다).</string>
     <string lang="ko" key="FILESYS_REPAIR_CONFIRM_BACKUP">주의: Microsoft의 “chkdsk” 도구를 이용해서 손상된 파일 시스템을 수리하게 되면 손상된 영역에 있는 파일의 손실이 발생할 수 있습니다. 그러므로 VeraCrypt 볼륨에 저장되어 있는 파일들을 상태가 좋은 다른 VeraCrypt 볼륨에 백업할 것을 권장합니다.\n\n파일 시스템의 오류를 지금 수리하시겠습니까?</string>
@@ -1297,81 +1305,114 @@
     <string lang="ko" key="MOUNTED_DEVICE_FORCED_READ_ONLY_WRITE_PROTECTION">운영체제가 호스트 장치를 쓰기-금지로 보고했기 때문에 “%s” 볼륨이 읽기-전용으로 삽입되었습니다.\n\n일부 사용자 칩셉 드라이버는 쓰기-허용된 미디어를 쓰기-금지된 것으로 잘못 표시한다는 보고가 있음을 참고해 주십시오. 이 문제는 VeraCrypt에 의해 야기된 것이 아닙니다. 현재 시스템에 설치되어 있는 (* Microsoft가 아닌) 사용자 칩셉 드라이버를 업데이트하거나 제거해서 해결될 수 있습니다.</string>
     <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' &gt; 'Performance' and enable 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' &gt; 'Performance' and disable 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="ko" key="ASK_REMOVE_DEVICE_WRITE_PROTECTION">VeraCrypt를 이용해서 파티션/드라이브의 쓰기-금지를 제거해 보시겠습니까?</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="ko" 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="ko" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">경고: VeraCrypt볼륨이 자동으로 마운트 해재가 되었습니다.</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="ko" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">삽입이 된 볼륨을 소유한 장치를 꺼내거나 끄기 전에 마운트상태를 확인해 주십시오.\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="ko" key="UNSUPPORTED_TRUECRYPT_FORMAT">이 볼륨은 TrueCrypt %x.%x 로 생성이 되어졌습니다. VeraCrypt는 TrueCrypt 6.x/7.x에서 생성된 볼륨만 지원이 됩니다.</string>
     <string lang="ko" key="TEST">테스트</string>
     <string lang="ko" key="KEYFILE">키파일</string>
-    <string lang="ko" key="VKEY_08">Backspace</string>
+    <string lang="en" key="VKEY_08">Backspace</string>
-    <string lang="ko" key="VKEY_09">Tab</string>
+    <string lang="en" key="VKEY_09">Tab</string>
     <string lang="ko" key="VKEY_0C">제거</string>
-    <string lang="ko" key="VKEY_0D">Enter</string>
+    <string lang="en" key="VKEY_0D">Enter</string>
-    <string lang="ko" key="VKEY_13">Pause</string>
+    <string lang="en" key="VKEY_13">Pause</string>
-    <string lang="ko" key="VKEY_14">Caps Lock</string>
+    <string lang="en" key="VKEY_14">Caps Lock</string>
-    <string lang="ko" key="VKEY_20">Spacebar</string>
+    <string lang="en" key="VKEY_20">Spacebar</string>
-    <string lang="ko" key="VKEY_21">Page Up</string>
+    <string lang="en" key="VKEY_21">Page Up</string>
-    <string lang="ko" key="VKEY_22">Page Down</string>
+    <string lang="en" key="VKEY_22">Page Down</string>
-    <string lang="ko" key="VKEY_23">End</string>
+    <string lang="en" key="VKEY_23">End</string>
-    <string lang="ko" key="VKEY_24">Home</string>
+    <string lang="en" key="VKEY_24">Home</string>
-    <string lang="ko" key="VKEY_25">Left Arrow</string>
+    <string lang="en" key="VKEY_25">Left Arrow</string>
-    <string lang="ko" key="VKEY_26">Up Arrow</string>
+    <string lang="en" key="VKEY_26">Up Arrow</string>
-    <string lang="ko" key="VKEY_27">Right Arrow</string>
+    <string lang="en" key="VKEY_27">Right Arrow</string>
-    <string lang="ko" key="VKEY_28">Down Arrow</string>
+    <string lang="en" key="VKEY_28">Down Arrow</string>
     <string lang="ko" key="VKEY_29">키 선택</string>
-    <string lang="ko" key="VKEY_2A">Print Key</string>
+    <string lang="en" key="VKEY_2A">Print Key</string>
-    <string lang="ko" key="VKEY_2B">Execute Key</string>
+    <string lang="en" key="VKEY_2B">Execute Key</string>
-    <string lang="ko" key="VKEY_2C">Print Screen</string>
+    <string lang="en" key="VKEY_2C">Print Screen</string>
-    <string lang="ko" key="VKEY_2D">Insert</string>
+    <string lang="en" key="VKEY_2D">Insert</string>
-    <string lang="ko" key="VKEY_2E">Delete</string>
+    <string lang="en" key="VKEY_2E">Delete</string>
-    <string lang="ko" key="VKEY_5D">Applications Key</string>
+    <string lang="en" key="VKEY_5D">Applications Key</string>
-    <string lang="ko" key="VKEY_5F">Sleep</string>
+    <string lang="en" key="VKEY_5F">Sleep</string>
-    <string lang="ko" key="VKEY_90">Num Lock</string>
+    <string lang="en" key="VKEY_90">Num Lock</string>
-    <string lang="ko" key="VKEY_91">Scroll Lock</string>
+    <string lang="en" key="VKEY_91">Scroll Lock</string>
-    <string lang="ko" key="VKEY_A6">Browser Back</string>
+    <string lang="en" key="VKEY_A6">Browser Back</string>
-    <string lang="ko" key="VKEY_A7">Browser Forward</string>
+    <string lang="en" key="VKEY_A7">Browser Forward</string>
-    <string lang="ko" key="VKEY_A8">Browser Refresh</string>
+    <string lang="en" key="VKEY_A8">Browser Refresh</string>
-    <string lang="ko" key="VKEY_A9">Browser Stop</string>
+    <string lang="en" key="VKEY_A9">Browser Stop</string>
-    <string lang="ko" key="VKEY_AA">Browser Search</string>
+    <string lang="en" key="VKEY_AA">Browser Search</string>
-    <string lang="ko" key="VKEY_AB">Browser Favorites</string>
+    <string lang="en" key="VKEY_AB">Browser Favorites</string>
-    <string lang="ko" key="VKEY_AC">Browser Home</string>
+    <string lang="en" key="VKEY_AC">Browser Home</string>
     <string lang="ko" key="VKEY_AD">음소거</string>
-    <string lang="ko" key="VKEY_AE">Volume Down</string>
+    <string lang="en" key="VKEY_AE">Volume Down</string>
-    <string lang="ko" key="VKEY_AF">Volume Up</string>
+    <string lang="en" key="VKEY_AF">Volume Up</string>
-    <string lang="ko" key="VKEY_B0">Next Track</string>
+    <string lang="en" key="VKEY_B0">Next Track</string>
-    <string lang="ko" key="VKEY_B1">Previous Track</string>
+    <string lang="en" key="VKEY_B1">Previous Track</string>
-    <string lang="ko" key="VKEY_B2">Stop Media</string>
+    <string lang="en" key="VKEY_B2">Stop Media</string>
-    <string lang="ko" key="VKEY_B3">Play/Pause Media</string>
+    <string lang="en" key="VKEY_B3">Play/Pause Media</string>
-    <string lang="ko" key="VKEY_B4">Start Mail Key</string>
+    <string lang="en" key="VKEY_B4">Start Mail Key</string>
-    <string lang="ko" key="VKEY_B5">Select Media Key</string>
+    <string lang="en" key="VKEY_B5">Select Media Key</string>
-    <string lang="ko" key="VKEY_B6">Application 1</string>
+    <string lang="en" key="VKEY_B6">Application 1</string>
-    <string lang="ko" key="VKEY_B7">Application 2</string>
+    <string lang="en" key="VKEY_B7">Application 2</string>
-    <string lang="ko" key="VKEY_F6">Attn</string>
+    <string lang="en" key="VKEY_F6">Attn</string>
-    <string lang="ko" key="VKEY_F7">CrSel</string>
+    <string lang="en" key="VKEY_F7">CrSel</string>
-    <string lang="ko" key="VKEY_F8">ExSel</string>
+    <string lang="en" key="VKEY_F8">ExSel</string>
-    <string lang="ko" key="VKEY_FA">Play</string>
+    <string lang="en" key="VKEY_FA">Play</string>
-    <string lang="ko" key="VKEY_FB">Zoom</string>
+    <string lang="en" key="VKEY_FB">Zoom</string>
-    <string lang="ko" key="VK_NUMPAD">NumPad</string>
+    <string lang="en" key="VK_NUMPAD">NumPad</string>
-    <string lang="ko" key="VK_SHIFT">SHIFT</string>
+    <string lang="en" key="VK_SHIFT">Shift</string>
-    <string lang="ko" key="VK_CONTROL">Control</string>
+    <string lang="en" key="VK_CONTROL">Control</string>
-    <string lang="ko" key="VK_ALT">ALT</string>
+    <string lang="en" key="VK_ALT">Alt</string>
-    <string lang="ko" key="VK_WIN">Win</string>
+    <string lang="en" key="VK_WIN">Win</string>
-    <string lang="ko" key="BYTE">B</string>
+    <string lang="en" key="BYTE">B</string>
-    <string lang="ko" key="KB">KB</string>
+    <string lang="en" key="KB">KB</string>
-    <string lang="ko" key="MB">MB</string>
+    <string lang="en" key="MB">MB</string>
-    <string lang="ko" key="GB">GB</string>
+    <string lang="en" key="GB">GB</string>
-    <string lang="ko" key="TB">TB</string>
+    <string lang="en" key="TB">TB</string>
-    <string lang="ko" key="PB">PB</string>
+    <string lang="en" key="PB">PB</string>
-    <string lang="ko" key="B_PER_SEC">B/s</string>
+    <string lang="en" key="B_PER_SEC">B/s</string>
-    <string lang="ko" key="KB_PER_SEC">KB/s</string>
+    <string lang="en" key="KB_PER_SEC">KB/s</string>
-    <string lang="ko" key="MB_PER_SEC">MB/s</string>
+    <string lang="en" key="MB_PER_SEC">MB/s</string>
-    <string lang="ko" key="GB_PER_SEC">GB/s</string>
+    <string lang="en" key="GB_PER_SEC">GB/s</string>
-    <string lang="ko" key="TB_PER_SEC">TB/s</string>
+    <string lang="en" key="TB_PER_SEC">TB/s</string>
-    <string lang="ko" key="PB_PER_SEC">PB/s</string>
+    <string lang="en" key="PB_PER_SEC">PB/s</string>
     <string lang="en" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="ko" key="ERR_EXFAT_INVALID_VOLUME_SIZE">오류: 명령 프롬프트에 지정된 볼륨 사이즈는 선택된 exFAT 파일 시스템과 호환이 되지 않습니다.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.lv.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="lv" name="Latviešu" en-name="Latvian" version="0.1.0" translators="Edmunds Melkers" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="en" key="IDC_BROWSE">Bro&amp;wse...</control>
     <control lang="en" key="IDC_DESKTOP_ICON">Add VeraCrypt icon to &amp;desktop</control>
     <control lang="en" key="IDC_DONATE">Donate now...</control>
-    <control lang="en" key="IDC_FILE_TYPE">Associate the .tc file &amp;extension with VeraCrypt</control>
+    <control lang="en" key="IDC_FILE_TYPE">Associate the .hc file &amp;extension with VeraCrypt</control>
     <control lang="en" key="IDC_OPEN_CONTAINING_FOLDER">&amp;Open the destination location when finished</control>
     <control lang="en" key="IDC_PROG_GROUP">Add VeraCrypt to &amp;Start menu</control>
     <control lang="en" key="IDC_SYSTEM_RESTORE">Create System &amp;Restore point</control>
@@ -37,6 +37,7 @@
     <control lang="en" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Download CD/DVD recording software</control>
     <control lang="en" key="IDC_FILE_CONTAINER">Create an encrypted file container</control>
     <control lang="en" key="IDC_GB">&amp;GB</control>
+    <control lang="en" key="IDC_TB">&amp;TB</control>
     <control lang="en" key="IDC_HIDDEN_SYSENC_INFO_LINK">More information</control>
     <control lang="en" key="IDC_HIDDEN_VOL">Hi&amp;dden VeraCrypt volume </control>
     <control lang="en" key="IDC_HIDDEN_VOL_HELP">More information about hidden volumes</control>
@@ -44,6 +45,7 @@
     <control lang="en" key="IDC_HIDVOL_WIZ_MODE_FULL">Normal mode</control>
     <control lang="lv" key="IDC_KB">&amp;KB</control>
     <control lang="en" key="IDC_KEYFILES_ENABLE">U&amp;se keyfiles</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="en" key="IDC_KEY_FILES">&amp;Keyfiles...</control>
     <control lang="en" key="IDC_LINK_HASH_INFO">Information on hash algorithms</control>
@@ -58,7 +60,8 @@
     <control lang="en" key="IDC_NO_HISTORY">&amp;Never save history</control>
     <control lang="lv" key="IDC_OPEN_OUTER_VOLUME">Atvērt ārējo apgabalu</control>
     <control lang="en" key="IDC_PAUSE">&amp;Pause</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="lv" key="IDC_QUICKFORMAT">Ātrā formatēšana</control>
     <control lang="en" key="IDC_SHOW_PASSWORD">&amp;Display password</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Display password</control>
@@ -118,6 +121,7 @@
     <control lang="lv" key="IDC_CREATE">Izveidot</control>
     <control lang="lv" key="IDC_CREATE_VOLUME">Izveidot apgabalu</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <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="lv" key="IDC_ENABLE_KEYFILES">Lietot atslēgdatnes</control>
     <control lang="lv" key="IDC_ENABLE_NEW_KEYFILES">Lietot atslēgdatnes</control>
@@ -132,6 +136,7 @@
     <control lang="en" key="IDC_FAVORITE_MOVE_UP">Move &amp;Up</control>
     <control lang="en" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Open &amp;Explorer window for selected volume when successfully mounted</control>
     <control lang="en" key="IDC_FAVORITE_REMOVE">&amp;Remove</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="en" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Global Settings</control>
     <control lang="en" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Display balloon tooltip after successful hot-key dismount</control>
     <control lang="en" key="IDC_HK_DISMOUNT_PLAY_SOUND">Play system notification sound after successful hot-key dismount</control>
@@ -189,7 +194,7 @@
     <control lang="lv" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="en" key="IDD_PASSWORDCHANGE_DLG">Change Password or Keyfiles</control>
     <control lang="lv" key="IDD_PASSWORD_DLG">Ievadiet VeraCrypt apgabala paroli</control>
-    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance Options</control>
+    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance and Driver Options</control>
     <control lang="lv" key="IDD_PREFERENCES_DLG">VeraCrypt - Iespējas</control>
     <control lang="en" key="IDD_SYSENC_SETTINGS">VeraCrypt - System Encryption Settings</control>
     <control lang="en" key="IDD_TOKEN_PREFERENCES">VeraCrypt - Security Token Preferences</control>
@@ -235,7 +240,7 @@
     <control lang="en" key="IDM_ONLINE_TUTORIAL">Beginner's Tutorial</control>
     <control lang="en" key="IDM_ORGANIZE_FAVORITES">Organize Favorite Volumes...</control>
     <control lang="en" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organize System Favorite Volumes...</control>
-    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance...</control>
+    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance/Driver Configuration</control>
     <control lang="en" key="IDM_PERMANENTLY_DECRYPT_SYS">Permanently Decrypt System Partition/Drive</control>
     <control lang="lv" key="IDM_PREFERENCES">Iespējas...</control>
     <control lang="lv" key="IDM_REFRESH_DRIVE_LETTERS">Atsvaidzināt diskdziņu burtus</control>
@@ -256,6 +261,7 @@
     <control lang="lv" key="IDM_UNMOUNTALL">Demontēt visus uzstādītos apgabalus</control>
     <control lang="lv" key="IDM_UNMOUNT_VOLUME">Demontēt apgabalu</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 Image</control>
     <control lang="lv" key="IDM_VERSION_HISTORY">Versijas vēsture</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="lv" key="IDM_VOLUME_PROPERTIES">Apgabala īpšības</control>
@@ -365,7 +371,7 @@
     <control lang="en" key="IDT_SECURITY_TOKEN">Security token:</control>
     <control lang="lv" key="IDT_SORT_METHOD">Kārtošanas metode:</control>
     <control lang="en" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Please wait. This process may take a long time...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="en" key="IDT_TEST_BLOCK_NUMBER">Block number:</control>
     <control lang="lv" key="IDT_TEST_CIPHERTEXT">Šifrteksts (hexadecimal)</control>
     <control lang="en" key="IDT_TEST_DATA_UNIT_NUMBER">Data unit number (64-bit hexadecimal, data unit size is 512 bytes)</control>
@@ -410,13 +416,13 @@
     <string lang="lv" key="CIPHER_TITLE">Šifrēšanas iespējas</string>
     <string lang="en" key="CLEAN_WINMRU_FAILED">WARNING: Failed to clear the path of the last selected volume/keyfile (remembered by file selector)!</string>
     <string lang="en" key="COMPRESSION_NOT_SUPPORTED">Error: The container has been compressed at the filesystem level. VeraCrypt does not support compressed containers (note that compression of encrypted data is ineffective and redundant).\n\nPlease disable compression for the container by following these steps:\n1) Right-click the container in Windows Explorer (not in VeraCrypt).\n2) Select 'Properties'.\n3) In the 'Properties' dialog box, click 'Advanced'.\n4) In the 'Advanced Attributes' dialog box, disable the option 'Compress contents to save disk space' and click 'OK'.\n5) In the 'Properties' dialog box, click 'OK'.</string>
-    <string lang="en" key="CREATE_FAILED">Failed to create volume %hs</string>
+    <string lang="en" key="CREATE_FAILED">Failed to create volume %s</string>
-    <string lang="en" key="DEVICE_FREE_BYTES">Size of %hs is %.2f bytes</string>
+    <string lang="en" key="DEVICE_FREE_BYTES">Size of %s is %.2f bytes</string>
-    <string lang="en" key="DEVICE_FREE_KB">Size of %hs is %.2f KB</string>
+    <string lang="en" key="DEVICE_FREE_KB">Size of %s is %.2f KB</string>
-    <string lang="en" key="DEVICE_FREE_MB">Size of %hs is %.2f MB</string>
+    <string lang="en" key="DEVICE_FREE_MB">Size of %s is %.2f MB</string>
-    <string lang="en" key="DEVICE_FREE_GB">Size of %hs is %.2f GB</string>
+    <string lang="en" key="DEVICE_FREE_GB">Size of %s is %.2f GB</string>
-    <string lang="en" key="DEVICE_FREE_TB">Size of %hs is %.2f TB</string>
+    <string lang="en" key="DEVICE_FREE_TB">Size of %s is %.2f TB</string>
-    <string lang="en" key="DEVICE_FREE_PB">Size of %hs is %.2f PB</string>
+    <string lang="en" key="DEVICE_FREE_PB">Size of %s is %.2f PB</string>
     <string lang="en" key="DEVICE_IN_USE_FORMAT">WARNING: The device/partition is in use by the operating system or applications. Formatting the device/partition might cause data corruption and system instability.\n\nContinue?</string>
     <string lang="en" key="DEVICE_IN_USE_INPLACE_ENC">Warning: The partition is in use by the operating system or applications. You should close any applications that might be using the partition (including antivirus software).\n\nContinue?</string>
     <string lang="en" key="FORMAT_CANT_DISMOUNT_FILESYS">Error: The device/partition contains a file system that could not be dismounted. The file system may be in use by the operating system. Formatting the device/partition would very likely cause data corruption and system instability.\n\nTo solve this issue, we recommend that you first delete the partition and then recreate it without formatting. To do so, follow these steps:\n1) Right-click the 'Computer' (or 'My Computer') icon in the 'Start Menu' and select 'Manage'. The 'Computer Management' window should appear.\n2) In the 'Computer Management' window, select 'Storage' &gt; 'Disk Management'.\n3) Right-click the partition you want to encrypt and select either 'Delete Partition', or 'Delete Volume', or 'Delete Logical Drive'.\n4) Click 'Yes'. If Windows asks you to restart the computer, do so. Then repeat the steps 1 and 2 and continue from the step 5.\n5) Right-click the unallocated/free space area and select either 'New Partition', or 'New Simple Volume', or 'New Logical Drive'.\n6) The 'New Partition Wizard' or 'New Simple Volume Wizard' window should appear now; follow its instructions. On the wizard page entitled 'Format Partition', select either 'Do not format this partition' or 'Do not format this volume'. In the same wizard, click 'Next' and then 'Finish'.\n7) Note that the device path you have selected in VeraCrypt may be wrong now. Therefore, exit the VeraCrypt Volume Creation Wizard (if it is still running) and then start it again.\n8) Try encrypting the device/partition again.\n\nIf VeraCrypt repeatedly fails to encrypt the device/partition, you may want to consider creating a file container instead.</string>
@@ -435,15 +441,15 @@
     <string lang="en" key="INPLACE_ENC_INVALID_PATH">Error: VeraCrypt can in-place encrypt only a partition, a dynamic volume, or an entire system drive. Please make sure the specified path is valid.</string>
     <string lang="en" key="CANNOT_RESIZE_FILESYS">Error: Cannot shrink the filesystem (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPossible causes and solutions:\n\n- Not enough free space on the volume. Please make sure no other application is writing to the filesystem.\n\n- Corrupted file system. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
     <string lang="en" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Error: There is not enough free space on the volume and so the filesystem cannot be shrunk (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPlease delete any redundant files and empty the Recycle Bin so as to free at least 256 KB of space and then try again. Note that due to a Windows issue, the amount of free space reported by the Windows Explorer may be incorrect until the operating system is restarted. If restarting the system does not help, the file system may be corrupted. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
-    <string lang="lv" key="DISK_FREE_BYTES">Diskā %hs ir %.2f baiti brīvas vietas.</string>
+    <string lang="lv" key="DISK_FREE_BYTES">Diskā %s ir %.2f baiti brīvas vietas.</string>
-    <string lang="en" key="DISK_FREE_KB">Free space on drive %hs is %.2f KB</string>
+    <string lang="en" key="DISK_FREE_KB">Free space on drive %s is %.2f KB</string>
-    <string lang="en" key="DISK_FREE_MB">Free space on drive %hs is %.2f MB</string>
+    <string lang="en" key="DISK_FREE_MB">Free space on drive %s is %.2f MB</string>
-    <string lang="en" key="DISK_FREE_GB">Free space on drive %hs is %.2f GB</string>
+    <string lang="en" key="DISK_FREE_GB">Free space on drive %s is %.2f GB</string>
-    <string lang="en" key="DISK_FREE_TB">Free space on drive %hs is %.2f TB</string>
+    <string lang="en" key="DISK_FREE_TB">Free space on drive %s is %.2f TB</string>
-    <string lang="en" key="DISK_FREE_PB">Free space on drive %hs is %.2f PB</string>
+    <string lang="en" key="DISK_FREE_PB">Free space on drive %s is %.2f PB</string>
     <string lang="en" key="DRIVELETTERS">Could not get available drive letters.</string>
     <string lang="en" key="DRIVER_NOT_FOUND">Error: VeraCrypt driver not found.\n\nPlease copy the files 'veracrypt.sys' and 'veracrypt-x64.sys' to the directory where the main VeraCrypt application (VeraCrypt.exe) is located.</string>
-    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall; on Windows XP, select 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
+    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' > Computer > 'Uninstall or change a program' > VeraCrypt > Uninstall; on Windows XP, select 'Start Menu' > Settings > 'Control Panel' > 'Add Or Remove Programs' > VeraCrypt > Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
     <string lang="en" key="ERR_CIPHER_INIT_FAILURE">Error: Cipher initialization failure.</string>
     <string lang="en" key="ERR_CIPHER_INIT_WEAK_KEY">Error: A weak or a potentially weak key has been detected. The key will be discarded. Please try again.</string>
     <string lang="en" key="EXCEPTION_REPORT">A critical error has occurred and VeraCrypt must be terminated. If this is caused by a bug in VeraCrypt, we would like to fix it. To help us, you can send us an automatically generated error report containing the following items:\n\n- Program version\n- Operating system version\n- Type of CPU\n- VeraCrypt component name\n- Checksum of VeraCrypt executable\n- Symbolic name of dialog window\n- Error category\n- Error address\n- VeraCrypt call stack\n\nIf you select 'Yes', the following URL (which contains the entire error report) will be opened in your default Internet browser.\n\n%hs\n\nDo you want to send us the above error report?</string>
@@ -497,7 +503,7 @@
     <string lang="en" key="WIPE_FINISHED">The content of the partition/device has been successfully erased.</string>
     <string lang="en" key="WIPE_FINISHED_DECOY_SYSTEM_PARTITION">The content of the partition where the original system (of which the hidden system is a clone) resided has been successfully erased.</string>
     <string lang="en" key="DECOY_OS_VERSION_WARNING">Please make sure the version of Windows you are going to install (on the wiped partition) is the same as the version of Windows you are currently running. This is required due to the fact that both systems will share a common boot partition.</string>
-    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' &gt; 'Add Mounted Volume to System Favorites').</string>
+    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' > 'Add Mounted Volume to System Favorites').</string>
     <string lang="en" key="SYSTEM_DECRYPTION_FINISHED">The system partition/drive has been successfully decrypted.</string>
     <string lang="en" key="FORMAT_FINISHED_HELP">\n\nThe VeraCrypt volume has been created and is ready for use. If you wish to create another VeraCrypt volume, click Next. Otherwise, click Exit.</string>
     <string lang="en" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nThe hidden VeraCrypt volume has been successfully created (the hidden operating system will reside within this hidden volume).\n\nClick Next to continue.</string>
@@ -524,7 +530,7 @@
     <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 password for this outer volume, and the existence of the hidden volume (and of the hidden operating system) will remain secret.\n\nIMPORTANT: The files you copy to the outer volume should not occupy more than %s. Otherwise, there may not be enough free space on the outer volume for the hidden volume (and you will not be able to continue). After you finish copying, click Next (do not dismount the volume).</string>
     <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 you finish copying, click Next. Do not dismount the volume.\n\nNote: After you click Next, cluster bitmap of the outer volume will be scanned to determine the size of uninterrupted area of free space whose end is aligned with the end of the volume. This area will accommodate the hidden volume, so it will limit its maximum possible size. Cluster bitmap scanning ensures that no data on the outer volume are overwritten by the hidden volume.</string>
     <string lang="en" key="HIDVOL_HOST_FILLING_TITLE">Outer Volume Contents</string>
-    <string lang="en" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nIn the next steps, you will set the options for the outer volume (within which the hidden volume will be created later on). </string>
+    <string lang="en" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nIn the next steps, you will set the options for the outer volume (within which the hidden volume will be created later on).</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>
     <string lang="en" key="HIDVOL_HOST_PRE_CIPHER_TITLE">Outer Volume</string>
     <string lang="en" key="HIDDEN_OS_PRE_CIPHER_HELP">In the following steps, you will set the options and password for the hidden volume, which will contain the hidden operating system.\n\nRemark: The cluster bitmap of the outer volume has been scanned in order to determine the size of uninterrupted area of free space whose end is aligned with the end of the outer volume. This area will accommodate the hidden volume, so it limits its maximum possible size. The maximum possible size of the hidden volume has been determined and confirmed to be greater than the size of the system partition (which is required, because the entire content of the system partition will need to be copied to the hidden volume). This ensures that no data currently stored on the outer volume will be overwritten by data written to the area of the hidden volume.</string>
@@ -561,6 +567,7 @@
     <string lang="en" key="MAX_HIDVOL_SIZE_KB">Maximum possible hidden volume size for this volume is %.2f KB.</string>
     <string lang="en" key="MAX_HIDVOL_SIZE_MB">Maximum possible hidden volume size for this volume is %.2f MB.</string>
     <string lang="en" key="MAX_HIDVOL_SIZE_GB">Maximum possible hidden volume size for this volume is %.2f GB.</string>
+    <string lang="en" key="MAX_HIDVOL_SIZE_TB">Maximum possible hidden volume size for this volume is %.2f TB.</string>
     <string lang="en" key="MOUNTED_NOPWCHANGE">Volume password/keyfiles cannot be changed while the volume is mounted. Please dismount the volume first.</string>
     <string lang="en" key="MOUNTED_NO_PKCS5_PRF_CHANGE">The header key derivation algorithm cannot be changed while the volume is mounted. Please dismount the volume first.</string>
     <string lang="lv" key="MOUNT_BUTTON">Uzstādīt izvēlēto</string>
@@ -591,12 +598,12 @@
     <string lang="en" key="SELECT_PKCS11_MODULE">Select PKCS #11 Library</string>
     <string lang="en" key="OUTOFMEMORY">Out of Memory</string>
     <string lang="en" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">IMPORTANT: We strongly recommend that inexperienced users create a VeraCrypt file container on the selected device/partition, instead of attempting to encrypt the entire device/partition.\n\nWhen you create a VeraCrypt file container (as opposed to encrypting a device or partition) there is, for example, no risk of destroying a large number of files. Note that a VeraCrypt file container (even though it contains a virtual encrypted disk) is actually just like any normal file. For more information, see the chapter Beginner's Tutorial in the VeraCrypt User Guide.\n\nAre you sure you want to encrypt the entire device/partition?</string>
-    <string lang="en" key="OVERWRITEPROMPT">WARNING: The file '%hs' already exists!\n\nIMPORTANT: VERACRYPT WILL NOT ENCRYPT THE FILE, BUT IT WILL DELETE IT. Are you sure you want to delete the file and replace it with a new VeraCrypt container?</string>
+    <string lang="en" key="OVERWRITEPROMPT">WARNING: The file '%s' already exists!\n\nIMPORTANT: VERACRYPT WILL NOT ENCRYPT THE FILE, BUT IT WILL DELETE IT. Are you sure you want to delete the file and replace it with a new VeraCrypt container?</string>
-    <string lang="en" key="OVERWRITEPROMPT_DEVICE">CAUTION: ALL FILES CURRENTLY STORED ON THE SELECTED %s '%hs'%s WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
+    <string lang="en" key="OVERWRITEPROMPT_DEVICE">CAUTION: ALL FILES CURRENTLY STORED ON THE SELECTED %s '%s'%s WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
-    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%s'%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting/decrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting/decrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting/decrypting, please make sure that you have backup copies of the files you want to encrypt/decrypt.\n\nDo you have such a backup?</string>
-    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%hs'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
+    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%s'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
     <string lang="en" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">WARNING: THE SELECTED PARTITION CONTAINS A LARGE AMOUNT OF DATA! Any files stored on the partition will be erased and lost (they will NOT be encrypted)!</string>
     <string lang="en" key="ERASE_FILES_BY_CREATING_VOLUME">Erase any files stored on the partition by creating a VeraCrypt volume within it</string>
     <string lang="lv" key="PASSWORD">Parole</string>
@@ -645,7 +652,7 @@
     <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
     <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
     <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 &gt; Organize &gt; 'Folder and search options' &gt; View).</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="SELECTED_PARTITION_ALREADY_INPLACE_ENC">The selected partition/device is already fully encrypted.\nHeader Flags = 0x%.8X</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="en" key="PREV">&lt; &amp;Back</string>
     <string lang="en" key="RAWDEVICES">Unable to list raw devices installed on your system!</string>
-    <string lang="en" key="READONLYPROMPT">The volume '%hs' exists, and is read-only. Are you sure you want to replace it?</string>
+    <string lang="en" key="READONLYPROMPT">The volume '%s' exists, and is read-only. Are you sure you want to replace it?</string>
     <string lang="en" key="SELECT_DEST_DIR">Select destination directory</string>
     <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>
@@ -680,13 +687,13 @@
     <string lang="en" key="TEST_CIPHERTEXT_SIZE">The test ciphertext you have supplied is too long or short.</string>
     <string lang="en" key="TEST_KEY_SIZE">The test key you have supplied is too long or short.</string>
     <string lang="en" key="TEST_PLAINTEXT_SIZE">The test plaintext you have supplied is too long or short.</string>
-    <string lang="en" key="TWO_LAYER_CASCADE_HELP">Two ciphers in a cascade operating in XTS mode. Each block is first encrypted with %hs (%d-bit key) and then with %hs (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
+    <string lang="en" key="TWO_LAYER_CASCADE_HELP">Two ciphers in a cascade operating in XTS mode. Each block is first encrypted with %s (%d-bit key) and then with %s (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
-    <string lang="en" key="THREE_LAYER_CASCADE_HELP">Three ciphers in a cascade operating in XTS mode. Each block is first encrypted with %hs (%d-bit key), then with %hs (%d-bit key), and finally with %hs (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
+    <string lang="en" key="THREE_LAYER_CASCADE_HELP">Three ciphers in a cascade operating in XTS mode. Each block is first encrypted with %s (%d-bit key), then with %s (%d-bit key), and finally with %s (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
     <string lang="en" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Note that, depending on the operating system configuration, these auto-run and auto-mount features may work only when the traveler disk files are created on a non-writable CD/DVD-like medium. Also note that this is not a bug in VeraCrypt (it is a limitation of Windows).</string>
     <string lang="en" key="TRAVELER_DISK_CREATED">VeraCrypt traveler disk has been successfully created.\n\nNote that you need administrator privileges to run VeraCrypt in portable mode. Also note that, after examining the registry file, it may be possible to tell that VeraCrypt was run on a Windows system even if it is run in portable mode.</string>
     <string lang="en" key="TC_TRAVELER_DISK">VeraCrypt Traveler Disk</string>
     <string lang="en" key="TWOFISH_HELP">Designed by Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall, and Niels Ferguson. Published in 1998. 256-bit key, 128-bit block. Mode of operation is XTS. Twofish was one of the AES finalists.</string>
-    <string lang="en" key="MORE_INFO_ABOUT">More information on %hs</string>
+    <string lang="en" key="MORE_INFO_ABOUT">More information on %s</string>
     <string lang="en" key="UNKNOWN">Unknown</string>
     <string lang="en" key="ERR_UNKNOWN">An unspecified or unknown error occurred (%d).</string>
     <string lang="en" key="UNMOUNTALL_LOCK_FAILED">Some volumes contain files or folders being used by applications or system.\n\nForce dismount?</string>
@@ -706,7 +713,7 @@
     <string lang="lv" key="WRONG_VOL_TYPE">VeraCrypt nevar mainīt paroli svešas izcelsmes apgabalam.</string>
     <string lang="lv" key="SELECT_FREE_DRIVE">Izvēlieties brīvu diskburtu no saraksta.</string>
     <string lang="lv" key="SELECT_A_MOUNTED_VOLUME">Izvēlieties uzstādīto apgabalu diskburtu sarakstā.</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="lv" key="CANT_CREATE_AUTORUN">Kļūda: Nav iespējams izveidot datni autorun.inf</string>
     <string lang="lv" key="ERR_PROCESS_KEYFILE">Kļūda atslēgdatnes apstrādē.</string>
     <string lang="lv" key="ERR_PROCESS_KEYFILE_PATH">Kļūda atslēgdatnes izvietojuma apstrādē.</string>
@@ -851,7 +858,7 @@
     <string lang="en" key="INSTALL_FAILED">Installation failed.</string>
     <string lang="en" key="UNINSTALL_FAILED">Uninstallation failed.</string>
     <string lang="en" key="DIST_PACKAGE_CORRUPTED">This distribution package is damaged. Please try downloading it again (preferably from the official VeraCrypt website at https://veracrypt.codeplex.com).</string>
-    <string lang="en" key="CANNOT_WRITE_FILE_X">Cannot write file %hs</string>
+    <string lang="en" key="CANNOT_WRITE_FILE_X">Cannot write file %s</string>
     <string lang="en" key="EXTRACTING_VERB">Extracting</string>
     <string lang="en" key="CANNOT_READ_FROM_PACKAGE">Cannot read data from the package.</string>
     <string lang="en" key="CANT_VERIFY_PACKAGE_INTEGRITY">Cannot verify the integrity of this distribution package.</string>
@@ -860,8 +867,8 @@
     <string lang="en" key="INSTALL_OK">VeraCrypt has been successfully installed.</string>
     <string lang="en" key="SETUP_UPDATE_OK">VeraCrypt has been successfully updated.</string>
     <string lang="en" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt has been successfully upgraded. However, before you can start using it, the computer must be restarted.\n\nDo you want to restart it now?</string>
-    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
+    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu > All programs > Accessories > System Tools > System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
-    <string lang="en" key="UNINSTALL_OK">VeraCrypt has been successfully uninstalled.\n\nClick 'Finish' to remove the VeraCrypt installer and the folder %hs. Note that the folder will not be removed if it contains any files that were not installed by the VeraCrypt installer or created by VeraCrypt.</string>
+    <string lang="en" key="UNINSTALL_OK">VeraCrypt has been successfully uninstalled.\n\nClick 'Finish' to remove the VeraCrypt installer and the folder %s. Note that the folder will not be removed if it contains any files that were not installed by the VeraCrypt installer or created by VeraCrypt.</string>
     <string lang="en" key="REMOVING_REG">Removing VeraCrypt registry entries</string>
     <string lang="en" key="ADDING_REG">Adding registry entry</string>
     <string lang="en" key="REMOVING_APPDATA">Removing application-specific data</string>
@@ -872,10 +879,10 @@
     <string lang="lv" key="CREATING_SYS_RESTORE">Sistēmas atjaunošanas punkta izveidošana</string>
     <string lang="lv" key="FAILED_SYS_RESTORE">Sistēmas atjaunošanas punkta izveidošana nesekmīga.</string>
     <string lang="en" key="INSTALLER_UPDATING_BOOT_LOADER">Updating boot loader</string>
-    <string lang="en" key="INSTALL_OF_FAILED">Failed to install '%hs'. %hs\nDo you want to continue installing?</string>
+    <string lang="en" key="INSTALL_OF_FAILED">Failed to install '%s'. %s\nDo you want to continue installing?</string>
-    <string lang="en" key="UNINSTALL_OF_FAILED">Failed to uninstall '%hs'. %hs\nDo you want to continue uninstalling?</string>
+    <string lang="en" key="UNINSTALL_OF_FAILED">Failed to uninstall '%s'. %s\nDo you want to continue uninstalling?</string>
     <string lang="lv" key="INSTALL_COMPLETED">Uzstādīšana paveikta.</string>
-    <string lang="lv" key="CANT_CREATE_FOLDER">Mapi '%hs' nav iespējams izveidot</string>
+    <string lang="lv" key="CANT_CREATE_FOLDER">Mapi '%s' nav iespējams izveidot</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="en" key="DISMOUNT_ALL_FIRST">All VeraCrypt volumes must be dismounted before installing or uninstalling 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>
@@ -921,14 +928,14 @@
     <string lang="en" key="SYS_FAVORITE_VOLUMES_SAVED">System favorite volumes saved.\n\nTo enable mounting of system favorite volumes when the system starts, please select 'Settings' &gt; 'System Favorite Volumes' &gt; 'Mount system favorite volumes when Windows starts'.</string>
     <string lang="en" key="FAVORITE_ADD_DRIVE_DEV_WARNING">The volume you are adding to favorites is neither a partition nor a dynamic volume. Therefore, VeraCrypt will be unable to mount this favorite volume if the device number changes.</string>
     <string lang="en" key="FAVORITE_ADD_PARTITION_TYPE_WARNING">The volume you are adding to favorites is a partition not recognized by Windows.\n\nVeraCrypt will be unable to mount this favorite volume if the device number changes. Please set the type of the partition to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then add the partition to favorites again.</string>
-    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings &gt; Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
+    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings > Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_NETWORK_PATH_ERR">A container stored in a remote filesystem shared over a network cannot be automatically mounted when its host device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, the volume hosted on the device cannot be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable the volume hosted on the device to be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_LABEL_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, no label can be assigned to it.</string>
     <string lang="en" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable VeraCrypt to assign a label to the partition.</string>
     <string lang="en" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Due to a Windows limitation, a container stored in a remote filesystem shared over a network cannot be mounted as a system favorite volume (however, it can be mounted as a non-system favorite volume when a user logs on).</string>
-    <string lang="lv" key="ENTER_PASSWORD_FOR">Ievadiet paroli apgabalam %hs</string>
+    <string lang="lv" key="ENTER_PASSWORD_FOR">Ievadiet paroli apgabalam %s</string>
     <string lang="en" key="ENTER_PASSWORD_FOR_LABEL">Enter password for '%s'</string>
     <string lang="en" key="ENTER_NORMAL_VOL_PASSWORD">Enter password for the normal/outer volume</string>
     <string lang="en" key="ENTER_HIDDEN_VOL_PASSWORD">Enter password for the hidden volume</string>
@@ -943,8 +950,8 @@
     <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 header backup to restore a header of a different volume, you will be able to mount the volume, but you will NOT be able to decrypt any data stored in the volume (because you will change its master key).</string>
     <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) for the hidden volume.</string>
-    <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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</string>
+    <string lang="en" key="CONFIRM_VOL_HEADER_BAK">Are you sure you want to create volume header backup for %s?\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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</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="CONFIRM_VOL_HEADER_RESTORE">Are you sure you want to restore volume header of %s?\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>
@@ -955,12 +962,14 @@
     <string lang="en" key="VOLUME_HAS_NO_BACKUP_HEADER">There is no backup header embedded in this volume (note that only volumes created by VeraCrypt 6.0 or later contain embedded backup headers).</string>
     <string lang="en" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">You are attempting to back up the header of the system partition/drive. This is not allowed. Backup/restore operations pertaining to the system partition/drive can be performed only using the VeraCrypt Rescue Disk.\n\nDo you want to create a VeraCrypt Rescue Disk?</string>
     <string lang="en" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">You are attempting to restore the header of a virtual VeraCrypt volume but you selected the system partition/drive. This is not allowed. Backup/restore operations pertaining to the system partition/drive can be performed only using the VeraCrypt Rescue Disk.\n\nDo you want to create a VeraCrypt Rescue Disk?</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">After you click OK, you will select a filename for the new VeraCrypt Rescue Disk ISO image and the location where you wish to place it.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">After you click OK, you will select a filename for the new VeraCrypt Rescue Disk image and the location where you wish to place it.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <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_INSERT">Please insert your VeraCrypt Rescue Disk 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 a new Rescue Disk fully compatible with your current configuration, select 'System' &gt; 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk 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' &gt; '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 be used, because it was created for a different master key. You need to burn the newly generated Rescue Disk.</string>
@@ -989,8 +998,8 @@
     <string lang="en" key="DRIVE_LETTER_ITEM">Drive Letter:   </string>
     <string lang="en" key="UNSUPPORTED_CHARS_IN_PWD">Error: Password must contain only ASCII characters.\n\nNon-ASCII characters in password might cause the volume to be impossible to mount when your system configuration changes.\n\nThe following characters are allowed:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="en" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">Warning: Password contains non-ASCII characters. This may cause the volume to be impossible to mount when your system configuration changes.\n\nYou should replace all non-ASCII characters in the password with ASCII characters. To do so, click 'Volumes' -&gt; 'Change Volume Password'.\n\nThe following are ASCII characters:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="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 change it (e.g., to '.tc').\n\nAre you sure you want to use the problematic file extension?</string>
+    <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 change it (e.g., to '.hc').\n\nAre you sure you want to use the problematic file extension?</string>
-    <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 container or change it (e.g., to '.tc') after you dismount the volume.</string>
+    <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 container or change it (e.g., to '.hc') after you dismount the volume.</string>
     <string lang="lv" key="HOMEPAGE">Mājaslapa</string>
     <string lang="en" key="LARGE_IDE_WARNING_XP">WARNING: It appears that you have not applied any Service Pack to your Windows installation. You should not write to IDE disks larger than 128 GB under Windows XP to which you did not apply Service Pack 1 or later! 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 bug in VeraCrypt.</string>
     <string lang="en" key="LARGE_IDE_WARNING_2K">WARNING: It appears that you have not applied Service Pack 3 or later to your Windows installation. You should not write to IDE disks larger than 128 GB under Windows 2000 to which you did not apply Service Pack 3 or later! 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 bug in VeraCrypt.\n\nNote: You may also need to enable the 48-bit LBA support in the registry; for more information, see http://support.microsoft.com/kb/305098/EN-US</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="en" key="CHECKING_FS">Checking the file system on the VeraCrypt volume mounted as %s...</string>
-    <string lang="en" key="REPAIRING_FS">Attempting to repair the file system on the VeraCrypt volume mounted as %hs...</string>
+    <string lang="en" key="REPAIRING_FS">Attempting to repair the file system on the VeraCrypt volume mounted as %s...</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 later.</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 encryption algorithm (e.g., AES, Serpent, Twofish, etc.) and that you move all files from this volume to the new volume.</string>
     <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="en" key="SYS_ASSIGN_DRIVE_LETTER">Please assign a drive letter to the partition/device before proceeding ('Control Panel' &gt; 'System and Maintenance' &gt; 'Administrative Tools' - 'Create and format hard disk partitions').\n\nNote that this is a requirement of the operating system.</string>
@@ -1069,7 +1077,7 @@
     <string lang="en" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt no longer supports encryption of the system partition/drive on Windows Vista with no Service Pack installed. Before upgrading VeraCrypt, please install Service Pack 1 or higher for Windows Vista.</string>
     <string lang="en" key="FEATURE_REQUIRES_INSTALLATION">Error: This feature requires VeraCrypt to be installed on the system (you are running VeraCrypt in portable mode).\n\nPlease install VeraCrypt and then try again.</string>
     <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="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</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' &gt; '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>
@@ -1093,7 +1101,7 @@
     <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 medium (or using a service partition)?</string>
     <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 Hidden Volumes" in the VeraCrypt User's Guide.\n\nImportant: Before proceeding, please make sure you have read the section "Security Requirements and Precautions Pertaining to Hidden Volumes" in the VeraCrypt User's Guide.\n\n\nDoes the currently running operating system meet the above condition?</string>
     <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 from writing to the shared boot partition and from hibernating.\n\n\nDo you want to continue? If you select 'No', instructions for removing the extra boot partition will be displayed.</string>
-    <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' &gt; '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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
+    <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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
     <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>
@@ -1108,8 +1116,8 @@
     <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 you do NOT have a real US keyboard.</string>
     <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 starts.\n\n- The VRD will contain a backup of the present content of the first drive track (which typically contains a system loader or boot manager) and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ISO image will be created in the location specified below.</string>
     <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">The Rescue Disk image has been created and stored in this file:\n%s\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>
+    <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%s\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>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">IMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software. If you do not have any CD/DVD recording software that can write the ISO disk image to a CD/DVD, click the link below to download such free software.\n\n</string>
     <string lang="en" key="LAUNCH_WIN_ISOBURN">Launch Microsoft Windows Disc Image Burner</string>
     <string lang="en" key="RESCUE_DISK_BURN_NO_CHECK_WARN">WARNING: If you already created a VeraCrypt Rescue Disk in the past, it cannot be reused for this system partition/drive because it was created for a different master key! Every time you encrypt a system partition/drive, you must create a new VeraCrypt Rescue Disk for it even if you use the same password.</string>
@@ -1247,7 +1255,7 @@
     <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 system (but not on the decoy system), the decoy system would contain a VeraCrypt driver and VeraCrypt applications whose version numbers are different from the version number of the VeraCrypt Boot Loader. Such a discrepancy might indicate that there is a hidden operating system on this computer.\n\n\nDo you want to continue?</string>
     <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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' &gt; '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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' > 'Create Rescue Disk').</string>
     <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' &gt; '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' &gt; 'Create Rescue Disk'.</string>
     <string lang="en" key="BOOT_LOADER_UPGRADE_FAILED">Failed to upgrade the VeraCrypt Boot Loader.</string>
@@ -1272,7 +1280,7 @@
     <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' &gt; '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>
@@ -1297,8 +1305,8 @@
     <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 system.</string>
     <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' &gt; 'Performance' and enable 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' &gt; 'Performance' and disable 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>
@@ -1372,6 +1380,39 @@
     <string lang="lv" key="TB_PER_SEC">TB/s</string>
     <string lang="lv" key="PB_PER_SEC">PB/s</string>
     <string lang="en" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.my.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="my" name="မြန်မာ" en-name="Burmese" version="1.0.0" translators="Zaw Myo Htet" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="my" key="IDC_BROWSE">ဖွင့်ကြည့်ရန်...</control>
     <control lang="my" key="IDC_DESKTOP_ICON">VeraCrypt အိုင်ကွန်ပုံကို &amp;Desktop ထဲ ထည့်သွင်းရန်</control>
     <control lang="my" key="IDC_DONATE">ယခု လှူဒါန်းရန်...</control>
-    <control lang="my" key="IDC_FILE_TYPE">.tc ဖိုင် &amp;extension ကို VeraCrypt ဖြင့် တွဲဖက်ရန်</control>
+    <control lang="my" key="IDC_FILE_TYPE">.hc ဖိုင် &amp;extension ကို VeraCrypt ဖြင့် တွဲဖက်ရန်</control>
     <control lang="my" key="IDC_OPEN_CONTAINING_FOLDER">ပြီးစီးသည့်အခါ ထားရှိမည့် နေရာကို ဖွင့်ရန်</control>
     <control lang="my" key="IDC_PROG_GROUP">VeraCrypt ကို &amp;Start မီနူးထဲ ထည့်သွင်းရန်</control>
     <control lang="my" key="IDC_SYSTEM_RESTORE">စက်လည်ပတ်မှုစနစ် ပြန်ရယူနိုင်သည့် အချိန်တစ်ခုခု သတ်မှတ်ရန်</control>
@@ -37,6 +37,7 @@
     <control lang="my" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">စီဒီ/ဒီဗွီဒီ မှတ်တမ်းတင် ဆော့ဗ်ဝဲကို ဒေါင်းလုဒ် ဆွဲရန်</control>
     <control lang="my" key="IDC_FILE_CONTAINER">စာဝှက်ထားသော ဖိုင် သိမ်းဆည်းခန်း တစ်ခု ဖန်တီးရန်</control>
     <control lang="my" key="IDC_GB">&amp;GB</control>
+    <control lang="my" key="IDC_TB">&amp;TB</control>
     <control lang="my" key="IDC_HIDDEN_SYSENC_INFO_LINK">နောက်ထပ် အချက်အလက်</control>
     <control lang="my" key="IDC_HIDDEN_VOL">လျှို့ဝှက် VeraCrypt volume</control>
     <control lang="my" key="IDC_HIDDEN_VOL_HELP">လျှို့ဝှက် volumes များအကြောင်း နောက်ထပ် အ​ချက်အလက်များ</control>
@@ -44,6 +45,7 @@
     <control lang="my" key="IDC_HIDVOL_WIZ_MODE_FULL">ပုံမှန် နည်းစနစ်</control>
     <control lang="my" key="IDC_KB">&amp;KB</control>
     <control lang="my" key="IDC_KEYFILES_ENABLE">ကီးဖိုင်ကို သုံးရန်</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="my" key="IDC_KEY_FILES">ကီးဖိုင်များ...</control>
     <control lang="my" key="IDC_LINK_HASH_INFO">H​ash အယ်လဂိုရီသမ်များ၏ အချက်အလက်များ</control>
@@ -58,7 +60,8 @@
     <control lang="my" key="IDC_NO_HISTORY">မှတ်တမ်း လုံး၀ မတင်ရန်</control>
     <control lang="my" key="IDC_OPEN_OUTER_VOLUME">ပြင်ပ volume ကို ဖွင့်ရန်</control>
     <control lang="my" key="IDC_PAUSE">ခေတ္တရပ်နားရန်</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="my" key="IDC_QUICKFORMAT">အမြန် မော်မက်ချရန်</control>
     <control lang="my" key="IDC_SHOW_PASSWORD">စကားဝှက်ကို ပြရန်</control>
     <control lang="my" key="IDC_SHOW_PASSWORD_SINGLE">စကားဝှက်ကို ပြရန်</control>
@@ -118,6 +121,7 @@
     <control lang="my" key="IDC_CREATE">ဖန်တီးရန်</control>
     <control lang="my" key="IDC_CREATE_VOLUME">Volume ဖန်တီးရန်</control>
     <control lang="my" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">စက်မတက်မီ စစ်ဆေးမှုပြ မျက်နှာပြင်တွင် မည်သည့်စာသားမျှ မပြပါနှင့်(အောက်ဖေါ်ပြပါ စိတ်ကြိုက် စာတမ်းမှ လွဲ၍)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="my" key="IDC_ENABLE_HARDWARE_ENCRYPTION">ပရိုဆက်ဆာ၏ AES လမ်းညွှန်မှုကိုအသုံးပြု၍ AES ဝှက်စာခြင်း/စာဝှက်ဖေါ်ခြင်းကို အရိုန်မြှင့်ပါ (အကယ်၍ ရနိုင်ပါက)</control>
     <control lang="my" key="IDC_ENABLE_KEYFILES">ကီးဖိုင် သုံးရန်</control>
     <control lang="my" key="IDC_ENABLE_NEW_KEYFILES">ကီးဖိုင် သုံးရန်</control>
@@ -132,6 +136,7 @@
     <control lang="my" key="IDC_FAVORITE_MOVE_UP">အပေါ်သို့ ရွှေ့ရန်</control>
     <control lang="my" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">ရွေးချယ်ထားသော volume ကို အောင်မြင်စွာ အစပျိုးပြီးပါက Explorer ဝင်းဒိုးကို ဖွင့်ပါ</control>
     <control lang="my" key="IDC_FAVORITE_REMOVE">ဖယ်ရှားရန်</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="my" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">ဘုံသုံး ချိန်ညှိချက်များ</control>
     <control lang="my" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">အထူး ကီးကို အောင်မြင်စွာ အဆုံးသတ်ပြီးပါက ပူပေါင်း လမ်းညွှန်ကို ပြပါ</control>
     <control lang="my" key="IDC_HK_DISMOUNT_PLAY_SOUND">အထူး ကီးကို အောင်မြင်စွာ အဆုံးသတ်ပြီးပါက စက် အချက်ပြ အသံကို ဖွင့်ပါ</control>
@@ -256,6 +261,7 @@
     <control lang="my" key="IDM_UNMOUNTALL">အစပျိုးထားသော Volumes အားလုံး အဆုံးသတ်ရန်</control>
     <control lang="my" key="IDM_UNMOUNT_VOLUME">Volume အဆုံးသတ်ရန်</control>
     <control lang="my" key="IDM_VERIFY_RESCUE_DISK">ကယ်ဆယ်ရေး Disk စစ်ဆေးရန်</control>
+    <control lang="en" key="IDM_VERIFY_RESCUE_DISK_ISO">Verify Rescue Disk Image</control>
     <control lang="my" key="IDM_VERSION_HISTORY">ဗားရှင်း မှတ်တမ်း</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="my" key="IDM_VOLUME_PROPERTIES">Volume ဂုဏ်အင်္ဂါရပ်များ</control>
@@ -365,7 +371,7 @@
     <control lang="my" key="IDT_SECURITY_TOKEN">လုံခြုံရေး တိုကင် -</control>
     <control lang="my" key="IDT_SORT_METHOD">မျိုးတူစုနည်း -</control>
     <control lang="my" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">ကျေးဇူးပြု၍ စောင့်ပါ။ ဤလုပ်ငန်းစဉ်သည် အတော် ကြာနိုင်ပါသည်...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="my" key="IDT_TEST_BLOCK_NUMBER">နံပါတ် အစု -</control>
     <control lang="my" key="IDT_TEST_CIPHERTEXT">ဝှက်စာ စာသား (hexadecimal)</control>
     <control lang="my" key="IDT_TEST_DATA_UNIT_NUMBER">ဒေတာ ယူနစ် နံပါတ် (64-bit hexadecimal, ဒေတာ ယူနစ် အရွယ်သည် 512 bytes ဖြစ်သည်)</control>
@@ -410,13 +416,13 @@
     <string lang="my" key="CIPHER_TITLE">စာဝှက်စနစ် ရွေးစရာများ</string>
     <string lang="my" key="CLEAN_WINMRU_FAILED">သတိပေးချက် - နောက်ဆုံး ရွေးချယ်ထားသော volume/(ဖိုင် ရွေးချယ်စနစ်က မှတ်သားထားသော) ကီးဖိုင် လမ်းကြောင်းကို ရှင်းလင်း၍ မရပါ!</string>
     <string lang="my" key="COMPRESSION_NOT_SUPPORTED">ချို့ယွင်းချက် - သိမ်းဆည်းခန်းကို filesystem အဆင့်၌ ဖိသိပ်ထားသည်။ VeraCrypt သည် သိမ်းဆည်းခန်းများကို ဖိသိပ်မှု မပြုပါ (စာဝှက်ထားသော ဒေတာကို ဖိသိပ်ခြင်းသည် ထိရောက်မှု မရှိ၍ မလိုအပ်ချေ)။\n\n အောက်ပါ အဆင့်များဖြင့် သိမ်းဆည်းခန်း ဖိသိပ်မှုကို ပိတ်ပါ -\n၁) ဝင်းဒိုး Explorer (VeraCrypt ထဲ၌ မဟုတ်ပါ) ထဲရှိ သိမ်းဆည်းခန်းကို ညာဖက် နှိပ်ပါ။\n၂) 'ဂုဏ်အင်္ဂါရပ်များ' ကို ရွေးချယ်ပါ။\n၃)  'ဂုဏ်အင်္ဂါရပ်များ' အညွှန်းထဲ၌၊ 'အဆင့်မြင့်' ကို နှိပ်ပါ။\n၄) 'အဆင့်မြင့် သတ်မှတ်ချက်များ' အညွှန်းထဲ၌၊ 'disk နေရာလွတ် ရရှိရန် အကြောင်းအရာများကို ဖိသိပ်ရန်' ရွေးစရာကို ပိတ်ပြီး 'ကောင်းပြီ' ကို နှိပ်ပါ။၅) 'ဂုဏ်အင်္ဂါရပ်များ' အညွှန်းထဲ၌၊ 'ကောင်းပြီ' ကို နှိပ်ပါ။</string>
-    <string lang="my" key="CREATE_FAILED">Volume %hs ဖန်တီးရာတွင် မအောင်မြင်ပါ</string>
+    <string lang="my" key="CREATE_FAILED">Volume %s ဖန်တီးရာတွင် မအောင်မြင်ပါ</string>
-    <string lang="my" key="DEVICE_FREE_BYTES">%hs ၏အရွယ်မှာ %.2f bytes ဖြစ်သည်</string>
+    <string lang="my" key="DEVICE_FREE_BYTES">%s ၏အရွယ်မှာ %.2f bytes ဖြစ်သည်</string>
-    <string lang="my" key="DEVICE_FREE_KB">%hs ၏အရွယ်မှာ %.2f KB ဖြစ်သည်</string>
+    <string lang="my" key="DEVICE_FREE_KB">%s ၏အရွယ်မှာ %.2f KB ဖြစ်သည်</string>
-    <string lang="my" key="DEVICE_FREE_MB">%hs ၏အရွယ်မှာ %.2f MB ဖြစ်သည်</string>
+    <string lang="my" key="DEVICE_FREE_MB">%s ၏အရွယ်မှာ %.2f MB ဖြစ်သည်</string>
-    <string lang="my" key="DEVICE_FREE_GB">%hs ၏ အရွယ်မှာ %.2f GB ဖြစ်သည်</string>
+    <string lang="my" key="DEVICE_FREE_GB">%s ၏ အရွယ်မှာ %.2f GB ဖြစ်သည်</string>
-    <string lang="my" key="DEVICE_FREE_TB">%hs ၏အရွယ်မှာ %.2f TB ဖြစ်သည်</string>
+    <string lang="my" key="DEVICE_FREE_TB">%s ၏အရွယ်မှာ %.2f TB ဖြစ်သည်</string>
-    <string lang="my" key="DEVICE_FREE_PB">%hs ၏အရွယ်မှာ %.2f PB ဖြစ်သည်</string>
+    <string lang="my" key="DEVICE_FREE_PB">%s ၏အရွယ်မှာ %.2f PB ဖြစ်သည်</string>
     <string lang="my" key="DEVICE_IN_USE_FORMAT">သတိပေးချက် - စက်ပစ္စည်း/အခန်းကန့်ကို OS မှ (သို့) အ​ပ္ပလီကေးရှင်းများမှ အသုံးပြုထားသည်။ စက်ပစ္စည်း/အခန်းကန့်ကို ဖော်မက်ချခြင်းဖြင့် ဒေတာ ပျက်စီမှုနှင့် စက်လည်ပတ်မှု မတည်မငြိမ် ဖြစ်စေနိုင်သည်။\n\nဆက်လုပ်မည်လား?</string>
     <string lang="my" key="DEVICE_IN_USE_INPLACE_ENC">သတိပေးချက် - စက်ပစ္စည်း/အခန်းကန့်ကို OS မှ (သို့) အ​ပ္ပလီကေးရှင်းများမှ အသုံးပြုထားသည်။  အခန်းကန့်ကို အသုံးပြုသော ​အပ္ပလီကေးရှင်းများ (ဗိုင်းရပ်စ်သတ် ဆော့ဗ်ဝဲ အပါအဝင်)ကို ပိတ်ထားပါ။\n\n ဆက်လုပ်မည်လား?</string>
     <string lang="my" key="FORMAT_CANT_DISMOUNT_FILESYS">ချို့ယွင်းချက် - စက်ပစ္စည်း/အခန်းကန့်၌ အဆုံးသတ်၍ မရနိုင်သော ဖိုင်စနစ် တစ်ခု ပါရှိနေသည်။ ​၎င်းဖိုင်စနစ်ကို စက်လည်ပတ်မှုစနစ်က အသုံးပြုထားနိုင်သည်။ စက်ပစ္စည်း/အခန်းကန့်ကို ဖော်မက်ချခြင်းဖြင့် ဒေတာ ပျက်စီခြင်းနှင့် စက်လည်ပတ်မှုစနစ် မတည်ငြိမ်မှုများ ဖြစ်ပေါ်စေနိုင်သည်။\n\nဤပြဿနာကို ဖြေရှင်းရန်၊ ထိုအခန်းကန့်ကို ဦးစွာ ပယ်ဖျက်ပြီး ၄င်းကို ဖော်မက်ချစရာ မလိုပဲ အသစ် ပြန်ဖန်တီးပါ။ ထိုသို့ ဆောင်ရွတ်ရန်၊ အောက်ပါ အဆင့်များကို လုပ်ဆောင်ပါ -\n၁) 'Start ​Menu' ရှိ 'Computer' ပုံကို ညာဖက် နှိပ်ပြီး 'Manage' ကို ရွေးပါ။ 'Computer Management' ၀င်းဒိုး ပေါ်လာလိမ့်မည်။\n၂) 'Disk Management' ဝင်းဒိုးထဲ၌ 'Storage' &gt; 'Disk Management' ကို ရွေးပါ။\n၃) သင် စာဝှက်လိုသော အခန်းကန့်ကို ညာဖက် နှိပ်ပြီး 'Delete Partition', (သို့) 'Delete Volume', (သို့) 'Delete Logical Drive' ကို ရွေးပါ။\n၄) 'Yes' ကို နှိပ်ပါ။ အကယ်၍ ဝင်းဒိုးက စက်ပြန်ဖွင့်ရန် တောင်းဆိုလာပါက ကွန်ပျူတာစက်ကို ပြန်စလိုက်ပါ။ ထို့နောက် အဆင့် ၁ နှင့် ၂ ကို ပြန်လုပ်ပြီး အဆင့် ၅ မှ ဆက်လုပ်ပါ။\n၅) နေရာမယူထားသော/နေရာလွတ်၌ ညာဖက် နှိပ်ပြီး 'New Partition', (သို့) 'New Simple Volume', (သို့) 'New Logical Drive' ကို ရွေးပါ။\n၆) ယခုအချိန်၌ 'New Partition Wizard' (သို့) 'New Simple Volume Wizard' ၀င်းဒိုး ပေါ်လာမည် ဖြစ်သည်။ ညွန်ကြားချက်အတိုင်း ဆက်လုပ်ပါ။ 'Format Partition' ခေါင်းစဉ်အောက်ရှိ 'Do not format this partition' (သို့) 'Do not format this volume' တစ်ခုခုကို ရွေးချယ်ပါ။ အညွှန်း တစ်ခုထဲ၌၊ 'Next' ကို နှိပ်ပြီးနောက် 'Finish' ကို နှိပ်ပါ။\n၇) VeraCrypt ၌ သင် ရွေးချယ်ခဲ့သော လမ်းကြောင်း မှားနေနိုင်သည်ကို သတိပြုပါ။ ထို့ကြောင့်၊ VeraCrypt Volume  ဖန်တီးမှု အညွှန်းမှ ထွက်ပြီး ပြန်ဖွင့်ပါ။\n၈) စက်ပစ္စည်း/အခန်းကန့်ကို တဖန် စာဝှက်လိုက်ပါ။\n\n အကယ်၍ VeraCrypt သည် စက်ပစ္စည်း/အခန်းကန့်ကို စာဝှက်ရန် အကြိမ်ကြိမ် မအောင်မြင်ပါက၊ ၄င်းအစား ဖိုင် သိမ်းဆည်းခန်းတစ်ခုကို ဖန်တီးရန် စဉ်းစားပါ။</string>
@@ -435,12 +441,12 @@
     <string lang="my" key="INPLACE_ENC_INVALID_PATH">ချို့ယွင်းချက် - VeraCrypt သည် အခန်းကန့် တစ်ခု၊ တက်ကြွ volume တစ်ခု၊ (သို့) ကွန်ပျူတာစနစ် ​drive တစ်ခုလုံးကို အစီအစဉ်တကျ စာဝှက်နိုင်သည်။ သတ်မှတ်ထားသော လမ်းကြောင်း မှန်မမှန် စစ်​ဆေးပါ။</string>
     <string lang="my" key="CANNOT_RESIZE_FILESYS">ချို့ယွင်းချက် - filesystem ကို ကျုံ့၍ မရပါ (volume ခေါင်းစီးနှင့် အရန်သင့် ခေါင်းစီးအတွက် နေရာပေးရန် filesystem ကို ကျုံ့ရန် လိုသည်)။\n\nဖြစ်နိုင်ချ အကြောင်းရင်းနှင့် ဖြေရှင်းချက်များ -\n\nဤ volume ၌ လုံလောက်သော နေရာလွတ်မရှိပါ။ ဤ filesystem ၌ အခြား အပ္ပလီကေးရှင်းကို ရေးသားခြင်း မပြုရန် သတိပြုပါ။\n\n- ပျက်စီးနေသော ဖိုင်စနစ် ဖြစ်သည်။ ၄င်းကို စစ်ဆေးပြီး ချို့ယွင်းချက်များကို ပြင်ဆင်ပါ ('Computer' စာရင်းရှိ သက်ဆိုင်ရာ drive အက္ခရာကို ညာဖက် နှိပ်ပါ၊ ထို့နောက်  Properties &gt; Tools &gt; ကို ရွေးပြီး 'Check Now' ကို ရွေးပါ၊  ရွေးစရာ 'Automatically fix file system errors' ကို ဖွင့်ပြီး Start ကို နှိပ်ပါ)။\n\n အထက်ပါ အဆင့်များ အလုပ်မဖြစ်ပါက၊ အောက်ပါ အဆင့်များကို ဆက်လုပ်ပါ။</string>
     <string lang="my" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">ချို့ယွင်းချက် - ဤ volume ထဲ၌ နေရာလွတ် အလုံအလောက် မရှိသောကြောင့် filesystem ကို ကျုံ့၍ မရပါ (volume ခေါင်းစီးနှင့် အရန်သင့် ခေါင်းစီးအတွက် နေရာပေးရန် filesystem ကို ကျုံ့ရန် လိုအပ်သည်)\n\n နေရာလွတ် အနည်းဆုံး 256 KB ရရှိအောင် မလိုအပ်သော ဖိုင်များကို ပယ်ဖျက်ပြီး Recycle Bin ကို ရှင်းလင်းကာ ထပ်ကြိုးစားပါ။ ဝင်းဒိုး ပြဿနာ တစ်ရပ်ကြောင့် OS ကို စက်ပြန်မဖွင့်မချင်း Windows Explorer မှ ဖေါ်ပြသော နေရာလွတ် ပမာဏမှာ မှန်ကန်လိမ့်မည် မဟုတ်ပါ။ အကယ်၍ စက်ပြန်တက်၍ ​အကြောင်းမထူးလျှင်၊ ဖိုင်စနစ် ပျက်စီး၍ ဖြစ်မည်။ ၄င်းကို စစ်ဆေးပြီး ချို့ယွင်းချက်များကို ပြင်ဆင်ပါ ('Computer' စာရင်းရှိ သက်ဆိုင်ရာ drive အက္ခရာကို ညာဖက် နှိပ်ပါ၊ ထို့နောက်  Properties &gt; Tools &gt; ကို ရွေးပြီး 'Check Now' ကို ရွေးပါ၊  ရွေးစရာ 'Automatically fix file system errors' ကို ဖွင့်ပြီး Start ကို နှိပ်ပါ)။\n\n အထက်ပါ အဆင့်များ အလုပ်မဖြစ်ပါက၊ အောက်ပါ အဆင့်များကို ဆက်လုပ်ပါ။</string>
-    <string lang="my" key="DISK_FREE_BYTES">Drive %hs ပေါ်၌ နေရာလွတ် %.2f bytes ရှိသည်</string>
+    <string lang="my" key="DISK_FREE_BYTES">Drive %s ပေါ်၌ နေရာလွတ် %.2f bytes ရှိသည်</string>
-    <string lang="my" key="DISK_FREE_KB">Drive %hs ပေါ်၌ နေရာလွတ် %.2f KB ရှိသည်</string>
+    <string lang="my" key="DISK_FREE_KB">Drive %s ပေါ်၌ နေရာလွတ် %.2f KB ရှိသည်</string>
-    <string lang="my" key="DISK_FREE_MB">Drive %hs ပေါ်၌ နေရာလွတ် %.2f MB ရှိသည်</string>
+    <string lang="my" key="DISK_FREE_MB">Drive %s ပေါ်၌ နေရာလွတ် %.2f MB ရှိသည်</string>
-    <string lang="my" key="DISK_FREE_GB">Drive %hs ပေါ်၌ နေရာလွတ် %.2f GB ရှိသည်</string>
+    <string lang="my" key="DISK_FREE_GB">Drive %s ပေါ်၌ နေရာလွတ် %.2f GB ရှိသည်</string>
-    <string lang="my" key="DISK_FREE_TB">Drive %hs ပေါ်၌ နေရာလွတ် %.2f TB ရှိသည်</string>
+    <string lang="my" key="DISK_FREE_TB">Drive %s ပေါ်၌ နေရာလွတ် %.2f TB ရှိသည်</string>
-    <string lang="my" key="DISK_FREE_PB">Drive %hs ပေါ်၌ နေရာလွတ် %.2f PB ရှိသည်</string>
+    <string lang="my" key="DISK_FREE_PB">Drive %s ပေါ်၌ နေရာလွတ် %.2f PB ရှိသည်</string>
     <string lang="my" key="DRIVELETTERS">လွတ်နေသော drive အက္ခရာများ မရှိပါ။</string>
     <string lang="my" key="DRIVER_NOT_FOUND">ချို့ယွင်းချက် - VeraCrypt ဒရိုင်ဘာကို ရှာမတွေ့ပါ။\n\nကျေးဇူးပြု၍ 'veracrypt.sys' နှင့် 'veracrypt-x64.sys' ဖိုင်များကို ပင်မ VeraCrypt ​အ​ပ္ပလီကေးရှင်း (VeraCrypt.exe) တည်ရှိရာ ဖိုင်တွဲထဲ ကော်ပီကူးပါ။</string>
     <string lang="my" key="DRIVER_VERSION">ချို့ယွင်းချက် - လောလောဆယ် လိုက်ဖက်ကိုက်ညီမှု မရှိသော VeraCrypt ဒရိုင်ဘာ ဗားရှင်းdriver ကို သုံးစွဲနေသည်။\n\n အကယ်၍ သင်သည် VeraCrypt ကို (စက်ထဲ မထည့်သွင်းပဲ) အိတ်ဆောင်စနစ်ဖြင့် သုံးစွဲရန် ကြိုးစားနေပြီး၊ တခြား VeraCrypt ဗားရှင်းကို စက်ထဲ ထည့်သွင်းပြီး ဖြစ်ပါက၊ ၄င်းကို အလျင် ဖယ်ထုတ်ရမည် (သို့မဟုတ် VeraCrypt ထည့်သွင်းစနစ်ကို သုံး၍ အဆင့်မြှင့်ပါ)။ ၄င်းကို ဖယ်ထုတ်ရန်၊ ဖေါ်ပြပါ အဆင့်များကို လိုက်နာပါ - Window Vista (သို့) ၄င်းထက် အဆင့်မြင့်၌၊ 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall ကို ရွေးပါ၊ Windows XP ၌၊ 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove ကို ရွေးပါ။\n\nအလားတူ၊ အကယ်၍ သင်သည် VeraCrypt ကို အိတ်ဆောင်စနစ်ဖြင့် (စက်ထဲ ထည့်သွင်းစရာမလိုပဲ) သုံးစွဲရန် ကြိုးစားနေပြီး၊ အခြား VeraCrypt ဗားရှင်း တစ်ခုကို အိတ်ဆောင်စနစ်ဖြင့် သုံးစွဲနေပါက၊ အရင်ဦးဆုံး စက်ကို ပြန်ဖွင့်ပြီးနောက် ဤဗားရှင်းအသစ်ကိုသာ သုံးစွဲပါ။</string>
@@ -562,6 +568,7 @@
     <string lang="my" key="MAX_HIDVOL_SIZE_KB">ဤ volume အတွက် လျှို့ဝှက် volume ၏ အများဆုံး အရွယ်အစားမှာ %.2f KB ဖြစ်သည်။</string>
     <string lang="my" key="MAX_HIDVOL_SIZE_MB">ဤ volume အတွက် လျှို့ဝှက် volume ၏ အများဆုံး အရွယ်အစားမှာ %.2f MB ဖြစ်သည်။</string>
     <string lang="my" key="MAX_HIDVOL_SIZE_GB">ဤ volume အတွက် လျှို့ဝှက် volume ၏ အများဆုံး အရွယ်အစားမှာ %.2f GB ဖြစ်သည်။</string>
+    <string lang="my" key="MAX_HIDVOL_SIZE_TB">ဤ volume အတွက် လျှို့ဝှက် volume ၏ အများဆုံး အရွယ်အစားမှာ %.2f TB ဖြစ်သည်။</string>
     <string lang="my" key="MOUNTED_NOPWCHANGE">ဤ volume ကို အစပျိုးထားစဉ် volume စကားဝှက်/ကီးဖိုင်များကို ပြောင်းလဲ၍ မရပါ။ ဤ volume ကို အရင် အဆုံးသတ်လိုက်ပါ။</string>
     <string lang="my" key="MOUNTED_NO_PKCS5_PRF_CHANGE">ဤ volume ကို အစပျိုးနေစဉ် ခေါင်းစီး ဆင်းသက်ပုံ အယ်လဂိုရီသမ်ကို ပြောင်း၍ မရပါ။ ဤ volume ကို အရင် အဆုံးသတ်ပါ။</string>
     <string lang="my" key="MOUNT_BUTTON">&amp;အစပျိုးပါ</string>
@@ -592,12 +599,12 @@
     <string lang="my" key="SELECT_PKCS11_MODULE">PKCS #11 လိုင်ဘရာရီ ရွေးချယ်ရန်</string>
     <string lang="my" key="OUTOFMEMORY">မှတ်ဉာဏ် မရှိတော့ပါ</string>
     <string lang="my" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">အရေးကြီးချက် - အတွေ့အကြုံ မရှိသေးသော သုံးစွဲသူများသည် VeraCrypt ဖိုင် သိမ်းဆည်းခန်းကို device/အခန်းကန့် တစ်ခုလုံး၌ ဖန်တီးမည့်အစား၊ ရွေးချယ်ထားသော device/အခန်းကန့်၌ ဖန်တီးရန် အထူး အကြံပြုအပ်ပါသည်။\n\nVeraCrypt ဖိုင် သိမ်းဆည်းခန်း (device တစ်ခု (သို့) အခန်းကန့် တစ်ခုကို စာဝှက်ခြင်း မဟုတ်ပဲ) တစ်ခုကို သင် ဖန်တီးသည့်အခါ၊ ဖိုင်အများအပြား ပျက်စီးသွားမည့် အန္တရာယ် မရှိပါ။ VeraCrypt ဖိုင် သိမ်းဆည်းခန်း (၄င်း၌ စာဝှက်ထားသော disk အတု တစ်ခု ရှိနေသော်လည်း) သည် ပုံမှန် ဖိုင် တစ်ဖိုင်ကဲ့သို့ ဖြစ်သည်။ နောက်ထပ် အချက်အလက်များကို VeraCrypt သုံးစွဲသူ လမ်းညွှန်ထဲရှိ စတင် လေ့လာသူ သင်တန်း လမ်းညွှန် အခန်းကို လေ့လာပါ။\n\nDevice/အခန်းကန့် တစ်ခုလုံးကို သင် စာဝှက်လိုသလား?</string>
-    <string lang="my" key="OVERWRITEPROMPT">သတိပေးချက် - ဖိုင်အမည် '%hs' ရှိနေပြီ ဖြစ်သည်!\n\nအရေးကြီးချက် - VeraCrypt သည် ဖိုင်ကို စာဝှက်ပေးမည် မဟုတ်ပါ၊ သို့သော် ၄င်းကို ပယ်ဖျက်မည် မဟုတ်ပါ။ ဖိုင်ကို ပယ်ဖျက်ပြီး VeraCrypt သိမ်းဆည်းခန်း အသစ် တစ်ခုနှင့် အစားထိုးလိုသလား?</string>
+    <string lang="my" key="OVERWRITEPROMPT">သတိပေးချက် - ဖိုင်အမည် '%s' ရှိနေပြီ ဖြစ်သည်!\n\nအရေးကြီးချက် - VeraCrypt သည် ဖိုင်ကို စာဝှက်ပေးမည် မဟုတ်ပါ၊ သို့သော် ၄င်းကို ပယ်ဖျက်မည် မဟုတ်ပါ။ ဖိုင်ကို ပယ်ဖျက်ပြီး VeraCrypt သိမ်းဆည်းခန်း အသစ် တစ်ခုနှင့် အစားထိုးလိုသလား?</string>
-    <string lang="my" key="OVERWRITEPROMPT_DEVICE">သတိပေးချက် - လောလောဆယ် ရွေးချယ်ထားသော %s '%hs'%s ၌ သိမ်းဆည်းထားသော ဖိုင်အားလုံးကို ဖျက်ပစ်မည် ဖြစ်ပြီး၊ ​ပျောက်ဆုံးသွားမည် ဖြစ်သည် (၄င်းတို့ကို စာဝှက်ထားမည် မဟုတ်ပါ)!\n\nဖော်မက်ချပြီး သင် ဆက်လက် လုပ်ဆောင်လိုသလား?</string>
+    <string lang="my" key="OVERWRITEPROMPT_DEVICE">သတိပေးချက် - လောလောဆယ် ရွေးချယ်ထားသော %s '%s'%s ၌ သိမ်းဆည်းထားသော ဖိုင်အားလုံးကို ဖျက်ပစ်မည် ဖြစ်ပြီး၊ ​ပျောက်ဆုံးသွားမည် ဖြစ်သည် (၄င်းတို့ကို စာဝှက်ထားမည် မဟုတ်ပါ)!\n\nဖော်မက်ချပြီး သင် ဆက်လက် လုပ်ဆောင်လိုသလား?</string>
-    <string lang="my" key="NONSYS_INPLACE_ENC_CONFIRM">သတိပေးချက် - Volume ကို အပြည့်အ၀ စာမဝှက်မီ ၎င်းကို အစပျိုးနိုင်မည် မဟုတ်ပါ (သို့) ၄င်းအထဲရှိ ဖိုင်များကို ရယူနိုင်မည် မဟုတ်ပါ။\n\nရွေးချယ်ထားသော %s '%hs'%s ကို စတင် စာဝှက်လိုသလား?</string>
+    <string lang="my" key="NONSYS_INPLACE_ENC_CONFIRM">သတိပေးချက် - Volume ကို အပြည့်အ၀ စာမဝှက်မီ ၎င်းကို အစပျိုးနိုင်မည် မဟုတ်ပါ (သို့) ၄င်းအထဲရှိ ဖိုင်များကို ရယူနိုင်မည် မဟုတ်ပါ။\n\nရွေးချယ်ထားသော %s '%s'%s ကို စတင် စာဝှက်လိုသလား?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="my" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">သတိပေးချက် - လက်ရှိ ဒေတာများကို အစီအစဉ်တကျ စာဝှက်နေစဉ် ​ပါဝါအား ပျက်သွားပါက၊ (သို့) VeraCrypt သည် လက်ရှိ ဒေတာများကို အစီအစဉ်တကျ စာဝှက်နေစဉ် ဆော့ဗ်ဝဲ ချို့ယွင်းချက်ကြောင့် သို့မဟုတ် စက်ပိုင်းဆိုင်ရာ ချို့ယွင်းချက်ကြောင့် OS စနစ် ပျက်စီးသွားပါက၊ ဒေတာ တစ်စိတ်တစ်ပိုင်းသည် ပျက်စီးသွားမည် (သို့) ပျောက်ဆုံးသွားမည် ဖြစ်သည်။ ထို့ကြောင့်၊ စာဝှက်ခြင်း မပြုမီ၊ သင် စာဝှက်​လိုသော ဖိုင်များ၏ အရန်သင့်​ ကော်ပီ ထားရှိရမည် ဖြစ်သည်။\n\nယင်းကဲ့သို့ အရန်သင့် သိမ်းဆည်းချက် သင့်ထံ၌ ရှိသလား?</string>
-    <string lang="my" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">သတိပေးချက် - လောလောဆယ် '%hs'%s အခန်းကန့် (ကွန်ပျူတာစနစ် အခန်းကန့်​ နောက်ကွယ်မှ ပထမ အခန်းကန့်) ၌ သိမ်းဆည်းထားသော ဖိုင်များ (၄်းတို့ကို စာဝှက်ထားမည် မဟုတ်) သည် ပယ်ဖျက်ခံရလိမ့်မည် (သို့) ပျောက်ဆုံးသွားလိမ့်မည်!\n\nဖော်မက်ချပြီး ဆက်လက် လုပ်ဆောင်ရန် သေချာသလား?</string>
+    <string lang="my" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">သတိပေးချက် - လောလောဆယ် '%s'%s အခန်းကန့် (ကွန်ပျူတာစနစ် အခန်းကန့်​ နောက်ကွယ်မှ ပထမ အခန်းကန့်) ၌ သိမ်းဆည်းထားသော ဖိုင်များ (၄်းတို့ကို စာဝှက်ထားမည် မဟုတ်) သည် ပယ်ဖျက်ခံရလိမ့်မည် (သို့) ပျောက်ဆုံးသွားလိမ့်မည်!\n\nဖော်မက်ချပြီး ဆက်လက် လုပ်ဆောင်ရန် သေချာသလား?</string>
     <string lang="my" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">သတိပေးချက် - ရွေးချယ်ထားသော အခန်းကန့်၌ ဒေတာ အများအပြား ရှိနေသည်။ ၄င်း အခန်းကန့်၌ သိမ်းဆည်းထားသော ဖိုင်များသည် ဖျက်ဆီးခံရမည် ဖြစ်ပြီး ပျောက်ဆုံးသွားမည် ဖြစ်သည် (၎င်းဖိုင်များကို စာဝှက်မထားပါ)!</string>
     <string lang="my" key="ERASE_FILES_BY_CREATING_VOLUME">အခန်းကန့်ထဲ၌ VeraCrypt volume တစ်ခု ဖန်တီးပြီး သိမ်းဆည်းထားသော ဖိုင်များကို ပယ်ဖျက်ပါ။</string>
     <string lang="my" key="PASSWORD">စကားဝှက်</string>
@@ -658,7 +665,7 @@
     <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>
     <string lang="my" key="PREV">&lt; &amp;နောက်သို့</string>
     <string lang="my" key="RAWDEVICES">သင့် ကွန်ပျူတာစနစ်၌ ထည့်သွင်းထားသော devices များ အကြမ်းစာရင်းကို ထုတ်ပြန်၍ မရပါ။</string>
-    <string lang="my" key="READONLYPROMPT">Volume '%hs' ရှိနေပြီး ၄င်းသည် ဖတ်ရှုရန်သက်သက် ဖြစ်သည်။ ၄င်းကို အစားထိုးရန် သေချာသလား?</string>
+    <string lang="my" key="READONLYPROMPT">Volume '%s' ရှိနေပြီး ၄င်းသည် ဖတ်ရှုရန်သက်သက် ဖြစ်သည်။ ၄င်းကို အစားထိုးရန် သေချာသလား?</string>
     <string lang="my" key="SELECT_DEST_DIR">ဖိုင်တွဲ ထားမည့်နေရာကို ရွေးရန်</string>
     <string lang="my" key="SELECT_KEYFILE">ကီးဖိုင် ရွေးရန်</string>
     <string lang="my" key="SELECT_KEYFILE_PATH">ကီးဖိုင် ရှာဖွေရေး လမ်းကြောင်း တစ်ခုကို ရွေးပါ။ သတိပေးချက် - ဖိုင်အမည်များ မပါပဲ၊ ဖိုင်လမ်းကြောင်းကိုသာ မှတ်သားမည် ဖြစ်သည်။</string>
@@ -682,13 +689,13 @@
     <string lang="my" key="TEST_CIPHERTEXT_SIZE">သင် ဖြည့်စွက်သော အစမ်း ဝှက်စာသည် ရှည်လွန်းသည် (သို့) တိုလွန်းသည်။</string>
     <string lang="my" key="TEST_KEY_SIZE">သင် ဖြည့်စွက်သော အစမ်း ကီးသည် ရှည်လွန်းသည် (သို့) တိုလွန်းသည်။</string>
     <string lang="my" key="TEST_PLAINTEXT_SIZE">င် ဖြည့်စွက်သော အစမ်း စာသားသည် ရှည်လွန်းသည် (သို့) တိုလွန်းသည်။</string>
-    <string lang="my" key="TWO_LAYER_CASCADE_HELP">XTS စနစ်၌ cascade လုပ်ဆောင်နေသော ဝှက်စာ နှစ်ခု။ အကွက် တစ်ခုစီကို အရင်ဆုံး ပထမဆုံး %hs (%d-bit ကီး) ဖြင့် စာဝှက်ထားပြီးနောက် %hs (%d-bit ကီး) ဖြင့် စာဝှက်ထားသည်။ ဝှက်စာ တစ်ခုစီသည် ကိုယ်ပိုင် ကီးကို အသုံးပြုသည်။ ကီး အားလုံးသည် နှစ်ဦးနှစ်ဖက် သီးခြား လုပ်ဆောင်ကြသည်။</string>
+    <string lang="my" key="TWO_LAYER_CASCADE_HELP">XTS စနစ်၌ cascade လုပ်ဆောင်နေသော ဝှက်စာ နှစ်ခု။ အကွက် တစ်ခုစီကို အရင်ဆုံး ပထမဆုံး %s (%d-bit ကီး) ဖြင့် စာဝှက်ထားပြီးနောက် %s (%d-bit ကီး) ဖြင့် စာဝှက်ထားသည်။ ဝှက်စာ တစ်ခုစီသည် ကိုယ်ပိုင် ကီးကို အသုံးပြုသည်။ ကီး အားလုံးသည် နှစ်ဦးနှစ်ဖက် သီးခြား လုပ်ဆောင်ကြသည်။</string>
-    <string lang="my" key="THREE_LAYER_CASCADE_HELP">XTS စနစ်၌ cascade လုပ်ဆောင်နေသော ဝှက်စာ သုံးခု။ အကွက် တစ်ခုစီကို အရင်ဆုံး ပထမဆုံး %hs (%d-bit ကီး) ဖြင့်လည်းကောင်း၊ ၄င်းနောက် %hs (%d-bit ကီး) ဖြင့်လည်းကောင်း၊ နောက်ဆုံးတွင် %hs (%d-bit ကီး) ဖြင့်လည်းကောင်း စာဝှက်ထားသည်။ ဝှက်စာ တစ်ခုစီသည် ကိုယ်ပိုင် ကီးကို အသုံးပြုသည်။ ကီး အားလုံးသည် နှစ်ဦးနှစ်ဖက် သီးခြား လုပ်ဆောင်ကြသည်။</string>
+    <string lang="my" key="THREE_LAYER_CASCADE_HELP">XTS စနစ်၌ cascade လုပ်ဆောင်နေသော ဝှက်စာ သုံးခု။ အကွက် တစ်ခုစီကို အရင်ဆုံး ပထမဆုံး %s (%d-bit ကီး) ဖြင့်လည်းကောင်း၊ ၄င်းနောက် %s (%d-bit ကီး) ဖြင့်လည်းကောင်း၊ နောက်ဆုံးတွင် %s (%d-bit ကီး) ဖြင့်လည်းကောင်း စာဝှက်ထားသည်။ ဝှက်စာ တစ်ခုစီသည် ကိုယ်ပိုင် ကီးကို အသုံးပြုသည်။ ကီး အားလုံးသည် နှစ်ဦးနှစ်ဖက် သီးခြား လုပ်ဆောင်ကြသည်။</string>
     <string lang="my" key="AUTORUN_MAY_NOT_ALWAYS_WORK">OS စနစ် ပြုပြင်ဖန်တီးမှုအပေါ် မူတည်ပြီး၊ ယင်း auto-run နှင့် auto-mount အင်္ဂါရပ်များသည် ခရီးဆောင် disk ဖိုင်များကို စီဒီ/ဒီဗွီဒီကဲ့သို့ ကြားခံဖြင့် ဖန်တီးမှသာ အလုပ်လုပ်နိုင်မည်ကို သတိပြုပါ။ ၄င်းသည် VeraCrypt ထဲမှ ပရိုဂရမ် အမှားတစ်ခု မဟုတ်ပါ (၎င်းသည် ၀င်းဒိုး၏ ကန့်သတ်ချက် တစ်ရပ် ဖြစ်သည်)</string>
     <string lang="my" key="TRAVELER_DISK_CREATED">VeraCrypt ခရီးဆောင် အခွေကို အောင်မြင်စွာ ဖန်တီးလိုက်ပြီ။\n\n VeraCrypt ကို အိတ်ဆောင်စနစ်ဖြင့် သုံးစွဲနိုင်ရန် သင်သည် စီမံခန့်ခွဲမှုဆိုင်ရာ လုပ်ပိုင်ခွင့် ရရှိထားရမည် ဖြစ်သည်။ Registry ဖိုင်ကို စစ်ဆေးပြီးနောက်၊ အကယ်၍ VeraCrypt သည် အိတ်ဆောင်စနစ်ဖြင့် လည်ပတ်​နေလျှင်ပင် ၄င်းသည် ၀င်းဒိုးစနစ်ဖြင့် လည်ပတ်နေသည်ဟု ပြောနိုင်မည် ဖြစ်သည်။</string>
     <string lang="my" key="TC_TRAVELER_DISK">VeraCrypt ခရီးဆောင် အခွေ</string>
     <string lang="my" key="TWOFISH_HELP">Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall နှင့် Niels Ferguson တို့မှ ဒီဇိုင်း ရေးဆွဲထားသည်။ ၁၉၉၈ တွင် ထုတ်လုပ်သည်။ 256-bit key, 128-bit block ဖြစ်သည်။ လည်ပတ်မှု စနစ်မှာ XTS ဖြစ်သည်။ Twofish သည် AES ၏ နောက်ဆုံး ရွေးချယ်စာရင်းမှ တစ်ခု ဖြစ်သည်။</string>
-    <string lang="my" key="MORE_INFO_ABOUT">%hs နှင့် ပါတ်သက်သည့် နောက်ထပ် အချက်အလက်များ</string>
+    <string lang="my" key="MORE_INFO_ABOUT">%s နှင့် ပါတ်သက်သည့် နောက်ထပ် အချက်အလက်များ</string>
     <string lang="my" key="UNKNOWN">အမည်မသိ</string>
     <string lang="my" key="ERR_UNKNOWN">သတ်မှတ်၍ မရသော (သို့) အမည်မသိသော ချို့ယွင်းချက် ဖြစ်ပေါ်နေသည် (%d)။</string>
     <string lang="my" key="UNMOUNTALL_LOCK_FAILED">အချို့ volumes များ၌ အပ္ပလီကေးရှင်း (သို့) ကွန်ပျူတာစနစ်မှ အသုံးပြုနေသော ဖိုင်များ (သို့) ဖိုင်တွဲများ ပါ၀င်နေသည်။\n\nအတင်း အဆုံးသတ်မည်လား?</string>
@@ -853,7 +860,7 @@
     <string lang="my" key="INSTALL_FAILED">စက်ထဲ ထည့်သွင်းမှု မအောင်မြင်ပါ။</string>
     <string lang="my" key="UNINSTALL_FAILED">ဖယ်ထုတ်မှု မအောင်မြင်ပါ။</string>
     <string lang="my" key="DIST_PACKAGE_CORRUPTED">ဖြန့်ချီသော ဖိုင်ထုတ် ပျက်စီးနေသည်။ ထပ်မံ၍ ဒေါင်းလုဒ် ဆွဲယူပါ (တရား၀င် VeraCrypt ကွန်ရက် စာမျက်နှာ www.teuecrypt.org ၌ ရယူရန် ပိုသင့်လျှော်သည်)။ </string>
-    <string lang="my" key="CANNOT_WRITE_FILE_X">%hs ဖိုင်ကို ရေး၍ မရပါ</string>
+    <string lang="my" key="CANNOT_WRITE_FILE_X">%s ဖိုင်ကို ရေး၍ မရပါ</string>
     <string lang="my" key="EXTRACTING_VERB">ဖြည်ချနေသည်</string>
     <string lang="my" key="CANNOT_READ_FROM_PACKAGE">ဒေတာများကို ဖိုင်ထုတ်ထဲမှ ဖတ်၍ မရပါ။</string>
     <string lang="my" key="CANT_VERIFY_PACKAGE_INTEGRITY">ဤဖြန့်ဖြူးရေး ဖိုင်ထုတ်၏ တည်တံ့ခိုင်မြဲမှုကို အတည်ပြု၍ မရနိုင်ပါ။</string>
@@ -863,7 +870,7 @@
     <string lang="my" key="SETUP_UPDATE_OK">VeraCrypt ကို အောင်မြင်စွာ အဆင့်မြှင့်လိုက်ပြီ။</string>
     <string lang="my" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt ကို အောင်မြင်စွာ အဆင့်မြှင့်လိုက်ပြီ။ သို့သော်၊ ၄င်းကို အသုံးမပြုခင် ကွန်ပျူတာကို ပြန်ဖွင့်ပါ။\n\n ကွန်ပျူတာကို ယ​ခု ပြန်ဖွင့်မည်လား?</string>
     <string lang="my" key="SYS_ENC_UPGRADE_FAILED">VeraCrypt ကို အဆင့်မြှင့်၍ မရပါ!\n\n အရေးကြီးချက် - ကွန်ပျူတာစနစ်ကို မပိတ်ခင် (သို့) ပြန်မဖွင့်ခင်၊ 'VeraCrypt ထည့်သွင်းစနစ်' ဟု ခေါ်သော နေရာ၌ သင့် ကွန်ပျူတာ လည်ပတ်မှုစနစ်ကို ပြန်ထားရန် ကွန်ပျူတာ လည်ပတ်မှုစနစ် ပြန်ရယူခြင်း (Windows Start ​menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) ကို အသုံးပြုရန် ကျွန်ုပ်တို့ အထူး အကြုံပြုလိုပါသည်။ အကယ်၍ 'VeraCrypt ထည့်သွင်းစနစ်' ဟု ခေါ်သော နေရာ၌ သင့် ကွန်ပျူတာ လည်ပတ်မှုစနစ်ကို ပြန်ထားရန် 'ကွန်ပျူတာ လည်ပတ်မှုစနစ် ပြန်ရယူခြင်း' မရှိပါက၊ ကွန်ပျူတာစနစ်ကို မပိတ်ခင် (သို့) ပြန်မဖွင့်ခင် မူလ VeraCrypt (သို့) ဗားရှင်းအသစ်ကို ထည့်သွင်းကြည့်ပါ။</string>
-    <string lang="my" key="UNINSTALL_OK">VeraCrypt ကို အောင်မြင်စွာ ဖယ်ထုတ်လိုက်ပြီ။\n\n VeraCrypt ထည့်သွင်းစနစ်နှင့် ဖိုင်တွဲ %hs ကို ဖယ်ရှားရန် 'ပြီးသွားပြီ' ကို နှိပ်ပါ။ VeraCrypt ထည့်သွင်းစနစ်နှင့် မသက်ဆိုင်သော ဖိုင်များ ပါရှိသည် ဖိုင်တွဲ ရှိနေပါက၊ ၄င်းကို ဖယ်ရှားပေးမည် မဟုတ်ပါ။</string>
+    <string lang="my" key="UNINSTALL_OK">VeraCrypt ကို အောင်မြင်စွာ ဖယ်ထုတ်လိုက်ပြီ။\n\n VeraCrypt ထည့်သွင်းစနစ်နှင့် ဖိုင်တွဲ %s ကို ဖယ်ရှားရန် 'ပြီးသွားပြီ' ကို နှိပ်ပါ။ VeraCrypt ထည့်သွင်းစနစ်နှင့် မသက်ဆိုင်သော ဖိုင်များ ပါရှိသည် ဖိုင်တွဲ ရှိနေပါက၊ ၄င်းကို ဖယ်ရှားပေးမည် မဟုတ်ပါ။</string>
     <string lang="my" key="REMOVING_REG">VeraCrypt registry ရေးသွင်းချက်များကို ဖယ်ရှားနေသည်</string>
     <string lang="my" key="ADDING_REG">Registery ရေးသွင်းချက်ကို ထည့်သွင်းနေသည်</string>
     <string lang="my" key="REMOVING_APPDATA">အပ္ပလီကေးရှင်း-သီးသန့် ဒေတာများကို ဖယ်ရှားနေသည်</string>
@@ -874,10 +881,10 @@
     <string lang="my" key="CREATING_SYS_RESTORE">ကွန်ပျူတာ လည်ပတ်မှုစနစ် ပြန်ရယူနိုင်သည့် အချိန် ဖန်တီးရန်</string>
     <string lang="my" key="FAILED_SYS_RESTORE">ကွန်ပျူတာ လည်ပတ်မှုစနစ် ပြန်ရယူနိုင်သည့် အချိန် ဖန်တီး၍ မရပါ!</string>
     <string lang="my" key="INSTALLER_UPDATING_BOOT_LOADER">Boot loader မွမ်းမံနေသည်</string>
-    <string lang="my" key="INSTALL_OF_FAILED">'%hs' ကို ထည့်သွင်း၍ မရပါ။ %hs \nဆက်ပြီး ထည့်သွင်းမည်လား?</string>
+    <string lang="my" key="INSTALL_OF_FAILED">'%s' ကို ထည့်သွင်း၍ မရပါ။ %s \nဆက်ပြီး ထည့်သွင်းမည်လား?</string>
-    <string lang="my" key="UNINSTALL_OF_FAILED">'%hs' ကို ဖယ်ထုတ်၍ မရပါ။ %hs \nဆက်ပြီး ဖယ်ထုတ်မည်လား?</string>
+    <string lang="my" key="UNINSTALL_OF_FAILED">'%s' ကို ဖယ်ထုတ်၍ မရပါ။ %s \nဆက်ပြီး ဖယ်ထုတ်မည်လား?</string>
     <string lang="my" key="INSTALL_COMPLETED">စက်ထဲ ထည့်သွင်းမှု ပြီးစီးသွားပြီ။</string>
-    <string lang="my" key="CANT_CREATE_FOLDER">ဖိုင်တွဲ '%hs' ကို ဖန်တီး၍ မရပါ</string>
+    <string lang="my" key="CANT_CREATE_FOLDER">ဖိုင်တွဲ '%s' ကို ဖန်တီး၍ မရပါ</string>
     <string lang="my" key="CLOSE_TC_FIRST">VeraCrypt device ဒရိုင်ဘာကို ရပ်တန့်၍ မရပါ။\n\n ဦးစွာ VeraCrypt ဝင်းဒိုး အားလုံးကို ပိတ်ပါ။ အကယ်၍ အလုပ်မဖြစ်ပါက၊ ၀င်းဒိုးကို ပြန်ဖွင့်ပြီး ထပ်ကြိုးစားပါ။</string>
     <string lang="my" key="DISMOUNT_ALL_FIRST">VeraCrypt ကို စက်ထဲ မထည့်သွင်းမီ (သို့) ဖယ်ထုတ်ခြင်း မပြုမီ VeraCrypt volumes အားလုံကို အဆုံးသတ်ပါ။</string>
     <string lang="my" key="UNINSTALL_OLD_VERSION_FIRST">တိမ်ကောနေပြီ ဖြစ်သော VeraCrypt ဗားရှင်း တစ်ခုကို ဤစက်ထဲတွင် သုံးစွဲနေသည်။ VeraCrypt  ဗားရှင်း မသွင်းမီ ၄င်းကို ဖယ်ထုတ်ရမည် ဖြစ်သည်။\n\n ဤစာပုံးကို သင် ပိတ်သည့်အခါ၊ ဗားရှင်း အဟောင်၏ ဆော့ဗ်ဝဲ ဖယ်ထုတ်စနစ် ပွင့်လာလိမ့်မည်။ VeraCrypt ကို ဖယ်ထုတ်နေစဉ် မည်သည့် volume ကိုမျှ စာဝှက်ပေးမည် မဟုတ်ပါ။ VeraCrypt ဗားရှင်း အဟောင်းကို ဖယ်ထုတ်ပြီးနောက်၊ ဗားရှင်းအသစ်ကို ထည့်သွင်းပါ။</string>
@@ -930,7 +937,7 @@
     <string lang="my" key="FAVORITE_LABEL_DEVICE_PATH_ERR">အောက်တွင် ဖော်ပြသော device မှာ အခန်းကန့်လည်း မဟုတ်၊ တက်ကြွ volume လည်း မဟုတ်ပါ။ ထို့ကြောင့်၊ ၎င်းအတွက် မည်သည့် လေဘယ်လ်ကိုမျှ သတ်မှတ်၍ ရမည် မဟုတ်ပါ။</string>
     <string lang="my" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">အောက်တွင် ဖော်ပြသော အခန်းကန့်ကို ဝင်းဒိုးမှ အသိအမှတ်ပြုသော အမျိုးအစားအဖြင့် သတ်မှတ်ပါ (ဝင်းဒိုး၏ 'diskpart' ကိရိယာမှ SETID ညွှန်ကြားချက်ကို သုံးစွဲပါ)။ အခန်းကန့်ကို စိတ်ကြိုက်များ စာရင်းမှ ဖယ်ရှားပြီး ပြန်ထည့်သွင်းပါ။ ထိုသို့ ပြုလုပ်ခြင်းဖြင့် VeraCrypt သည် အခန်းကန့်အတွက် လေဘယ်လ် တစ်ခု သတ်မှတ်ပေးနိုင်မည် ဖြစ်သည်။</string>
     <string lang="my" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">ဝင်းဒိုး၏ ကန့်သတ်ချက်ကြောင့်၊ ကွန်ရက် တစ်ခုအတွင်း ဝေမျှထားသော ရပ်ဝေး ဖိုင်စနစ်ထဲ၌ သိမ်းဆည်းထားသော သိမ်းဆည်းခန်း တစ်ခုကို ကွန်ပျူတာစနစ် စိတ်ကြိုက် volume တစ်ခုအဖြစ် အစပျိုး၍ မရနိုင်ပါ (သို့သော်၊ အကောင့်ထဲ သုံးစွဲသူ တစ်ဦး ၀င်ရောက်လာသောအခါ ကွန်ပျူတာစနစ် မဟုတ်သော စိတ်ကြိုက် volume တစ်ခုအဖြစ် ​အစပျိုးနိုင်သည်)။</string>
-    <string lang="my" key="ENTER_PASSWORD_FOR">%hs အတွက် စကားဝှက် ရေးထည့်ပါ</string>
+    <string lang="my" key="ENTER_PASSWORD_FOR">%s အတွက် စကားဝှက် ရေးထည့်ပါ</string>
     <string lang="my" key="ENTER_PASSWORD_FOR_LABEL">'%s' အတွက် စကားဝှက် ရေးထည့်ပါ</string>
     <string lang="my" key="ENTER_NORMAL_VOL_PASSWORD">ပုံမှန် volume/ ပြင်ပ volume အတွက် စကားဝှက် ရေးထည့်ပါ</string>
     <string lang="my" key="ENTER_HIDDEN_VOL_PASSWORD">လျှို့ဝှက် volume အတွက် စကားဝှက် ရေးထည့်ပါ</string>
@@ -945,8 +952,8 @@
     <string lang="my" key="VOL_HEADER_BACKED_UP">Volume ခေါင်းစီးကို အောင်မြင်စွာ ဖန်တီးလိုက်ပြီ။\n\nအရေးကြီးချက် - ဤအရန်သင့် ဖိုင်ကို အသုံးပြုပြီး volume ခေါင်းစီးကို ပြန်ထားခြင်းဖြင့် လက်ရှိ volume ၏ စကားဝှက်ကိုလည်း ပြန်ထားပေးမည် ဖြစ်သည်။ ထို့အပြင် volume ကို အစပျိုးရန် ကီးဖိုင်(များ) လိုအပ်လာပါက၊ volume ခေါင်းစီးကို ပြန်ထားသည့်အခါ ၄င်း volume ကို အစပျိုးရန်အတွက် အလားတူ ကီးဖိုင် လိုအပ်လာမည်ဖြစ်သည်။\n\nသတိပေးချက် - ဤ volume ခေါင်းစီးကို သီးခြား volume ၏ ခေါင်းစီးကို ပြန်ထားရန် သုံးစွဲနိုင်သည်။ အကယ်၍ ဤခေါင်းစီး အရန်သင့် ဖိုင်ကို အခြား volume တစ်ခု၏ ခေါင်းစီး ပြန်ထားရန် အသုံးပြုပါက၊ ၄င်း volume ကို သင် အစပျိုးနိုင်မည် ဖြစ်သည်၊ သို့သော် volume ထဲ၌ သိမ်းဆည်းထားသော ဒေတာများကို သင် စာဝှက်ဖေါ်နိုင်မည် မဟုတ်ပါ (အဘယ့်ကြောင့် ဆိုသော် ၄င်း၏ မာစတာ ကီးကို သင် ပြောင်းလဲရမည် ဖြစ်သည်)။</string>
     <string lang="my" key="VOL_HEADER_RESTORED">volume ခေါင်းစီးကို အောင်မြင်စွာ ပြန်ထားလိုက်ပြီ။\n\nအရေးကြီးချက် - စကားဝှက် အဟောင်းကိုပါ ပြန်ထားနိုင်သည်ကို သတိပြုပါ။ ဒါ့အပြင်၊ အကယ်၍ အရန်သင့်ဖိုင်ကို ဖန်တီးသည့်အခါ volume ကို အစပျိုးရန်အတွက် ကီးဖိုင်(များ) လိုအပ်လာပါက၊ ၄င်း volume ကို အစပျိုးရန်အတွက် အလားတူ ကီးဖိုင်များ လိုအပ်လာမည် ဖြစ်သည်။</string>
     <string lang="my" key="EXTERNAL_VOL_HEADER_BAK_FIRST_INFO">လုံခြုံရေး အကြောင်းကြောင့်၊ ဤ volume အတွက် စကားဝှက် အမှန် (နှင့် ကီးဖိုင် အမှန်) ကို သင် ရေးထည့်ရမည်။\n\nမှတ်ချက် - အကယ်၍ volume ၌ လျှို့ဝှက် volume တစ်ခု ပါရှိပါက၊ ပြင်ပ volume အတွက် စကားဝှက် အမှန်ကို အရင် ရေးထည့်ပေးရမည် ဖြစ်သည်။ ထိုမှတဆင့်၊ လျှို့ဝှက် volume ၏ ခေါင်းစီးကို အရန်သင့် ဖိုင် ပြုလုပ်မည် ဆိုပါက၊ လျှို့ဝှက် volume အတွက် စကားဝှက်အမှန် (နှင့် ကီးဖိုင် အမှန်) ကို သင် ရေးထည့်ရမည် ဖြစ်သည်။</string>
-    <string lang="my" key="CONFIRM_VOL_HEADER_BAK">%hs အတွက် volume အရန်သင့် ခေါင်းစီးကို ဖန်တီးရန် သေချာသလား?\n\n ဟုတ်ကဲ့ ခလုတ်ကို နှိပ်ပြီးပါက၊အရန်သင့် ခေါင်းစီးအတွက် ဖိုင်အမည်ကို တောင်းလာလိမ့်မည်။\n\nမှတ်ချက် - ပုံမှန် volume နှင့် လျှို့ဝှက် volume ခေါင်းစီးများကို salt အသစ် တစ်ခု သုံးပြီး ထပ်မံ စာဝှက်ပေးမည် ဖြစ်ပြီး၊ အရန်ဖိုင်တွင် သိမ်းဆည်းထားမည် ဖြစ်သည်။ ဤ volume အထဲ၌ လျှို့ဝှက် volume မရှိပါက၊ အရန်သင့် ဖိုင်အတွင်းရှိ လျှို့ဝှက် volume အတွက် ချန်ထား​ပေးသော နေရာ၌ (ပေါ်ပေါက်လာနိုင်သော ငြင်းဆိုမှုကို ထိန်းသိမ်းရန်) ကျပန်း ဒေတာများ နေရာယူသွားမည် ဖြစ်သည်။ Volume ​ခေါင်းစီး တစ်ခုကို အရန်သင့် ဖိုင်ထဲမှ ပြန်ထားသည့်အခါ၊ volume အရန်သင့် ခေါင်းစီးကို ဖန်တီးသည့်အခါ သုံးစွဲသော စကားဝှက် အမှန် (နှင့် ကီးဖိုင် အမှန်) ကို သင် ရေးထည့်ရမည်။ စကားဝှက် (နှင့် ကီးဖိုင်များ) သည် ပြန်ထားရမည့် volume ခေါင်းစီး အမျိုးအစားကို အလိုအလျောက် ဆုံးဖြတ်ပေးမည် ဖြစ်သည်၊ ဥပ​မာ အားဖြင့် - ပုံမှန်လား (သို့) လျှို့ဝှက်လား (VeraCrypt သည် ယင်း အမျိုးအစားကို အစမ်း သုံးစွဲမှုနှင့် ချို့ယွင်းချက်များမှ တဆင့် ဆုံးဖြတ်ပေးသည်)။</string>
+    <string lang="my" key="CONFIRM_VOL_HEADER_BAK">%s အတွက် volume အရန်သင့် ခေါင်းစီးကို ဖန်တီးရန် သေချာသလား?\n\n ဟုတ်ကဲ့ ခလုတ်ကို နှိပ်ပြီးပါက၊အရန်သင့် ခေါင်းစီးအတွက် ဖိုင်အမည်ကို တောင်းလာလိမ့်မည်။\n\nမှတ်ချက် - ပုံမှန် volume နှင့် လျှို့ဝှက် volume ခေါင်းစီးများကို salt အသစ် တစ်ခု သုံးပြီး ထပ်မံ စာဝှက်ပေးမည် ဖြစ်ပြီး၊ အရန်ဖိုင်တွင် သိမ်းဆည်းထားမည် ဖြစ်သည်။ ဤ volume အထဲ၌ လျှို့ဝှက် volume မရှိပါက၊ အရန်သင့် ဖိုင်အတွင်းရှိ လျှို့ဝှက် volume အတွက် ချန်ထား​ပေးသော နေရာ၌ (ပေါ်ပေါက်လာနိုင်သော ငြင်းဆိုမှုကို ထိန်းသိမ်းရန်) ကျပန်း ဒေတာများ နေရာယူသွားမည် ဖြစ်သည်။ Volume ​ခေါင်းစီး တစ်ခုကို အရန်သင့် ဖိုင်ထဲမှ ပြန်ထားသည့်အခါ၊ volume အရန်သင့် ခေါင်းစီးကို ဖန်တီးသည့်အခါ သုံးစွဲသော စကားဝှက် အမှန် (နှင့် ကီးဖိုင် အမှန်) ကို သင် ရေးထည့်ရမည်။ စကားဝှက် (နှင့် ကီးဖိုင်များ) သည် ပြန်ထားရမည့် volume ခေါင်းစီး အမျိုးအစားကို အလိုအလျောက် ဆုံးဖြတ်ပေးမည် ဖြစ်သည်၊ ဥပ​မာ အားဖြင့် - ပုံမှန်လား (သို့) လျှို့ဝှက်လား (VeraCrypt သည် ယင်း အမျိုးအစားကို အစမ်း သုံးစွဲမှုနှင့် ချို့ယွင်းချက်များမှ တဆင့် ဆုံးဖြတ်ပေးသည်)။</string>
-    <string lang="my" key="CONFIRM_VOL_HEADER_RESTORE">%hs ၏ volume ခေါင်းစီးကို ပြန်ထားရန် သေချာသလား?\n\n သတိပေးချက် - Volume ခေါင်းစီးကို ပြန်ထားခြင်းသည် အရန်သင့် ဖိုင် ဖန်တီးခဲ့စဉ်က သုံးစွဲခဲ့သော volume စကားဝှက်ကိုလည်း ပြန်ထားပေးမည် ဖြစ်သည်။ ထို့အပြင် အရန်သင့်ဖိုင် ဖန်တီးခဲ့စဉ်က volume ကို အစပျိုးရန် ကီးဖိုင်(များ) လိုအပ်ပါက၊ volume ခေါင်းစီးကို ပြန်ထားပြီးနောက် အဲဒီ volume ကို အစပျိုးဖို့ အလားတူ ကီးဖိုင်(များ) လိုအပ်လာမည် ဖြစ်သည်။\n\nဟုတ်ကဲ့ ခလုတ်ကို နှိပ်ပြီးပါက၊ အရန်သင့် ခေါင်းစီးဖိုင်ကို သင် ရွေးချယ်ရပါမည် ဖြစ်သည်။</string>
+    <string lang="my" key="CONFIRM_VOL_HEADER_RESTORE">%s ၏ volume ခေါင်းစီးကို ပြန်ထားရန် သေချာသလား?\n\n သတိပေးချက် - Volume ခေါင်းစီးကို ပြန်ထားခြင်းသည် အရန်သင့် ဖိုင် ဖန်တီးခဲ့စဉ်က သုံးစွဲခဲ့သော volume စကားဝှက်ကိုလည်း ပြန်ထားပေးမည် ဖြစ်သည်။ ထို့အပြင် အရန်သင့်ဖိုင် ဖန်တီးခဲ့စဉ်က volume ကို အစပျိုးရန် ကီးဖိုင်(များ) လိုအပ်ပါက၊ volume ခေါင်းစီးကို ပြန်ထားပြီးနောက် အဲဒီ volume ကို အစပျိုးဖို့ အလားတူ ကီးဖိုင်(များ) လိုအပ်လာမည် ဖြစ်သည်။\n\nဟုတ်ကဲ့ ခလုတ်ကို နှိပ်ပြီးပါက၊ အရန်သင့် ခေါင်းစီးဖိုင်ကို သင် ရွေးချယ်ရပါမည် ဖြစ်သည်။</string>
     <string lang="my" key="DOES_VOLUME_CONTAIN_HIDDEN">ဤ volume ထဲ၌ လျှို့ဝှက် volume ပါရှိသလား?</string>
     <string lang="my" key="VOLUME_CONTAINS_HIDDEN">ဤ volume ထဲ၌ လျှို့ဝှက် volume ပါရှိသည်</string>
     <string lang="my" key="VOLUME_DOES_NOT_CONTAIN_HIDDEN">ဤ volume ထဲ၌ လျှို့ဝှက် volume မရှိပါ</string>
@@ -958,11 +965,13 @@
     <string lang="my" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">သင်သည် ကွန်ပျူတာစနစ်မှ အခန်းကန့်/drive ၏ ခေါင်းစီးကို အရန်သင့် ပြုလုပ်ရန် ကြိုးစားနေသည်။၎င်းကို ခွင့်မပြုပါ။ ကွန်ပျူတာစနစ်မှ အခန်းကန့်/drive နှင့် သက်ဆိုင်သော အရန်သင့် ပြုလုပ်ခြင်း/ပြန်ထားခြင်း လုပ်ငန်းများကို VeraCrypt ဆယ်တင်ရေး ခွေဖြင့်သာ ပြုလုပ်နိုင်သည်။\n\n VeraCrypt ဆယ်တင်ရေးခွေကို ပြုလုပ်လိုသလား?</string>
     <string lang="my" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">သင်သည် VeraCrypt volume အတု၏ ခေါင်းစီးကို ပြန်ထားရန် ကြိုးစားနေသည်၊ သို့သော် ကွန်ပျူတာစနစ် အခန်းကန့်/drive ကို သင် ရွေးချယ်ထားသည်။ ၎င်းကို ခွင့်မပြုပါ။ ကွန်ပျူတာစနစ်မှ အခန်းကန့်/drive နှင့် သက်ဆိုင်သော အရန်သင့် ပြုလုပ်ခြင်း/ပြန်ထားခြင်း လုပ်ငန်းများကို VeraCrypt ဆယ်တင်ရေး ခွေဖြင့်သာ ပြုလုပ်နိုင်သည်။\n\n VeraCrypt ဆယ်တင်ရေးခွေကို ပြုလုပ်လိုသလား?</string>
     <string lang="my" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">ကောင်းပြီ ခလုတ်ကို နှိပ်ပြီးနောက်၊ လိုက်ပါက  VeraCrypt ဆယ်တင်ရေး အခွေ ISO image အသစ် အတွက် ဖိုင်အမည်နှင့် ၄င်းကို ထားရှိလိုသည့် နေရာကို သင် ရွေးချယ်ရမည်။</string>
-    <string lang="my" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">ဆယ်တင်ရေး အခွေ image ကို ဖန်တီးလိုက်ပြီး ၄င်းကို ဤဖိုင်ထဲ၌ သိမ်းဆည်းထားသည် -\n%hs\n\nယခုအခါ ဆယ်တင်ရေး အခွေကို စီဒီ/ဒီဗွီဒီ ခွေအဖြစ် သင် ဖန်တီးရမည် ဖြစ်သည်။\n\nအရေးကြီးချက် - ၄င်းဖိုင်ကို (သီးခြားဖိုင် အဖြစ် မဟုတ်ပဲ) ISO ​အခွေ image အဖြစ် စီဒီ/ဒီဗွီဒီထဲ၌ ရေးရမည် ဖြစ်သည်။ ပြုလုပ်နည်း အချက်အလက်ကို၊ သင့် စီဒီ/ဒီဗွီဒီ မှတ်တမ်းတင် ဆော့ဗ်ဝဲထဲရှိ သုံးစွဲနည်း လမ်းညွှန်၌ လေ့လာပါ။\n\n ဆယ်တင်ရေး အခွေ ပြုလုပ်ပြီးပါက၊ အခွေကို မှန်မှန်ကန်ကန် ကူးယူမှု ရှိမရှိ စစ်ဆေးရန် 'System'  &gt; 'ဆယ်တင်ရေး အခွေ စစ်ဆေးရန်' ကို ရွေးပါ။</string>
+    <string lang="my" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">ဆယ်တင်ရေး အခွေ image ကို ဖန်တီးလိုက်ပြီး ၄င်းကို ဤဖိုင်ထဲ၌ သိမ်းဆည်းထားသည် -\n%s\n\nယခုအခါ ဆယ်တင်ရေး အခွေကို စီဒီ/ဒီဗွီဒီ ခွေအဖြစ် သင် ဖန်တီးရမည် ဖြစ်သည်။\n\nအရေးကြီးချက် - ၄င်းဖိုင်ကို (သီးခြားဖိုင် အဖြစ် မဟုတ်ပဲ) ISO ​အခွေ image အဖြစ် စီဒီ/ဒီဗွီဒီထဲ၌ ရေးရမည် ဖြစ်သည်။ ပြုလုပ်နည်း အချက်အလက်ကို၊ သင့် စီဒီ/ဒီဗွီဒီ မှတ်တမ်းတင် ဆော့ဗ်ဝဲထဲရှိ သုံးစွဲနည်း လမ်းညွှန်၌ လေ့လာပါ။\n\n ဆယ်တင်ရေး အခွေ ပြုလုပ်ပြီးပါက၊ အခွေကို မှန်မှန်ကန်ကန် ကူးယူမှု ရှိမရှိ စစ်ဆေးရန် 'System'  &gt; 'ဆယ်တင်ရေး အခွေ စစ်ဆေးရန်' ကို ရွေးပါ။</string>
-    <string lang="my" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">ဆယ်တင်ရေး အခွေ image ကို ဖန်တီးလိုက်ပြီး ၄င်းကို ဤဖိုင်ထဲ၌ သိမ်းဆည်းထားသည် -\n%hs\n\nယခုအခါ ဆယ်တင်ရေး အခွေကို စီဒီ/ဒီဗွီဒီ ခွေအဖြစ် သင် ဖန်တီးရမည် ဖြစ်သည်။\n\nမိုက်ခရိုဆော့ဗ် ၀င်းဒိုး အခွေ Image ကူးစနစ်ကို ယခု ဖွင့်မည်လား?\n\nမှတ်ချက် - ဆယ်တင်ရေး အခွေကို ကူးယူပြီးပါက၊ အခွေကို မှန်မှန်ကန်ကန် ကူးယူမှု ရှိမရှိ စစ်ဆေးရန် 'System'  &gt; 'ဆယ်တင်ရေး အခွေ စစ်ဆေးရန်' ကို ရွေးပါ။</string>
+    <string lang="my" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">ဆယ်တင်ရေး အခွေ image ကို ဖန်တီးလိုက်ပြီး ၄င်းကို ဤဖိုင်ထဲ၌ သိမ်းဆည်းထားသည် -\n%s\n\nယခုအခါ ဆယ်တင်ရေး အခွေကို စီဒီ/ဒီဗွီဒီ ခွေအဖြစ် သင် ဖန်တီးရမည် ဖြစ်သည်။\n\nမိုက်ခရိုဆော့ဗ် ၀င်းဒိုး အခွေ Image ကူးစနစ်ကို ယခု ဖွင့်မည်လား?\n\nမှတ်ချက် - ဆယ်တင်ရေး အခွေကို ကူးယူပြီးပါက၊ အခွေကို မှန်မှန်ကန်ကန် ကူးယူမှု ရှိမရှိ စစ်ဆေးရန် 'System'  &gt; 'ဆယ်တင်ရေး အခွေ စစ်ဆေးရန်' ကို ရွေးပါ။</string>
     <string lang="my" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">VeraCrypt ဆယ်တင်ရေး အခွေကို သင့် CD/DVD drive ထဲ ထည့်ပြီး ၄င်းကို စစ်ဆေးရန် ကောင်းပြီး ခလုတ်ကို နှိပ်ပါ။</string>
     <string lang="my" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">VeraCrypt ဆယ်တင်ရေး အခွေကို အောင်မြင်စွာ စစ်ဆေးလိုက်ပြီ။</string>
     <string lang="my" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">ဆယ်တင်ရေး အခွေကို မှန်မှန်ကန်ကန် ရေးကူးမှု ရှိမရှိ စစ်ဆေး၍ မရပါ။\n\nဆယ်တင်ရေး ​အခွေကို ကူးပြီးပါ​က၊ စီဒီ/ဒီဗွီဒီကို ထုတ်ပြီး ပြန်သွင်းကာ ထပ်စမ်းကြည့်ပါ။ အကယ်၍ အလုပ်မဖြစ်ပါက၊ အခြား  စီဒီ/ဒီဗွီဒီ ခွေကူး ဆော့ဗ်ဝဲ (သို့) ကြားခံဖြင့် ထပ်စမ်းကြည့်ပါ။\n\nအကယ်၍ သင်သည် အခြား မာစတာ ကီး၊ စကားဝှက်၊ salt နှင့် အခြားအတွက် ဖန်တီးထားသော VeraCrypt ဆယ်တင်ရေး အခွေကို စစ်ဆေးရန် ကြိုးပမ်း​နေပါက၊ ယင်းကဲ့သို့ ဆယ်တင်ရေး အခွေသည် ဤကဲ့သို့ စစ်ဆေးမှုကို အောင်မြင်မည် မဟုတ်ပါ။ သင့် လက်ရှိ ပြုပြင်ဖန်တီးမှုနှင့် ကိုက်ညီသော ဆယ်တင်ရေး အခွေသစ် တစ်ခုကို သင် ပြုလုပ်လိုပါက 'System' &gt; 'ဆယ်တင်ရေး ​အခွေ ဖန်တီးရန်' ကို ရွေးပါ။</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk image fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
     <string lang="my" key="ERROR_CREATING_RESCUE_DISK">VeraCrypt ဆယ်တင်ရေး အ​ခွေ ဖန်တီးမှု ချို့ယွင်းချက်။</string>
     <string lang="my" key="CANNOT_CREATE_RESCUE_DISK_ON_HIDDEN_OS">လျှို့ဝှက် OS ကို သုံးစွဲ​​နေစဉ် VeraCrypt ဆယ်တင်ရေး အခွေကို ဖန်တီး၍ မရပါ။\n\nVeraCrypt ဆယ်တင်ရေး အခွေကို ဖန်တီးရန်၊ မျက်လှည့် OS ကို ဖွင့်ပြီး 'System' &gt; 'ဆယ်တင်ရေး အခွေ ဖန်တီးရန်' ကို ရွေးပါ။</string>
     <string lang="my" key="RESCUE_DISK_CHECK_FAILED">ဆယ်တင်ရေး အခွေကို မှန်မှန်ကန်ကန် ရေးကူးမှု ရှိမရှိ စစ်ဆေး၍ မရပါ။\n\nဆယ်တင်ရေး ​အခွေကို ကူးပြီးပါ​က၊ စီဒီ/ဒီဗွီဒီကို ထုတ်ပြီး ပြန်သွင်းကာ ထပ်စမ်းကြည့်ပါ။ အကယ်၍ အလုပ်မဖြစ်ပါက၊ အခြား  စီဒီ/ဒီဗွီဒီ ခွေကူး ဆော့ဗ်ဝဲ (သို့) ကြားခံ %s ဖြင့် ထပ်စမ်းကြည့်ပါ။\n\nအကယ်၍ သင်သည် ဆယ်တင်ရေး အခွေကို မကူးသေးပါက၊ ယခု ကူးယူပြီးနောက်၊ ရှေ့သို့ ခလုတ်ကို နှိပ်ပါ။\n\n ဤအညွှန်းကို မဖွင့်မီ သင် ဖန်တီးခဲ့သော VeraCrypt ဆယ်တင်ရေး အခွေကို စစ်ဆေးရန် သင် ကြိုးပမ်းနေပါက၊ ယင်းကဲ့သို့ ဆယ်တင်ရေး အခွေကို သုံးစွဲနိုင်မည် မဟုတ်ပါ၊ အဘယ်ကြောင့် ဆိုသော် ၄င်းသည် အခြား မာစတာ ကီးအတွက် ဖန်တီးထား၍ ဖြစ်သည်။ အသစ် ထုတ်လုပ်ထားသော ဆယ်တင်ရေး အခွေကို သင် ကူးယူရန် လိုအပ်သည်။</string>
@@ -991,8 +1000,8 @@
     <string lang="my" key="DRIVE_LETTER_ITEM">Drive အက္ခရာ -</string>
     <string lang="my" key="UNSUPPORTED_CHARS_IN_PWD">ချို့ယွင်းချက် - စကားဝှက်၌ ASCII အက္ခရာ စာလုံးများသာ ပါ၀င်ရမည်။\n\nစကားဝှက်တွင် ASCII အက္ခရာ စာလုံးများ မဟုတ်သော စာလုံးများ ရှိပါက၊ သင့် ကွန်ပျူတာစနစ် ပြုပြင်ဖန်တီးမှု ပြောင်းသွားသောအခါ volume ကို ဖွင့်နိုင်မည် မဟုတ်ပါ။\n\nအောက်ပါ အက္ခရာ စာလုံးများကို ခွင့်ပြုထားသည် -\n\n ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="my" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">သတိပေးချက် - စကားဝှက်၌ ASCII မဟုတ်သော အက္ခရာစာလုံးများ ပါရှိနေသည်။ ဤအချက်ကြောင့် သင့် ကွန်ပျူတာစနစ် ပြုပြင်ဖန်တီးမှု ပြောင်းသွားသောအခါ volume ကို ဖွင့်နိုင်မည် မဟုတ်ပါ။\n\n စကားဝှက်၌ ပါသော ASCII မဟုတ်သော စကားဝှက်များကို ASCII အက္ခရာများနှင့် အစားထိုးပါ။ ထိုသို့ ပြုလုပ်ရန် 'Volumes' -&gt; 'Volume စကားဝှက် ပြောင်းရန်' ကို နှိပ်ပါ။\n\n ASCII အက္ခရာစာလုံးများကို အောက်ပါအတိုင်း ဖေါ်ပြထားသည် -\n\n ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="my" key="EXE_FILE_EXTENSION_CONFIRM">သတိပေးချက် - ဖိုင် extensions များ (such as .exe, .sys, or .dll) နှင့် အခြား အလားတူ ပြဿနာ ရှိနိုင်သော ဖိုင် extensions များကို ရှောင်ရန် အထူး တိုက်တွန်းလိုသည်။ ယင်းကဲ့သို့ ဖိုင် extensions များကို သုံးစွဲခြင်းဖြင့် ဝင်းဒိုးနှင့် ဗိုင်းရပ်စ်သတ် ဆော့ဗ်ဝဲတို့သည် သိမ်းဆည်းခန်းနှင့် အနှောင့်အယှက် ဖြစ်လာနိုင်သည်။ ၄င်းကြောင့် volume ၏ စွမ်းဆောင်ရည်ကို ထိ​ခိုက်စေပြီး အခြား ပြင်းထန်သော ပြဿနာများ ပေါ်ပေါက်စေနိုင်သည်။\n \nဖိုင် extension ကို ဖယ်ရှားပြီး ​အမည်ပြောင်းရန် အထူး အကြံပြုလိုသည် (ဥပမာ - '.tc' စသဖြင့်)။\n \nဤပြဿနာများ ဖြစ်စေနိုင်သည့် ဖိုင် extension ကို အသုံးပြုရန် သေချာသလား?</string>
+    <string lang="my" key="EXE_FILE_EXTENSION_CONFIRM">သတိပေးချက် - ဖိုင် extensions များ (such as .exe, .sys, or .dll) နှင့် အခြား အလားတူ ပြဿနာ ရှိနိုင်သော ဖိုင် extensions များကို ရှောင်ရန် အထူး တိုက်တွန်းလိုသည်။ ယင်းကဲ့သို့ ဖိုင် extensions များကို သုံးစွဲခြင်းဖြင့် ဝင်းဒိုးနှင့် ဗိုင်းရပ်စ်သတ် ဆော့ဗ်ဝဲတို့သည် သိမ်းဆည်းခန်းနှင့် အနှောင့်အယှက် ဖြစ်လာနိုင်သည်။ ၄င်းကြောင့် volume ၏ စွမ်းဆောင်ရည်ကို ထိ​ခိုက်စေပြီး အခြား ပြင်းထန်သော ပြဿနာများ ပေါ်ပေါက်စေနိုင်သည်။\n \nဖိုင် extension ကို ဖယ်ရှားပြီး ​အမည်ပြောင်းရန် အထူး အကြံပြုလိုသည် (ဥပမာ - '.hc' စသဖြင့်)။\n \nဤပြဿနာများ ဖြစ်စေနိုင်သည့် ဖိုင် extension ကို အသုံးပြုရန် သေချာသလား?</string>
-    <string lang="my" key="EXE_FILE_EXTENSION_MOUNT_WARNING">သတိပေးချက် - ဤသိမ်းဆည်းခန်း၌ ဖိုင် extensions များ (such as .exe, .sys, or .dll) နှင့် အခြား အလားတူ ပြဿနာ ရှိနိုင်သော ဖိုင် extensions များ၌ သုံးစွဲသော ဖိုင် extension တစ်ခု ရှိနေသည်။ ယင်းကြောင့် ဝင်းဒိုးနှင့် ဗိုင်းရပ်စ်သတ် ဆော့ဗ်ဝဲတို့သည် သိမ်းဆည်းခန်းနှင့် အနှောင့်အယှက် ဖြစ်လာနိုင်ပြီး volume ၏ စွမ်းဆောင်ရည်ကို ထိ​ခိုက်စေပြီး အခြား ပြင်းထန်သော ပြဿနာများ ပေါ်ပေါက်စေနိုင်သည်။\n\n Volume ကို အဆုံးသတ်ပြီးနောက် ဖိုင် extension ကို ဖယ်ရှားပြီး ​(ဥပမာ - '.tc' စသဖြင့်) အမည်ပြောင်းရန် အထူး အကြံပြုလိုသည်။</string>
+    <string lang="my" key="EXE_FILE_EXTENSION_MOUNT_WARNING">သတိပေးချက် - ဤသိမ်းဆည်းခန်း၌ ဖိုင် extensions များ (such as .exe, .sys, or .dll) နှင့် အခြား အလားတူ ပြဿနာ ရှိနိုင်သော ဖိုင် extensions များ၌ သုံးစွဲသော ဖိုင် extension တစ်ခု ရှိနေသည်။ ယင်းကြောင့် ဝင်းဒိုးနှင့် ဗိုင်းရပ်စ်သတ် ဆော့ဗ်ဝဲတို့သည် သိမ်းဆည်းခန်းနှင့် အနှောင့်အယှက် ဖြစ်လာနိုင်ပြီး volume ၏ စွမ်းဆောင်ရည်ကို ထိ​ခိုက်စေပြီး အခြား ပြင်းထန်သော ပြဿနာများ ပေါ်ပေါက်စေနိုင်သည်။\n\n Volume ကို အဆုံးသတ်ပြီးနောက် ဖိုင် extension ကို ဖယ်ရှားပြီး ​(ဥပမာ - '.hc' စသဖြင့်) အမည်ပြောင်းရန် အထူး အကြံပြုလိုသည်။</string>
     <string lang="my" key="HOMEPAGE">ပင်မ စာမျက်နှာ</string>
     <string lang="my" key="LARGE_IDE_WARNING_XP">သတိပေးချက် - ဝင်းဒိုး ထည့်သွင်းရာ၌ မည်သည့် Service Pack ကိုမျှ သုံးစွဲထားပုံ မပေါ်ပါ။ Service Pack 1 (သို့) နောက်ဆုံးထွက်ကို သုံးစွဲမထားသော Windows XP ထဲ၌ 128GB ထက် ကြီးသော IDE disks များကို ရေးသားခြင်း မပြုရ။ အကယ်၍ ပြုလုပ်ပါက၊ disk ပေါ်ရှိ (VeraCrypt volume ဟုတ်သည် ဖြစ်စေ၊ မဟုတ်သည် ဖြစ်စေ) ဒေတာများ ပျက်စီးနိုင်သည်။ ၎င်းမှာ ဝင်းဒိုး၏ ကန့်သတ်ချက် ဖြစ်ပြီး၊ VeraCrypt ၏ ပရိုဂရမ်အမှား မဟုတ်ပါ။</string>
     <string lang="my" key="LARGE_IDE_WARNING_2K">သတိပေးချက် - ဝင်းဒိုး ထည့်သွင်းရာ၌ Service Pack 3 နှင့် နောက်ဆုံးထွက်ကို သင် သုံးစွဲထားပုံ မပေါ်ပါ။  Service Pack 3 (သို့) နောက်ဆုံးထွက်ကို သုံးစွဲမထားသော Windows 2000 ထဲ၌ 128GB ထက် ကြီးသော IDE disks များကို ရေးသားခြင်း မပြုရ။ အကယ်၍ ပြုလုပ်ပါက၊ disk ပေါ်ရှိ (VeraCrypt volume ဟုတ်သည် ဖြစ်စေ၊ မဟုတ်သည် ဖြစ်စေ) ဒေတာများ ပျက်စီးနိုင်သည်။ ၎င်းမှာ ဝင်းဒိုး၏ ကန့်သတ်ချက် ဖြစ်ပြီး၊ VeraCrypt ၏ ပရိုဂရမ်အမှား မဟုတ်ပါ။\n\nမှတ်ချက် - Registry ထဲ၌ 48-bit LBA အထောက်အပံ့ကို ဖွင့်ထားရန် လိုအပ်နိုင်သည်။ အသေးစိတ် အချက်အလက်ကို http://support.microsoft.com/kb/305098/EN-US ၌ လေ့လာပါ။</string>
@@ -1052,9 +1061,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="my" key="CHECKING_FS">%s အနေဖြင့် အစပျိုးထားသော VeraCrypt volume မှ ဖိုင်စနစ်ကို စစ်ဆေးနေသည်...</string>
-    <string lang="my" key="REPAIRING_FS">%hs အနေဖြင့် အစပျိုးထားသော VeraCrypt volume မှ ဖိုင်စနစ်ကို ပြုပြင်ရန် ကြိုးစားနေသည်...</string>
+    <string lang="my" key="REPAIRING_FS">%s အနေဖြင့် အစပျိုးထားသော VeraCrypt volume မှ ဖိုင်စနစ်ကို ပြုပြင်ရန် ကြိုးစားနေသည်...</string>
-    <string lang="my" key="WARN_CBC_MODE">သတိပေးချက် - ဤ volume ကို CBC စနစ်ဖြင့် စာဝှက်ထားသည်။ လုံခြုံရေး ပြဿနာများကြောင့်၊ CBC စနစ်ကို VeraCrypt 4.1 ကတည်းက ကန့်ကွက်ထားသည်။\n\n ဤ VeraCrypt volume ထဲမှ ဒေတာများကို ဒီ VeraCrypt ဗားရှင်းဖြင့် ဖန်တီးခဲ့သော volume အသစ်သို့ ရွှေ့ပြောင်းရန် ကျွန်တော်တို့ အထူး အကြံပြုလိုသည်။ထိုသို့ ပြုလုပ်ပြီးပါက volume အဟောင်းကို ဖျက်ဆီးပစ်နိုင်သည်။ အသေးစိတ် အချက်အလက်များကို အသုံးပြုနည်း လက်စွဲမှ ဗားရှင်း သမိုင်း (သို့) VeraCrypt 4.1 သို့မဟုတ် နောက်ပိုင်းထွက်၌ ဖြန့်ဖြူးသော ထုတ်ပြန်ချက် မှတ်တမ်းများတွင် ကြည့်ရှနိုင်သည်။</string>
     <string lang="my" key="WARN_64_BIT_BLOCK_CIPHER">သတိပေးချက် - ဤ volume ကို တရား၀င် စာဝှက်စနစ် အယ်လဂိုရီသမ်ဖြင့် စာဝှက်ထားသည်။\n\n 64-bit-block စာဝှက်စနစ် အယ်လဂိုရီသမ်များ (e.g., Blowfish, CAST-128, or Triple DES) အာလုံးကို ကန့်ကွက်ထားသည်။ ဤ volume ကို နောက်ထွက်မည့် VeraCrypt ဗားရှင်းများဖြင့် အစပျိုးနိုင်မည် ဖြစ်သည်။ သို့သော် ယင်း legacy စာဝှက်စနစ် အယ်လဂိုရီသမ်များ သုံးစွဲမှုအတွက် နောက်ထပ် တိုးမြှင့်ချက်များ ရှိမည် မဟုတ်ပါ။ VeraCrypt volume အသစ်ကို 128-bit-block စာဝှက်စနစ် အယ်လဂိုရီသမ် (ဥပမာ - AES, Serpent, Twofish စသဖြင့်) ဖြင့် ဖန်တီးပြီး ဤ volume မှ ဖိုင်အားလုံးကို volume အသစ်သို့ ပြောင်းရွှေ့ရန် အကြံပြုလိုသည်။</string>
     <string lang="my" key="SYS_AUTOMOUNT_DISABLED">သင့်ကွန်ပျူတာစနစ်သည် အလိုလို-အစပျိုး volume အသစ်များအတွက် ပြုပြင်ဖန်တီးထားခြင်း မရှိပါ။ Device-အခြေခံ VeraCrypt volumes များကို အစပျိုးရန် မဖြစ်နိုင်ပါ။ အောက်ပါ ညွှန်ကြားချက်ကို လုပ်ဆောင်ပြိး ကွန်ပျူတာစနစ်ကို ပြန်ဖွင့်ခြင်းဖြင့် အလိုလို-အစပျိုးခြင်းကို ဖွင့်ထားနိုင်သည်။\n\nmountvol.exe /E</string>
     <string lang="my" key="SYS_ASSIGN_DRIVE_LETTER">('Control Panel' &gt; 'System and Maintenance' &gt; 'Administrative Tools' - 'Create and format hard disk partitions') ကို ဆက်လက် မလုပ်​ဆောင်မီ အခန်းကန့်/device အတွက် drive အက္ခရာ တစ်ခု သတ်မှတ်ပါ။\n\n၄င်းသည် OS စနစ်၏ တောင်းဆိုချက် တစ်ခု ဖြစ်သည်။</string>
@@ -1071,7 +1079,7 @@
     <string lang="my" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt သည် Service Pack ထည့်သွင်းမထားသော Windows Vista ၌ ကွန်ပျူတာစနစ် အခန်းကန့်/drive စာဝှက်ခြင်းကို ထောက်ပံ့ခြင်း မပြုတော့ပါ။ VeraCrypt ကို အဆင့်မြှင့်တင်ခြင်း မပြုမီ Windows Vista ၏ Service Pack 1 နှင့်အထက်ကို ထည့်သွင်းပါ။</string>
     <string lang="my" key="FEATURE_REQUIRES_INSTALLATION">ချို့ယွင်းချက် - ဤအင်္ဂါရပ်သည် ကွန်ပျူတာစနစ်ထဲ၌ VeraCrypt ကို ထည့်သွင်းရန် တောင်းဆိုထားသည် (သင်သည် VeraCrypt အိတ်ဆောင်စနစ်ကို သုံးစွဲနေသည်)။\n\n VeraCrypt ကို စက်ထဲ ထည့်သွင်းပြီး ထပ်ကြိုးစားပါ။</string>
     <string lang="my" key="WINDOWS_NOT_ON_BOOT_DRIVE_ERROR">သတိပေးချက် - Windows သည် ၄င်းကို boot ထားသည့် နေရာရှိ drive ၌ ထည့်သွင်းထားပုံ မပေါ်ပါ။ ၄င်းကို ထောက်ပံ့မထားပါ။\n\n Windows ကို ၄င်း boot တက်လာသည့် drive ၌ ထည့်သွင်းထားကြောင်း သေချာပါက သင် ဆက်လက် လုပ်ဆောင်နိုင်သည်။\n\nဆက်လုပ်မည်လား?</string>
-    <string lang="my" key="GPT_BOOT_DRIVE_UNSUPPORTED">သင့် ကွန်ပျူတာစနစ်၌ GUID partition table (GPT) တစ်ခု ရှိသည်။ ​​​လောလောဆယ်၌၊ MBR partition table ပါသော drives များကိုသာ ထောက်ပံ့ထားသည်။</string>
+    <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</string>
     <string lang="my" key="TC_BOOT_LOADER_ALREADY_INSTALLED">သတိပြုရန် - VeraCrypt Boot Loader ကို သင့် ကွန်ပျူတာစနစ် drive ထဲ၌ ထည့်သွင်းထားပြီး ဖြစ်သည်!\n\n သင့်ကွန်ပျူတာရှိ အခြား လည်ပတ်မှုစနစ်ကို စာဝှက်ထား၍ ဖြစ်မည်။\n\nသတိပေးချက် - လောလောဆယ် သုံးစွဲနေသော ကွန်ပျူတာစနစ်ကို ဆက်လက် စာဝှက်ခြင်းဖြင့် အခြား ကွန်ပျူတာစနစ်(များ)ကို ဖွင့်နိုင်မည်မဟုတ်သကဲ့သို့ သက်ဆိုင်ရာ ဒေတာများကို ရယူနိုင်မည် မဟုတ်ပါ။\n\n ဆက်လုပ်မည်လား?</string>
     <string lang="my" key="SYS_LOADER_RESTORE_FAILED">မူရင်း system loader ကို နဂိုနေရာ ပြန်ထား၍ မရပါ။\n\n VeraCrypt Boot Loade ကို Windows system loader ဖြင့် အစားထိုးရန် VeraCrypt Rescue Disk ('Repair Options' &gt; 'Restore original system loader') သို့မဟုတ် Windows အခွေကို အသုံးပြုပါ။</string>
     <string lang="my" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">မူရင်း system loader ကို Rescue Disk (ဖြစ်နိုင်ချေ အကြောင်းရင် - အရန်သင့် သိမ်းဆည်းဖိုင် ပျောက်ဆုံးခြင်း) ၌ သိမ်းဆည်းမည် မဟုတ်ပါ။</string>
@@ -1110,8 +1118,8 @@
     <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 (VRD) တစ်ခုကို သင် ဖန်တီးရမည် ဖြစ်သည်။\n\n- အကယ်၍ VeraCrypt Boot Loader ၊ မာစတာကီး (သို့) အခြား အရေးကြီးသော ဒေတာများ ပျက်စီးသွားလျှင်၊ VRD ကို အသုံးပြုပြီး နဂိုဖိုင်များကို ပြန်ထားနိုင်သည် (သို့သော်၊ စကားဝှက် အမှန်ကို သင် ရေးထည့်ရမည် ဖြစ်သည်)။\n\nအကယ်၍ ၀င်းဒိုး ပျက်သွားပြီး ဖွင့်မရပါက၊ VRD သည် ဝင်းဒိုး မစမီ အခန်းကန့်/drive ကို အမြဲတမ်း စာဝှက်ပေးမည် ဖြစ်သည်။\n\n- VRD ထဲ၌ (system loader သို့မဟုတ် boot manager ပါ၀င်သော) ပထမ drive track မှ လက်​ရှိ အကြောင်းအရာအတွက် အရန်သင့် သိမ်းဆည်းချက် တစ်ခု ရှိမည် ဖြစ်သည်။ လိုအပ်ပါက ၄င်းကို နဂိုအတိုင်း ပြန်ထားနိုင်သည်။\n\nVeraCrypt Rescue Disk ISO image ကို အောက်တွင် ​သတ်မှတ်ထားသော နေရာတွင် ဖန်တီးသွားမည် ဖြစ်သည်။</string>
     <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">ဆယ်တင်ရေး Disk image ကို ဖန်တီးလိုက်ပြီး ဤဖိုင်ထဲ၌ သိမ်းထားသည် -\n%s\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>
+    <string lang="my" key="RESCUE_DISK_BURN_INFO_NO_CHECK">ဆယ်တင်ရေး Disk image ကို ဖန်တီးလိုက်ပြီး ဤဖိုင်ထဲ၌ သိမ်းထားသည် -\n%s\n\n ၎င်းကို ယခုအချိန်၌ စီဒီ/ဒီဗွီဒီထဲ ကူးထားပြီး နောက် အသုံးပြုရန် လုံခြုံသော နေရာ၌ သိမ်းထားပါ။\n\n%ls ဆက်လုပ်ရန် ရှေ့သို့ ကို နှိပ်ပါ။</string>
     <string lang="my" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">အရေးကြီးချက် - ဖိုင်ကို စီဒီ/ဒီဗွီဒီထဲ၌ (သီးသန့်ဖိုင် အဖြစ် မဟုတ်ပဲ) ISO disk image အဖြစ် ရေးကူးရမည်။ လုပ်ဆောင်နည်းနဲ့ပါတ်သက်သော အချက်အလက်မျာကို စီဒီ/ဒီဗွီဒီ ကူးဆော့ဗ်ဝဲရှိ အသုံးပြုနည်း လမ်းညွှန်ကို လေ့လာပါ။ အကယ်၍ သင့်ထံ၌ မရှိပါက၊ အောက်မှ လင့်ခ်ကို သွားပြီး ယင်းကဲ့သို့ အခမဲ့ ဆော့ဗ်ဝဲကို ဒေါင်းလုဒ် ဆွဲယူပါ။\n\n</string>
     <string lang="my" key="LAUNCH_WIN_ISOBURN">မိုက်ခရိုဆော့ဗ်ဝဲ ၀င်းဒိုး Disc Image Burner ကို ဖွင့်ရန်</string>
     <string lang="my" key="RESCUE_DISK_BURN_NO_CHECK_WARN">သတိပေးချက် - ယခင်က VeraCrypt ဆယ်တင်ရေး အခွေကို ဖန်တီးခဲ့ပြီး ဖြစ်ပါက၊ ၄င်းကို ကွန်ပျူတာစနစ် အခန်းကန့်/drive အတွက် ပြန်သုံး၍ ရမည် မဟုတ်ပါ၊ အဘယ့်ကြောင့် ဆိုသော်၊ ၄င်းကို အခြား မာစတာကီးအတွက် ဖန်တီးထားသောကြောင့် ဖြစ်သည်။ ကွန်ပျူတာစနစ် အခန်းကန့်/drive ကို သင် စာဝှက်သည့်အချိန်တိုင်း၊ စကားဝှက် တစ်ခုတည်းကို သင် အသုံးပြုလျှင်လည်း VeraCrypt ဆယ်တင်ရေး အခွေ တစ်ခုကို သင် ဖန်တီးရမည် ဖြစ်သည်။</string>
@@ -1374,6 +1382,39 @@
     <string lang="my" key="TB_PER_SEC">တယ်ရာဘိုက်/စက္ကန့်</string>
     <string lang="my" key="PB_PER_SEC">ပီတာဘိုက်/စက္ကန့်</string>
     <string lang="my" key="TRIPLE_DOT_GLYPH_ELLIPSIS">...</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.nn.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="nn" name="Norsk Nynorsk" en-name="Norwegian (Nynorsk)" version="0.1.0" translators="Kjell Rune Helland" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="en" key="IDC_BROWSE">Bro&amp;wse...</control>
     <control lang="nn" key="IDC_DESKTOP_ICON">Legg til VeraCrypt ikon til skrivebordet</control>
     <control lang="en" key="IDC_DONATE">Donate now...</control>
-    <control lang="en" key="IDC_FILE_TYPE">Associate the .tc file &amp;extension with VeraCrypt</control>
+    <control lang="en" key="IDC_FILE_TYPE">Associate the .hc file &amp;extension with VeraCrypt</control>
     <control lang="en" key="IDC_OPEN_CONTAINING_FOLDER">&amp;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>
@@ -37,6 +37,7 @@
     <control lang="en" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Download CD/DVD recording software</control>
     <control lang="en" key="IDC_FILE_CONTAINER">Create an encrypted file container</control>
     <control lang="en" key="IDC_GB">&amp;GB</control>
+    <control lang="en" key="IDC_TB">&amp;TB</control>
     <control lang="en" key="IDC_HIDDEN_SYSENC_INFO_LINK">More information</control>
     <control lang="en" key="IDC_HIDDEN_VOL">Hi&amp;dden VeraCrypt volume </control>
     <control lang="en" key="IDC_HIDDEN_VOL_HELP">More information about hidden volumes</control>
@@ -44,12 +45,13 @@
     <control lang="en" key="IDC_HIDVOL_WIZ_MODE_FULL">Normal mode</control>
     <control lang="nn" key="IDC_KB">&amp;KB</control>
     <control lang="nn" key="IDC_KEYFILES_ENABLE">U&amp;Bruk nøkkelfiler</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="nn" key="IDC_KEY_FILES">Nø&amp;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">&amp;MB </control>
+    <control lang="nn" key="IDC_MB">&amp;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>
@@ -58,7 +60,8 @@
     <control lang="nn" key="IDC_NO_HISTORY">&amp;Aldri lagra historie</control>
     <control lang="nn" key="IDC_OPEN_OUTER_VOLUME">Opne Ytre Volum</control>
     <control lang="en" key="IDC_PAUSE">&amp;Pause</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="nn" key="IDC_QUICKFORMAT">Rask Formatering</control>
     <control lang="nn" key="IDC_SHOW_PASSWORD">&amp;Vis passord</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Display password</control>
@@ -74,7 +77,7 @@
     <control lang="nn" key="IDT_CLUSTER">Sektorgruppe </control>
     <control lang="en" key="IDT_COLLECTING_RANDOM_DATA_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 encryption keys. Then click Next to continue.</control>
     <control lang="nn" key="IDT_CONFIRM">&amp;Bekreft:</control>
-    <control lang="nn" key="IDT_DONE">Ferdig </control>
+    <control lang="nn" key="IDT_DONE">Ferdig</control>
     <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="nn" key="IDT_ENCRYPTION_ALGO">Krypterings Algoritme</control>
     <control lang="nn" key="IDT_FILESYSTEM">Filsystem </control>
@@ -82,7 +85,7 @@
     <control lang="nn" key="IDT_FORMAT_OPTIONS">Alternativ</control>
     <control lang="nn" key="IDT_HASH_ALGO">Hash Algoritme</control>
     <control lang="nn" key="IDT_HEADER_KEY">Over Nøkkel: </control>
-    <control lang="nn" key="IDT_LEFT">Venstre </control>
+    <control lang="nn" key="IDT_LEFT">Venstre</control>
     <control lang="nn" key="IDT_MASTER_KEY">Hovud Nøkkel: </control>
     <control lang="en" key="IDT_MULTI_BOOT">Select this option if there are two or more operating systems installed on this computer.\n\nFor example:\n- Windows XP and Windows XP\n- Windows XP and Windows Vista\n- Windows and Mac OS X\n- Windows and Linux\n- Windows, Linux and Mac OS X</control>
     <control lang="en" key="IDT_NON_SYS_DEVICE">Encrypts a non-system partition on any internal or external drive (e.g. a flash drive). Optionally, creates a hidden volume.</control>
@@ -94,7 +97,7 @@
     <control lang="en" key="IDT_PROGRESS">Progress:</control>
     <control lang="nn" key="IDT_RANDOM_POOL">Tilfeldig Gruppe: </control>
     <control lang="en" key="IDT_SINGLE_BOOT">Select this option if there is only one operating system installed on this computer (even if it has multiple users).</control>
-    <control lang="nn" key="IDT_SPEED">Hastigheit </control>
+    <control lang="nn" key="IDT_SPEED">Hastigheit</control>
     <control lang="en" key="IDT_STATUS">Status</control>
     <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>
@@ -118,6 +121,7 @@
     <control lang="nn" key="IDC_CREATE">Opprett</control>
     <control lang="nn" key="IDC_CREATE_VOLUME">&amp;Opprett Volum</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <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>
@@ -132,6 +136,7 @@
     <control lang="en" key="IDC_FAVORITE_MOVE_UP">Move &amp;Up</control>
     <control lang="en" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Open &amp;Explorer window for selected volume when successfully mounted</control>
     <control lang="en" key="IDC_FAVORITE_REMOVE">&amp;Remove</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="en" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Global Settings</control>
     <control lang="en" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Display balloon tooltip after successful hot-key dismount</control>
     <control lang="en" key="IDC_HK_DISMOUNT_PLAY_SOUND">Play system notification sound after successful hot-key dismount</control>
@@ -189,7 +194,7 @@
     <control lang="nn" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="en" key="IDD_PASSWORDCHANGE_DLG">Change Password or Keyfiles</control>
     <control lang="nn" key="IDD_PASSWORD_DLG">Skriv inn VeraCrypt Volum Passord</control>
-    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance Options</control>
+    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance and Driver Options</control>
     <control lang="nn" key="IDD_PREFERENCES_DLG">VeraCrypt - Innstillingar</control>
     <control lang="en" key="IDD_SYSENC_SETTINGS">VeraCrypt - System Encryption Settings</control>
     <control lang="en" key="IDD_TOKEN_PREFERENCES">VeraCrypt - Security Token Preferences</control>
@@ -219,7 +224,7 @@
     <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">&amp;Heimeside</control>
+    <control lang="nn" key="IDM_HOMEPAGE">&amp;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>
@@ -235,7 +240,7 @@
     <control lang="nn" key="IDM_ONLINE_TUTORIAL">Nybegynnar rettleiing</control>
     <control lang="en" key="IDM_ORGANIZE_FAVORITES">Organize Favorite Volumes...</control>
     <control lang="en" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organize System Favorite Volumes...</control>
-    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance...</control>
+    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance/Driver Configuration</control>
     <control lang="en" key="IDM_PERMANENTLY_DECRYPT_SYS">Permanently Decrypt System Partition/Drive</control>
     <control lang="nn" key="IDM_PREFERENCES">Innstillingar...</control>
     <control lang="nn" key="IDM_REFRESH_DRIVE_LETTERS">Oppfrisk Stasjons bokstavar</control>
@@ -256,6 +261,7 @@
     <control lang="nn" key="IDM_UNMOUNTALL">Avmonter Alle Monterte Volum</control>
     <control lang="nn" key="IDM_UNMOUNT_VOLUME">Avmonter Volum</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 Image</control>
     <control lang="nn" key="IDM_VERSION_HISTORY">Versjons Historie</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="nn" key="IDM_VOLUME_PROPERTIES">Volum Eigenskapar</control>
@@ -289,7 +295,7 @@
     <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="en" key="IDT_NEW_PKCS5_PRF">PKCS-5 PRF:</control>
+    <control lang="nn" 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>
     <control lang="nn" key="IDT_TASKBAR_ICON">VeraCrypt Bakgrunns Oppgåve</control>
@@ -365,7 +371,7 @@
     <control lang="en" key="IDT_SECURITY_TOKEN">Security token:</control>
     <control lang="nn" key="IDT_SORT_METHOD">Sorterings metode:</control>
     <control lang="en" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Please wait. This process may take a long time...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="en" key="IDT_TEST_BLOCK_NUMBER">Block number:</control>
     <control lang="nn" key="IDT_TEST_CIPHERTEXT">Kodenøkkel tekst (heksadesimal)</control>
     <control lang="en" key="IDT_TEST_DATA_UNIT_NUMBER">Data unit number (64-bit hexadecimal, data unit size is 512 bytes)</control>
@@ -379,7 +385,7 @@
     <control lang="nn" key="MENU_TOOLS">Verk&amp;tøy</control>
     <control lang="en" key="MENU_SETTINGS">Settin&amp;gs</control>
     <control lang="nn" key="MENU_HELP">&amp;Hjelp</control>
-    <control lang="nn" key="MENU_WEBSITE"> ..Heime&amp;side ..</control>
+    <control lang="nn" key="MENU_WEBSITE">   ..Heime&amp;side ..   </control>
     <!-- Strings -->
     <string lang="nn" key="ABOUTBOX">&amp;Om...</string>
     <string lang="nn" key="ACCESSMODEFAIL">Skrivevernings attributten på ditt gamle volum kunne ikkje endrast. Sjekk om du har tilgang til fila.</string>
@@ -410,13 +416,13 @@
     <string lang="nn" key="CIPHER_TITLE">Krypterings Alternativer</string>
     <string lang="nn" key="CLEAN_WINMRU_FAILED">ADVARSEL: Kunne ikkje fjerna stien til den sist valde volum/nøkkelfila (hugsa av fil veljar)!</string>
     <string lang="nn" key="COMPRESSION_NOT_SUPPORTED">Feil: Kontainaren har vorte komprimert på filsystem nivå. VeraCrypt støttar ikkje komprimerte kontainerar (merk att komprimering av krypterte data er fåfengt og bortkasta).\n\nSlå av komprimering for kontainaren ved å fylja desse stega: 1) Høgre klikk på kontainaren i windows utforskaren (ikkje inne i VeraCrypt). 2) Vel 'Eigenskapar'. 3) Frå 'Eigenskapar' dialog boksen, klikk 'Avansert'. 4) I 'Avanserte Attributter' dialog boksen, deaktiver valet 'Komprimer innhold for å spare plass' og klikk 'OK'. 5) I 'Eigenskapar' dialog boksen, klikk 'OK'.</string>
-    <string lang="nn" key="CREATE_FAILED">Kunne ikkje oppretta volum %hs</string>
+    <string lang="nn" key="CREATE_FAILED">Kunne ikkje oppretta volum %s</string>
-    <string lang="nn" key="DEVICE_FREE_BYTES">%hs er %.2f bytes stor</string>
+    <string lang="nn" key="DEVICE_FREE_BYTES">%s er %.2f bytes stor</string>
-    <string lang="nn" key="DEVICE_FREE_KB">%hs er %.2f KB</string>
+    <string lang="nn" key="DEVICE_FREE_KB">%s er %.2f KB</string>
-    <string lang="nn" key="DEVICE_FREE_MB">%hs er %.2f MB</string>
+    <string lang="nn" key="DEVICE_FREE_MB">%s er %.2f MB</string>
-    <string lang="en" key="DEVICE_FREE_GB">Size of %hs is %.2f GB</string>
+    <string lang="en" key="DEVICE_FREE_GB">Size of %s is %.2f GB</string>
-    <string lang="en" key="DEVICE_FREE_TB">Size of %hs is %.2f TB</string>
+    <string lang="en" key="DEVICE_FREE_TB">Size of %s is %.2f TB</string>
-    <string lang="en" key="DEVICE_FREE_PB">Size of %hs is %.2f PB</string>
+    <string lang="en" key="DEVICE_FREE_PB">Size of %s is %.2f PB</string>
     <string lang="nn" key="DEVICE_IN_USE_FORMAT">ADVARSEL: Einheita/partisjonen er i bruk av opperativsystemet eller eit program. Å formatera einheiten/partisjonen kan føra til att data vert korrupte og systemet vert ustabilt.\n\nHaldfram?</string>
     <string lang="en" key="DEVICE_IN_USE_INPLACE_ENC">Warning: The partition is in use by the operating system or applications. You should close any applications that might be using the partition (including antivirus software).\n\nContinue?</string>
     <string lang="nn" key="FORMAT_CANT_DISMOUNT_FILESYS">Feil: Einheita/partisjonen inneheld eit filsystem som ikkje kunne demonterast. Filsystemet kan vera i bruk av opperativ systemet. Å formatera einheta/patisjonen vil nesten garantert føra til korupte data og ustabilt system.\n\nFor å løysa dette problemt , anbefallar me att du fyrst slettar partisjonen for så og oppretta den på nytt utan å formatera den. For å gjera dette, fylja desse stega: 1) Right-click the 'Computer' (or 'My Computer') icon in the 'Start Menu' and select 'Manage'. The 'Computer Management' window should appear. 2) In the 'Computer Management' window, select 'Storage' &gt; 'Disk Management'. 3) Right-click the partition you want to encrypt and select either 'Delete Partition', or 'Delete Volume', or 'Delete Logical Drive'. 4) Click 'Yes'. If Windows asks you to restart the computer, do so. Then repeat the steps 1 and 2 and continue from the step 5. 5) Right-click the unallocated/free space area and select either 'New Partition', or 'New Simple Volume', or 'New Logical Drive'. 6) The 'New Partition Wizard' or 'New Simple Volume Wizard' window should appear now; follow its instructions. On the wizard page entitled 'Format Partition', select either 'Do not format this partition' or 'Do not format this volume'. In the same wizard, click 'Next' and then 'Finish'. 7) Note that the device path you have selected in VeraCrypt may be wrong now. Therefore, exit the VeraCrypt Volume Creation Wizard (if it is still running) and then start it again. 8) Try encrypting the device/partition again.\n\nIf VeraCrypt repeatedly fails to encrypt the device/partition, you may want to consider creating a file container instead.</string>
@@ -433,17 +439,17 @@
     <string lang="en" key="INPLACE_ENC_ALTERNATIVE_STEPS">To encrypt the data on this partition, please follow these steps:\n\n1) Create a VeraCrypt volume on an empty partition/device and then mount it.\n\n2) Copy all files from the partition that you originally wanted to encrypt to the mounted VeraCrypt volume (that has been created and mounted in step 1). That way, you will create a VeraCrypt-encrypted backup of the data.\n\n3) Create a VeraCrypt volume on the partition that you originally wanted to encrypt and make sure that (in the VeraCrypt wizard) you choose the option "Create encrypted volume and format it" (instead of the option "Encrypt partition in place"). Note that all data stored on the partition will be erased. After the volume is created, mount it.\n\n4) Copy all files from the mounted backup VeraCrypt volume (created and mounted in step 1) to the mounted VeraCrypt volume that has been created (and mounted) in step 3.\n\nAfter you complete these steps, the data will be encrypted and, in addition, there will be an encrypted backup of the data.</string>
     <string lang="en" key="RAW_DEV_NOT_SUPPORTED_FOR_INPLACE_ENC">VeraCrypt can in-place encrypt only a partition, a dynamic volume, or an entire system drive.\n\nIf you want to create an encrypted VeraCrypt volume within the selected non-system device, choose the option "Create encrypted volume and format it" (instead of the option "Encrypt partition in place").</string>
     <string lang="en" key="INPLACE_ENC_INVALID_PATH">Error: VeraCrypt can in-place encrypt only a partition, a dynamic volume, or an entire system drive. Please make sure the specified path is valid.</string>
-    <string lang="en" key="CANNOT_RESIZE_FILESYS">Error: Cannot shrink the filesystem (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPossible causes and solutions:\n\n- Not enough free space on the volume. Please make sure no other application is writing to the filesystem.\n\n- Corrupted file system. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
+    <string lang="en" key="CANNOT_RESIZE_FILESYS">Error: Cannot shrink the filesystem (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPossible causes and solutions:\n\n- Not enough free space on the volume. Please make sure no other application is writing to the filesystem.\n\n- Corrupted file system. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties > Tools > 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
-    <string lang="en" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Error: There is not enough free space on the volume and so the filesystem cannot be shrunk (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPlease delete any redundant files and empty the Recycle Bin so as to free at least 256 KB of space and then try again. Note that due to a Windows issue, the amount of free space reported by the Windows Explorer may be incorrect until the operating system is restarted. If restarting the system does not help, the file system may be corrupted. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
+    <string lang="en" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Error: There is not enough free space on the volume and so the filesystem cannot be shrunk (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPlease delete any redundant files and empty the Recycle Bin so as to free at least 256 KB of space and then try again. Note that due to a Windows issue, the amount of free space reported by the Windows Explorer may be incorrect until the operating system is restarted. If restarting the system does not help, the file system may be corrupted. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties > Tools > 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
-    <string lang="nn" key="DISK_FREE_BYTES">Stasjon %hs har %.2f bytes ledig.</string>
+    <string lang="nn" key="DISK_FREE_BYTES">Stasjon %s har %.2f bytes ledig.</string>
-    <string lang="en" key="DISK_FREE_KB">Free space on drive %hs is %.2f KB</string>
+    <string lang="en" key="DISK_FREE_KB">Free space on drive %s is %.2f KB</string>
-    <string lang="en" key="DISK_FREE_MB">Free space on drive %hs is %.2f MB</string>
+    <string lang="en" key="DISK_FREE_MB">Free space on drive %s is %.2f MB</string>
-    <string lang="en" key="DISK_FREE_GB">Free space on drive %hs is %.2f GB</string>
+    <string lang="en" key="DISK_FREE_GB">Free space on drive %s is %.2f GB</string>
-    <string lang="en" key="DISK_FREE_TB">Free space on drive %hs is %.2f TB</string>
+    <string lang="en" key="DISK_FREE_TB">Free space on drive %s is %.2f TB</string>
-    <string lang="en" key="DISK_FREE_PB">Free space on drive %hs is %.2f PB</string>
+    <string lang="en" key="DISK_FREE_PB">Free space on drive %s is %.2f PB</string>
     <string lang="nn" key="DRIVELETTERS">Kunne ikkje få tilgjengelege stasjons bokstavar.</string>
     <string lang="en" key="DRIVER_NOT_FOUND">Error: VeraCrypt driver not found.\n\nPlease copy the files 'veracrypt.sys' and 'veracrypt-x64.sys' to the directory where the main VeraCrypt application (VeraCrypt.exe) is located.</string>
-    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall; on Windows XP, select 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
+    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' > Computer > 'Uninstall or change a program' > VeraCrypt > Uninstall; on Windows XP, select 'Start Menu' > Settings > 'Control Panel' > 'Add Or Remove Programs' > VeraCrypt > Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
     <string lang="nn" key="ERR_CIPHER_INIT_FAILURE">Feil: Cipher initialisering feila.</string>
     <string lang="nn" key="ERR_CIPHER_INIT_WEAK_KEY">Feil: Ein svak nøkkel har vorte oppdaga! Prøv omatt.</string>
     <string lang="en" key="EXCEPTION_REPORT">A critical error has occurred and VeraCrypt must be terminated. If this is caused by a bug in VeraCrypt, we would like to fix it. To help us, you can send us an automatically generated error report containing the following items:\n\n- Program version\n- Operating system version\n- Type of CPU\n- VeraCrypt component name\n- Checksum of VeraCrypt executable\n- Symbolic name of dialog window\n- Error category\n- Error address\n- VeraCrypt call stack\n\nIf you select 'Yes', the following URL (which contains the entire error report) will be opened in your default Internet browser.\n\n%hs\n\nDo you want to send us the above error report?</string>
@@ -497,7 +503,7 @@
     <string lang="en" key="WIPE_FINISHED">The content of the partition/device has been successfully erased.</string>
     <string lang="en" key="WIPE_FINISHED_DECOY_SYSTEM_PARTITION">The content of the partition where the original system (of which the hidden system is a clone) resided has been successfully erased.</string>
     <string lang="en" key="DECOY_OS_VERSION_WARNING">Please make sure the version of Windows you are going to install (on the wiped partition) is the same as the version of Windows you are currently running. This is required due to the fact that both systems will share a common boot partition.</string>
-    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' &gt; 'Add Mounted Volume to System Favorites').</string>
+    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' > 'Add Mounted Volume to System Favorites').</string>
     <string lang="en" key="SYSTEM_DECRYPTION_FINISHED">The system partition/drive has been successfully decrypted.</string>
     <string lang="nn" key="FORMAT_FINISHED_HELP">\n\nVeraCrypt volum har vorte oppretta og er klart til bruk. Vist du vill oppretta fleire VeraCrypt volum, klikk Neste. Vist ikkje, klikk Avslutt.</string>
     <string lang="en" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nThe hidden VeraCrypt volume has been successfully created (the hidden operating system will reside within this hidden volume).\n\nClick Next to continue.</string>
@@ -523,8 +529,8 @@
     <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 applications will know that data written to and read from the system partition are actually written to and read from the partition behind it (from/to a hidden volume). Any such data is encrypted and decrypted on the fly as usual (with an encryption key different from the one that will be used for the decoy operating system).\n\n\nPlease click Next to continue.</string>
     <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 password for this outer volume, and the existence of the hidden volume (and of the hidden operating system) will remain secret.\n\nIMPORTANT: The files you copy to the outer volume should not occupy more than %s. Otherwise, there may not be enough free space on the outer volume for the hidden volume (and you will not be able to continue). After you finish copying, click Next (do not dismount the volume).</string>
     <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 you finish copying, click Next. Do not dismount the volume.\n\nNote: After you click Next, cluster bitmap of the outer volume will be scanned to determine the size of uninterrupted area of free space whose end is aligned with the end of the volume. This area will accommodate the hidden volume, so it will limit its maximum possible size. Cluster bitmap scanning ensures that no data on the outer volume are overwritten by the hidden volume.</string>
-    <string lang="nn" key="HIDVOL_HOST_FILLING_TITLE">Innhald på Ytre Volum </string>
+    <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="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>
     <string lang="nn" key="HIDVOL_HOST_PRE_CIPHER_TITLE">Ytre Volum</string>
     <string lang="en" key="HIDDEN_OS_PRE_CIPHER_HELP">In the following steps, you will set the options and password for the hidden volume, which will contain the hidden operating system.\n\nRemark: The cluster bitmap of the outer volume has been scanned in order to determine the size of uninterrupted area of free space whose end is aligned with the end of the outer volume. This area will accommodate the hidden volume, so it limits its maximum possible size. The maximum possible size of the hidden volume has been determined and confirmed to be greater than the size of the system partition (which is required, because the entire content of the system partition will need to be copied to the hidden volume). This ensures that no data currently stored on the outer volume will be overwritten by data written to the area of the hidden volume.</string>
@@ -561,6 +567,7 @@
     <string lang="nn" key="MAX_HIDVOL_SIZE_KB">Størst mogleg skjult volum storleik for dette volumet er %.2f KB.</string>
     <string lang="nn" key="MAX_HIDVOL_SIZE_MB">Størst mogleg skjult volum storleik for dette volumet er %.2f MB.</string>
     <string lang="en" key="MAX_HIDVOL_SIZE_GB">Maximum possible hidden volume size for this volume is %.2f GB.</string>
+    <string lang="en" key="MAX_HIDVOL_SIZE_TB">Maximum possible hidden volume size for this volume is %.2f TB.</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">&amp;Monter</string>
@@ -591,12 +598,12 @@
     <string lang="en" key="SELECT_PKCS11_MODULE">Select PKCS #11 Library</string>
     <string lang="nn" key="OUTOFMEMORY">Ikkje meir minne</string>
     <string lang="en" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">IMPORTANT: We strongly recommend that inexperienced users create a VeraCrypt file container on the selected device/partition, instead of attempting to encrypt the entire device/partition.\n\nWhen you create a VeraCrypt file container (as opposed to encrypting a device or partition) there is, for example, no risk of destroying a large number of files. Note that a VeraCrypt file container (even though it contains a virtual encrypted disk) is actually just like any normal file. For more information, see the chapter Beginner's Tutorial in the VeraCrypt User Guide.\n\nAre you sure you want to encrypt the entire device/partition?</string>
-    <string lang="en" key="OVERWRITEPROMPT">WARNING: The file '%hs' already exists!\n\nIMPORTANT: VERACRYPT WILL NOT ENCRYPT THE FILE, BUT IT WILL DELETE IT. Are you sure you want to delete the file and replace it with a new VeraCrypt container?</string>
+    <string lang="en" key="OVERWRITEPROMPT">WARNING: The file '%s' already exists!\n\nIMPORTANT: VERACRYPT WILL NOT ENCRYPT THE FILE, BUT IT WILL DELETE IT. Are you sure you want to delete the file and replace it with a new VeraCrypt container?</string>
-    <string lang="en" key="OVERWRITEPROMPT_DEVICE">CAUTION: ALL FILES CURRENTLY STORED ON THE SELECTED %s '%hs'%s WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
+    <string lang="en" key="OVERWRITEPROMPT_DEVICE">CAUTION: ALL FILES CURRENTLY STORED ON THE SELECTED %s '%s'%s WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
-    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%s'%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting/decrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting/decrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting/decrypting, please make sure that you have backup copies of the files you want to encrypt/decrypt.\n\nDo you have such a backup?</string>
-    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%hs'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
+    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%s'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
     <string lang="en" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">WARNING: THE SELECTED PARTITION CONTAINS A LARGE AMOUNT OF DATA! Any files stored on the partition will be erased and lost (they will NOT be encrypted)!</string>
     <string lang="en" key="ERASE_FILES_BY_CREATING_VOLUME">Erase any files stored on the partition by creating a VeraCrypt volume within it</string>
     <string lang="nn" key="PASSWORD">Passord</string>
@@ -645,7 +652,7 @@
     <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
     <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
     <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 &gt; Organize &gt; 'Folder and search options' &gt; View).</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 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>
@@ -656,7 +663,7 @@
     <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>
     <string lang="en" key="PREV">&lt; &amp;Back</string>
     <string lang="nn" key="RAWDEVICES">Kunne ikkje lista raw einingar installert på systemet ditt!</string>
-    <string lang="nn" key="READONLYPROMPT">Volumet '%hs' eksisterer, og er skrive verna. Er du sikker på att du vill erstatta det?</string>
+    <string lang="nn" key="READONLYPROMPT">Volumet '%s' eksisterer, og er skrive verna. Er du sikker på att du vill erstatta det?</string>
     <string lang="nn" key="SELECT_DEST_DIR">Vel destinasjons katalog</string>
     <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>
@@ -680,13 +687,13 @@
     <string lang="nn" key="TEST_CIPHERTEXT_SIZE">Test cipherteksten som du har valt er for kort eller lang.</string>
     <string lang="nn" key="TEST_KEY_SIZE">Test nøkkelen som du har valt er for lang eller kort.</string>
     <string lang="nn" key="TEST_PLAINTEXT_SIZE">Test klarteksten du har valt er for lang eller kort.</string>
-    <string lang="en" key="TWO_LAYER_CASCADE_HELP">Two ciphers in a cascade operating in XTS mode. Each block is first encrypted with %hs (%d-bit key) and then with %hs (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
+    <string lang="en" key="TWO_LAYER_CASCADE_HELP">Two ciphers in a cascade operating in XTS mode. Each block is first encrypted with %s (%d-bit key) and then with %s (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
-    <string lang="en" key="THREE_LAYER_CASCADE_HELP">Three ciphers in a cascade operating in XTS mode. Each block is first encrypted with %hs (%d-bit key), then with %hs (%d-bit key), and finally with %hs (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
+    <string lang="en" key="THREE_LAYER_CASCADE_HELP">Three ciphers in a cascade operating in XTS mode. Each block is first encrypted with %s (%d-bit key), then with %s (%d-bit key), and finally with %s (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
     <string lang="en" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Note that, depending on the operating system configuration, these auto-run and auto-mount features may work only when the traveler disk files are created on a non-writable CD/DVD-like medium. Also note that this is not a bug in VeraCrypt (it is a limitation of Windows).</string>
     <string lang="en" key="TRAVELER_DISK_CREATED">VeraCrypt traveler disk has been successfully created.\n\nNote that you need administrator privileges to run VeraCrypt in portable mode. Also note that, after examining the registry file, it may be possible to tell that VeraCrypt was run on a Windows system even if it is run in portable mode.</string>
     <string lang="en" key="TC_TRAVELER_DISK">VeraCrypt Traveler Disk</string>
     <string lang="en" key="TWOFISH_HELP">Designed by Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall, and Niels Ferguson. Published in 1998. 256-bit key, 128-bit block. Mode of operation is XTS. Twofish was one of the AES finalists.</string>
-    <string lang="nn" key="MORE_INFO_ABOUT">Meir info på %hs</string>
+    <string lang="nn" key="MORE_INFO_ABOUT">Meir info på %s</string>
     <string lang="nn" key="UNKNOWN">Ukjent</string>
     <string lang="en" key="ERR_UNKNOWN">An unspecified or unknown error occurred (%d).</string>
     <string lang="nn" key="UNMOUNTALL_LOCK_FAILED">Eit eller anna volum inneheld filer som er i bruk av eit program eller system.\n\nTving demontering?</string>
@@ -728,7 +735,7 @@
     <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">partisjon</string>
+    <string lang="nn" 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>
@@ -764,8 +771,8 @@
     <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_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="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="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="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>
@@ -851,7 +858,7 @@
     <string lang="en" key="INSTALL_FAILED">Installation failed.</string>
     <string lang="en" key="UNINSTALL_FAILED">Uninstallation failed.</string>
     <string lang="en" key="DIST_PACKAGE_CORRUPTED">This distribution package is damaged. Please try downloading it again (preferably from the official VeraCrypt website at https://veracrypt.codeplex.com).</string>
-    <string lang="en" key="CANNOT_WRITE_FILE_X">Cannot write file %hs</string>
+    <string lang="en" key="CANNOT_WRITE_FILE_X">Cannot write file %s</string>
     <string lang="en" key="EXTRACTING_VERB">Extracting</string>
     <string lang="en" key="CANNOT_READ_FROM_PACKAGE">Cannot read data from the package.</string>
     <string lang="en" key="CANT_VERIFY_PACKAGE_INTEGRITY">Cannot verify the integrity of this distribution package.</string>
@@ -860,8 +867,8 @@
     <string lang="nn" key="INSTALL_OK">VeraCrypt vart installert utan feil.</string>
     <string lang="en" key="SETUP_UPDATE_OK">VeraCrypt has been successfully updated.</string>
     <string lang="en" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt has been successfully upgraded. However, before you can start using it, the computer must be restarted.\n\nDo you want to restart it now?</string>
-    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
+    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu > All programs > Accessories > System Tools > System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
-    <string lang="nn" key="UNINSTALL_OK">VeraCrypt har vorte avinstallert utan feil.\n\nKlikk 'Avslutt' for å fjerna VeraCrypt installer og mappa %hs. Mappa vill ikkje verta fjerna vist den inneheld filer som ikkje vart innstallert av VeraCrypt installer eller av VeraCrypt.</string>
+    <string lang="nn" key="UNINSTALL_OK">VeraCrypt har vorte avinstallert utan feil.\n\nKlikk 'Avslutt' for å fjerna VeraCrypt installer og mappa %s. Mappa vill ikkje verta fjerna vist den inneheld filer som ikkje vart innstallert av VeraCrypt installer eller av VeraCrypt.</string>
     <string lang="nn" key="REMOVING_REG">Fjerner VeraCrypt register oppføringar</string>
     <string lang="nn" key="ADDING_REG">Legg til register oppføring</string>
     <string lang="nn" key="REMOVING_APPDATA">Fjernar program spesifikke data</string>
@@ -872,10 +879,10 @@
     <string lang="nn" key="CREATING_SYS_RESTORE">Lag system gjennopprettings punkt</string>
     <string lang="nn" key="FAILED_SYS_RESTORE">Kunne ikkje laga system gjennopprettings punkt!</string>
     <string lang="en" key="INSTALLER_UPDATING_BOOT_LOADER">Updating boot loader</string>
-    <string lang="en" key="INSTALL_OF_FAILED">Failed to install '%hs'. %hs\nDo you want to continue installing?</string>
+    <string lang="en" key="INSTALL_OF_FAILED">Failed to install '%s'. %s\nDo you want to continue installing?</string>
-    <string lang="en" key="UNINSTALL_OF_FAILED">Failed to uninstall '%hs'. %hs\nDo you want to continue uninstalling?</string>
+    <string lang="en" key="UNINSTALL_OF_FAILED">Failed to uninstall '%s'. %s\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="CANT_CREATE_FOLDER">Mappe '%s' kunne ikkje opprettast</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>
@@ -906,8 +913,8 @@
     <string lang="en" key="ENCRYPTED_PORTION">Encrypted Portion</string>
     <string lang="en" key="ENCRYPTED_PORTION_FULLY_ENCRYPTED">100% (fully encrypted)</string>
     <string lang="en" key="ENCRYPTED_PORTION_NOT_ENCRYPTED">0% (not encrypted)</string>
-    <string lang="en" key="PROCESSED_PORTION_X_PERCENT">%.3f%%</string>
+    <string lang="nn" key="PROCESSED_PORTION_X_PERCENT">%.3f%%</string>
-    <string lang="en" key="PROCESSED_PORTION_100_PERCENT">100%</string>
+    <string lang="nn" key="PROCESSED_PORTION_100_PERCENT">100%</string>
     <string lang="en" key="PROGRESS_STATUS_WAITING">Waiting</string>
     <string lang="en" key="PROGRESS_STATUS_PREPARING">Preparing</string>
     <string lang="en" key="PROGRESS_STATUS_RESIZING">Resizing</string>
@@ -918,17 +925,17 @@
     <string lang="en" key="PROGRESS_STATUS_FINISHED">Finished</string>
     <string lang="en" key="PROGRESS_STATUS_ERROR">Error</string>
     <string lang="en" key="FAVORITE_DISCONNECTED_DEV">Device disconnected</string>
-    <string lang="en" key="SYS_FAVORITE_VOLUMES_SAVED">System favorite volumes saved.\n\nTo enable mounting of system favorite volumes when the system starts, please select 'Settings' &gt; 'System Favorite Volumes' &gt; 'Mount system favorite volumes when Windows starts'.</string>
+    <string lang="en" key="SYS_FAVORITE_VOLUMES_SAVED">System favorite volumes saved.\n\nTo enable mounting of system favorite volumes when the system starts, please select 'Settings' > 'System Favorite Volumes' > 'Mount system favorite volumes when Windows starts'.</string>
     <string lang="en" key="FAVORITE_ADD_DRIVE_DEV_WARNING">The volume you are adding to favorites is neither a partition nor a dynamic volume. Therefore, VeraCrypt will be unable to mount this favorite volume if the device number changes.</string>
     <string lang="en" key="FAVORITE_ADD_PARTITION_TYPE_WARNING">The volume you are adding to favorites is a partition not recognized by Windows.\n\nVeraCrypt will be unable to mount this favorite volume if the device number changes. Please set the type of the partition to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then add the partition to favorites again.</string>
-    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings &gt; Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
+    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings > Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_NETWORK_PATH_ERR">A container stored in a remote filesystem shared over a network cannot be automatically mounted when its host device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, the volume hosted on the device cannot be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable the volume hosted on the device to be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_LABEL_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, no label can be assigned to it.</string>
     <string lang="en" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable VeraCrypt to assign a label to the partition.</string>
     <string lang="en" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Due to a Windows limitation, a container stored in a remote filesystem shared over a network cannot be mounted as a system favorite volume (however, it can be mounted as a non-system favorite volume when a user logs on).</string>
-    <string lang="nn" key="ENTER_PASSWORD_FOR">Skriv inn passord for %hs</string>
+    <string lang="nn" key="ENTER_PASSWORD_FOR">Skriv inn passord for %s</string>
     <string lang="en" key="ENTER_PASSWORD_FOR_LABEL">Enter password for '%s'</string>
     <string lang="en" key="ENTER_NORMAL_VOL_PASSWORD">Enter password for the normal/outer volume</string>
     <string lang="en" key="ENTER_HIDDEN_VOL_PASSWORD">Enter password for the hidden volume</string>
@@ -939,12 +946,12 @@
     <string lang="en" key="KEYFILE_EMPTY_BASE_NAME">Please enter a name for the keyfile(s) to be generated</string>
     <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' &gt; 'Restore Volume Header'.</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="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 header backup to restore a header of a different volume, you will be able to mount the volume, but you will NOT be able to decrypt any data stored in the volume (because you will change its master key).</string>
     <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) for the hidden volume.</string>
-    <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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</string>
+    <string lang="en" key="CONFIRM_VOL_HEADER_BAK">Are you sure you want to create volume header backup for %s?\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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</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="CONFIRM_VOL_HEADER_RESTORE">Are you sure you want to restore volume header of %s?\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>
@@ -955,14 +962,16 @@
     <string lang="en" key="VOLUME_HAS_NO_BACKUP_HEADER">There is no backup header embedded in this volume (note that only volumes created by VeraCrypt 6.0 or later contain embedded backup headers).</string>
     <string lang="en" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">You are attempting to back up the header of the system partition/drive. This is not allowed. Backup/restore operations pertaining to the system partition/drive can be performed only using the VeraCrypt Rescue Disk.\n\nDo you want to create a VeraCrypt Rescue Disk?</string>
     <string lang="en" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">You are attempting to restore the header of a virtual VeraCrypt volume but you selected the system partition/drive. This is not allowed. Backup/restore operations pertaining to the system partition/drive can be performed only using the VeraCrypt Rescue Disk.\n\nDo you want to create a VeraCrypt Rescue Disk?</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">After you click OK, you will select a filename for the new VeraCrypt Rescue Disk ISO image and the location where you wish to place it.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">After you click OK, you will select a filename for the new VeraCrypt Rescue Disk image and the location where you wish to place it.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <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_INSERT">Please insert your VeraCrypt Rescue Disk 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 a new Rescue Disk fully compatible with your current configuration, select 'System' &gt; 'Create Rescue Disk'.</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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk 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' &gt; 'Create 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 be used, because it was created for a different master key. You need to burn the newly generated Rescue Disk.</string>
     <string lang="en" key="RESCUE_DISK_CHECK_FAILED_SENTENCE_APPENDIX"> and/or other CD/DVD recording software</string>
     <string lang="en" key="SYSTEM_FAVORITES_DLG_TITLE">VeraCrypt - System Favorite Volumes</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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="CHECKING_FS">Sjekkar filsystemet på VeraCrypt volumet montert som %s...</string>
-    <string lang="nn" key="REPAIRING_FS">Forsøk på å reparere filsystemet på VeraCrypt volumet montert som har %hs...</string>
+    <string lang="nn" key="REPAIRING_FS">Forsøk på å reparere filsystemet på VeraCrypt volumet montert som har %s...</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 later.</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 encryption algorithm (e.g., AES, Serpent, Twofish, etc.) and that you move all files from this volume to the new volume.</string>
     <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' &gt; 'System og Vedlikehold' &gt; 'Administrative Vertøy' - 'Lag og formater harddiskpartisjoner').\n\nMerk att dette er eit krav frå opperativ systemet.</string>
@@ -1069,7 +1077,7 @@
     <string lang="en" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt no longer supports encryption of the system partition/drive on Windows Vista with no Service Pack installed. Before upgrading VeraCrypt, please install Service Pack 1 or higher for Windows Vista.</string>
     <string lang="en" key="FEATURE_REQUIRES_INSTALLATION">Error: This feature requires VeraCrypt to be installed on the system (you are running VeraCrypt in portable mode).\n\nPlease install VeraCrypt and then try again.</string>
     <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="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</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_UNAVAILABLE_FOR_RESCUE_DISK">The original system loader will not be stored on the Rescue Disk (probable cause: missing backup file).</string>
@@ -1108,8 +1116,8 @@
     <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 you do NOT have a real US keyboard.</string>
     <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 starts.\n\n- The VRD will contain a backup of the present content of the first drive track (which typically contains a system loader or boot manager) and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ISO image will be created in the location specified below.</string>
     <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">The Rescue Disk image has been created and stored in this file:\n%s\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>
+    <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%s\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>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">IMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software. If you do not have any CD/DVD recording software that can write the ISO disk image to a CD/DVD, click the link below to download such free software.\n\n</string>
     <string lang="en" key="LAUNCH_WIN_ISOBURN">Launch Microsoft Windows Disc Image Burner</string>
     <string lang="en" key="RESCUE_DISK_BURN_NO_CHECK_WARN">WARNING: If you already created a VeraCrypt Rescue Disk in the past, it cannot be reused for this system partition/drive because it was created for a different master key! Every time you encrypt a system partition/drive, you must create a new VeraCrypt Rescue Disk for it even if you use the same password.</string>
@@ -1372,6 +1380,39 @@
     <string lang="nn" key="TB_PER_SEC">TB/s</string>
     <string lang="nn" key="PB_PER_SEC">PB/s</string>
     <string lang="en" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.pt-br.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- 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 -->
@@ -14,7 +14,7 @@
     <control lang="pt-br" key="IDC_BROWSE">Pro&amp;curar...</control>
     <control lang="pt-br" key="IDC_DESKTOP_ICON">Adicionar ícone à área de &amp;trabalho</control>
     <control lang="en" key="IDC_DONATE">Donate now...</control>
-    <control lang="pt-br" key="IDC_FILE_TYPE">Associar a &amp;extensão .tc ao VeraCrypt</control>
+    <control lang="pt-br" key="IDC_FILE_TYPE">Associar a &amp;extensão .hc ao VeraCrypt</control>
     <control lang="pt-br" key="IDC_OPEN_CONTAINING_FOLDER">&amp;Abrir o local de destino quando concluído</control>
     <control lang="pt-br" key="IDC_PROG_GROUP">Incluir o Veracrypt no menu &amp;Iniciar</control>
     <control lang="pt-br" key="IDC_SYSTEM_RESTORE">Criar um ponto de &amp;restauração do sistema</control>
@@ -37,6 +37,7 @@
     <control lang="pt-br" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Baixar software de gravação de CD/DVD</control>
     <control lang="pt-br" key="IDC_FILE_CONTAINER">Crie um recipiente de arquivo criptografado</control>
     <control lang="pt-br" key="IDC_GB">&amp; GB</control>
+    <control lang="pt-br" key="IDC_TB">&amp; TB</control>
     <control lang="pt-br" key="IDC_HIDDEN_SYSENC_INFO_LINK">Mais informações</control>
     <control lang="pt-br" key="IDC_HIDDEN_VOL">Volume o&amp;culto VeraCrypt </control>
     <control lang="pt-br" key="IDC_HIDDEN_VOL_HELP">Mais informações sobre volumes ocultos</control>
@@ -44,6 +45,7 @@
     <control lang="pt-br" key="IDC_HIDVOL_WIZ_MODE_FULL">Modo normal</control>
     <control lang="pt-br" key="IDC_KB">&amp;KB</control>
     <control lang="pt-br" key="IDC_KEYFILES_ENABLE">U&amp;sar arquivos-chave</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="pt-br" key="IDC_KEY_FILES">&amp;Arquivos-chave...</control>
     <control lang="pt-br" key="IDC_LINK_HASH_INFO">Informação sobre algoritmos hash</control>
@@ -58,7 +60,8 @@
     <control lang="pt-br" key="IDC_NO_HISTORY">Nunca &amp;salvar histórico</control>
     <control lang="pt-br" key="IDC_OPEN_OUTER_VOLUME">Abrir volume externo</control>
     <control lang="pt-br" key="IDC_PAUSE">&amp;Pausar</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="pt-br" key="IDC_QUICKFORMAT">Formatação rápida</control>
     <control lang="pt-br" key="IDC_SHOW_PASSWORD">&amp;Mostrar senha</control>
     <control lang="pt-br" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Mostrar senha</control>
@@ -71,19 +74,19 @@
     <control lang="pt-br" key="IDC_SYS_PARTITION">Criptografar a partição de sistema do Windows</control>
     <control lang="pt-br" key="IDC_WHOLE_SYS_DRIVE">Criptografar a unidade inteira</control>
     <control lang="pt-br" key="IDD_VOL_CREATION_WIZARD_DLG">Assistente de Criação de Volume VeraCrypt</control>
-    <control lang="pt-br" key="IDT_CLUSTER">Cluster</control>
+    <control lang="pt-br" key="IDT_CLUSTER">Cluster </control>
     <control lang="pt-br" key="IDT_COLLECTING_RANDOM_DATA_NOTE">IMPORTANTE: Mova seu mouse tão aleatoriamente quanto possível nesta janela. Quanto mais você demorar movendo-o, melhor. Isto aumenta significativamente a força de criptografia das chaves. Depois clique em Avançar para continuar.</control>
     <control lang="pt-br" key="IDT_CONFIRM">&amp;Confirmar:</control>
     <control lang="pt-br" key="IDT_DONE">Concl.</control>
     <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="pt-br" key="IDT_ENCRYPTION_ALGO">Algoritmo de Criptografia</control>
-    <control lang="pt-br" key="IDT_FILESYSTEM">Sistema de arquivos</control>
+    <control lang="pt-br" key="IDT_FILESYSTEM">Sistema de arquivos </control>
     <control lang="pt-br" key="IDT_FILE_CONTAINER">Cria um disco virtual criptografado em um arquivo. Recomendado para usuários inexperientes.</control>
     <control lang="pt-br" key="IDT_FORMAT_OPTIONS">Opções</control>
     <control lang="pt-br" key="IDT_HASH_ALGO">Algoritmo de hash</control>
-    <control lang="pt-br" key="IDT_HEADER_KEY">Chave do cabeçalho:</control>
+    <control lang="pt-br" key="IDT_HEADER_KEY">Chave do cabeçalho: </control>
     <control lang="pt-br" key="IDT_LEFT">Faltam</control>
-    <control lang="pt-br" key="IDT_MASTER_KEY">Chave mestra:</control>
+    <control lang="pt-br" key="IDT_MASTER_KEY">Chave mestra: </control>
     <control lang="pt-br" key="IDT_MULTI_BOOT">Selecione esta opção se houver dois ou mais sistemas operacionais instalados neste computador.\n\nPor exemplo:\n- Windows XP e Windows XP\n- Windows XP e Windows Vista\n- Windows e Mac OS X\n- Windows e Linux\n- Windows, Linux e Mac OS X</control>
     <control lang="pt-br" key="IDT_NON_SYS_DEVICE">Criptografa uma partição não-sistema em qualquer unidade interna ou externa (por exemplo, um pendrive). Opcionalmente, cria um volume oculto.</control>
     <control lang="pt-br" key="IDT_PARTIAL_POOL_CONTENTS">Conteúdo atual do pool (parcial)</control>
@@ -92,7 +95,7 @@
     <control lang="en" key="IDT_PIM">Volume PIM:</control>
     <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
     <control lang="pt-br" key="IDT_PROGRESS">Progresso:</control>
-    <control lang="pt-br" key="IDT_RANDOM_POOL">Pool aleatório:</control>
+    <control lang="pt-br" key="IDT_RANDOM_POOL">Pool aleatório: </control>
     <control lang="pt-br" key="IDT_SINGLE_BOOT">Selecione esta opção se houver apenas um sistema operacional instalado neste computador(mesmo se ele tiver vários usuários).</control>
     <control lang="pt-br" key="IDT_SPEED">Velocid</control>
     <control lang="pt-br" key="IDT_STATUS">Status</control>
@@ -118,6 +121,7 @@
     <control lang="pt-br" key="IDC_CREATE">Criar</control>
     <control lang="pt-br" key="IDC_CREATE_VOLUME">&amp;Criar Volume</control>
     <control lang="pt-br" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Não mo&amp;strar quaisquer textos na tela de autenticação pré-boot (exceto a mensagem personalizada abaixo)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <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="pt-br" key="IDC_ENABLE_KEYFILES">Usar arquivos-chave</control>
     <control lang="pt-br" key="IDC_ENABLE_NEW_KEYFILES">Usar arquivos-chave</control>
@@ -132,11 +136,12 @@
     <control lang="en" key="IDC_FAVORITE_MOVE_UP">Move &amp;Up</control>
     <control lang="en" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Open &amp;Explorer window for selected volume when successfully mounted</control>
     <control lang="en" key="IDC_FAVORITE_REMOVE">&amp;Remove</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="en" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Global Settings</control>
     <control lang="en" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Display balloon tooltip after successful hot-key dismount</control>
     <control lang="en" key="IDC_HK_DISMOUNT_PLAY_SOUND">Play system notification sound after successful hot-key dismount</control>
     <control lang="pt-br" key="IDC_HK_MOD_ALT">Alt</control>
-    <control lang="en" key="IDC_HK_MOD_CTRL">Ctrl</control>
+    <control lang="pt-br" key="IDC_HK_MOD_CTRL">Ctrl</control>
     <control lang="pt-br" key="IDC_HK_MOD_SHIFT">Shift</control>
     <control lang="pt-br" key="IDC_HK_MOD_WIN">Win</control>
     <control lang="pt-br" key="IDC_HOTKEY_ASSIGN">Atribuir</control>
@@ -189,7 +194,7 @@
     <control lang="pt-br" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="pt-br" key="IDD_PASSWORDCHANGE_DLG">Mudar Senha ou Arquivos-Chaves</control>
     <control lang="pt-br" key="IDD_PASSWORD_DLG">Digitar a Senha do Volume VeraCrypt</control>
-    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance Options</control>
+    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance and Driver Options</control>
     <control lang="pt-br" key="IDD_PREFERENCES_DLG">VeraCrypt - Preferências</control>
     <control lang="pt-br" key="IDD_SYSENC_SETTINGS">VeraCrypt - Configurações de Criptografia de Sistema</control>
     <control lang="pt-br" key="IDD_TOKEN_PREFERENCES">VeraCrypt - Preferências de Token de Segurança</control>
@@ -219,7 +224,7 @@
     <control lang="pt-br" key="IDM_ENCRYPT_SYSTEM_DEVICE">Criptografar Unidade/Partição de Sistema...</control>
     <control lang="pt-br" key="IDM_FAQ">Perguntas Frequentes</control>
     <control lang="pt-br" key="IDM_HELP">Guia do Usuário</control>
-    <control lang="pt-br" key="IDM_HOMEPAGE">&amp;Site na Internet</control>
+    <control lang="pt-br" key="IDM_HOMEPAGE">&amp;Site na Internet </control>
     <control lang="pt-br" key="IDM_HOTKEY_SETTINGS">Atalhos...</control>
     <control lang="pt-br" key="IDM_KEYFILE_GENERATOR">Gerador de arquivo-chave</control>
     <control lang="pt-br" key="IDM_LANGUAGE">Idioma...</control>
@@ -235,7 +240,7 @@
     <control lang="pt-br" key="IDM_ONLINE_TUTORIAL">Tutorial Para Iniciantes</control>
     <control lang="en" key="IDM_ORGANIZE_FAVORITES">Organize Favorite Volumes...</control>
     <control lang="en" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organize System Favorite Volumes...</control>
-    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance...</control>
+    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance/Driver Configuration</control>
     <control lang="pt-br" key="IDM_PERMANENTLY_DECRYPT_SYS">Descriptografar Unidade/Partição de Sistema Permanentemente</control>
     <control lang="pt-br" key="IDM_PREFERENCES">Preferências...</control>
     <control lang="pt-br" key="IDM_REFRESH_DRIVE_LETTERS">Atualizar Letras de Unidade</control>
@@ -256,6 +261,7 @@
     <control lang="pt-br" key="IDM_UNMOUNTALL">Desmontar Todos os Volumes Montados</control>
     <control lang="pt-br" key="IDM_UNMOUNT_VOLUME">Desmontar Volume</control>
     <control lang="pt-br" key="IDM_VERIFY_RESCUE_DISK">Verificar Disco de Emergência</control>
+    <control lang="en" key="IDM_VERIFY_RESCUE_DISK_ISO">Verify Rescue Disk Image</control>
     <control lang="pt-br" key="IDM_VERSION_HISTORY">Histórico de Versões</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="pt-br" key="IDM_VOLUME_PROPERTIES">Propriedades do Volume</control>
@@ -294,7 +300,7 @@
     <control lang="pt-br" key="IDT_SECURITY_OPTIONS">Opções de Segurança</control>
     <control lang="pt-br" key="IDT_TASKBAR_ICON">Execução em Segundo Plano</control>
     <control lang="pt-br" key="IDT_TRAVELER_MOUNT">Volume VeraCrypt a montar (em relação à raiz do disco removível):</control>
-    <control lang="pt-br" key="IDT_TRAVEL_INSERTION">Ao inserir o disco removível:</control>
+    <control lang="pt-br" key="IDT_TRAVEL_INSERTION">Ao inserir o disco removível: </control>
     <control lang="pt-br" key="IDT_TRAVEL_ROOT">Criar arquivos de disco removível em (diretório raiz do disco removível):</control>
     <control lang="pt-br" key="IDT_VOLUME">Disco</control>
     <control lang="pt-br" key="IDT_WINDOWS_RELATED_SETTING">Windows</control>
@@ -339,7 +345,7 @@
     <control lang="pt-br" key="IDD_NEW_TOKEN_KEYFILE">Propriedades de Novo Arquivo-Chave de Token de Segurança</control>
     <control lang="pt-br" key="IDD_RANDOM_POOL_ENRICHMENT">VeraCrypt - Melhoramento do Pool Aleatório</control>
     <control lang="pt-br" key="IDD_RAWDEVICES_DLG">Selecione uma partição ou dispositivo</control>
-    <control lang="en" key="IDD_STATIC_MODELESS_WAIT_DLG">VeraCrypt</control>
+    <control lang="pt-br" key="IDD_STATIC_MODELESS_WAIT_DLG">VeraCrypt</control>
     <control lang="pt-br" key="IDD_TOKEN_KEYFILES">Arquivos-Chave de Token de Segurança</control>
     <control lang="pt-br" key="IDD_TOKEN_PASSWORD">Senha/PIN do Token de Segurança Exigida</control>
     <control lang="pt-br" key="IDT_ACTIVE_LANG_PACK">Pacote de Idioma Ativo</control>
@@ -365,7 +371,7 @@
     <control lang="pt-br" key="IDT_SECURITY_TOKEN">Token de Segurança:</control>
     <control lang="pt-br" key="IDT_SORT_METHOD">Ordenar por:</control>
     <control lang="en" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Please wait. This process may take a long time...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="pt-br" key="IDT_TEST_BLOCK_NUMBER">Número do Bloco:</control>
     <control lang="pt-br" key="IDT_TEST_CIPHERTEXT">Texto cifrado (hexadecimal)</control>
     <control lang="pt-br" key="IDT_TEST_DATA_UNIT_NUMBER">Número de unidade de dados (hexadecimal de 64 bits, tamanho da unidade de dados: 512 bytes)</control>
@@ -379,7 +385,7 @@
     <control lang="pt-br" key="MENU_TOOLS">&amp;Ferramentas</control>
     <control lang="pt-br" key="MENU_SETTINGS">Confi&amp;gurações</control>
     <control lang="pt-br" key="MENU_HELP">A&amp;juda</control>
-    <control lang="pt-br" key="MENU_WEBSITE">Homepage</control>
+    <control lang="pt-br" key="MENU_WEBSITE">   Site na Internet   </control>
     <!-- Strings -->
     <string lang="pt-br" key="ABOUTBOX">&amp;Sobre...</string>
     <string lang="pt-br" key="ACCESSMODEFAIL">O atributo de somente-leitura de seu disco antigo não pôde ser alterado. Por favor verifique as permissões de acesso ao arquivo.</string>
@@ -410,13 +416,13 @@
     <string lang="pt-br" key="CIPHER_TITLE">Opções de Criptografia</string>
     <string lang="pt-br" key="CLEAN_WINMRU_FAILED">AVISO: Falha ao limpar o caminho do último disco/arquivo-chave selecionado (mantido via 'seletor de arquivos')!</string>
     <string lang="pt-br" key="COMPRESSION_NOT_SUPPORTED">Erro: O recipiente foi compactado a nível de sistema de arquivo. O VeraCrypt não suporta recipientes compactados (observe que compressão de dados criptografados é ineficiente e redundante).\n\nPor favor, desative a compressão do recipiente através dos seguintes passos: 1) Clique com o botão direito no arquivo recipiente no Windows Explorer (não no VeraCrypt). 2) Selecione 'Propriedades'. 3) Na caixa de diálogo 'Propriedades', clique 'Avançado'. 4) Em 'Atributos Avançados', desative a opção 'Compactar conteúdo para economizar espaço em disco' e clique 'OK'. 5) Na caixa de diálogo 'Propriedades', clique 'OK'.</string>
-    <string lang="pt-br" key="CREATE_FAILED">Falha ao criar volumes %hs</string>
+    <string lang="pt-br" key="CREATE_FAILED">Falha ao criar volumes %s</string>
-    <string lang="pt-br" key="DEVICE_FREE_BYTES">Tamanho de %hs é %.2f bytes</string>
+    <string lang="pt-br" key="DEVICE_FREE_BYTES">Tamanho de %s é %.2f bytes</string>
-    <string lang="pt-br" key="DEVICE_FREE_KB">Tamanho de %hs é %.2f KB</string>
+    <string lang="pt-br" key="DEVICE_FREE_KB">Tamanho de %s é %.2f KB</string>
-    <string lang="pt-br" key="DEVICE_FREE_MB">Tamanho de %hs é %.2f MB</string>
+    <string lang="pt-br" key="DEVICE_FREE_MB">Tamanho de %s é %.2f MB</string>
-    <string lang="pt-br" key="DEVICE_FREE_GB">Tamanho de %hs é %.2f GB</string>
+    <string lang="pt-br" key="DEVICE_FREE_GB">Tamanho de %s é %.2f GB</string>
-    <string lang="pt-br" key="DEVICE_FREE_TB">Tamanho de %hs é %.2f TB</string>
+    <string lang="pt-br" key="DEVICE_FREE_TB">Tamanho de %s é %.2f TB</string>
-    <string lang="pt-br" key="DEVICE_FREE_PB">Tamanho de %hs é %.2f PB</string>
+    <string lang="pt-br" key="DEVICE_FREE_PB">Tamanho de %s é %.2f PB</string>
     <string lang="pt-br" key="DEVICE_IN_USE_FORMAT">AVISO: O dispositivo/partição está em uso pelo sistema operacional ou por programas. Formatar o dispositivo/partição pode causar corrupção de dados e instabilidade do sistema.\n\nDeseja continuar?</string>
     <string lang="pt-br" key="DEVICE_IN_USE_INPLACE_ENC">Aviso: A partição está em uso pelo sistema operacional ou aplicações. Você deve fechar todas as aplicações que possam estar utilizando a partição (incluindo software antivírus) .\n\nContinuar?</string>
     <string lang="pt-br" key="FORMAT_CANT_DISMOUNT_FILESYS">Erro: O dispositivo/partição contém um sistema de arquivo que não pôde ser desmontado. O sistema de arquivo pode estar em uso pelo sistema operacional. Formatar o dispositivo/partição provavelmente causaria corrupção de dados e instabilidade do sistema.\n\nPara resolver esse problema, recomendamos que você primeiro exclua a partição e depois a recrie sem formatar. Para isso, siga os seguintes passos: 1) Clique com o botão direito no ícone 'Meu Computador' no 'Menu Iniciar' e selecione 'Gerenciar'. A janela 'Gerenciamento do Computador' deverá aparecer. 2) Na janela 'Gerenciamento do Computador', selecione 'Armazenamento' e 'Gerenciamento de Disco'. 3) Clique na partição que você deseja criptografar e selecione 'Excluir Partição', 'Excluir Volume', ou 'Excluir Unidade Lógica'. 4) Clique 'Sim'. Se o Windows solicitar, reinicie o computador. Depois, repita os passos 1 e 2 e continue a partir do 5. 5) Clique no espaço não-alocado/livre e selecione 'Nova Partição', 'Novo Volume Simples', ou 'Nova Unidade Logica'. 6) O 'Assistente para Novas Partições' ou 'Assistente para Novo Volume' deverá aparecer agora; siga as instruções. Na página 'Formatar Partição', selecione 'Não formatar esta partição' ou 'Não formatar este volume'. No mesmo assistente, clique em 'Avançar' e em 'Concluir'. 7) Observe que o caminho de dispositivo que você selecionou no VeraCrypt pode estar errado agora. Por isso, saia do Assistente de Criação de Volume do VeraCrypt (se ainda estiver aberto) e abra novamente. 8) Tente criptografar o dispositivo/partição novamente.\n\nSe o VeraCrypt nao conseguir criptografar o dispositivo/partição novamente, você pode tentar criar um arquivo recipiente.</string>
@@ -435,15 +441,15 @@
     <string lang="pt-br" key="INPLACE_ENC_INVALID_PATH">Erro: O VeraCrypt pode criptografar no local apenas uma partição, um volume dinâmico, ou toda uma unidade de sistema. Verifique se o caminho especificado é válido.</string>
     <string lang="pt-br" key="CANNOT_RESIZE_FILESYS">Erro: Não é possível compactar o sistema de arquivos (o sistema de arquivos precisa ser compactado para criar espaço para o cabeçalho de volume e o cabeçalho de backup).\n\nPossíveis causas e soluções:\n\n- Espaço livre insuficiente no volume. Certifique-se que nenhuma outra aplicação está gravando no sistema de arquivos.\n\n- Sistema de arquivos corrompido. Tente verificar e corrigir eventuais erros (clique com o botão direito na letra do drive correspondente na lista do 'Meu Computador', depois selecione Propriedades &gt; Ferramentas &gt; 'Verificar agora', certifique-se que a opção 'Corrigir automaticamente erros no sistema de arquivos' está ativada e clique em Iniciar).\n\nSe as etapas acima não ajudarem, por favor, siga os passos abaixo.</string>
     <string lang="pt-br" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Erro: Não há espaço livre suficiente no volume e, portanto, o sistema de arquivos não pode ser compactado (o sistema de arquivos precisa ser compactado para criar espaço para o cabeçalho de volume e o cabeçalho de backup).\n\nPor favor, exclua quaisquer arquivos redundantes e esvazie a lixeira a fim de liberar pelo menos 256 KB de espaço e então tente novamente. Note que devido a um problema do Windows, a quantidade de espaço livre indicada pelo Windows Explorer pode estar incorreta até o sistema operacional ser reiniciado. Se reiniciar o sistema não funcionar, o sistema de arquivos pode estar corrompido. Tente checá-lo e corrigir quaisquer erros (clique com o botão direito na letra do drive correspondente na lista do 'Meu Computador', depois selecione Propriedades &gt; Ferramentas &gt; 'Verificar agora', certifique-se que a opção 'Corrigir automaticamente erros no sistema de arquivos' está ativada e clique em Iniciar).\n\nSe as etapas acima não ajudarem, por favor, siga os passos abaixo.</string>
-    <string lang="pt-br" key="DISK_FREE_BYTES">Espaço livre na unidade %hs é %.2f bytes</string>
+    <string lang="pt-br" key="DISK_FREE_BYTES">Espaço livre na unidade %s é %.2f bytes</string>
-    <string lang="pt-br" key="DISK_FREE_KB">Espaço livre na unidade %hs é %.2f KB</string>
+    <string lang="pt-br" key="DISK_FREE_KB">Espaço livre na unidade %s é %.2f KB</string>
-    <string lang="pt-br" key="DISK_FREE_MB">Espaço livre na unidade %hs é %.2f MB</string>
+    <string lang="pt-br" key="DISK_FREE_MB">Espaço livre na unidade %s é %.2f MB</string>
-    <string lang="pt-br" key="DISK_FREE_GB">Espaço livre na unidade %hs é %.2f GB</string>
+    <string lang="pt-br" key="DISK_FREE_GB">Espaço livre na unidade %s é %.2f GB</string>
-    <string lang="pt-br" key="DISK_FREE_TB">Espaço livre na unidade %hs é %.2f TB</string>
+    <string lang="pt-br" key="DISK_FREE_TB">Espaço livre na unidade %s é %.2f TB</string>
-    <string lang="pt-br" key="DISK_FREE_PB">Espaço livre na unidade %hs é %.2f PB</string>
+    <string lang="pt-br" key="DISK_FREE_PB">Espaço livre na unidade %s é %.2f PB</string>
     <string lang="pt-br" key="DRIVELETTERS">Não foi possível obter letras de drive disponíveis.</string>
     <string lang="pt-br" key="DRIVER_NOT_FOUND">Erro: Driver do VeraCrypt não encontrado.\n\nFavor copiar os arquivos 'veracrypt.sys' e 'veracrypt-x64.sys' para a pasta onde o programa principal do VeraCrypt (VeraCrypt.exe) está localizado.</string>
-    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall; on Windows XP, select 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
+    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' > Computer > 'Uninstall or change a program' > VeraCrypt > Uninstall; on Windows XP, select 'Start Menu' > Settings > 'Control Panel' > 'Add Or Remove Programs' > VeraCrypt > Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
     <string lang="pt-br" key="ERR_CIPHER_INIT_FAILURE">Erro: Falha ao iniciar a cifra.</string>
     <string lang="pt-br" key="ERR_CIPHER_INIT_WEAK_KEY">Erro: Uma chave fraca ou potencialmente fraca foi detectada. A chave será descartada. Favor tentar novamente.</string>
     <string lang="pt-br" key="EXCEPTION_REPORT">Um erro crítico ocorreu e o VeraCrypt deve ser encerrado. Se isto for causado por um bug no VeraCrypt, gostaríamos de corrigí-lo. Para nos ajudar, você pode nos enviar um relatório de erro gerado automaticamente contendo os seguintes itens:\n\n- Versão do programa\n- Versão do sistema operacional\n- Tipo de CPU\n- Nome do componente VeraCrypt\n- Checksum do executável do VeraCrypt\n- Nome simbólico da janela\n- Categoria do erro\n- Endereço do erro\n- Chamada de pilha do VeraCrypt\n\nSe você selecionar 'Sim', a seguinte URL (que contém todo o relatório de erro) será aberta no seu navegador de Internet padrão.\n\n%hs\n\nVocê deseja nos enviar o relatório de erro acima?</string>
@@ -484,7 +490,7 @@
     <string lang="pt-br" key="DEVICE_TRANSFORM_MODE_PAGE_TITLE">Modo de Criação de Volume</string>
     <string lang="pt-br" key="DEVICE_TRANSFORM_MODE_PAGE_FORMAT_HELP">Este é o caminho mais rápido para criar uma volume VeraCrypt armazenado numa partição ou dispositivo (criptografia no local, que é a outra opção, é mais lenta porque o conteúdo de cada setor tem que ser primeiro lido, criptografado e depois, escrito). Os dados atualmente armazenados na partição/dispositivo selecionado(a) serão perdido (os dados NÃO serão criptografados e serão sobrescritos com dados aleatórios). Se você quiser criptografar os dados existentes em uma partição, escolha a outra opção.</string>
     <string lang="pt-br" key="DEVICE_TRANSFORM_MODE_PAGE_INPLACE_HELP">Toda a partição selecionada e todos os dados armazenados nela serão criptografados no local. Se a partição estiver vazia, você deve escolher a outra opção (o volume será criado muito mais rápido).</string>
-    <string lang="pt-br" key="NOTE_BEGINNING">Nota:</string>
+    <string lang="pt-br" key="NOTE_BEGINNING">Nota: </string>
     <string lang="pt-br" key="RESUME">Continua&amp;r</string>
     <string lang="pt-br" key="DEFER">&amp;Adiar</string>
     <string lang="pt-br" key="START">&amp;Iniciar</string>
@@ -497,7 +503,7 @@
     <string lang="pt-br" key="WIPE_FINISHED">O conteúdo da partição/dispositivo foi apagado com sucesso.</string>
     <string lang="pt-br" key="WIPE_FINISHED_DECOY_SYSTEM_PARTITION">O conteúdo da partição onde o sistema operacional (do qual o sistema oculta é um clone) está instalado foi apagado com sucesso.</string>
     <string lang="en" key="DECOY_OS_VERSION_WARNING">Please make sure the version of Windows you are going to install (on the wiped partition) is the same as the version of Windows you are currently running. This is required due to the fact that both systems will share a common boot partition.</string>
-    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' &gt; 'Add Mounted Volume to System Favorites').</string>
+    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' > 'Add Mounted Volume to System Favorites').</string>
     <string lang="pt-br" key="SYSTEM_DECRYPTION_FINISHED">O dispositivo/partição de sistema foi descriptografado com sucesso.</string>
     <string lang="pt-br" key="FORMAT_FINISHED_HELP">\n\nO volume VeraCrypt foi criado e está pronto para uso. Se você deseja criar outro volume VeraCrypt, clique em Avançar. Caso contrário, clique em Sair.</string>
     <string lang="pt-br" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nO volume VeraCrypt oculto foi criado com sucesso (o sistema operacional oculto residirá dentro deste volume oculto).\n\nClique em Avançar para continuar.</string>
@@ -561,6 +567,7 @@
     <string lang="pt-br" key="MAX_HIDVOL_SIZE_KB">O tamanho máximo de um volume oculto para este disco é %.2f KB.</string>
     <string lang="pt-br" key="MAX_HIDVOL_SIZE_MB">O tamanho máximo de um volume oculto para este disco é %.2f MB.</string>
     <string lang="pt-br" key="MAX_HIDVOL_SIZE_GB">O tamanho máximo de um volume oculto para este disco é %.2f GB.</string>
+    <string lang="pt-br" key="MAX_HIDVOL_SIZE_TB">O tamanho máximo de um volume oculto para este disco é %.2f TB.</string>
     <string lang="pt-br" key="MOUNTED_NOPWCHANGE">A senha ou arquivo-chave não podem ser alterados enquanto o disco estiver montado. Favor desmontar o disco primeiro.</string>
     <string lang="pt-br" key="MOUNTED_NO_PKCS5_PRF_CHANGE">O algoritmo de derivação da chave não pode ser trocado enquanto o volume está montado. Favor desmontar o disco primeiro.</string>
     <string lang="pt-br" key="MOUNT_BUTTON">&amp;Montar</string>
@@ -591,12 +598,12 @@
     <string lang="pt-br" key="SELECT_PKCS11_MODULE">Selecione a biblioteca PKCS #11</string>
     <string lang="pt-br" key="OUTOFMEMORY">Memória Esgotada</string>
     <string lang="en" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">IMPORTANT: We strongly recommend that inexperienced users create a VeraCrypt file container on the selected device/partition, instead of attempting to encrypt the entire device/partition.\n\nWhen you create a VeraCrypt file container (as opposed to encrypting a device or partition) there is, for example, no risk of destroying a large number of files. Note that a VeraCrypt file container (even though it contains a virtual encrypted disk) is actually just like any normal file. For more information, see the chapter Beginner's Tutorial in the VeraCrypt User Guide.\n\nAre you sure you want to encrypt the entire device/partition?</string>
-    <string lang="pt-br" key="OVERWRITEPROMPT">AVISO: O arquivo '%hs' ja existe!\n\nIMPORTANTE: O VERACRYPT NÃO IRÁ CRIPTOGRAFAR O ARQUIVO, MAS APAGÁ-LO. Você tem certeza de que deseja apagar o arquivo e substituí-lo com um novo recipiente VeraCrypt?</string>
+    <string lang="pt-br" key="OVERWRITEPROMPT">AVISO: O arquivo '%s' ja existe!\n\nIMPORTANTE: O VERACRYPT NÃO IRÁ CRIPTOGRAFAR O ARQUIVO, MAS APAGÁ-LO. Você tem certeza de que deseja apagar o arquivo e substituí-lo com um novo recipiente VeraCrypt?</string>
-    <string lang="pt-br" key="OVERWRITEPROMPT_DEVICE">CUIDADO: TODOS OS ARQUIVOS ARMAZENADOS NO %s '%hs'%s SELECIONADO SERÃO APAGADOS E PERDIDOS (NÃO CRIPTOGRAFADOS)!\n\nVocê tem certeza de que deseja continuar e formatar?</string>
+    <string lang="pt-br" key="OVERWRITEPROMPT_DEVICE">CUIDADO: TODOS OS ARQUIVOS ARMAZENADOS NO %s '%s'%s SELECIONADO SERÃO APAGADOS E PERDIDOS (NÃO CRIPTOGRAFADOS)!\n\nVocê tem certeza de que deseja continuar e formatar?</string>
-    <string lang="pt-br" key="NONSYS_INPLACE_ENC_CONFIRM">AVISO: Você não será capaz de montar o volume ou acessar quaisquer arquivos armazenados nele até que ele tenha sido totalmente criptografado.\n\nTem certeza de que deseja iniciar a criptografia do %s '%hs'%s selecionado?</string>
+    <string lang="pt-br" key="NONSYS_INPLACE_ENC_CONFIRM">AVISO: Você não será capaz de montar o volume ou acessar quaisquer arquivos armazenados nele até que ele tenha sido totalmente criptografado.\n\nTem certeza de que deseja iniciar a criptografia do %s '%s'%s selecionado?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="pt-br" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">AVISO: Por favor, note que se o fornecimento de energia for interrompido de repente durante a criptografia dos dados existentes no local, ou quando o sistema operacional falhar devido a um erro de software ou hardware defeituoso enquanto o VeraCrypt estiver criptografando os dados existentes no local, porções dos dados serão corrompidos ou perdidos. Portanto, antes de começar a criptografia, certifique-se de possuir cópias de backup dos arquivos que você deseja criptografar.\n\nVocê tem um backup desses?</string>
-    <string lang="pt-br" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CUIDADO: OS ARQUIVOS ATUALMENTE ARMAZENADOS NA PARTIÇÃO '%hs'%s (OU SEJA, A PRIMEIRA PARTIÇÃO ATRÁS DA PARTIÇÃO DO SISTEMA) SERÃO APAGADOS E PERDIDOS (ELES NÃO SERÃO CRIPTOGRAFADOS)!\n\nTem certeza que deseja prosseguir com o formato?</string>
+    <string lang="pt-br" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CUIDADO: OS ARQUIVOS ATUALMENTE ARMAZENADOS NA PARTIÇÃO '%s'%s (OU SEJA, A PRIMEIRA PARTIÇÃO ATRÁS DA PARTIÇÃO DO SISTEMA) SERÃO APAGADOS E PERDIDOS (ELES NÃO SERÃO CRIPTOGRAFADOS)!\n\nTem certeza que deseja prosseguir com o formato?</string>
     <string lang="pt-br" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">AVISO: A PARTIÇÃO SELECIONADA CONTÉM UMA GRANDE QUANTIDADE DE DADOS! Todos os arquivos armazenados na partição serão apagados e perdidos (eles não serão criptografados)!</string>
     <string lang="pt-br" key="ERASE_FILES_BY_CREATING_VOLUME">Apague todos os arquivos armazenados na partição, criando um volume VeraCrypt dentro dele</string>
     <string lang="pt-br" key="PASSWORD">Senha</string>
@@ -616,8 +623,8 @@
     <string lang="pt-br" key="NONSYS_INPLACE_ENC_RESUME_VOL_SELECT_HELP">Selecione um dos volumes listados. A lista contém todos os volumes não-sistema acessíveis em que o processo de criptografia tenha sido interrompido e cujo cabeçalho poderia ser descriptografado usando a senha e/ou arquivo(s)-chave fornecidos.</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="pt-br" key="PASSWORD_HELP">É muito importante que você escolha uma boa senha. Evite escolher uma que contenha apenas uma única palavra que pode ser encontrada em um dicionário (ou uma combinação de 2, 3 ou 4 palavras assim). A senha não deve conter quaisquer nomes ou datas de nascimento. Não deve ser fácil de adivinhar. Uma boa senha é uma combinação aleatória de letras maiúsculas e minúsculas, números e caracteres especiais, como @ ^ = $ * + etc. Recomendamos escolher uma senha com mais de 20 caracteres (quanto mais longo, melhor). O comprimento máximo é 64 caracteres.</string>
-    <string lang="pt-br" key="PASSWORD_HIDDENVOL_HELP">Escolha uma senha para o volume oculto.</string>
+    <string lang="pt-br" key="PASSWORD_HIDDENVOL_HELP">Escolha uma senha para o volume oculto. </string>
-    <string lang="pt-br" key="PASSWORD_HIDDEN_OS_HELP">Por favor, escolha uma senha para o sistema operacional oculto (ou seja, para o volume oculto).</string>
+    <string lang="pt-br" key="PASSWORD_HIDDEN_OS_HELP">Por favor, escolha uma senha para o sistema operacional oculto (ou seja, para o volume oculto). </string>
     <string lang="pt-br" key="PASSWORD_HIDDEN_OS_NOTE">IMPORTANTE: A senha que você escolher para o sistema operacional oculto nesta etapa deve ser substancialmente diferente das outras duas senhas (ou seja, da senha do volume externo e da senha do sistema operacional isca).</string>
     <string lang="pt-br" key="PASSWORD_HIDDENVOL_HOST_DIRECT_HELP">Favor digitar a senha para o disco que você dentro do qual você deseja criar o volume oculto.\n\nDepois de clicar 'Próximo', o VeraCrypt vai tentar montar o disco. Assim que o disco estiver montado, seu bitmap de cluster será varrido para determinar o tamanho da área livre ininterrupta (se houver) cujo final está alinhado com o final do disco. Esta área irá acomodar o volume oculto e irá limitar seu tamanho máximo. A varredura do mapa de clusters é necessária para garantir que nenhum dado do volume externo será sobrescrito pelo volume oculto.</string>
     <string lang="pt-br" key="PASSWORD_HIDDENVOL_HOST_HELP">\nPor favor escolha uma senha para o volume externo. Esta será a senha que você poderá revelar a um adversário se lhe for pedido ou forçado a fazê-lo.\n\nIMPORTANTE: A senha deve ser substancialmente diferente da que você vai escolher para o volume oculto.\n\nNota: O comprimento máximo possível da senha é 64 caracteres.</string>
@@ -645,7 +652,7 @@
     <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
     <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
     <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 &gt; Organize &gt; 'Folder and search options' &gt; View).</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="pt-br" key="HIDDEN_VOL_PROT_PASSWORD_US_KEYB_LAYOUT">Se você está tentando proteger um volume oculto contendo um sistema oculto, certifique-se de estar usando uma configuração de teclado padrão US quando digitar a senha do volume oculto. Isto porque tal senha precisará ser digitada no ambiente pré-boot (antes do Windows iniciar) onde configurações diferentes do padrão US de teclado não estão disponíveis.</string>
     <string lang="pt-br" key="FOUND_NO_PARTITION_W_DEFERRED_INPLACE_ENC">O VeraCrypt não encontrou nenhum volume onde a criptografia não-sistema tenha sido interrompida e onde o cabeçalho do volume pode ser descriptografado usando a senha e/ou arquivo(s)-chave fornecidos.\n\nPor favor, certifique-se que a senha e/ou arquivo(s)-chave estão corretos e que a partição/volume não está sendo usada pelo sistema ou aplicativos (incluindo software antivírus).</string>
     <string lang="en" key="SELECTED_PARTITION_ALREADY_INPLACE_ENC">The selected partition/device is already fully encrypted.\nHeader Flags = 0x%.8X</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="pt-br" key="PREV">&lt; &amp;Voltar</string>
     <string lang="pt-br" key="RAWDEVICES">Não foi possível listar os dispositivos instalados em seu sistema!</string>
-    <string lang="pt-br" key="READONLYPROMPT">O disco '%hs' já existe e está protegido contra gravação. Tem certeza que deseja substituí-lo?</string>
+    <string lang="pt-br" key="READONLYPROMPT">O disco '%s' já existe e está protegido contra gravação. Tem certeza que deseja substituí-lo?</string>
     <string lang="pt-br" key="SELECT_DEST_DIR">Selecione o Diretório de Destino</string>
     <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>
@@ -680,13 +687,13 @@
     <string lang="pt-br" key="TEST_CIPHERTEXT_SIZE">O texto cifrado de teste que você escolheu é muito curto ou muito longo.</string>
     <string lang="pt-br" key="TEST_KEY_SIZE">A chave de teste que você escolheu é muito curta ou muito longa.</string>
     <string lang="pt-br" key="TEST_PLAINTEXT_SIZE">O texto em claro de teste que você escolheu é muito curto ou muito longo.</string>
-    <string lang="pt-br" key="TWO_LAYER_CASCADE_HELP">Duas cifras operando em modo XTS em cascata. Cada bloco é criptografado primeiro com %hs (chave de %d bits) e depois com %hs (chave de %d bits). Cada cifra utiliza sua própria chave. Todas as chaves são independentes das outras.</string>
+    <string lang="pt-br" key="TWO_LAYER_CASCADE_HELP">Duas cifras operando em modo XTS em cascata. Cada bloco é criptografado primeiro com %s (chave de %d bits) e depois com %s (chave de %d bits). Cada cifra utiliza sua própria chave. Todas as chaves são independentes das outras.</string>
-    <string lang="pt-br" key="THREE_LAYER_CASCADE_HELP">Três cifras operando em modo XTS em cascata. Cada bloco é criptografado primeiro com %hs (chave de %d bits), depois com %hs (chave de %d bits) e, finalmente, com %hs (chave de %d bits). Cada cifra utiliza sua própria chave. Todas as chaves são independentes das outras.</string>
+    <string lang="pt-br" key="THREE_LAYER_CASCADE_HELP">Três cifras operando em modo XTS em cascata. Cada bloco é criptografado primeiro com %s (chave de %d bits), depois com %s (chave de %d bits) e, finalmente, com %s (chave de %d bits). Cada cifra utiliza sua própria chave. Todas as chaves são independentes das outras.</string>
     <string lang="pt-br" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Note que, dependendo da configuração do sistema operacional, os recursos de auto-executar e auto-montar podem funcionar só quando os arquivos do disco removível estiverem criados em uma mídia de CD/DVD não-regravável. Note também que este não é um bug do VeraCrypt (é uma limitação do Windows).</string>
     <string lang="en" key="TRAVELER_DISK_CREATED">VeraCrypt traveler disk has been successfully created.\n\nNote that you need administrator privileges to run VeraCrypt in portable mode. Also note that, after examining the registry file, it may be possible to tell that VeraCrypt was run on a Windows system even if it is run in portable mode.</string>
     <string lang="pt-br" key="TC_TRAVELER_DISK">Disco Removível VeraCrypt</string>
     <string lang="pt-br" key="TWOFISH_HELP">Criado por Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall e Niels Ferguson. Publicado em 1998. chave de 256 bits, bloco de 128 bits. Modo de operação XTS. O Twofish foi um dos finalistas para o AES.</string>
-    <string lang="pt-br" key="MORE_INFO_ABOUT">Mais informações sobre %hs</string>
+    <string lang="pt-br" key="MORE_INFO_ABOUT">Mais informações sobre %s</string>
     <string lang="pt-br" key="UNKNOWN">Desconhecido</string>
     <string lang="en" key="ERR_UNKNOWN">An unspecified or unknown error occurred (%d).</string>
     <string lang="pt-br" key="UNMOUNTALL_LOCK_FAILED">Alguns discos contem arquivos ou pastas que estão sendo usadas.\n\nDesmontar forçadamente?</string>
@@ -694,7 +701,7 @@
     <string lang="pt-br" key="UNMOUNT_FAILED">Falha ao desmontar!</string>
     <string lang="pt-br" key="UNMOUNT_LOCK_FAILED">Disco contém arquivos ou pastas que estão sendo usadas.\n\nDesmontar forçadamente?</string>
     <string lang="en" key="NO_VOLUME_MOUNTED_TO_DRIVE">No volume is mounted to the specified drive letter.</string>
-    <string lang="pt-br" key="VOL_ALREADY_MOUNTED">O disco que voce está tebntando montar já está montado.</string>
+    <string lang="pt-br" key="VOL_ALREADY_MOUNTED">O disco que voce está tebntando montar já está montado. </string>
     <string lang="pt-br" key="VOL_MOUNT_FAILED">Um erro ocorreu ao tentar montar o disco.</string>
     <string lang="pt-br" key="VOL_SEEKING">Erro ao procurar a localização dentro do disco.</string>
     <string lang="pt-br" key="VOL_SIZE_WRONG">Erro: Tamanho do disco incorreto.</string>
@@ -706,7 +713,7 @@
     <string lang="pt-br" key="WRONG_VOL_TYPE">O VeraCrypt não pode mudar a senha de um volume externo.</string>
     <string lang="pt-br" key="SELECT_FREE_DRIVE">Favor selecionar uma letra de drive na lista.</string>
     <string lang="pt-br" key="SELECT_A_MOUNTED_VOLUME">Favor selecionar um disco montado na lista de letras de drive.</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="pt-br" key="CANT_CREATE_AUTORUN">Erro: Não foi possível criar autorun.inf</string>
     <string lang="pt-br" key="ERR_PROCESS_KEYFILE">Erro enquanto processava o arquivo-chave!</string>
     <string lang="pt-br" key="ERR_PROCESS_KEYFILE_PATH">Erro enquanto processava o caminho de arquivos-chave!</string>
@@ -812,7 +819,7 @@
     <string lang="pt-br" key="PKCS5_ITERATIONS">Contagem de Iterações do PKCS-5</string>
     <string lang="pt-br" key="VOLUME_CREATE_DATE">Disco Criado</string>
     <string lang="pt-br" key="VOLUME_HEADER_DATE">Última modificação do cabeçalho</string>
-    <string lang="pt-br" key="VOLUME_HEADER_DAYS">(%I64d dias atrás)</string>
+    <string lang="pt-br" key="VOLUME_HEADER_DAYS"> (%I64d dias atrás)</string>
     <string lang="pt-br" key="VOLUME_FORMAT_VERSION">Versão de Formatação do Volume</string>
     <string lang="pt-br" key="BACKUP_HEADER">Cabeçalho de Backup Embutido</string>
     <string lang="en" key="VC_BOOT_LOADER_VERSION">VeraCrypt Boot Loader Version</string>
@@ -851,7 +858,7 @@
     <string lang="pt-br" key="INSTALL_FAILED">A instalação falhou.</string>
     <string lang="pt-br" key="UNINSTALL_FAILED">A desinstalação falhou.</string>
     <string lang="pt-br" key="DIST_PACKAGE_CORRUPTED">Este pacote de distribuição parece estar danificado. Tente baixá-lo novamente (de preferência a partir do nosso site oficial https://veracrypt.codeplex.com).</string>
-    <string lang="pt-br" key="CANNOT_WRITE_FILE_X">Não foi possível gravr o arquivoe %hs</string>
+    <string lang="pt-br" key="CANNOT_WRITE_FILE_X">Não foi possível gravr o arquivoe %s</string>
     <string lang="pt-br" key="EXTRACTING_VERB">Extraindo</string>
     <string lang="pt-br" key="CANNOT_READ_FROM_PACKAGE">Não foi possível ler alguns dados do pacote de instalação.</string>
     <string lang="pt-br" key="CANT_VERIFY_PACKAGE_INTEGRITY">Não foi possível verificar a integridade do pacote de instalação.</string>
@@ -860,8 +867,8 @@
     <string lang="pt-br" key="INSTALL_OK">O VeraCrypt foi instalado com sucesso.</string>
     <string lang="pt-br" key="SETUP_UPDATE_OK">O VeraCrypt foi atualizado com sucesso.</string>
     <string lang="en" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt has been successfully upgraded. However, before you can start using it, the computer must be restarted.\n\nDo you want to restart it now?</string>
-    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
+    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu > All programs > Accessories > System Tools > System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
-    <string lang="pt-br" key="UNINSTALL_OK">O VeraCrypt foi desinstalado com sucesso.\n\nClique em 'Concluir' para remover o instalador do VeraCrypt e a pasta %hs. Observe que a pasta não será removida se ela contiver algum arquivo que não tenha sido criado pelo VeraCrypt ou instalado pelo seu instalador.</string>
+    <string lang="pt-br" key="UNINSTALL_OK">O VeraCrypt foi desinstalado com sucesso.\n\nClique em 'Concluir' para remover o instalador do VeraCrypt e a pasta %s. Observe que a pasta não será removida se ela contiver algum arquivo que não tenha sido criado pelo VeraCrypt ou instalado pelo seu instalador.</string>
     <string lang="pt-br" key="REMOVING_REG">Removendo entradas do VeraCrypt do registro</string>
     <string lang="pt-br" key="ADDING_REG">Adicionando entrada no registro</string>
     <string lang="pt-br" key="REMOVING_APPDATA">Removendo dados específicos da aplicação</string>
@@ -872,10 +879,10 @@
     <string lang="pt-br" key="CREATING_SYS_RESTORE">Criando ponto de restauração do sistema</string>
     <string lang="pt-br" key="FAILED_SYS_RESTORE">Falha ao criar o ponto de restauração do sistema!</string>
     <string lang="pt-br" key="INSTALLER_UPDATING_BOOT_LOADER">Atualizando gerenciador de boot</string>
-    <string lang="pt-br" key="INSTALL_OF_FAILED">Não foi possível instalar '%hs'. %hs Você deseja continuar instalando?</string>
+    <string lang="pt-br" key="INSTALL_OF_FAILED">Não foi possível instalar '%s'. %s Você deseja continuar instalando?</string>
-    <string lang="pt-br" key="UNINSTALL_OF_FAILED">Não foi possível desinstalar '%hs'. %hs Você deseja continuar desinstalando?</string>
+    <string lang="pt-br" key="UNINSTALL_OF_FAILED">Não foi possível desinstalar '%s'. %s Você deseja continuar desinstalando?</string>
     <string lang="pt-br" key="INSTALL_COMPLETED">Instalação concluída.</string>
-    <string lang="pt-br" key="CANT_CREATE_FOLDER">A pasta '%hs' não pode ser criada</string>
+    <string lang="pt-br" key="CANT_CREATE_FOLDER">A pasta '%s' não pode ser criada</string>
     <string lang="pt-br" key="CLOSE_TC_FIRST">O driver de dispositivo do VeraCrypt não pôde ser encerrado.\n\nFavor fechar todas as janelas do VeraCrypt primeiro. Se não adiantar, reinicie o Windows e tente novamente.</string>
     <string lang="pt-br" key="DISMOUNT_ALL_FIRST">Todos os volumes VeraCrypt precisam ser fechados antes de instalar ou desinstalar o 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>
@@ -921,14 +928,14 @@
     <string lang="en" key="SYS_FAVORITE_VOLUMES_SAVED">System favorite volumes saved.\n\nTo enable mounting of system favorite volumes when the system starts, please select 'Settings' &gt; 'System Favorite Volumes' &gt; 'Mount system favorite volumes when Windows starts'.</string>
     <string lang="en" key="FAVORITE_ADD_DRIVE_DEV_WARNING">The volume you are adding to favorites is neither a partition nor a dynamic volume. Therefore, VeraCrypt will be unable to mount this favorite volume if the device number changes.</string>
     <string lang="en" key="FAVORITE_ADD_PARTITION_TYPE_WARNING">The volume you are adding to favorites is a partition not recognized by Windows.\n\nVeraCrypt will be unable to mount this favorite volume if the device number changes. Please set the type of the partition to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then add the partition to favorites again.</string>
-    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings &gt; Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
+    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings > Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_NETWORK_PATH_ERR">A container stored in a remote filesystem shared over a network cannot be automatically mounted when its host device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, the volume hosted on the device cannot be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable the volume hosted on the device to be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_LABEL_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, no label can be assigned to it.</string>
     <string lang="en" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable VeraCrypt to assign a label to the partition.</string>
     <string lang="en" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Due to a Windows limitation, a container stored in a remote filesystem shared over a network cannot be mounted as a system favorite volume (however, it can be mounted as a non-system favorite volume when a user logs on).</string>
-    <string lang="pt-br" key="ENTER_PASSWORD_FOR">Entre senha para %hs</string>
+    <string lang="pt-br" key="ENTER_PASSWORD_FOR">Entre senha para %s</string>
     <string lang="en" key="ENTER_PASSWORD_FOR_LABEL">Enter password for '%s'</string>
     <string lang="pt-br" key="ENTER_NORMAL_VOL_PASSWORD">Digite a senha para o volume normal/externo</string>
     <string lang="pt-br" key="ENTER_HIDDEN_VOL_PASSWORD">Digite a senha para o volume oculto</string>
@@ -943,8 +950,8 @@
     <string lang="pt-br" key="VOL_HEADER_BACKED_UP">O cabeçalho do volume foi copiado com sucesso.\n\nIMPORTANTE: Restaurar o cabeçalho do volume usando essa cópia também irá restaurar a senha do volume. Além disso, se algum(s) arquivo(s)-chave for(em) necessário(s) para montar este volume, o(s) mesmo(s) arquivo(s)-chave será(ão) necessário(s) para montar o volume de novo quando seu cabeçalho for restaurado.\n\nAVISO: Esta cópia so poderá ser usada para restaurar o cabeçalho DESTE volume. Se você utilizar esta cópia para restaurar o cabeçalho de outro volume, ainda será possível montá-lo, mas não descriptografar qualquer dado nele (porque você irá mudar a chave mestra).</string>
     <string lang="pt-br" key="VOL_HEADER_RESTORED">O cabeçalho do volume foi restaurado com sucesso.\n\nIMPORTANTE: Lembre que as senhas antigas foram restauras também. Além disto, se eram necessários arquivos-chave para montar o disco, os mesmos arquivos serão necessários novamente.</string>
     <string lang="pt-br" key="EXTERNAL_VOL_HEADER_BAK_FIRST_INFO">Por motivos de segurança, você terá que digitar a senha correta (e/ou fornecer o arquivo-chave correto) para o volume.\n\nNota: Se o volume contém um volume oculto, você terá que digitar a senha correta (e/ou fornecer o arquivo-chave correto) para o volume externo primeiro. Depois, se você optar por fazer um backup do cabeçalho do volume oculto, você terá de digitar a senha correta (e/ou fornecer o arquivo-chave correto) para o volume oculto.</string>
-    <string lang="pt-br" key="CONFIRM_VOL_HEADER_BAK">Tem certeza de que deseja criar um backup do cabeçalho do volume para %hs?\n\nDepois de clicar em Sim, você será perguntado por um nome de arquivo para o backup.\n\nNota: Ambos os cabeçalhos do volume normal e do oculto serão re-criptografados usando um novo salt e armazenados no arquivo de backup. Se não existir um volume oculto dentro deste volume, a área reservada para o cabeçalho do volume oculto no arquivo de backup será preenchida com dados aleatórios (para preservar a camuflagem de informação). Ao restaurar um cabeçalho de volume do arquivo de backup, você precisará digitar a senha correta (e/ou fornecer os arquivos-chave corretos) que era válida quando o backup do cabeçalho foi criado. A senha (e/ou arquivos-chave) também determinará automaticamente o tipo de cabeçalho de volume para restaurar, ou seja, normal ou oculto (note que o VeraCrypt determina o tipo através do processo de tentativa e erro).</string>
+    <string lang="pt-br" key="CONFIRM_VOL_HEADER_BAK">Tem certeza de que deseja criar um backup do cabeçalho do volume para %s?\n\nDepois de clicar em Sim, você será perguntado por um nome de arquivo para o backup.\n\nNota: Ambos os cabeçalhos do volume normal e do oculto serão re-criptografados usando um novo salt e armazenados no arquivo de backup. Se não existir um volume oculto dentro deste volume, a área reservada para o cabeçalho do volume oculto no arquivo de backup será preenchida com dados aleatórios (para preservar a camuflagem de informação). Ao restaurar um cabeçalho de volume do arquivo de backup, você precisará digitar a senha correta (e/ou fornecer os arquivos-chave corretos) que era válida quando o backup do cabeçalho foi criado. A senha (e/ou arquivos-chave) também determinará automaticamente o tipo de cabeçalho de volume para restaurar, ou seja, normal ou oculto (note que o VeraCrypt determina o tipo através do processo de tentativa e erro).</string>
-    <string lang="pt-br" key="CONFIRM_VOL_HEADER_RESTORE">Tem certeza que deseja restaurar o cabeçalho do disco %hs?\n\nAVISO: Ao restaurar o cabeçalho de um disco, também é restaurada a senha que era válida no momento em que o cabeçalho foi copiado. Além disto, se eram necessários arquivos-chave para montar o disco, os mesmos arquivos serão necessários novamente.\n\nSe voce clicar 'Sim', voce deverá selecionar o arquivo com a cópia do cabeçalho.</string>
+    <string lang="pt-br" key="CONFIRM_VOL_HEADER_RESTORE">Tem certeza que deseja restaurar o cabeçalho do disco %s?\n\nAVISO: Ao restaurar o cabeçalho de um disco, também é restaurada a senha que era válida no momento em que o cabeçalho foi copiado. Além disto, se eram necessários arquivos-chave para montar o disco, os mesmos arquivos serão necessários novamente.\n\nSe voce clicar 'Sim', voce deverá selecionar o arquivo com a cópia do cabeçalho.</string>
     <string lang="pt-br" key="DOES_VOLUME_CONTAIN_HIDDEN">O volume contém um volume oculto?</string>
     <string lang="pt-br" key="VOLUME_CONTAINS_HIDDEN">O volume contém um volume oculto</string>
     <string lang="pt-br" key="VOLUME_DOES_NOT_CONTAIN_HIDDEN">O volume não contém um volume oculto</string>
@@ -956,11 +963,13 @@
     <string lang="pt-br" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">Você está tentando fazer back up do cabeçalho do dispositivo/partição de sistema. Isto não é permitido. Operações de backup e restauração com o dispositivo/partição de sistema só podem ser realizadas utilizando o Disco de Emergência VeraCrypt.\n\nVocê deseja criar um Disco de Emergência VeraCrypt?</string>
     <string lang="pt-br" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">Você está tentando restaurar o cabeçalho do dispositivo/partição de sistema. Isto não é permitido. Operações de backup e restauração com o dispositivo/partição de sistema só podem ser realizadas utilizando o Disco de Emergência VeraCrypt.\n\nVocê deseja criar um Disco de Emergência VeraCrypt?</string>
     <string lang="pt-br" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">Depois de clicar em OK, você irá selecionar um nome para o arquivo da imagem ISO do novo Disco de Emergência VeraCrypt e o local onde você deseja salvá-lo.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <string lang="pt-br" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Insira seu Disco de Emergência VeraCrypt no drive de CD/DVD e clique em OK para verificá-lo.</string>
+    <string lang="pt-br" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Insira seu Disco de Emergência VeraCrypt e clique em OK para verificá-lo.</string>
     <string lang="pt-br" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">O Disco de Emergência VeraCrypt foi verificado com sucesso.</string>
     <string lang="pt-br" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">Não foi possível verificar se o Disco de Emergência foi gravado corretamente.\n\nSe você ja gravou o Disco de Emergência, remova o CD/DVD, coloque-o novamente e tente novamente. Se isto não andiantar, tente utilisar outro programa para gravar o CD/DVD ou outro CD/DVD.\n\nSe você tentou verificar um Disco de Emergência VeraCrypt criado para uma chave mestra, senha, salt, etc. diferente, lembre que esse Disco de Emergência will vai sempre causar erro nesta verificação. Para criar um novo Disco de Emergência compatível com esta configuração, clique em 'Sistema' &gt; 'Criar Disco de Emergência'.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk image fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
     <string lang="pt-br" key="ERROR_CREATING_RESCUE_DISK">Erro ao criar o Disco de Emergência VeraCrypt.</string>
     <string lang="pt-br" key="CANNOT_CREATE_RESCUE_DISK_ON_HIDDEN_OS">O Disco de Emergência VeraCrypt não pode ser criado quando um sistema operacional oculto está sendo executado.\n\nPara criar um Disco de Emergência VeraCrypt, inicialize o sistema operacional isca e então selecione 'Sistema' &gt; 'Criar Disco de Emergência'.</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 be used, because it was created for a different master key. You need to burn the newly generated Rescue Disk.</string>
@@ -983,14 +992,14 @@
     <string lang="pt-br" key="DIGIT_ONE">1</string>
     <string lang="pt-br" key="TWO_OR_MORE">2 ou mais</string>
     <string lang="pt-br" key="MODE_OF_OPERATION">Modo de Operação</string>
-    <string lang="pt-br" key="LABEL_ITEM">Etiqueta:</string>
+    <string lang="pt-br" key="LABEL_ITEM">Etiqueta:   </string>
-    <string lang="pt-br" key="SIZE_ITEM">Tamanho:</string>
+    <string lang="pt-br" key="SIZE_ITEM">Tamanho:   </string>
-    <string lang="pt-br" key="PATH_ITEM">Caminho:</string>
+    <string lang="pt-br" key="PATH_ITEM">Caminho:   </string>
-    <string lang="pt-br" key="DRIVE_LETTER_ITEM">Letra da Unidade:</string>
+    <string lang="pt-br" key="DRIVE_LETTER_ITEM">Letra da Unidade:   </string>
     <string lang="pt-br" key="UNSUPPORTED_CHARS_IN_PWD">Erro: A senha deve conter apenas caracteres ASCII.\n\nCaracteres diferentes podem impossibilitar a montagem dos disco  quando as configurações do seus sistema forem alteradas.\n\nOs seguinte caracteres são permitidos:\n\n ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4  5 6 7 8 9 : ; &lt; = &gt; ? @ 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="pt-br" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">AVISO: A senha contém caracteres não-ASCII. Isto pode impossibilitar a montagem do volume quando as configurações do seus sistema mudarem.\n\nVoce deveria substituir todos os caracteres não-ASCII na senha por caracteres ASCII. Para faze-lo, clique em 'Discos' -&gt; 'Alterar a Senha do Disco'.\n\nOs caracteres ASCII são:\n\n ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4  5 6 7 8 9 : ; &lt; = &gt; ? @ 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="pt-br" key="EXE_FILE_EXTENSION_CONFIRM">AVISO: Recomendamos que você evite extensões usadas para arquivos executáveis (como .exe, .sys ou .dll) ou outra extensão igualmente problemática. É muito provável que usar essa extensão faça o Windows e programas antivírus interferirem nesse recipiente, o que pode afetar o desempenho do volume além de causar outros problemas sérios.\n\nRecomendamos que você remova ou mude a extensão do recipiente (por exemplo, para .tc).\n\nVocê tem certeza de que deseja usar essa extensão problemática?</string>
+    <string lang="pt-br" key="EXE_FILE_EXTENSION_CONFIRM">AVISO: Recomendamos que você evite extensões usadas para arquivos executáveis (como .exe, .sys ou .dll) ou outra extensão igualmente problemática. É muito provável que usar essa extensão faça o Windows e programas antivírus interferirem nesse recipiente, o que pode afetar o desempenho do volume além de causar outros problemas sérios.\n\nRecomendamos que você remova ou mude a extensão do recipiente (por exemplo, para .hc).\n\nVocê tem certeza de que deseja usar essa extensão problemática?</string>
-    <string lang="pt-br" key="EXE_FILE_EXTENSION_MOUNT_WARNING">AVISO: Este recipiente tem uma extensão usada para arquivos executáveis (como .exe, .sys ou .dll) ou outra extensão igualmente problemática. É muito provável que usar essa extensão faça o Windows e programas antivírus interferirem nesse recipiente, o que pode afetar o desempenho do volume além de causar outros problemas sérios.\n\nRecomendamos que você remova ou mude a extensão do recipiente (por exemplo, para .tc) após desmontar o volume.</string>
+    <string lang="pt-br" key="EXE_FILE_EXTENSION_MOUNT_WARNING">AVISO: Este recipiente tem uma extensão usada para arquivos executáveis (como .exe, .sys ou .dll) ou outra extensão igualmente problemática. É muito provável que usar essa extensão faça o Windows e programas antivírus interferirem nesse recipiente, o que pode afetar o desempenho do volume além de causar outros problemas sérios.\n\nRecomendamos que você remova ou mude a extensão do recipiente (por exemplo, para .hc) após desmontar o volume.</string>
     <string lang="pt-br" key="HOMEPAGE">Site na Internet</string>
     <string lang="pt-br" key="LARGE_IDE_WARNING_XP">AVISO: Parece que voce não aplicou os Service Packs no Windows. Voce não deve gravar em discos IDE maiores que 128 GB em um Windows XP sem o Service Pack 1 ou superior! Se você o fizer, os dados no disco podem ser corrompidos. Lembre que esta é uma limitação do Windows, não um bug no VeraCrypt.</string>
     <string lang="pt-br" key="LARGE_IDE_WARNING_2K">AVISO: Parece que voce não aplicou o Service Pack 3 ou superior no seu Windows. Voce não deve grevar em discos IDE maiores que 128 GB em um Windows 2000 sem o Service Pack 3 ou superior! Se você o fizer, os dados no disco podem ser corrompidos. Lembre que esta é uma limitação do windows, não um bug no VeraCrypt.\n\nObs: Voce pode ter de habilitar o LBA de 48 bits no regsitro do Windows; para mais informações, veja http://support.microsoft.com/kb/305098/EN-US</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="pt-br" key="CHECKING_FS">Verificando o sistema de arquivos do volume VeraCrypt montado como %s...</string>
-    <string lang="pt-br" key="REPAIRING_FS">Tentando reparar o sistema de arquivos do volume VeraCrypt montado como %hs...</string>
+    <string lang="pt-br" key="REPAIRING_FS">Tentando reparar o sistema de arquivos do volume VeraCrypt montado como %s...</string>
-    <string lang="pt-br" key="WARN_CBC_MODE">Aviso: Este volume está criptografado no modo CBC. Devido a questões de segurança, o modo CBC foi abandonado desde o VeraCrypt 4.1.\n\nRecomendamos que você mova seus dados deste volume VeraCrypt para um novo volume criado por esta versão do VeraCrypt. Depois de fazê-lo, você deve apagar com segurança ou destruir o volume antigo. Para mais informações, veja o Histórico de Versões na documentação ou as notas de versão distribuídas com o VeraCrypt 4.1 ou posterior.</string>
     <string lang="pt-br" key="WARN_64_BIT_BLOCK_CIPHER">AVISO: este volume está criptografado com um algoritmo legacy.\n\nTodos os algoritmos de blocos de 64 bits (como Blowfish, CAST-128 e Triple DES) estão obsoletos. Ainda será possível montar este volume usando futuras versões do VeraCrypt. Mas não haverá mais melhoramentos na implementação desses algoritmos legacy. Recomendamos que você crie um novo volume VeraCrypt criptografado com um algoritmo de bloco de 128 bits (como AES, Serpent, Twofish, etc.)e mova todos os arquivos deste volume para o novo.</string>
     <string lang="pt-br" key="SYS_AUTOMOUNT_DISABLED">Seu sistema não está configurado para auto-montar novos volumes. Pode não ser possível montar um volume VeraCrypt baseado em dispositivo. A opção de auto-montar pode ser habilitada com a execução do seguinte comando e uma reinicialização do sistema.\n\nmountvol.exe /E</string>
     <string lang="pt-br" key="SYS_ASSIGN_DRIVE_LETTER">Favor atribuir uma letra de unidade ao dispositivo/partição antes de continuar ('Painel de Controle' &gt; 'Sistema e Manutenção' &gt; 'Ferramentas Administrativas' - 'Criar e formatar partitições').\n\nIsto é uma exigência do sistema operacional.</string>
@@ -1069,7 +1077,7 @@
     <string lang="en" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt no longer supports encryption of the system partition/drive on Windows Vista with no Service Pack installed. Before upgrading VeraCrypt, please install Service Pack 1 or higher for Windows Vista.</string>
     <string lang="en" key="FEATURE_REQUIRES_INSTALLATION">Error: This feature requires VeraCrypt to be installed on the system (you are running VeraCrypt in portable mode).\n\nPlease install VeraCrypt and then try again.</string>
     <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="pt-br" key="GPT_BOOT_DRIVE_UNSUPPORTED">Seu sistema possui uma tabela de partição GUID (GPT). No momento, apenas tabelas de partição MBR são suportadas.</string>
+    <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</string>
     <string lang="pt-br" key="TC_BOOT_LOADER_ALREADY_INSTALLED">CUIDADO: O VeraCrypt Boot Loader ja está instalado no seu disco de sistema!\n\nÉ possível que outro sistema em seu computador ja esteja criptografado.\n\nAVISO: CONTINUAR COM A CRIPTOGRAFIA DESTE SISTEMA PODE TORNAR OUTRO(S) SISTEMA(S) E SEUS DADO(S) INACESSÍVEL(IS).\n\nVocê tem certeza de que deseja continuar?</string>
     <string lang="pt-br" key="SYS_LOADER_RESTORE_FAILED">Não foi possível restaurar o inicializador original do sistema.\n\nPor favor, use o seu Disco de Emergência VeraCrypt ('Opções de Reparação' &gt; 'Restaurar inicializador original do sistema') ou sua mídia de instalação do Windows para substituir o Gerenciador de Boot do VeraCrypt pelo do Windows.</string>
     <string lang="pt-br" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">O loader original do sistema não será armazenado no Disco de Emergência (provável causa: arquivo de backup não encontrado).</string>
@@ -1089,11 +1097,11 @@
     <string lang="pt-br" key="USER_PROFILE_NOT_ON_SYS_PARTITION">Seus arquivos do perfil de usuário não estão armazenados na partição do sistema.\n\nArquivos do perfil de usuário podem ser armazenados somente na partição do sistema.</string>
     <string lang="pt-br" key="PAGING_FILE_NOT_ON_SYS_PARTITION">Existe(m) arquivo(s) de paginação em partições não-sistema.\n\nArquivos de paginação podem estar localizados somente na partição do sistema.</string>
     <string lang="pt-br" key="RESTRICT_PAGING_FILES_TO_SYS_PARTITION">Deseja configurar o Windows para criar arquivos de paginação na partição do Windows agora?\n\nNote que se você selecionar 'Sim', o computador será reiniciado. Depois disso, inicie o VeraCrypt e tente criar o SO oculto novamente.</string>
-    <string lang="pt-br" key="LEAKS_OUTSIDE_SYSPART_UNIVERSAL_EXPLANATION">Caso contrário, a camuflagem de informação do sistema operacional oculto poderia ser adversamente afetada.\n\nNota: Se um adversário analisasse o conteúdo de tais arquivos (residido numa partição não-sistema), ele poderia descobrir que você usou este assistente modo de criação de sistema oculto (que pode indicar a existência de um sistema operacional oculto no seu computador). Observe também que todos esses arquivos armazenados na partição do sistema serão apagados com segurança pelo VeraCrypt durante o processo de criação do sistema operacional oculto.</string>
+    <string lang="pt-br" key="LEAKS_OUTSIDE_SYSPART_UNIVERSAL_EXPLANATION"> Caso contrário, a camuflagem de informação do sistema operacional oculto poderia ser adversamente afetada.\n\nNota: Se um adversário analisasse o conteúdo de tais arquivos (residido numa partição não-sistema), ele poderia descobrir que você usou este assistente modo de criação de sistema oculto (que pode indicar a existência de um sistema operacional oculto no seu computador). Observe também que todos esses arquivos armazenados na partição do sistema serão apagados com segurança pelo VeraCrypt durante o processo de criação do sistema operacional oculto.</string>
     <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 medium (or using a service partition)?</string>
     <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 Hidden Volumes" in the VeraCrypt User's Guide.\n\nImportant: Before proceeding, please make sure you have read the section "Security Requirements and Precautions Pertaining to Hidden Volumes" in the VeraCrypt User's Guide.\n\n\nDoes the currently running operating system meet the above condition?</string>
     <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 from writing to the shared boot partition and from hibernating.\n\n\nDo you want to continue? If you select 'No', instructions for removing the extra boot partition will be displayed.</string>
-    <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' &gt; '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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
+    <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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
     <string lang="pt-br" key="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">Aviso: Há espaço não alocado entre a partição de sistema e a primeira partição depois dela. Depois de criar o sistema operacional oculto, você não deve criar novas partições nesse espaço não alocado. Caso contrário, o sistema operacional oculto será impossibilitado de inicializar (até você excluir essas recém-criadas partições).</string>
     <string lang="pt-br" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Este algoritmo não é suportado para criptografia de sistema.</string>
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
@@ -1108,8 +1116,8 @@
     <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 digitar a senha com segurança (tanto agora quanto no ambiente pré-inicialização) mesmo se você NÃO possuir um teclado Estados Unidos (Internacional).</string>
     <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 starts.\n\n- The VRD will contain a backup of the present content of the first drive track (which typically contains a system loader or boot manager) and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ISO image will be created in the location specified below.</string>
     <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">The Rescue Disk image has been created and stored in this file:\n%s\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>
+    <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%s\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>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">IMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software. If you do not have any CD/DVD recording software that can write the ISO disk image to a CD/DVD, click the link below to download such free software.\n\n</string>
     <string lang="en" key="LAUNCH_WIN_ISOBURN">Launch Microsoft Windows Disc Image Burner</string>
     <string lang="pt-br" key="RESCUE_DISK_BURN_NO_CHECK_WARN">ATENÇÃO: Se você já criou um Disco de Emergência VeraCrypt no passado, ele não pode ser reutilizado para esta partição/unidade de sistema, porque ele foi criado para uma chave mestra diferente! Cada vez que criptografar uma partição/unidade de sistema você deve criar um novo Disco de Emergência VeraCrypt para ela, mesmo se usar a mesma senha.</string>
@@ -1247,7 +1255,7 @@
     <string lang="pt-br" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">Se você tiver algum dos problemas descritos acima, descriptografe o disco/partição (se ele estiver criptografado) e tente criptografá-lo novamente usando um algoritmo não sequencial (como o 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 system (but not on the decoy system), the decoy system would contain a VeraCrypt driver and VeraCrypt applications whose version numbers are different from the version number of the VeraCrypt Boot Loader. Such a discrepancy might indicate that there is a hidden operating system on this computer.\n\n\nDo you want to continue?</string>
     <string lang="pt-br" key="UPDATE_TC_IN_HIDDEN_OS_TOO">O número da versão do Gerenciador de Boot do VeraCrypt que inicializou esse sistema operacional é diferente do número da versão do driver do VeraCrypt (e do aplicativo do VeraCrypt) instalados no sistema.\n\nVocê deve executar o instalador do VeraCrypt (cujo número de versão é o mesmo do Gerenciador de Boot) para atualizar o VeraCrypt neste sistema operacional.</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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' &gt; '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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' > 'Create Rescue Disk').</string>
     <string lang="pt-br" key="BOOT_LOADER_UPGRADE_OK">O VeraCrypt Boot Loader foi atualizado.\n\nÉ fortemente recomendável que você crie um novo Disco de Emergência VeraCrypt (que conterá a nova versão do VeraCrypt Boot Loader) selecionando 'Sistema' &gt; 'Criar Disco de Emergência' depois que você reiniciar o seu computador.</string>
     <string lang="pt-br" key="BOOT_LOADER_UPGRADE_OK_HIDDEN_OS">O Gerenciador de Boot do VeraCrypt foi atualizado.\n\nÉ altamente recomendado que você inicie o sistema operacional isca e então crie um novo Disco de Emergência VeraCrypt (que incluirá a nova versão do Gerenciador de Boot do VeraCrypt), selecionando 'Sistema' &gt; 'Criar Disco de Emergência'.</string>
     <string lang="pt-br" key="BOOT_LOADER_UPGRADE_FAILED">Não foi possível atualizar o VeraCrypt Boot Loader.</string>
@@ -1272,7 +1280,7 @@
     <string lang="pt-br" key="INVALID_TOKEN_KEYFILE_PATH">O caminho do arquivo-chave do token de segurança é inválido.</string>
     <string lang="pt-br" key="SECURITY_TOKEN_ERROR">Erro no token de segurança</string>
     <string lang="pt-br" key="CKR_PIN_INCORRECT">A senha para o token de segurança está incorreta.</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' &gt; '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="pt-br" key="ALL_TOKEN_SESSIONS_CLOSED">Todas as sessões abertas de tokens de segurança foram fechadas.</string>
     <string lang="pt-br" key="SELECT_TOKEN_KEYFILES">Selecione os Arquivos-Chave do Token de Segurança</string>
     <string lang="pt-br" key="TOKEN_SLOT_ID">Slot</string>
@@ -1297,8 +1305,8 @@
     <string lang="pt-br" key="MOUNTED_DEVICE_FORCED_READ_ONLY_WRITE_PROTECTION">O volume '%s' foi montado como somente-leitura porque o sistema operacional informa que o dispositivo principal está protegido contra gravação.\n\nNote que alguns drivers personalizados de chipset causam o falso reconhecimento de mídias graváveis como protegidas contra gravação. Este problema não é causado pelo VeraCrypt. É possível resolvê-lo atualizando ou desinstalando qualquer driver personalizado de chipset que esteja atualmente instalado em seu sistema.</string>
     <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' &gt; 'Performance' and enable 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' &gt; 'Performance' and disable 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="pt-br" key="ASK_REMOVE_DEVICE_WRITE_PROTECTION">Você deseja que o VeraCrypt tente desabilitar a proteção contra gravação do(a) dispositivo/partição?</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>
@@ -1372,6 +1380,39 @@
     <string lang="pt-br" key="TB_PER_SEC">TB/s</string>
     <string lang="pt-br" key="PB_PER_SEC">PB/s</string>
     <string lang="en" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.sk.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="sk" name="Slovenčina" en-name="Slovak" version="0.1.0" translators="Kamil David" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="en" key="IDC_BROWSE">Bro&amp;wse...</control>
     <control lang="sk" key="IDC_DESKTOP_ICON">Pridať ikonu VeraCrypt na p&amp;lochu</control>
     <control lang="en" key="IDC_DONATE">Donate now...</control>
-    <control lang="en" key="IDC_FILE_TYPE">Associate the .tc file &amp;extension with VeraCrypt</control>
+    <control lang="en" key="IDC_FILE_TYPE">Associate the .hc file &amp;extension with VeraCrypt</control>
     <control lang="en" key="IDC_OPEN_CONTAINING_FOLDER">&amp;Open the destination location when finished</control>
     <control lang="sk" key="IDC_PROG_GROUP">Pridať VeraCrypt do &amp;Štart menu</control>
     <control lang="sk" key="IDC_SYSTEM_RESTORE">Vytvoriť bod &amp;obnovenia</control>
@@ -37,6 +37,7 @@
     <control lang="en" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Download CD/DVD recording software</control>
     <control lang="en" key="IDC_FILE_CONTAINER">Create an encrypted file container</control>
     <control lang="en" key="IDC_GB">&amp;GB</control>
+    <control lang="en" key="IDC_TB">&amp;TB</control>
     <control lang="en" key="IDC_HIDDEN_SYSENC_INFO_LINK">More information</control>
     <control lang="en" key="IDC_HIDDEN_VOL">Hi&amp;dden VeraCrypt volume </control>
     <control lang="en" key="IDC_HIDDEN_VOL_HELP">More information about hidden volumes</control>
@@ -44,6 +45,7 @@
     <control lang="en" key="IDC_HIDVOL_WIZ_MODE_FULL">Normal mode</control>
     <control lang="sk" key="IDC_KB">&amp;KB</control>
     <control lang="sk" key="IDC_KEYFILES_ENABLE">&amp;Použiť súborové kľúče</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="sk" key="IDC_KEY_FILES">Súborové &amp;kľúče...</control>
     <control lang="sk" key="IDC_LINK_HASH_INFO">Informácie o hash. algoritmoch</control>
@@ -58,7 +60,8 @@
     <control lang="sk" key="IDC_NO_HISTORY">Neukladať &amp;históriu</control>
     <control lang="sk" key="IDC_OPEN_OUTER_VOLUME">Otvoriť externý zväzok</control>
     <control lang="en" key="IDC_PAUSE">&amp;Pause</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="sk" key="IDC_QUICKFORMAT">Rýchlo sformátovať</control>
     <control lang="sk" key="IDC_SHOW_PASSWORD">&amp;Ukázať heslo</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Display password</control>
@@ -118,6 +121,7 @@
     <control lang="sk" key="IDC_CREATE">Vytvoriť</control>
     <control lang="sk" key="IDC_CREATE_VOLUME">V&amp;ytvoriť zväzok</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <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="sk" key="IDC_ENABLE_KEYFILES">Použiť súbor. kľúče</control>
     <control lang="sk" key="IDC_ENABLE_NEW_KEYFILES">Použiť súbor. kľúče</control>
@@ -132,6 +136,7 @@
     <control lang="en" key="IDC_FAVORITE_MOVE_UP">Move &amp;Up</control>
     <control lang="en" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Open &amp;Explorer window for selected volume when successfully mounted</control>
     <control lang="en" key="IDC_FAVORITE_REMOVE">&amp;Remove</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="en" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Global Settings</control>
     <control lang="en" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Display balloon tooltip after successful hot-key dismount</control>
     <control lang="en" key="IDC_HK_DISMOUNT_PLAY_SOUND">Play system notification sound after successful hot-key dismount</control>
@@ -189,7 +194,7 @@
     <control lang="sk" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="en" key="IDD_PASSWORDCHANGE_DLG">Change Password or Keyfiles</control>
     <control lang="sk" key="IDD_PASSWORD_DLG">Zadajte heslo zväzku VeraCrypt</control>
-    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance Options</control>
+    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance and Driver Options</control>
     <control lang="sk" key="IDD_PREFERENCES_DLG">VeraCrypt - predvoľby</control>
     <control lang="en" key="IDD_SYSENC_SETTINGS">VeraCrypt - System Encryption Settings</control>
     <control lang="en" key="IDD_TOKEN_PREFERENCES">VeraCrypt - Security Token Preferences</control>
@@ -235,7 +240,7 @@
     <control lang="sk" key="IDM_ONLINE_TUTORIAL">Návod pre začiatočníkov</control>
     <control lang="en" key="IDM_ORGANIZE_FAVORITES">Organize Favorite Volumes...</control>
     <control lang="en" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organize System Favorite Volumes...</control>
-    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance...</control>
+    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance/Driver Configuration</control>
     <control lang="en" key="IDM_PERMANENTLY_DECRYPT_SYS">Permanently Decrypt System Partition/Drive</control>
     <control lang="sk" key="IDM_PREFERENCES">Predvoľby...</control>
     <control lang="sk" key="IDM_REFRESH_DRIVE_LETTERS">Obnoviť písmena diskov</control>
@@ -256,6 +261,7 @@
     <control lang="sk" key="IDM_UNMOUNTALL">Odpojiť všetky pripojené zväzky</control>
     <control lang="sk" key="IDM_UNMOUNT_VOLUME">Odpojiť zväzok</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 Image</control>
     <control lang="sk" key="IDM_VERSION_HISTORY">História verzií</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="sk" key="IDM_VOLUME_PROPERTIES">Vlastnosti zväzku</control>
@@ -365,7 +371,7 @@
     <control lang="en" key="IDT_SECURITY_TOKEN">Security token:</control>
     <control lang="sk" key="IDT_SORT_METHOD">Metóda triedenia:</control>
     <control lang="en" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Please wait. This process may take a long time...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="en" key="IDT_TEST_BLOCK_NUMBER">Block number:</control>
     <control lang="sk" key="IDT_TEST_CIPHERTEXT">Šifrovaný text (hexadecimálne)</control>
     <control lang="en" key="IDT_TEST_DATA_UNIT_NUMBER">Data unit number (64-bit hexadecimal, data unit size is 512 bytes)</control>
@@ -410,13 +416,13 @@
     <string lang="sk" key="CIPHER_TITLE">Predvoľby šifrovania</string>
     <string lang="sk" key="CLEAN_WINMRU_FAILED">UPOZORNENIE: Nepodarilo sa vyčistiť cestu naposledy vybraného zväzku/súborového kľúča (zapamätané pri výbere súboru)!</string>
     <string lang="sk" key="COMPRESSION_NOT_SUPPORTED">Chyba: súborový zväzok bol skomprimovaný na úrovni systému súborov. VeraCrypt nepodporuje skomprimované súborové zväzky (pozn.: kompresia zašifrovaných dát je neefektívna a zbytočná).\n\nVypnite, prosím, kompresiu pre súborový zväzok podľa nasledujúcich krokov: 1) kliknite pravým tlačidlom myši na súborový zväzok v Prieskumníkovi Windows (nie v programe VeraCrypt). 2) Vyberte 'Vlastnosti'. 3) V dialógovom okne 'Vlastnosti' kliknite 'Upresniť'. 4) V dialógovom okne 'Upresniť atribúty', zrušte voľbu 'Komprimovať obsah a šetriť tak miesto na disku' a kliknite 'OK'. 5) V dialógovom okne 'Vlastnosti' kliknite 'OK'.</string>
-    <string lang="sk" key="CREATE_FAILED">Vytvorenie zväzku %hs zlyhalo</string>
+    <string lang="sk" key="CREATE_FAILED">Vytvorenie zväzku %s zlyhalo</string>
-    <string lang="sk" key="DEVICE_FREE_BYTES">Veľkosť %hs je %.2f bajtov</string>
+    <string lang="sk" key="DEVICE_FREE_BYTES">Veľkosť %s je %.2f bajtov</string>
-    <string lang="sk" key="DEVICE_FREE_KB">Veľkosť %hs je %.2f KB</string>
+    <string lang="sk" key="DEVICE_FREE_KB">Veľkosť %s je %.2f KB</string>
-    <string lang="sk" key="DEVICE_FREE_MB">Veľkosť %hs je %.2f MB</string>
+    <string lang="sk" key="DEVICE_FREE_MB">Veľkosť %s je %.2f MB</string>
-    <string lang="en" key="DEVICE_FREE_GB">Size of %hs is %.2f GB</string>
+    <string lang="en" key="DEVICE_FREE_GB">Size of %s is %.2f GB</string>
-    <string lang="en" key="DEVICE_FREE_TB">Size of %hs is %.2f TB</string>
+    <string lang="en" key="DEVICE_FREE_TB">Size of %s is %.2f TB</string>
-    <string lang="en" key="DEVICE_FREE_PB">Size of %hs is %.2f PB</string>
+    <string lang="en" key="DEVICE_FREE_PB">Size of %s is %.2f PB</string>
     <string lang="sk" key="DEVICE_IN_USE_FORMAT">VÝSTRAHA: zariadenie/oddiel sa používa operačným systémom alebo aplikáciami. Formátovanie zariadenia/oddielu môže spôsobiť poškodenie dát alebo systémovou nestabilitu.\n\nPokračovať?</string>
     <string lang="en" key="DEVICE_IN_USE_INPLACE_ENC">Warning: The partition is in use by the operating system or applications. You should close any applications that might be using the partition (including antivirus software).\n\nContinue?</string>
     <string lang="sk" key="FORMAT_CANT_DISMOUNT_FILESYS">Chyba: zariadenie/oddiel obsahuje systém súborov, ktorý nie je možné pripojiť. Systém súborov môže byť používaný operačným systémom. Formátovanie zariadenia/oddielu by pravdepodobne spôsobilo poškodenie dát a systémovou nestabilitu.\n\nPre vyriešenie tohto problému doporučujeme najskôr zmazať oddiel a potom ho znova vytvoriť bez formátovania. Postupujte nasledovne: 1) Pravý-klik myšou na ikonu 'Tento počítač' alebo v menu 'Štart'  vyberte 'Spravovať'. Zobrazí sa okno 'Správa počítača'. 2) V okne 'Správa počítača' vyberte 'ukladací priestor' &gt; 'Správa diskov'. 3) Pravý-klik myšou na oddiel, ktorý chcete zašifrovať a vyberte buď 'zmazať oddiel' alebo 'zmazať zväzok' alebo 'zmazať logický disk'. 4) kliknite 'Áno'. pokiaľ sa Windows opýta na reštart počítača, vykonajte tak. Potom zopakujte kroky 1 a 2 a pokračujte od kroku 5. 5) Pravý-klik na nealokované/Voľné miesto a vyberte buď 'Nový oddiel' alebo 'Nový obyčajný zväzok' alebo 'Nový logický disk'. 6) Zobrazí sa okno 'Sprievodca vytvorením nového oddielu' alebo 'Sprievodca nového jednoduchého zväzku'; nasledujte ich inštrukcie. Na stránke Sprievodca nazvanej 'sformátovať oddiel' vyberte buď 'Naformátovať tento oddiel' alebo 'Naformátovať tento zväzok'. V rovnakom sprievodcovi kliknite 'Ďalší' a potom 'Dokončiť'. 7) Cesta k zariadeniu, ktorú ste vybrali v programe VeraCrypt môže byť teraz nesprávne. Ukončite preto Sprievodcu vytvorením oddielu VeraCrypt (Pokiaľ stále beží) a spustite ho znova. 8) skúste zašifrovať zariadenie/oddiel znova.\n\nPokiaľ VeraCrypt opakovane zlyháva pri šifrovaní zariadenia/oddielu, skúste miesto toho vytvorenie súborového zväzku.</string>
@@ -435,15 +441,15 @@
     <string lang="en" key="INPLACE_ENC_INVALID_PATH">Error: VeraCrypt can in-place encrypt only a partition, a dynamic volume, or an entire system drive. Please make sure the specified path is valid.</string>
     <string lang="en" key="CANNOT_RESIZE_FILESYS">Error: Cannot shrink the filesystem (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPossible causes and solutions:\n\n- Not enough free space on the volume. Please make sure no other application is writing to the filesystem.\n\n- Corrupted file system. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
     <string lang="en" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Error: There is not enough free space on the volume and so the filesystem cannot be shrunk (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPlease delete any redundant files and empty the Recycle Bin so as to free at least 256 KB of space and then try again. Note that due to a Windows issue, the amount of free space reported by the Windows Explorer may be incorrect until the operating system is restarted. If restarting the system does not help, the file system may be corrupted. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
-    <string lang="sk" key="DISK_FREE_BYTES">Voľné miesto na disku %hs je %.2f bytov.</string>
+    <string lang="sk" key="DISK_FREE_BYTES">Voľné miesto na disku %s je %.2f bytov.</string>
-    <string lang="en" key="DISK_FREE_KB">Free space on drive %hs is %.2f KB</string>
+    <string lang="en" key="DISK_FREE_KB">Free space on drive %s is %.2f KB</string>
-    <string lang="en" key="DISK_FREE_MB">Free space on drive %hs is %.2f MB</string>
+    <string lang="en" key="DISK_FREE_MB">Free space on drive %s is %.2f MB</string>
-    <string lang="en" key="DISK_FREE_GB">Free space on drive %hs is %.2f GB</string>
+    <string lang="en" key="DISK_FREE_GB">Free space on drive %s is %.2f GB</string>
-    <string lang="en" key="DISK_FREE_TB">Free space on drive %hs is %.2f TB</string>
+    <string lang="en" key="DISK_FREE_TB">Free space on drive %s is %.2f TB</string>
-    <string lang="en" key="DISK_FREE_PB">Free space on drive %hs is %.2f PB</string>
+    <string lang="en" key="DISK_FREE_PB">Free space on drive %s is %.2f PB</string>
     <string lang="sk" key="DRIVELETTERS">Nie je možné získať voľné písmena diskov.</string>
     <string lang="en" key="DRIVER_NOT_FOUND">Error: VeraCrypt driver not found.\n\nPlease copy the files 'veracrypt.sys' and 'veracrypt-x64.sys' to the directory where the main VeraCrypt application (VeraCrypt.exe) is located.</string>
-    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall; on Windows XP, select 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
+    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' > Computer > 'Uninstall or change a program' > VeraCrypt > Uninstall; on Windows XP, select 'Start Menu' > Settings > 'Control Panel' > 'Add Or Remove Programs' > VeraCrypt > Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
     <string lang="sk" key="ERR_CIPHER_INIT_FAILURE">Chyba: zlyhala inicializácia šifry.</string>
     <string lang="sk" key="ERR_CIPHER_INIT_WEAK_KEY">Chyba: bol detekovaný slabý alebo potenciálne slabý kľúč. kľúč bude zahodený. skúste to prosím znova.</string>
     <string lang="en" key="EXCEPTION_REPORT">A critical error has occurred and VeraCrypt must be terminated. If this is caused by a bug in VeraCrypt, we would like to fix it. To help us, you can send us an automatically generated error report containing the following items:\n\n- Program version\n- Operating system version\n- Type of CPU\n- VeraCrypt component name\n- Checksum of VeraCrypt executable\n- Symbolic name of dialog window\n- Error category\n- Error address\n- VeraCrypt call stack\n\nIf you select 'Yes', the following URL (which contains the entire error report) will be opened in your default Internet browser.\n\n%hs\n\nDo you want to send us the above error report?</string>
@@ -497,7 +503,7 @@
     <string lang="en" key="WIPE_FINISHED">The content of the partition/device has been successfully erased.</string>
     <string lang="en" key="WIPE_FINISHED_DECOY_SYSTEM_PARTITION">The content of the partition where the original system (of which the hidden system is a clone) resided has been successfully erased.</string>
     <string lang="en" key="DECOY_OS_VERSION_WARNING">Please make sure the version of Windows you are going to install (on the wiped partition) is the same as the version of Windows you are currently running. This is required due to the fact that both systems will share a common boot partition.</string>
-    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' &gt; 'Add Mounted Volume to System Favorites').</string>
+    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' > 'Add Mounted Volume to System Favorites').</string>
     <string lang="en" key="SYSTEM_DECRYPTION_FINISHED">The system partition/drive has been successfully decrypted.</string>
     <string lang="sk" key="FORMAT_FINISHED_HELP">\n\nVeraCrypt zväzok bol vytvorený a je pripravený k použitiu. Pokiaľ chcete vytvoriť ďalší zväzok VeraCrypt, kliknite Ďalší. Inak kliknite Koniec.</string>
     <string lang="en" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nThe hidden VeraCrypt volume has been successfully created (the hidden operating system will reside within this hidden volume).\n\nClick Next to continue.</string>
@@ -524,7 +530,7 @@
     <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 password for this outer volume, and the existence of the hidden volume (and of the hidden operating system) will remain secret.\n\nIMPORTANT: The files you copy to the outer volume should not occupy more than %s. Otherwise, there may not be enough free space on the outer volume for the hidden volume (and you will not be able to continue). After you finish copying, click Next (do not dismount the volume).</string>
     <string lang="sk" key="HIDVOL_HOST_FILLING_HELP">Externý zväzok bol úspešne vytvorený a pripojený ako jednotka %hc:. Do tohto zväzku by ste teraz mali nakopírovať nejaké citlivo vyzerajúce súbory, ktoré v skutočnosti NECHCETE skryť. Súbory tam budú uložené pre kohokoľvek, kto by Vás nútil odhaliť heslo. Odhalíte len heslo pre tento externý zväzok, nie pre skrytý. Súbory, na ktorých Vám v skutočnosti záleží, budú uložené v skrytom zväzku, ktorý sa vytvorí neskôr. Po nakopírovaní údajov kliknite Ďalší. Zväzok neodpájajte.\n\nPozn.: Keď kliknete Ďalší, clusterová bitmapa externého zväzku bude naskenovaná pre určenie veľkosti neprerušenej oblasti voľného miesta, ktorého Koniec sa nachádza na konci zväzku. Táto oblasť bude obsahovať skrytý zväzok, takže tým obmedzí svoju maximálnu možnú veľkosť. Skenovanie clusterovej bitmapy zaistí, že žiadne údaje na externom zväzku nebudú prepísané externým zväzkom.</string>
     <string lang="sk" key="HIDVOL_HOST_FILLING_TITLE">Obsah externého zväzku</string>
-    <string lang="sk" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nV ďalšom kroku zadáte možnosti pre externý zväzok (vo vnútri ktorého bude neskôr vytvorený skrytý zväzok). </string>
+    <string lang="sk" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nV ďalšom kroku zadáte možnosti pre externý zväzok (vo vnútri ktorého bude neskôr vytvorený skrytý zväzok).</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>
     <string lang="sk" key="HIDVOL_HOST_PRE_CIPHER_TITLE">Externý zväzok</string>
     <string lang="en" key="HIDDEN_OS_PRE_CIPHER_HELP">In the following steps, you will set the options and password for the hidden volume, which will contain the hidden operating system.\n\nRemark: The cluster bitmap of the outer volume has been scanned in order to determine the size of uninterrupted area of free space whose end is aligned with the end of the outer volume. This area will accommodate the hidden volume, so it limits its maximum possible size. The maximum possible size of the hidden volume has been determined and confirmed to be greater than the size of the system partition (which is required, because the entire content of the system partition will need to be copied to the hidden volume). This ensures that no data currently stored on the outer volume will be overwritten by data written to the area of the hidden volume.</string>
@@ -561,6 +567,7 @@
     <string lang="sk" key="MAX_HIDVOL_SIZE_KB">Maximálna možná veľkosť skrytého zväzku pre tento zväzok je %.2f KB.</string>
     <string lang="sk" key="MAX_HIDVOL_SIZE_MB">Maximálna možná veľkosť skrytého zväzku pre tento zväzok je %.2f MB.</string>
     <string lang="en" key="MAX_HIDVOL_SIZE_GB">Maximum possible hidden volume size for this volume is %.2f GB.</string>
+    <string lang="en" key="MAX_HIDVOL_SIZE_TB">Maximum possible hidden volume size for this volume is %.2f TB.</string>
     <string lang="sk" key="MOUNTED_NOPWCHANGE">Heslo/súborový kľúč zväzku nemôže byť zmenený počas jeho pripájania. Zväzok najskôr odpojte.</string>
     <string lang="sk" key="MOUNTED_NO_PKCS5_PRF_CHANGE">Derivačný algoritmus pre kľúč hlavičky nemôže byť zmenený počas pripájania zväzku. Zväzok najskôr odpojte.</string>
     <string lang="sk" key="MOUNT_BUTTON">&amp;Pripojiť</string>
@@ -591,12 +598,12 @@
     <string lang="en" key="SELECT_PKCS11_MODULE">Select PKCS #11 Library</string>
     <string lang="sk" key="OUTOFMEMORY">Nedostatok pamäti</string>
     <string lang="en" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">IMPORTANT: We strongly recommend that inexperienced users create a VeraCrypt file container on the selected device/partition, instead of attempting to encrypt the entire device/partition.\n\nWhen you create a VeraCrypt file container (as opposed to encrypting a device or partition) there is, for example, no risk of destroying a large number of files. Note that a VeraCrypt file container (even though it contains a virtual encrypted disk) is actually just like any normal file. For more information, see the chapter Beginner's Tutorial in the VeraCrypt User Guide.\n\nAre you sure you want to encrypt the entire device/partition?</string>
-    <string lang="en" key="OVERWRITEPROMPT">WARNING: The file '%hs' already exists!\n\nIMPORTANT: VERACRYPT WILL NOT ENCRYPT THE FILE, BUT IT WILL DELETE IT. Are you sure you want to delete the file and replace it with a new VeraCrypt container?</string>
+    <string lang="en" key="OVERWRITEPROMPT">WARNING: The file '%s' already exists!\n\nIMPORTANT: VERACRYPT WILL NOT ENCRYPT THE FILE, BUT IT WILL DELETE IT. Are you sure you want to delete the file and replace it with a new VeraCrypt container?</string>
-    <string lang="en" key="OVERWRITEPROMPT_DEVICE">CAUTION: ALL FILES CURRENTLY STORED ON THE SELECTED %s '%hs'%s WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
+    <string lang="en" key="OVERWRITEPROMPT_DEVICE">CAUTION: ALL FILES CURRENTLY STORED ON THE SELECTED %s '%s'%s WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
-    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%s'%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting/decrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting/decrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting/decrypting, please make sure that you have backup copies of the files you want to encrypt/decrypt.\n\nDo you have such a backup?</string>
-    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%hs'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
+    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%s'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
     <string lang="en" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">WARNING: THE SELECTED PARTITION CONTAINS A LARGE AMOUNT OF DATA! Any files stored on the partition will be erased and lost (they will NOT be encrypted)!</string>
     <string lang="en" key="ERASE_FILES_BY_CREATING_VOLUME">Erase any files stored on the partition by creating a VeraCrypt volume within it</string>
     <string lang="sk" key="PASSWORD">Heslo</string>
@@ -645,7 +652,7 @@
     <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
     <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
     <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 &gt; Organize &gt; 'Folder and search options' &gt; View).</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="SELECTED_PARTITION_ALREADY_INPLACE_ENC">The selected partition/device is already fully encrypted.\nHeader Flags = 0x%.8X</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="en" key="PREV">&lt; &amp;Back</string>
     <string lang="sk" key="RAWDEVICES">Zoznam základných zariadení inštalovaných vo Vašom systéme nemohol byť vytvorený!</string>
-    <string lang="sk" key="READONLYPROMPT">Zväzok '%hs' už existuje a je len na čítanie. Ste si istý, že ho chcete nahradiť?</string>
+    <string lang="sk" key="READONLYPROMPT">Zväzok '%s' už existuje a je len na čítanie. Ste si istý, že ho chcete nahradiť?</string>
     <string lang="sk" key="SELECT_DEST_DIR">Vyberte cieľový adresár</string>
     <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>
@@ -680,13 +687,13 @@
     <string lang="sk" key="TEST_CIPHERTEXT_SIZE">Testovací šifrovaný text, ktorý ste zadali, je príliš dlhý alebo krátky.</string>
     <string lang="sk" key="TEST_KEY_SIZE">Testovací kľúč, ktorý ste zadali, je príliš dlhý alebo krátky.</string>
     <string lang="sk" key="TEST_PLAINTEXT_SIZE">Testovací čistý text, ktorý ste zadali, je príliš dlhý alebo krátky.</string>
-    <string lang="en" key="TWO_LAYER_CASCADE_HELP">Two ciphers in a cascade operating in XTS mode. Each block is first encrypted with %hs (%d-bit key) and then with %hs (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
+    <string lang="en" key="TWO_LAYER_CASCADE_HELP">Two ciphers in a cascade operating in XTS mode. Each block is first encrypted with %s (%d-bit key) and then with %s (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
-    <string lang="en" key="THREE_LAYER_CASCADE_HELP">Three ciphers in a cascade operating in XTS mode. Each block is first encrypted with %hs (%d-bit key), then with %hs (%d-bit key), and finally with %hs (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
+    <string lang="en" key="THREE_LAYER_CASCADE_HELP">Three ciphers in a cascade operating in XTS mode. Each block is first encrypted with %s (%d-bit key), then with %s (%d-bit key), and finally with %s (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
     <string lang="en" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Note that, depending on the operating system configuration, these auto-run and auto-mount features may work only when the traveler disk files are created on a non-writable CD/DVD-like medium. Also note that this is not a bug in VeraCrypt (it is a limitation of Windows).</string>
     <string lang="en" key="TRAVELER_DISK_CREATED">VeraCrypt traveler disk has been successfully created.\n\nNote that you need administrator privileges to run VeraCrypt in portable mode. Also note that, after examining the registry file, it may be possible to tell that VeraCrypt was run on a Windows system even if it is run in portable mode.</string>
     <string lang="en" key="TC_TRAVELER_DISK">VeraCrypt Traveler Disk</string>
     <string lang="en" key="TWOFISH_HELP">Designed by Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall, and Niels Ferguson. Published in 1998. 256-bit key, 128-bit block. Mode of operation is XTS. Twofish was one of the AES finalists.</string>
-    <string lang="sk" key="MORE_INFO_ABOUT">Viac informácií o %hs</string>
+    <string lang="sk" key="MORE_INFO_ABOUT">Viac informácií o %s</string>
     <string lang="sk" key="UNKNOWN">Neznámy</string>
     <string lang="en" key="ERR_UNKNOWN">An unspecified or unknown error occurred (%d).</string>
     <string lang="sk" key="UNMOUNTALL_LOCK_FAILED">Niektoré zväzky obsahujú súbory alebo adresáre používané aplikáciami alebo systémom.\n\nVynútiť odpojenie?</string>
@@ -706,7 +713,7 @@
     <string lang="sk" key="WRONG_VOL_TYPE">VeraCrypt nemôže zmeniť heslo pre cudzí zväzok.</string>
     <string lang="sk" key="SELECT_FREE_DRIVE">Vyberte prosím voľné písmeno disku zo zoznamu.</string>
     <string lang="sk" key="SELECT_A_MOUNTED_VOLUME">Vyberte prosím najskôr pripojený zväzok zo zoznamu písmen jednotiek.</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="sk" key="CANT_CREATE_AUTORUN">Chyba: nie je možné vytvoriť autorun.inf</string>
     <string lang="sk" key="ERR_PROCESS_KEYFILE">Chyba pri spracovaní súborového kľúča!</string>
     <string lang="sk" key="ERR_PROCESS_KEYFILE_PATH">Chyba pri spracovaní cesty k súborovému kľúču!</string>
@@ -851,7 +858,7 @@
     <string lang="en" key="INSTALL_FAILED">Installation failed.</string>
     <string lang="en" key="UNINSTALL_FAILED">Uninstallation failed.</string>
     <string lang="en" key="DIST_PACKAGE_CORRUPTED">This distribution package is damaged. Please try downloading it again (preferably from the official VeraCrypt website at https://veracrypt.codeplex.com).</string>
-    <string lang="en" key="CANNOT_WRITE_FILE_X">Cannot write file %hs</string>
+    <string lang="en" key="CANNOT_WRITE_FILE_X">Cannot write file %s</string>
     <string lang="en" key="EXTRACTING_VERB">Extracting</string>
     <string lang="en" key="CANNOT_READ_FROM_PACKAGE">Cannot read data from the package.</string>
     <string lang="en" key="CANT_VERIFY_PACKAGE_INTEGRITY">Cannot verify the integrity of this distribution package.</string>
@@ -860,8 +867,8 @@
     <string lang="sk" key="INSTALL_OK">VeraCrypt bol úspešne nainštalovaný.</string>
     <string lang="en" key="SETUP_UPDATE_OK">VeraCrypt has been successfully updated.</string>
     <string lang="en" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt has been successfully upgraded. However, before you can start using it, the computer must be restarted.\n\nDo you want to restart it now?</string>
-    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
+    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu > All programs > Accessories > System Tools > System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
-    <string lang="sk" key="UNINSTALL_OK">VeraCrypt bol úspešne odinštalovaný.\n\nKliknite 'Dokončiť' pre odstránenie inštalátora VeraCrypt a zložky %hs. Zložka nebude odstránená, pokiaľ obsahuje akékoľvek súbory, ktoré neboli nainštalované inštalátorom alebo programom VeraCrypt.</string>
+    <string lang="sk" key="UNINSTALL_OK">VeraCrypt bol úspešne odinštalovaný.\n\nKliknite 'Dokončiť' pre odstránenie inštalátora VeraCrypt a zložky %s. Zložka nebude odstránená, pokiaľ obsahuje akékoľvek súbory, ktoré neboli nainštalované inštalátorom alebo programom VeraCrypt.</string>
     <string lang="sk" key="REMOVING_REG">Odstraňujem záznamy v registroch O programe VeraCrypt</string>
     <string lang="sk" key="ADDING_REG">Pridávam záznamy do registrov</string>
     <string lang="sk" key="REMOVING_APPDATA">Odstraňuje, špecifické údaje aplikácie</string>
@@ -872,10 +879,10 @@
     <string lang="sk" key="CREATING_SYS_RESTORE">Vytváram bod obnovenia</string>
     <string lang="sk" key="FAILED_SYS_RESTORE">Bod obnovenia sa nepodarilo vytvoriť!</string>
     <string lang="en" key="INSTALLER_UPDATING_BOOT_LOADER">Updating boot loader</string>
-    <string lang="en" key="INSTALL_OF_FAILED">Failed to install '%hs'. %hs\nDo you want to continue installing?</string>
+    <string lang="en" key="INSTALL_OF_FAILED">Failed to install '%s'. %s\nDo you want to continue installing?</string>
-    <string lang="en" key="UNINSTALL_OF_FAILED">Failed to uninstall '%hs'. %hs\nDo you want to continue uninstalling?</string>
+    <string lang="en" key="UNINSTALL_OF_FAILED">Failed to uninstall '%s'. %s\nDo you want to continue uninstalling?</string>
     <string lang="sk" key="INSTALL_COMPLETED">Inštalácia dokončená.</string>
-    <string lang="sk" key="CANT_CREATE_FOLDER">Zložka '%hs' nemohla byť vytvorená</string>
+    <string lang="sk" key="CANT_CREATE_FOLDER">Zložka '%s' nemohla byť vytvorená</string>
     <string lang="sk" key="CLOSE_TC_FIRST">Ovládač zariadenia VeraCrypt nemôže byť odstránený.\n\nZatvorte prosím najskôr všetky okná VeraCrypt. Pokiaľ to nepomôže, reštartujte prosím Windows a skúste to znova.</string>
     <string lang="sk" key="DISMOUNT_ALL_FIRST">Všetky zväzky VeraCrypt musí byť odpojené pred inštaláciou alebo odinštaláciou programu 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>
@@ -921,14 +928,14 @@
     <string lang="en" key="SYS_FAVORITE_VOLUMES_SAVED">System favorite volumes saved.\n\nTo enable mounting of system favorite volumes when the system starts, please select 'Settings' &gt; 'System Favorite Volumes' &gt; 'Mount system favorite volumes when Windows starts'.</string>
     <string lang="en" key="FAVORITE_ADD_DRIVE_DEV_WARNING">The volume you are adding to favorites is neither a partition nor a dynamic volume. Therefore, VeraCrypt will be unable to mount this favorite volume if the device number changes.</string>
     <string lang="en" key="FAVORITE_ADD_PARTITION_TYPE_WARNING">The volume you are adding to favorites is a partition not recognized by Windows.\n\nVeraCrypt will be unable to mount this favorite volume if the device number changes. Please set the type of the partition to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then add the partition to favorites again.</string>
-    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings &gt; Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
+    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings > Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_NETWORK_PATH_ERR">A container stored in a remote filesystem shared over a network cannot be automatically mounted when its host device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, the volume hosted on the device cannot be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable the volume hosted on the device to be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_LABEL_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, no label can be assigned to it.</string>
     <string lang="en" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable VeraCrypt to assign a label to the partition.</string>
     <string lang="en" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Due to a Windows limitation, a container stored in a remote filesystem shared over a network cannot be mounted as a system favorite volume (however, it can be mounted as a non-system favorite volume when a user logs on).</string>
-    <string lang="sk" key="ENTER_PASSWORD_FOR">Zadajte heslo pre %hs</string>
+    <string lang="sk" key="ENTER_PASSWORD_FOR">Zadajte heslo pre %s</string>
     <string lang="en" key="ENTER_PASSWORD_FOR_LABEL">Enter password for '%s'</string>
     <string lang="en" key="ENTER_NORMAL_VOL_PASSWORD">Enter password for the normal/outer volume</string>
     <string lang="en" key="ENTER_HIDDEN_VOL_PASSWORD">Enter password for the hidden volume</string>
@@ -943,8 +950,8 @@
     <string lang="sk" key="VOL_HEADER_BACKED_UP">Záloha hlavičky zväzku bola úspešne vytvorená.\n\nDÔLEŽITÉ: obnovením hlavičky zväzku s použitím tejto zálohy sa tiež obnoví aktuálne heslo pre zväzok. Pokiaľ je/sú potrebný súborový kľúč(e) pre pripojenia zväzku, ten istý súborový kľúč/e bude potrebný pre pripojenia zväzku znova až bude hlavička opäť vytvorená.\n\nVAROVANIE: Táto záloha hlavičky zväzku môže byť použitá k obnoveniu len tohto zväzku. Pokiaľ použijete túto zálohu hlavičky k obnoveniu hlavičky iného zväzku, budete môcť zväzok pripojiť, ale NEBUDETE schopný dešifrovať akékoľvek údaje uložené na zväzku (pretože zmeníte jeho Hlavný kľúč).</string>
     <string lang="sk" key="VOL_HEADER_RESTORED">Hlavička zväzku bola úspešne obnovená.\n\nDÔLEŽITÉ: Staré heslo mohlo byť tiež obnovené. Pokiaľ bol v čase zálohy potrebný k pripojeniu zväzku súborový kľúč(e), rovnaký súborový kľúč(e) bude teraz potrebný opätovnému pripojeniu zväzku.</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) for the hidden volume.</string>
-    <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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</string>
+    <string lang="en" key="CONFIRM_VOL_HEADER_BAK">Are you sure you want to create volume header backup for %s?\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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</string>
-    <string lang="sk" key="CONFIRM_VOL_HEADER_RESTORE">Naozaj chcete Obnoviť hlavičku zväzku pre %hs?\n\nUPOZORNENIE: obnovením hlavičky zväzku obnovíte tiež jeho heslo, ktoré bolo platné v čase vytvorenia zálohy. Pokiaľ bol potrebný súborový kľúč(e) k pripojenia zväzku v čase vytvorenia zálohy, rovnaký súborový kľúč(e) bude potrebný k opätovnému pripojeniu zväzku po obnovení hlavičky zväzku.\n\nPo kliknutí na Áno, zvoľte záložný súbor hlavičky.</string>
+    <string lang="sk" key="CONFIRM_VOL_HEADER_RESTORE">Naozaj chcete Obnoviť hlavičku zväzku pre %s?\n\nUPOZORNENIE: obnovením hlavičky zväzku obnovíte tiež jeho heslo, ktoré bolo platné v čase vytvorenia zálohy. Pokiaľ bol potrebný súborový kľúč(e) k pripojenia zväzku v čase vytvorenia zálohy, rovnaký súborový kľúč(e) bude potrebný k opätovnému pripojeniu zväzku po obnovení hlavičky zväzku.\n\nPo kliknutí na Áno, zvoľte záložný súbor hlavičky.</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>
@@ -955,12 +962,14 @@
     <string lang="en" key="VOLUME_HAS_NO_BACKUP_HEADER">There is no backup header embedded in this volume (note that only volumes created by VeraCrypt 6.0 or later contain embedded backup headers).</string>
     <string lang="en" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">You are attempting to back up the header of the system partition/drive. This is not allowed. Backup/restore operations pertaining to the system partition/drive can be performed only using the VeraCrypt Rescue Disk.\n\nDo you want to create a VeraCrypt Rescue Disk?</string>
     <string lang="en" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">You are attempting to restore the header of a virtual VeraCrypt volume but you selected the system partition/drive. This is not allowed. Backup/restore operations pertaining to the system partition/drive can be performed only using the VeraCrypt Rescue Disk.\n\nDo you want to create a VeraCrypt Rescue Disk?</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">After you click OK, you will select a filename for the new VeraCrypt Rescue Disk ISO image and the location where you wish to place it.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">After you click OK, you will select a filename for the new VeraCrypt Rescue Disk image and the location where you wish to place it.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <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_INSERT">Please insert your VeraCrypt Rescue Disk 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 a new Rescue Disk fully compatible with your current configuration, select 'System' &gt; 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk 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' &gt; '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 be used, because it was created for a different master key. You need to burn the newly generated Rescue Disk.</string>
@@ -989,8 +998,8 @@
     <string lang="en" key="DRIVE_LETTER_ITEM">Drive Letter:   </string>
     <string lang="sk" key="UNSUPPORTED_CHARS_IN_PWD">Chyba: Heslo musí obsahovať len ASCII znaky.\n\nNe-ASCII znaky v hesle môžu spôsobiť nemožnosť pripojenia zväzku pri zmene Vašej systémovej konfigurácie.\n\nPovolené sú nasledujúce znaky:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4  5 6 7 8 9 : ; &lt; = &gt; ? @ 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="sk" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">Upozornenie: Heslo obsahuje ne-ASCII znaky. Toto môže spôsobiť nemožnosť pripojenia zväzku pri zmene Vašej systémovej konfigurácie.\n\nMali by ste zameniť všetky ne-ASCII znaky v hesle za ASCII znaky. To do so, click 'Volumes' -&gt; 'Change Volume Password'.\n\nToto sú ASCII znaky:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4  5 6 7 8 9 : ; &lt; = &gt; ? @ 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="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 change it (e.g., to '.tc').\n\nAre you sure you want to use the problematic file extension?</string>
+    <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 change it (e.g., to '.hc').\n\nAre you sure you want to use the problematic file extension?</string>
-    <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 container or change it (e.g., to '.tc') after you dismount the volume.</string>
+    <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 container or change it (e.g., to '.hc') after you dismount the volume.</string>
     <string lang="sk" key="HOMEPAGE">Domovská stránka</string>
     <string lang="sk" key="LARGE_IDE_WARNING_XP">UPOZORNENIE: Zdá sa, že ste nenainštalovali žiaden Service Pack vo Vašej používa Windows. Nemali by ste zapisovať na IDE disky väčšie ako 128 GB v systéme Windows XP, v ktorom ste nenainštalovali Service Pack 1 alebo novší! Pokiaľ tak učiníte, údaje na disku (bez ohľadu na to, či ide o zväzok VeraCrypt alebo ne) sa môžu poškodiť. Toto je obmedzenie Windows, nie chyba programu VeraCrypt.</string>
     <string lang="sk" key="LARGE_IDE_WARNING_2K">UPOZORNENIE: Zdá sa, že ste nenainštalovali Service Pack 3 alebo novší vo Vašej inštalácii Windows. Nemali by ste zapisovať na disky väčšie ako 128 GB v systéme Windows 2000, v ktorom ste nenainštalovali Service Pack 3 alebo novší! Pokiaľ tak učiníte, údaje na disku (bez ohľadu na to, či ide o zväzok VeraCrypt alebo nie) sa môžu poškodiť. Toto je obmedzenie Windows, nie chyba programu VeraCrypt.\n\nPozn.: Možno tiež bude potrebné zapnúť podporu 48-bit LBA v registroch; pre viac informácií viď http://support.microsoft.com/kb/305098/EN-US</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="sk" key="CHECKING_FS">Kontrolujem systém súborov na zväzku VeraCrypt pripojeného ako %s...</string>
-    <string lang="sk" key="REPAIRING_FS">Pokúšam sa opraviť súborový systém na zväzku VeraCrypt pripojenom ako %hs...</string>
+    <string lang="sk" key="REPAIRING_FS">Pokúšam sa opraviť súborový systém na zväzku VeraCrypt pripojenom ako %s...</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 later.</string>
     <string lang="sk" key="WARN_64_BIT_BLOCK_CIPHER">Varovanie: Tento zväzok je zašifrovaný odkazovaným šifrovacím algoritmom.\n\nVšetky 64-bit-blokové šifrovacie algoritmy (napr. Blowfish, CAST-128 alebo Triple DES) sú neschválené. Tento zväzok bude možné pripojiť použitím budúcej verzia programu VeraCrypt. Treba si tiež uvedomiť, že žiadne ďalšie vylepšenia týchto odkazovaných šifrovacích algoritmov nebudú. Doporučujeme Vám vytvoriť nový VeraCrypt zväzok zašifrovaný 128-bit-blokovým šifrovacím algoritmem (napr. AES, Serpent, Twofish, apod.) a presuňte všetky súboru z tohto zväzku do nového.</string>
     <string lang="sk" key="SYS_AUTOMOUNT_DISABLED">Váš systém nie je nakonfigurovaný k autom. pripojeniu nových zväzkov. Môže sa stať, že zväzky VeraCrypt umiestnené na zariadeniach nebude možné pripojiť. Autom. pripojenia môže byť povolené spustením nasledujúceho príkazu a reštartovaním systému.\n\nmountvol.exe /E</string>
     <string lang="sk" key="SYS_ASSIGN_DRIVE_LETTER">Priraďte prosím písmeno jednotke oddielu/zariadeniu, ako budete pokračovať ('Ovládacie panely' &gt; 'Systém a údržba' &gt; 'Administr. nástroje' - 'Vytvoriť a formátovať oddiely pevného disku').\n\nToto je požiadavka operačného systému.</string>
@@ -1069,7 +1077,7 @@
     <string lang="en" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt no longer supports encryption of the system partition/drive on Windows Vista with no Service Pack installed. Before upgrading VeraCrypt, please install Service Pack 1 or higher for Windows Vista.</string>
     <string lang="en" key="FEATURE_REQUIRES_INSTALLATION">Error: This feature requires VeraCrypt to be installed on the system (you are running VeraCrypt in portable mode).\n\nPlease install VeraCrypt and then try again.</string>
     <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="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</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' &gt; '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>
@@ -1093,7 +1101,7 @@
     <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 medium (or using a service partition)?</string>
     <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 Hidden Volumes" in the VeraCrypt User's Guide.\n\nImportant: Before proceeding, please make sure you have read the section "Security Requirements and Precautions Pertaining to Hidden Volumes" in the VeraCrypt User's Guide.\n\n\nDoes the currently running operating system meet the above condition?</string>
     <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 from writing to the shared boot partition and from hibernating.\n\n\nDo you want to continue? If you select 'No', instructions for removing the extra boot partition will be displayed.</string>
-    <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' &gt; '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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
+    <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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
     <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>
@@ -1108,8 +1116,8 @@
     <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 you do NOT have a real US keyboard.</string>
     <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 starts.\n\n- The VRD will contain a backup of the present content of the first drive track (which typically contains a system loader or boot manager) and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ISO image will be created in the location specified below.</string>
     <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">The Rescue Disk image has been created and stored in this file:\n%s\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>
+    <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%s\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>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">IMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software. If you do not have any CD/DVD recording software that can write the ISO disk image to a CD/DVD, click the link below to download such free software.\n\n</string>
     <string lang="en" key="LAUNCH_WIN_ISOBURN">Launch Microsoft Windows Disc Image Burner</string>
     <string lang="en" key="RESCUE_DISK_BURN_NO_CHECK_WARN">WARNING: If you already created a VeraCrypt Rescue Disk in the past, it cannot be reused for this system partition/drive because it was created for a different master key! Every time you encrypt a system partition/drive, you must create a new VeraCrypt Rescue Disk for it even if you use the same password.</string>
@@ -1247,7 +1255,7 @@
     <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 system (but not on the decoy system), the decoy system would contain a VeraCrypt driver and VeraCrypt applications whose version numbers are different from the version number of the VeraCrypt Boot Loader. Such a discrepancy might indicate that there is a hidden operating system on this computer.\n\n\nDo you want to continue?</string>
     <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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' &gt; '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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' > 'Create Rescue Disk').</string>
     <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' &gt; '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' &gt; 'Create Rescue Disk'.</string>
     <string lang="en" key="BOOT_LOADER_UPGRADE_FAILED">Failed to upgrade the VeraCrypt Boot Loader.</string>
@@ -1272,7 +1280,7 @@
     <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' &gt; '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>
@@ -1297,8 +1305,8 @@
     <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 system.</string>
     <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' &gt; 'Performance' and enable 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' &gt; 'Performance' and disable 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>
@@ -1372,6 +1380,39 @@
     <string lang="sk" key="TB_PER_SEC">TB/s</string>
     <string lang="sk" key="PB_PER_SEC">PB/s</string>
     <string lang="en" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.sl.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="sl" name="Slovenščina" en-name="Slovenian" version="0.1.0" translators="Erik David Salam" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="sl" key="IDC_BROWSE">&amp;Prebrskaj...</control>
     <control lang="en" key="IDC_DESKTOP_ICON">Add VeraCrypt icon to &amp;desktop</control>
     <control lang="en" key="IDC_DONATE">Donate now...</control>
-    <control lang="en" key="IDC_FILE_TYPE">Associate the .tc file &amp;extension with VeraCrypt</control>
+    <control lang="en" key="IDC_FILE_TYPE">Associate the .hc file &amp;extension with VeraCrypt</control>
     <control lang="en" key="IDC_OPEN_CONTAINING_FOLDER">&amp;Open the destination location when finished</control>
     <control lang="en" key="IDC_PROG_GROUP">Add VeraCrypt to &amp;Start menu</control>
     <control lang="en" key="IDC_SYSTEM_RESTORE">Create System &amp;Restore point</control>
@@ -37,6 +37,7 @@
     <control lang="sl" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Prenesite si CD/DVD zapisovalno programsko opremo</control>
     <control lang="sl" key="IDC_FILE_CONTAINER">Ustvari šifrirni datotečni kontejner</control>
     <control lang="en" key="IDC_GB">&amp;GB</control>
+    <control lang="en" key="IDC_TB">&amp;TB</control>
     <control lang="sl" key="IDC_HIDDEN_SYSENC_INFO_LINK">Več informacij</control>
     <control lang="sl" key="IDC_HIDDEN_VOL">&amp;Skriti VeraCrypt-ov zbirnik</control>
     <control lang="sl" key="IDC_HIDDEN_VOL_HELP">Več informacij o skritih zbirnikih</control>
@@ -44,6 +45,7 @@
     <control lang="sl" key="IDC_HIDVOL_WIZ_MODE_FULL">Običajen način</control>
     <control lang="en" key="IDC_KB">&amp;KB</control>
     <control lang="sl" key="IDC_KEYFILES_ENABLE">&amp;Uporabi ključne dat.</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="sl" key="IDC_KEY_FILES">&amp;Ključne dat. ...</control>
     <control lang="sl" key="IDC_LINK_HASH_INFO">Informacije o razpršil. algor.</control>
@@ -58,7 +60,8 @@
     <control lang="sl" key="IDC_NO_HISTORY">&amp;Nikoli ne beleži zgodovine</control>
     <control lang="sl" key="IDC_OPEN_OUTER_VOLUME">Odpri zunanji zbirnik</control>
     <control lang="en" key="IDC_PAUSE">&amp;Pause</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="sl" key="IDC_QUICKFORMAT">Hitro format.</control>
     <control lang="sl" key="IDC_SHOW_PASSWORD">&amp;Prikaži geslo</control>
     <control lang="sl" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Prikaži geslo</control>
@@ -118,6 +121,7 @@
     <control lang="sl" key="IDC_CREATE">Ustvari</control>
     <control lang="sl" key="IDC_CREATE_VOLUME">&amp;Ustvari zbirnik</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <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="sl" key="IDC_ENABLE_KEYFILES">Uporabi ključne dat.</control>
     <control lang="sl" key="IDC_ENABLE_NEW_KEYFILES">Uporabi ključne dat.</control>
@@ -132,6 +136,7 @@
     <control lang="en" key="IDC_FAVORITE_MOVE_UP">Move &amp;Up</control>
     <control lang="en" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Open &amp;Explorer window for selected volume when successfully mounted</control>
     <control lang="en" key="IDC_FAVORITE_REMOVE">&amp;Remove</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="en" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Global Settings</control>
     <control lang="en" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Display balloon tooltip after successful hot-key dismount</control>
     <control lang="en" key="IDC_HK_DISMOUNT_PLAY_SOUND">Play system notification sound after successful hot-key dismount</control>
@@ -189,7 +194,7 @@
     <control lang="en" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="en" key="IDD_PASSWORDCHANGE_DLG">Change Password or Keyfiles</control>
     <control lang="en" key="IDD_PASSWORD_DLG">Enter VeraCrypt Volume Password</control>
-    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance Options</control>
+    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance and Driver Options</control>
     <control lang="en" key="IDD_PREFERENCES_DLG">VeraCrypt - Preferences</control>
     <control lang="en" key="IDD_SYSENC_SETTINGS">VeraCrypt - System Encryption Settings</control>
     <control lang="en" key="IDD_TOKEN_PREFERENCES">VeraCrypt - Security Token Preferences</control>
@@ -235,7 +240,7 @@
     <control lang="sl" key="IDM_ONLINE_TUTORIAL">Začetniški vodič</control>
     <control lang="en" key="IDM_ORGANIZE_FAVORITES">Organize Favorite Volumes...</control>
     <control lang="en" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organize System Favorite Volumes...</control>
-    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance...</control>
+    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance/Driver Configuration</control>
     <control lang="sl" key="IDM_PERMANENTLY_DECRYPT_SYS">Dokončno dešifriraj sistemski razdelek/pogon</control>
     <control lang="sl" key="IDM_PREFERENCES">Možnosti...</control>
     <control lang="sl" key="IDM_REFRESH_DRIVE_LETTERS">Osveži pogonske črke</control>
@@ -256,6 +261,7 @@
     <control lang="sl" key="IDM_UNMOUNTALL">Odklopi vse priklopljene zbirnike</control>
     <control lang="sl" key="IDM_UNMOUNT_VOLUME">Odklopi zbirnik</control>
     <control lang="sl" key="IDM_VERIFY_RESCUE_DISK">Preveri rešilni disk</control>
+    <control lang="en" key="IDM_VERIFY_RESCUE_DISK_ISO">Verify Rescue Disk Image</control>
     <control lang="sl" key="IDM_VERSION_HISTORY">Zgodovina različic</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="sl" key="IDM_VOLUME_PROPERTIES">Lastnosti zbirnika</control>
@@ -365,7 +371,7 @@
     <control lang="en" key="IDT_SECURITY_TOKEN">Security token:</control>
     <control lang="sl" key="IDT_SORT_METHOD">Metod. razvrščanja:</control>
     <control lang="en" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Please wait. This process may take a long time...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="sl" key="IDT_TEST_BLOCK_NUMBER">Številka bloka:</control>
     <control lang="sl" key="IDT_TEST_CIPHERTEXT">Šifriran tekst (šestnajstiški)</control>
     <control lang="sl" key="IDT_TEST_DATA_UNIT_NUMBER">Številka podatkovne enote (64-bitni šestnajstiški, podatkovna enota je 512 bajtov)</control>
@@ -410,13 +416,13 @@
     <string lang="sl" key="CIPHER_TITLE">Možnosti šifriranja</string>
     <string lang="en" key="CLEAN_WINMRU_FAILED">WARNING: Failed to clear the path of the last selected volume/keyfile (remembered by file selector)!</string>
     <string lang="en" key="COMPRESSION_NOT_SUPPORTED">Error: The container has been compressed at the filesystem level. VeraCrypt does not support compressed containers (note that compression of encrypted data is ineffective and redundant).\n\nPlease disable compression for the container by following these steps:\n1) Right-click the container in Windows Explorer (not in VeraCrypt).\n2) Select 'Properties'.\n3) In the 'Properties' dialog box, click 'Advanced'.\n4) In the 'Advanced Attributes' dialog box, disable the option 'Compress contents to save disk space' and click 'OK'.\n5) In the 'Properties' dialog box, click 'OK'.</string>
-    <string lang="en" key="CREATE_FAILED">Failed to create volume %hs</string>
+    <string lang="en" key="CREATE_FAILED">Failed to create volume %s</string>
-    <string lang="sl" key="DEVICE_FREE_BYTES">Velikost %hs je %.2f bajtov</string>
+    <string lang="sl" key="DEVICE_FREE_BYTES">Velikost %s je %.2f bajtov</string>
-    <string lang="sl" key="DEVICE_FREE_KB">Velikost %hs je %.2f KB</string>
+    <string lang="sl" key="DEVICE_FREE_KB">Velikost %s je %.2f KB</string>
-    <string lang="sl" key="DEVICE_FREE_MB">Velikost %hs je %.2f MB</string>
+    <string lang="sl" key="DEVICE_FREE_MB">Velikost %s je %.2f MB</string>
-    <string lang="sl" key="DEVICE_FREE_GB">Velikost %hs je %.2f GB</string>
+    <string lang="sl" key="DEVICE_FREE_GB">Velikost %s je %.2f GB</string>
-    <string lang="sl" key="DEVICE_FREE_TB">Velikost %hs je %.2f TB</string>
+    <string lang="sl" key="DEVICE_FREE_TB">Velikost %s je %.2f TB</string>
-    <string lang="sl" key="DEVICE_FREE_PB">Velikost %hs je %.2f PB</string>
+    <string lang="sl" key="DEVICE_FREE_PB">Velikost %s je %.2f PB</string>
     <string lang="en" key="DEVICE_IN_USE_FORMAT">WARNING: The device/partition is in use by the operating system or applications. Formatting the device/partition might cause data corruption and system instability.\n\nContinue?</string>
     <string lang="en" key="DEVICE_IN_USE_INPLACE_ENC">Warning: The partition is in use by the operating system or applications. You should close any applications that might be using the partition (including antivirus software).\n\nContinue?</string>
     <string lang="en" key="FORMAT_CANT_DISMOUNT_FILESYS">Error: The device/partition contains a file system that could not be dismounted. The file system may be in use by the operating system. Formatting the device/partition would very likely cause data corruption and system instability.\n\nTo solve this issue, we recommend that you first delete the partition and then recreate it without formatting. To do so, follow these steps:\n1) Right-click the 'Computer' (or 'My Computer') icon in the 'Start Menu' and select 'Manage'. The 'Computer Management' window should appear.\n2) In the 'Computer Management' window, select 'Storage' &gt; 'Disk Management'.\n3) Right-click the partition you want to encrypt and select either 'Delete Partition', or 'Delete Volume', or 'Delete Logical Drive'.\n4) Click 'Yes'. If Windows asks you to restart the computer, do so. Then repeat the steps 1 and 2 and continue from the step 5.\n5) Right-click the unallocated/free space area and select either 'New Partition', or 'New Simple Volume', or 'New Logical Drive'.\n6) The 'New Partition Wizard' or 'New Simple Volume Wizard' window should appear now; follow its instructions. On the wizard page entitled 'Format Partition', select either 'Do not format this partition' or 'Do not format this volume'. In the same wizard, click 'Next' and then 'Finish'.\n7) Note that the device path you have selected in VeraCrypt may be wrong now. Therefore, exit the VeraCrypt Volume Creation Wizard (if it is still running) and then start it again.\n8) Try encrypting the device/partition again.\n\nIf VeraCrypt repeatedly fails to encrypt the device/partition, you may want to consider creating a file container instead.</string>
@@ -435,15 +441,15 @@
     <string lang="en" key="INPLACE_ENC_INVALID_PATH">Error: VeraCrypt can in-place encrypt only a partition, a dynamic volume, or an entire system drive. Please make sure the specified path is valid.</string>
     <string lang="en" key="CANNOT_RESIZE_FILESYS">Error: Cannot shrink the filesystem (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPossible causes and solutions:\n\n- Not enough free space on the volume. Please make sure no other application is writing to the filesystem.\n\n- Corrupted file system. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
     <string lang="en" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Error: There is not enough free space on the volume and so the filesystem cannot be shrunk (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPlease delete any redundant files and empty the Recycle Bin so as to free at least 256 KB of space and then try again. Note that due to a Windows issue, the amount of free space reported by the Windows Explorer may be incorrect until the operating system is restarted. If restarting the system does not help, the file system may be corrupted. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
-    <string lang="sl" key="DISK_FREE_BYTES">Nezasedenega prostora na pogonu %hs je %.2f bajtov.</string>
+    <string lang="sl" key="DISK_FREE_BYTES">Nezasedenega prostora na pogonu %s je %.2f bajtov.</string>
-    <string lang="sl" key="DISK_FREE_KB">Nezasedenega prostora na pogonu %hs je %.2f KB</string>
+    <string lang="sl" key="DISK_FREE_KB">Nezasedenega prostora na pogonu %s je %.2f KB</string>
-    <string lang="sl" key="DISK_FREE_MB">Nezasedenega prostora na pogonu %hs je %.2f MB</string>
+    <string lang="sl" key="DISK_FREE_MB">Nezasedenega prostora na pogonu %s je %.2f MB</string>
-    <string lang="sl" key="DISK_FREE_GB">Nezasedenega prostora na pogonu %hs je %.2f GB</string>
+    <string lang="sl" key="DISK_FREE_GB">Nezasedenega prostora na pogonu %s je %.2f GB</string>
-    <string lang="sl" key="DISK_FREE_TB">Nezasedenega prostora na pogonu %hs je %.2f TB</string>
+    <string lang="sl" key="DISK_FREE_TB">Nezasedenega prostora na pogonu %s je %.2f TB</string>
-    <string lang="sl" key="DISK_FREE_PB">Nezasedenega prostora na pogonu %hs je %.2f PB</string>
+    <string lang="sl" key="DISK_FREE_PB">Nezasedenega prostora na pogonu %s je %.2f PB</string>
     <string lang="en" key="DRIVELETTERS">Could not get available drive letters.</string>
     <string lang="en" key="DRIVER_NOT_FOUND">Error: VeraCrypt driver not found.\n\nPlease copy the files 'veracrypt.sys' and 'veracrypt-x64.sys' to the directory where the main VeraCrypt application (VeraCrypt.exe) is located.</string>
-    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall; on Windows XP, select 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
+    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' > Computer > 'Uninstall or change a program' > VeraCrypt > Uninstall; on Windows XP, select 'Start Menu' > Settings > 'Control Panel' > 'Add Or Remove Programs' > VeraCrypt > Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
     <string lang="en" key="ERR_CIPHER_INIT_FAILURE">Error: Cipher initialization failure.</string>
     <string lang="en" key="ERR_CIPHER_INIT_WEAK_KEY">Error: A weak or a potentially weak key has been detected. The key will be discarded. Please try again.</string>
     <string lang="en" key="EXCEPTION_REPORT">A critical error has occurred and VeraCrypt must be terminated. If this is caused by a bug in VeraCrypt, we would like to fix it. To help us, you can send us an automatically generated error report containing the following items:\n\n- Program version\n- Operating system version\n- Type of CPU\n- VeraCrypt component name\n- Checksum of VeraCrypt executable\n- Symbolic name of dialog window\n- Error category\n- Error address\n- VeraCrypt call stack\n\nIf you select 'Yes', the following URL (which contains the entire error report) will be opened in your default Internet browser.\n\n%hs\n\nDo you want to send us the above error report?</string>
@@ -497,7 +503,7 @@
     <string lang="en" key="WIPE_FINISHED">The content of the partition/device has been successfully erased.</string>
     <string lang="en" key="WIPE_FINISHED_DECOY_SYSTEM_PARTITION">The content of the partition where the original system (of which the hidden system is a clone) resided has been successfully erased.</string>
     <string lang="en" key="DECOY_OS_VERSION_WARNING">Please make sure the version of Windows you are going to install (on the wiped partition) is the same as the version of Windows you are currently running. This is required due to the fact that both systems will share a common boot partition.</string>
-    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' &gt; 'Add Mounted Volume to System Favorites').</string>
+    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' > 'Add Mounted Volume to System Favorites').</string>
     <string lang="en" key="SYSTEM_DECRYPTION_FINISHED">The system partition/drive has been successfully decrypted.</string>
     <string lang="sl" key="FORMAT_FINISHED_HELP">\n\nVeraCrypt-ov zbirnik je bil ustvarjen in je pripravljen za uporabo. Če želite ustvariti še kakšen VeraCrypt-ov zbirnik, kliknite Naprej. V nasprotnem primeru pa kliknite Izhod.</string>
     <string lang="en" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nThe hidden VeraCrypt volume has been successfully created (the hidden operating system will reside within this hidden volume).\n\nClick Next to continue.</string>
@@ -524,7 +530,7 @@
     <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 password for this outer volume, and the existence of the hidden volume (and of the hidden operating system) will remain secret.\n\nIMPORTANT: The files you copy to the outer volume should not occupy more than %s. Otherwise, there may not be enough free space on the outer volume for the hidden volume (and you will not be able to continue). After you finish copying, click Next (do not dismount the volume).</string>
     <string lang="sl" key="HIDVOL_HOST_FILLING_HELP">Zunanji zbirnik je bil uspešno ustvarjen in priklopljen kot pogon %hc:. Na ta zbirnik lahko sedaj prekopirate nekaj na videz občutljivih datotek, ki jih pravzaprav NE želite skriti. Datoteke se bodo nahajale tam za na ogled vsakomur, ki Vas bo prisilil v razkritje Vašega gesla. Razkrili boste geslo samo za ta zunanji zbirnik, ne pa za skritega. Datoteke, za katere Vam je pa res mar, bodo pa shranjene v skritem zbirniku, ki ga boste ustvarili v nadaljevanju. Ko končate s kopiranjem kliknite Naprej. Ne odklopite zbirnika.\n\nNote: Potem ko kliknete Naprej bodo grozdi o prostih informacijah od zunanjega zbirnika pregledani, da se ugotovi velikost neprekinjenega dela nezasedenega prostora, čigar konec je poravnan s koncem zbirnika. Ta prostor bo gostil skriti zbirnik tako da bo omejil njegovo najvišjo možno velikost. Pregledovanje grozdov o prostih informacijah zagotavlja, da se ne bodo prepisovali podatki iz skritega zbirnika na zunanjega.</string>
     <string lang="sl" key="HIDVOL_HOST_FILLING_TITLE">Vsebina zunanjega zbirnika</string>
-    <string lang="sl" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nV naslednjih korakih boste nastavili možnosti za zunanji zbirnik (znotraj katerega bo ustvarjen skriti zbirnik v nadaljevanju). </string>
+    <string lang="sl" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nV naslednjih korakih boste nastavili možnosti za zunanji zbirnik (znotraj katerega bo ustvarjen skriti zbirnik v nadaljevanju).</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>
     <string lang="sl" key="HIDVOL_HOST_PRE_CIPHER_TITLE">Zunanji zbirnik</string>
     <string lang="en" key="HIDDEN_OS_PRE_CIPHER_HELP">In the following steps, you will set the options and password for the hidden volume, which will contain the hidden operating system.\n\nRemark: The cluster bitmap of the outer volume has been scanned in order to determine the size of uninterrupted area of free space whose end is aligned with the end of the outer volume. This area will accommodate the hidden volume, so it limits its maximum possible size. The maximum possible size of the hidden volume has been determined and confirmed to be greater than the size of the system partition (which is required, because the entire content of the system partition will need to be copied to the hidden volume). This ensures that no data currently stored on the outer volume will be overwritten by data written to the area of the hidden volume.</string>
@@ -561,6 +567,7 @@
     <string lang="sl" key="MAX_HIDVOL_SIZE_KB">Najvišja možna velikost skritega zbirnika za ta zbirnik je %.2f KB.</string>
     <string lang="sl" key="MAX_HIDVOL_SIZE_MB">Najvišja možna velikost skritega zbirnika za ta zbirnik je %.2f MB.</string>
     <string lang="sl" key="MAX_HIDVOL_SIZE_GB">Najvišja možna velikost skritega zbirnika za ta zbirnik je %.2f GB.</string>
+    <string lang="sl" key="MAX_HIDVOL_SIZE_TB">Najvišja možna velikost skritega zbirnika za ta zbirnik je %.2f TB.</string>
     <string lang="sl" key="MOUNTED_NOPWCHANGE">Geslo ali ključne datoteke zbirnika ni moč spreminjati medtem ko je zbirnik priklopljen. Prosim, da slednjega prvo odklopite.</string>
     <string lang="sl" key="MOUNTED_NO_PKCS5_PRF_CHANGE">Izpeljani algoritem iz ključa glave ni možno spreminjati medtem ko je zbirnik prikljopljen. Prosim, da slednjega prvo odklopite.</string>
     <string lang="sl" key="MOUNT_BUTTON">&amp;Priklopi</string>
@@ -591,12 +598,12 @@
     <string lang="en" key="SELECT_PKCS11_MODULE">Select PKCS #11 Library</string>
     <string lang="en" key="OUTOFMEMORY">Out of Memory</string>
     <string lang="en" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">IMPORTANT: We strongly recommend that inexperienced users create a VeraCrypt file container on the selected device/partition, instead of attempting to encrypt the entire device/partition.\n\nWhen you create a VeraCrypt file container (as opposed to encrypting a device or partition) there is, for example, no risk of destroying a large number of files. Note that a VeraCrypt file container (even though it contains a virtual encrypted disk) is actually just like any normal file. For more information, see the chapter Beginner's Tutorial in the VeraCrypt User Guide.\n\nAre you sure you want to encrypt the entire device/partition?</string>
-    <string lang="en" key="OVERWRITEPROMPT">WARNING: The file '%hs' already exists!\n\nIMPORTANT: VERACRYPT WILL NOT ENCRYPT THE FILE, BUT IT WILL DELETE IT. Are you sure you want to delete the file and replace it with a new VeraCrypt container?</string>
+    <string lang="en" key="OVERWRITEPROMPT">WARNING: The file '%s' already exists!\n\nIMPORTANT: VERACRYPT WILL NOT ENCRYPT THE FILE, BUT IT WILL DELETE IT. Are you sure you want to delete the file and replace it with a new VeraCrypt container?</string>
-    <string lang="sl" key="OVERWRITEPROMPT_DEVICE">PREVIDNO: VSE DATOTEKE, KI SO TRENUTNO SHRANJENE NA IZBRANEM RAZDELKU %s '%hs'%s BODO POBRISANE IN IZGUBLJENE (NE BODO ŠIFRIRANE) !\n\nAli ste prepričani, da želite nadaljevati s formatiranjem ?</string>
+    <string lang="sl" key="OVERWRITEPROMPT_DEVICE">PREVIDNO: VSE DATOTEKE, KI SO TRENUTNO SHRANJENE NA IZBRANEM RAZDELKU %s '%s'%s BODO POBRISANE IN IZGUBLJENE (NE BODO ŠIFRIRANE) !\n\nAli ste prepričani, da želite nadaljevati s formatiranjem ?</string>
-    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%s'%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting/decrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting/decrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting/decrypting, please make sure that you have backup copies of the files you want to encrypt/decrypt.\n\nDo you have such a backup?</string>
-    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%hs'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
+    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%s'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
     <string lang="en" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">WARNING: THE SELECTED PARTITION CONTAINS A LARGE AMOUNT OF DATA! Any files stored on the partition will be erased and lost (they will NOT be encrypted)!</string>
     <string lang="en" key="ERASE_FILES_BY_CREATING_VOLUME">Erase any files stored on the partition by creating a VeraCrypt volume within it</string>
     <string lang="sl" key="PASSWORD">Geslo</string>
@@ -645,7 +652,7 @@
     <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
     <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
     <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 &gt; Organize &gt; 'Folder and search options' &gt; View).</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="SELECTED_PARTITION_ALREADY_INPLACE_ENC">The selected partition/device is already fully encrypted.\nHeader Flags = 0x%.8X</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="sl" key="PREV">&lt; &amp;Nazaj</string>
     <string lang="en" key="RAWDEVICES">Unable to list raw devices installed on your system!</string>
-    <string lang="en" key="READONLYPROMPT">The volume '%hs' exists, and is read-only. Are you sure you want to replace it?</string>
+    <string lang="en" key="READONLYPROMPT">The volume '%s' exists, and is read-only. Are you sure you want to replace it?</string>
     <string lang="en" key="SELECT_DEST_DIR">Select destination directory</string>
     <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>
@@ -680,13 +687,13 @@
     <string lang="en" key="TEST_CIPHERTEXT_SIZE">The test ciphertext you have supplied is too long or short.</string>
     <string lang="en" key="TEST_KEY_SIZE">The test key you have supplied is too long or short.</string>
     <string lang="en" key="TEST_PLAINTEXT_SIZE">The test plaintext you have supplied is too long or short.</string>
-    <string lang="sl" key="TWO_LAYER_CASCADE_HELP">Dve šifri, ki se izvajata kaskadno v XTS načinu. Vsak blok je prvo šifriran z %hs (%d-bitni ključ) in nato z %hs (%d-bitni ključ). Vsaka šifra uporablja svoj ključ. Vsi ključi so si med seboj neodvisni.</string>
+    <string lang="sl" key="TWO_LAYER_CASCADE_HELP">Dve šifri, ki se izvajata kaskadno v XTS načinu. Vsak blok je prvo šifriran z %s (%d-bitni ključ) in nato z %s (%d-bitni ključ). Vsaka šifra uporablja svoj ključ. Vsi ključi so si med seboj neodvisni.</string>
-    <string lang="sl" key="THREE_LAYER_CASCADE_HELP">Tri šifre, ki se izvajajo kaskadno v XTS načinu. Vsak blok je prvo šifriran z %hs (%d-bitni ključ), zatem z %hs (%d-bitni ključ) in končno z %hs (%d-bitni ključ). Vsaka šifra uporablja svoj ključ. Vsi ključi so si med seboj neodvisni.</string>
+    <string lang="sl" key="THREE_LAYER_CASCADE_HELP">Tri šifre, ki se izvajajo kaskadno v XTS načinu. Vsak blok je prvo šifriran z %s (%d-bitni ključ), zatem z %s (%d-bitni ključ) in končno z %s (%d-bitni ključ). Vsaka šifra uporablja svoj ključ. Vsi ključi so si med seboj neodvisni.</string>
     <string lang="en" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Note that, depending on the operating system configuration, these auto-run and auto-mount features may work only when the traveler disk files are created on a non-writable CD/DVD-like medium. Also note that this is not a bug in VeraCrypt (it is a limitation of Windows).</string>
     <string lang="en" key="TRAVELER_DISK_CREATED">VeraCrypt traveler disk has been successfully created.\n\nNote that you need administrator privileges to run VeraCrypt in portable mode. Also note that, after examining the registry file, it may be possible to tell that VeraCrypt was run on a Windows system even if it is run in portable mode.</string>
     <string lang="en" key="TC_TRAVELER_DISK">VeraCrypt Traveler Disk</string>
     <string lang="sl" key="TWOFISH_HELP">Zasnoval ga je Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall in Niels Ferguson. Objavljen je bil leta 1998. Uporablja 256-bitni ključ in 128-bitni blok. Način delovanja je XTS. Twofish je bil eden izmed AES-ovih finalistov.</string>
-    <string lang="sl" key="MORE_INFO_ABOUT">Več informacij o %hs</string>
+    <string lang="sl" key="MORE_INFO_ABOUT">Več informacij o %s</string>
     <string lang="en" key="UNKNOWN">Unknown</string>
     <string lang="en" key="ERR_UNKNOWN">An unspecified or unknown error occurred (%d).</string>
     <string lang="en" key="UNMOUNTALL_LOCK_FAILED">Some volumes contain files or folders being used by applications or system.\n\nForce dismount?</string>
@@ -706,7 +713,7 @@
     <string lang="en" key="WRONG_VOL_TYPE">VeraCrypt cannot change the password for a foreign volume.</string>
     <string lang="sl" key="SELECT_FREE_DRIVE">Prosim, da izberete prost pogon iz seznama.</string>
     <string lang="en" key="SELECT_A_MOUNTED_VOLUME">Please select a mounted volume in the drive letter list.</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="en" key="CANT_CREATE_AUTORUN">Error: Cannot create autorun.inf</string>
     <string lang="en" key="ERR_PROCESS_KEYFILE">Error while processing keyfile!</string>
     <string lang="en" key="ERR_PROCESS_KEYFILE_PATH">Error processing keyfile path!</string>
@@ -851,7 +858,7 @@
     <string lang="en" key="INSTALL_FAILED">Installation failed.</string>
     <string lang="en" key="UNINSTALL_FAILED">Uninstallation failed.</string>
     <string lang="en" key="DIST_PACKAGE_CORRUPTED">This distribution package is damaged. Please try downloading it again (preferably from the official VeraCrypt website at https://veracrypt.codeplex.com).</string>
-    <string lang="en" key="CANNOT_WRITE_FILE_X">Cannot write file %hs</string>
+    <string lang="en" key="CANNOT_WRITE_FILE_X">Cannot write file %s</string>
     <string lang="en" key="EXTRACTING_VERB">Extracting</string>
     <string lang="en" key="CANNOT_READ_FROM_PACKAGE">Cannot read data from the package.</string>
     <string lang="en" key="CANT_VERIFY_PACKAGE_INTEGRITY">Cannot verify the integrity of this distribution package.</string>
@@ -860,8 +867,8 @@
     <string lang="en" key="INSTALL_OK">VeraCrypt has been successfully installed.</string>
     <string lang="en" key="SETUP_UPDATE_OK">VeraCrypt has been successfully updated.</string>
     <string lang="en" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt has been successfully upgraded. However, before you can start using it, the computer must be restarted.\n\nDo you want to restart it now?</string>
-    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
+    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu > All programs > Accessories > System Tools > System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
-    <string lang="en" key="UNINSTALL_OK">VeraCrypt has been successfully uninstalled.\n\nClick 'Finish' to remove the VeraCrypt installer and the folder %hs. Note that the folder will not be removed if it contains any files that were not installed by the VeraCrypt installer or created by VeraCrypt.</string>
+    <string lang="en" key="UNINSTALL_OK">VeraCrypt has been successfully uninstalled.\n\nClick 'Finish' to remove the VeraCrypt installer and the folder %s. Note that the folder will not be removed if it contains any files that were not installed by the VeraCrypt installer or created by VeraCrypt.</string>
     <string lang="en" key="REMOVING_REG">Removing VeraCrypt registry entries</string>
     <string lang="en" key="ADDING_REG">Adding registry entry</string>
     <string lang="en" key="REMOVING_APPDATA">Removing application-specific data</string>
@@ -872,10 +879,10 @@
     <string lang="en" key="CREATING_SYS_RESTORE">Creating System Restore point</string>
     <string lang="en" key="FAILED_SYS_RESTORE">Failed to create System Restore point!</string>
     <string lang="en" key="INSTALLER_UPDATING_BOOT_LOADER">Updating boot loader</string>
-    <string lang="en" key="INSTALL_OF_FAILED">Failed to install '%hs'. %hs\nDo you want to continue installing?</string>
+    <string lang="en" key="INSTALL_OF_FAILED">Failed to install '%s'. %s\nDo you want to continue installing?</string>
-    <string lang="en" key="UNINSTALL_OF_FAILED">Failed to uninstall '%hs'. %hs\nDo you want to continue uninstalling?</string>
+    <string lang="en" key="UNINSTALL_OF_FAILED">Failed to uninstall '%s'. %s\nDo you want to continue uninstalling?</string>
     <string lang="en" key="INSTALL_COMPLETED">Installation completed.</string>
-    <string lang="en" key="CANT_CREATE_FOLDER">The folder '%hs' could not be created</string>
+    <string lang="en" key="CANT_CREATE_FOLDER">The folder '%s' could not be created</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="en" key="DISMOUNT_ALL_FIRST">All VeraCrypt volumes must be dismounted before installing or uninstalling 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>
@@ -921,14 +928,14 @@
     <string lang="en" key="SYS_FAVORITE_VOLUMES_SAVED">System favorite volumes saved.\n\nTo enable mounting of system favorite volumes when the system starts, please select 'Settings' &gt; 'System Favorite Volumes' &gt; 'Mount system favorite volumes when Windows starts'.</string>
     <string lang="en" key="FAVORITE_ADD_DRIVE_DEV_WARNING">The volume you are adding to favorites is neither a partition nor a dynamic volume. Therefore, VeraCrypt will be unable to mount this favorite volume if the device number changes.</string>
     <string lang="en" key="FAVORITE_ADD_PARTITION_TYPE_WARNING">The volume you are adding to favorites is a partition not recognized by Windows.\n\nVeraCrypt will be unable to mount this favorite volume if the device number changes. Please set the type of the partition to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then add the partition to favorites again.</string>
-    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings &gt; Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
+    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings > Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_NETWORK_PATH_ERR">A container stored in a remote filesystem shared over a network cannot be automatically mounted when its host device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, the volume hosted on the device cannot be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable the volume hosted on the device to be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_LABEL_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, no label can be assigned to it.</string>
     <string lang="en" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable VeraCrypt to assign a label to the partition.</string>
     <string lang="en" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Due to a Windows limitation, a container stored in a remote filesystem shared over a network cannot be mounted as a system favorite volume (however, it can be mounted as a non-system favorite volume when a user logs on).</string>
-    <string lang="sl" key="ENTER_PASSWORD_FOR">Vnesite geslo za %hs</string>
+    <string lang="sl" key="ENTER_PASSWORD_FOR">Vnesite geslo za %s</string>
     <string lang="en" key="ENTER_PASSWORD_FOR_LABEL">Enter password for '%s'</string>
     <string lang="en" key="ENTER_NORMAL_VOL_PASSWORD">Enter password for the normal/outer volume</string>
     <string lang="en" key="ENTER_HIDDEN_VOL_PASSWORD">Enter password for the hidden volume</string>
@@ -943,8 +950,8 @@
     <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 header backup to restore a header of a different volume, you will be able to mount the volume, but you will NOT be able to decrypt any data stored in the volume (because you will change its master key).</string>
     <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) for the hidden volume.</string>
-    <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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</string>
+    <string lang="en" key="CONFIRM_VOL_HEADER_BAK">Are you sure you want to create volume header backup for %s?\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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</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="CONFIRM_VOL_HEADER_RESTORE">Are you sure you want to restore volume header of %s?\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>
@@ -955,12 +962,14 @@
     <string lang="en" key="VOLUME_HAS_NO_BACKUP_HEADER">There is no backup header embedded in this volume (note that only volumes created by VeraCrypt 6.0 or later contain embedded backup headers).</string>
     <string lang="en" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">You are attempting to back up the header of the system partition/drive. This is not allowed. Backup/restore operations pertaining to the system partition/drive can be performed only using the VeraCrypt Rescue Disk.\n\nDo you want to create a VeraCrypt Rescue Disk?</string>
     <string lang="en" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">You are attempting to restore the header of a virtual VeraCrypt volume but you selected the system partition/drive. This is not allowed. Backup/restore operations pertaining to the system partition/drive can be performed only using the VeraCrypt Rescue Disk.\n\nDo you want to create a VeraCrypt Rescue Disk?</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">After you click OK, you will select a filename for the new VeraCrypt Rescue Disk ISO image and the location where you wish to place it.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">After you click OK, you will select a filename for the new VeraCrypt Rescue Disk image and the location where you wish to place it.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <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_INSERT">Please insert your VeraCrypt Rescue Disk 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 a new Rescue Disk fully compatible with your current configuration, select 'System' &gt; 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk 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' &gt; '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 be used, because it was created for a different master key. You need to burn the newly generated Rescue Disk.</string>
@@ -989,8 +998,8 @@
     <string lang="en" key="DRIVE_LETTER_ITEM">Drive Letter:   </string>
     <string lang="sl" key="UNSUPPORTED_CHARS_IN_PWD">Napaka: Geslo mora vsebovati samo ASCII znake.\n\nZnaki, ki niso ASCII narave in so vsebovani v geslu lahko povzročijo, da bo zbirnik nemogoče priklopiti, ko se bodo spremenile Vaše sistemske nastavitve.\n\nSledeči znaki so dovoljeni:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="en" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">Warning: Password contains non-ASCII characters. This may cause the volume to be impossible to mount when your system configuration changes.\n\nYou should replace all non-ASCII characters in the password with ASCII characters. To do so, click 'Volumes' -&gt; 'Change Volume Password'.\n\nThe following are ASCII characters:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="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 change it (e.g., to '.tc').\n\nAre you sure you want to use the problematic file extension?</string>
+    <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 change it (e.g., to '.hc').\n\nAre you sure you want to use the problematic file extension?</string>
-    <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 container or change it (e.g., to '.tc') after you dismount the volume.</string>
+    <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 container or change it (e.g., to '.hc') after you dismount the volume.</string>
     <string lang="en" key="HOMEPAGE">Homepage</string>
     <string lang="en" key="LARGE_IDE_WARNING_XP">WARNING: It appears that you have not applied any Service Pack to your Windows installation. You should not write to IDE disks larger than 128 GB under Windows XP to which you did not apply Service Pack 1 or later! 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 bug in VeraCrypt.</string>
     <string lang="en" key="LARGE_IDE_WARNING_2K">WARNING: It appears that you have not applied Service Pack 3 or later to your Windows installation. You should not write to IDE disks larger than 128 GB under Windows 2000 to which you did not apply Service Pack 3 or later! 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 bug in VeraCrypt.\n\nNote: You may also need to enable the 48-bit LBA support in the registry; for more information, see http://support.microsoft.com/kb/305098/EN-US</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="en" key="CHECKING_FS">Checking the file system on the VeraCrypt volume mounted as %s...</string>
-    <string lang="en" key="REPAIRING_FS">Attempting to repair the file system on the VeraCrypt volume mounted as %hs...</string>
+    <string lang="en" key="REPAIRING_FS">Attempting to repair the file system on the VeraCrypt volume mounted as %s...</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 later.</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 encryption algorithm (e.g., AES, Serpent, Twofish, etc.) and that you move all files from this volume to the new volume.</string>
     <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="en" key="SYS_ASSIGN_DRIVE_LETTER">Please assign a drive letter to the partition/device before proceeding ('Control Panel' &gt; 'System and Maintenance' &gt; 'Administrative Tools' - 'Create and format hard disk partitions').\n\nNote that this is a requirement of the operating system.</string>
@@ -1069,7 +1077,7 @@
     <string lang="en" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt no longer supports encryption of the system partition/drive on Windows Vista with no Service Pack installed. Before upgrading VeraCrypt, please install Service Pack 1 or higher for Windows Vista.</string>
     <string lang="en" key="FEATURE_REQUIRES_INSTALLATION">Error: This feature requires VeraCrypt to be installed on the system (you are running VeraCrypt in portable mode).\n\nPlease install VeraCrypt and then try again.</string>
     <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="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</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' &gt; '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>
@@ -1093,7 +1101,7 @@
     <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 medium (or using a service partition)?</string>
     <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 Hidden Volumes" in the VeraCrypt User's Guide.\n\nImportant: Before proceeding, please make sure you have read the section "Security Requirements and Precautions Pertaining to Hidden Volumes" in the VeraCrypt User's Guide.\n\n\nDoes the currently running operating system meet the above condition?</string>
     <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 from writing to the shared boot partition and from hibernating.\n\n\nDo you want to continue? If you select 'No', instructions for removing the extra boot partition will be displayed.</string>
-    <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' &gt; '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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
+    <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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
     <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>
@@ -1108,8 +1116,8 @@
     <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 NIMATE prave ameriške tipkovnice.</string>
     <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 starts.\n\n- The VRD will contain a backup of the present content of the first drive track (which typically contains a system loader or boot manager) and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ISO image will be created in the location specified below.</string>
     <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">The Rescue Disk image has been created and stored in this file:\n%s\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>
+    <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%s\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>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">IMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software. If you do not have any CD/DVD recording software that can write the ISO disk image to a CD/DVD, click the link below to download such free software.\n\n</string>
     <string lang="en" key="LAUNCH_WIN_ISOBURN">Launch Microsoft Windows Disc Image Burner</string>
     <string lang="en" key="RESCUE_DISK_BURN_NO_CHECK_WARN">WARNING: If you already created a VeraCrypt Rescue Disk in the past, it cannot be reused for this system partition/drive because it was created for a different master key! Every time you encrypt a system partition/drive, you must create a new VeraCrypt Rescue Disk for it even if you use the same password.</string>
@@ -1247,7 +1255,7 @@
     <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 system (but not on the decoy system), the decoy system would contain a VeraCrypt driver and VeraCrypt applications whose version numbers are different from the version number of the VeraCrypt Boot Loader. Such a discrepancy might indicate that there is a hidden operating system on this computer.\n\n\nDo you want to continue?</string>
     <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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' &gt; '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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' > 'Create Rescue Disk').</string>
     <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' &gt; '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' &gt; 'Create Rescue Disk'.</string>
     <string lang="en" key="BOOT_LOADER_UPGRADE_FAILED">Failed to upgrade the VeraCrypt Boot Loader.</string>
@@ -1272,7 +1280,7 @@
     <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' &gt; '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="sl" key="ALL_TOKEN_SESSIONS_CLOSED">Vse odprte varnostne žetonske seje so bile zaprte.</string>
     <string lang="en" key="SELECT_TOKEN_KEYFILES">Select Security Token Keyfiles</string>
     <string lang="en" key="TOKEN_SLOT_ID">Slot</string>
@@ -1297,8 +1305,8 @@
     <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 system.</string>
     <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' &gt; 'Performance' and enable 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' &gt; 'Performance' and disable 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>
@@ -1372,6 +1380,39 @@
     <string lang="en" key="TB_PER_SEC">TB/s</string>
     <string lang="en" key="PB_PER_SEC">PB/s</string>
     <string lang="en" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.sv.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="sv" name="Svenska" en-name="Swedish" version="1.0.0" translators="Peter Runesson" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="sv" key="IDC_BROWSE">&amp;Bläddra …</control>
     <control lang="sv" key="IDC_DESKTOP_ICON">Skapa en genväg till VeraCrypt på skri&amp;vbordet</control>
     <control lang="sv" key="IDC_DONATE">Donera nu …</control>
-    <control lang="sv" key="IDC_FILE_TYPE">Associera filnamns&amp;tillägget .tc med VeraCrypt</control>
+    <control lang="sv" key="IDC_FILE_TYPE">Associera filnamns&amp;tillägget .hc med VeraCrypt</control>
     <control lang="sv" key="IDC_OPEN_CONTAINING_FOLDER">&amp;Öppna målmappen efter slutförd uppackning</control>
     <control lang="sv" key="IDC_PROG_GROUP">Lägg till VeraCrypt till &amp;Start-menyn</control>
     <control lang="sv" key="IDC_SYSTEM_RESTORE">Skapa en system&amp;återställningspunkt</control>
@@ -37,6 +37,7 @@
     <control lang="sv" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Ladda ned programvara för CD/DVD-bränning</control>
     <control lang="sv" key="IDC_FILE_CONTAINER">Skapa en krypterad volym&amp;behållare</control>
     <control lang="sv" key="IDC_GB">&amp;GB</control>
+    <control lang="sv" key="IDC_TB">&amp;TB</control>
     <control lang="sv" key="IDC_HIDDEN_SYSENC_INFO_LINK">Ytterligare information</control>
     <control lang="sv" key="IDC_HIDDEN_VOL">&amp;Dold VeraCrypt-volym</control>
     <control lang="sv" key="IDC_HIDDEN_VOL_HELP">Ytterligare information om dolda volymer</control>
@@ -44,6 +45,7 @@
     <control lang="sv" key="IDC_HIDVOL_WIZ_MODE_FULL">N&amp;ormalläge</control>
     <control lang="sv" key="IDC_KB">&amp;kB</control>
     <control lang="sv" key="IDC_KEYFILES_ENABLE">&amp;Använd nyckelfiler</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="sv" key="IDC_KEY_FILES">N&amp;yckelfiler …</control>
     <control lang="sv" key="IDC_LINK_HASH_INFO">Information om hashalgoritmer</control>
@@ -58,7 +60,8 @@
     <control lang="sv" key="IDC_NO_HISTORY">Spara inte &amp;historik</control>
     <control lang="sv" key="IDC_OPEN_OUTER_VOLUME">Öppna yttre volym</control>
     <control lang="sv" key="IDC_PAUSE">&amp;Pausa</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="sv" key="IDC_QUICKFORMAT">Snabb- formatering</control>
     <control lang="sv" key="IDC_SHOW_PASSWORD">&amp;Visa lösenord</control>
     <control lang="sv" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Visa lösenord</control>
@@ -118,6 +121,7 @@
     <control lang="sv" key="IDC_CREATE">Skapa</control>
     <control lang="sv" key="IDC_CREATE_VOLUME">S&amp;kapa volym</control>
     <control lang="sv" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">&amp;Visa inte någon text vid förstartsautentiseringen (förutom det anpassade meddelandet)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="sv" key="IDC_ENABLE_HARDWARE_ENCRYPTION">&amp;Snabba upp AES-kryptering och -dekryptering genom att använda processorns AES-instruktioner</control>
     <control lang="sv" key="IDC_ENABLE_KEYFILES">&amp;Använd nyckelfiler</control>
     <control lang="sv" key="IDC_ENABLE_NEW_KEYFILES">A&amp;nvänd nyckelfiler</control>
@@ -132,6 +136,7 @@
     <control lang="sv" key="IDC_FAVORITE_MOVE_UP">Flytta &amp;upp</control>
     <control lang="sv" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">&amp;Öppna Utforskaren efter att markerad volym monterats</control>
     <control lang="sv" key="IDC_FAVORITE_REMOVE">&amp;Ta bort</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="sv" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Globala inställningar</control>
     <control lang="sv" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Visa ett systemmeddelande i Meddelandefältet efter att en snabbknappsdemontering genomförts</control>
     <control lang="sv" key="IDC_HK_DISMOUNT_PLAY_SOUND">Spela upp ett ljud efter att en snabbknappsdemontering genomförts</control>
@@ -256,6 +261,7 @@
     <control lang="sv" key="IDM_UNMOUNTALL">Demontera alla monterade volymer</control>
     <control lang="sv" key="IDM_UNMOUNT_VOLUME">Demontera volym</control>
     <control lang="sv" key="IDM_VERIFY_RESCUE_DISK">Verifiera återställningsskiva</control>
+    <control lang="en" key="IDM_VERIFY_RESCUE_DISK_ISO">Verify Rescue Disk Image</control>
     <control lang="sv" key="IDM_VERSION_HISTORY">Versionshistorik</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="sv" key="IDM_VOLUME_PROPERTIES">Volymegenskaper</control>
@@ -365,7 +371,7 @@
     <control lang="sv" key="IDT_SECURITY_TOKEN">Säkerhetstoken:</control>
     <control lang="sv" key="IDT_SORT_METHOD">Sortering:</control>
     <control lang="sv" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Vänta. Denna process kan ta lång tid …</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="sv" key="IDT_TEST_BLOCK_NUMBER">Blocknummer:</control>
     <control lang="sv" key="IDT_TEST_CIPHERTEXT">Krypterad text (hexadecimalt)</control>
     <control lang="sv" key="IDT_TEST_DATA_UNIT_NUMBER">Dataenhetsnummer (64 bitar hexadecimalt, dataenhetsstorleken är 512 byte)</control>
@@ -410,13 +416,13 @@
     <string lang="sv" key="CIPHER_TITLE">Krypteringsalternativ</string>
     <string lang="sv" key="CLEAN_WINMRU_FAILED">VARNING: Det gick inte att rensa sökvägen till den senast valda volymen eller nyckelfilen!</string>
     <string lang="sv" key="COMPRESSION_NOT_SUPPORTED">Fel: Volymbehållaren har komprimerats på filsystemsnivå. VeraCrypt stöder inte komprimerade volymbehållare. (Observera att komprimering av krypterade data är ineffektivt och överflödigt.)\n\nInaktivera komprimeringen av volymbehållaren med hjälp av följande steg:\n1) Högerklicka på volymbehållaren i Utforskaren (inte i VeraCrypt).\n2) Välj ”Egenskaper”.\n3) Klicka på ”Avancerat”.\n4) Inaktivera kryssrutan ”Komprimera innehåll för att spara diskutrymme” och klicka på ”OK”.\n5) Klicka på ”OK”.</string>
-    <string lang="sv" key="CREATE_FAILED">Misslyckades med att skapa volymen %hs</string>
+    <string lang="sv" key="CREATE_FAILED">Misslyckades med att skapa volymen %s</string>
-    <string lang="sv" key="DEVICE_FREE_BYTES">Storleken på %hs är %.2f byte</string>
+    <string lang="sv" key="DEVICE_FREE_BYTES">Storleken på %s är %.2f byte</string>
-    <string lang="sv" key="DEVICE_FREE_KB">Storleken på %hs är %.2f kB</string>
+    <string lang="sv" key="DEVICE_FREE_KB">Storleken på %s är %.2f kB</string>
-    <string lang="sv" key="DEVICE_FREE_MB">Storleken på %hs är %.2f MB</string>
+    <string lang="sv" key="DEVICE_FREE_MB">Storleken på %s är %.2f MB</string>
-    <string lang="sv" key="DEVICE_FREE_GB">Storleken på %hs är %.2f GB</string>
+    <string lang="sv" key="DEVICE_FREE_GB">Storleken på %s är %.2f GB</string>
-    <string lang="sv" key="DEVICE_FREE_TB">Storleken på %hs är %.2f TB</string>
+    <string lang="sv" key="DEVICE_FREE_TB">Storleken på %s är %.2f TB</string>
-    <string lang="sv" key="DEVICE_FREE_PB">Storleken på %hs är %.2f PB</string>
+    <string lang="sv" key="DEVICE_FREE_PB">Storleken på %s är %.2f PB</string>
     <string lang="sv" key="DEVICE_IN_USE_FORMAT">VARNING: Enheten eller partitionen används av operativsystemet eller en applikation. En formatering av enheten eller partitionen kan skada dina data och orsaka att systemet blir instabilt.\n\nVill du fortsätta?</string>
     <string lang="sv" key="DEVICE_IN_USE_INPLACE_ENC">Varning: Partitionen används av operativsystemet eller en applikation. Du bör stänga alla applikationer som kan tänkas använda partitionen (inklusive antivirusprogramvaror).\n\nVill du fortsätta?</string>
     <string lang="sv" key="FORMAT_CANT_DISMOUNT_FILESYS">Fel: Enheten eller partitionen innehåller ett filsystem som inte gick att demontera. Filsystemet används eventuellt av operativsystemet. En formatering av enheten eller partitionen kan skada dina data och orsaka att systemet blir instabilt.\n\nFör att lösa detta problem bör du först ta bort partitionen och sedan återskapa den utan att formatera den. Följ nedanstående steg för att göra det:\n1) Högerklicka på ”Dator” i Start-menyn och välj ”Hantera”. Fönstret ”Datorhantering” bör då öppnas.\n2) Välj ”Lagring” och ”Diskhantering” i fönstret ”Datorhantering”.\n3) Högerklicka på partitionen du vill kryptera och välj antingen ”Ta bort partition”, ”Ta bort volym” eller ”Ta bort logisk enhet”.\n4) Klicka på ”Ja”. Starta om datorn, om Windows ber dig om det. Repetera sedan steg 1 och 2 och fortsätt från steg 5.\n5) Högerklicka på det oallokerade eller lediga utrymmet och välj antingen ”Ny partition”, ”Ny enkel volym” eller ”Ny logisk enhet”.\n6) Någon av guiderna ”Ny partition” eller ”Ny enkel volym” bör startas. Följ instruktionerna, och på sidan med titeln ”Formatera partition” väljer du antingen ”Formatera inte den här partitionen” eller ”Formatera inte den här volymen”. Klicka sedan på ”Nästa” följt av ”Slutför”.\n7) Observera att enhetssökvägen du valt i VeraCrypt nu kan vara fel. Avsluta därför guiden Skapa VeraCrypt-volym (om den fortfarande körs) och starta den igen.\n8) Försöka att kryptera enheten eller partitionen igen.\n\nOm VeraCrypt upprepade gånger misslyckas att kryptera enheten eller partitionen, bör du överväga att skapa en volymbehållare i stället.</string>
@@ -435,12 +441,12 @@
     <string lang="sv" key="INPLACE_ENC_INVALID_PATH">Fel: VeraCrypt kan endast på plats-kryptera partitioner, dynamiska volymen och hela systemenheter. Kontrollera att den angivna sökvägen är giltig.</string>
     <string lang="sv" key="CANNOT_RESIZE_FILESYS">Fel: Det går inte att krympa filsystemet. (Filsystemet måste krympas för att lämna plats för volymhuvudet och dess säkerhetskopia.)\n\nMöjliga orsaker och lösningar:\n\n· Det saknas utrymme på volymen. Kontrollera att inga andra applikationer skriver till filsystemet.\n\n· Filsystemet är skadat. Kontrollera det och reparera eventuella fel genom att högerklicka på motsvarande enhetsbeteckning i Utforskaren och välja alternativet ”Egenskaper”. Klicka på ”Kontrollera nu” under fliken ”Verktyg” och sedan på ”Starta”. Se till att alternativet ”Reparera fel automatiskt” är aktiverat.\n\nFölj stegen nedan, om dessa steg inte hjälper.</string>
     <string lang="sv" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Fel: Det finns inte tillräckligt med utrymme på volymen för att filsystemet ska kunna krympas. (Filsystemet måste krympas för att lämna plats för volymhuvudet och dess säkerhetskopia.)\n\nTa bort överflödiga filer och töm Papperskorgen för att frigöra åtminstone 256 kB utrymme och försök därefter igen. Observera att den mängd utrymme som Utforskaren rapporterar som ledigt kan vara felaktigt innan operativsystemets startats om. Om en omstart av operativsystemet inte hjälper kan det hända att filsystemet är skadat. Kontrollera det och reparera eventuella fel genom att högerklicka på motsvarande enhetsbeteckning i Utforskaren och välja alternativet ”Egenskaper”. Klicka på ”Kontrollera nu” under fliken ”Verktyg” och sedan på ”Starta”. Se till att alternativet ”Reparera fel i filsystemet automatiskt” är aktiverat.\n\nFölj stegen nedan, om dessa steg inte hjälper.</string>
-    <string lang="sv" key="DISK_FREE_BYTES">Ledigt utrymme på enhet %hs är %.2f byte.</string>
+    <string lang="sv" key="DISK_FREE_BYTES">Ledigt utrymme på enhet %s är %.2f byte.</string>
-    <string lang="sv" key="DISK_FREE_KB">Ledigt utrymme på enhet %hs är %.2f kB</string>
+    <string lang="sv" key="DISK_FREE_KB">Ledigt utrymme på enhet %s är %.2f kB</string>
-    <string lang="sv" key="DISK_FREE_MB">Ledigt utrymme på enhet %hs är %.2f MB</string>
+    <string lang="sv" key="DISK_FREE_MB">Ledigt utrymme på enhet %s är %.2f MB</string>
-    <string lang="sv" key="DISK_FREE_GB">Ledigt utrymme på enhet %hs är %.2f GB</string>
+    <string lang="sv" key="DISK_FREE_GB">Ledigt utrymme på enhet %s är %.2f GB</string>
-    <string lang="sv" key="DISK_FREE_TB">Ledigt utrymme på enhet %hs är %.2f TB</string>
+    <string lang="sv" key="DISK_FREE_TB">Ledigt utrymme på enhet %s är %.2f TB</string>
-    <string lang="sv" key="DISK_FREE_PB">Ledigt utrymme på enhet %hs är %.2f PB</string>
+    <string lang="sv" key="DISK_FREE_PB">Ledigt utrymme på enhet %s är %.2f PB</string>
     <string lang="sv" key="DRIVELETTERS">Kunde inte läsa in tillgängliga enhetsbeteckningar.</string>
     <string lang="sv" key="DRIVER_NOT_FOUND">Fel: VeraCrypts drivrutin kunde inte hittas.\n\nKopiera filerna ”veracrypt.sys” och ”veracrypt-x64.sys” till mappen där VeraCrypts huvudapplikation (VeraCrypt.exe) är belägen.</string>
     <string lang="sv" key="DRIVER_VERSION">Fel: En inkompatibel version av VeraCrypts drivrutin körs redan.\n\nOm du försöker köra VeraCrypt i portabelt läge (d.v.s. utan att installera programmet) och en annan version av VeraCrypt redan är installerad, måste denna först avinstalleras eller uppgraderas med hjälp av VeraCrypts installationsprogram.\n\nFölj dessa steg för att avinstallera VeraCrypt i Windows Vista eller senare: Välj ”Dator” i Start-menyn och klicka på ”Avinstallera eller ändra ett program”. Markera VeraCrypt och klicka på ”Avinstallera”. I Windows XP startar man Kontrollpanelen i Start-menyn och klickar på ”Lägg till eller ta bort program”. Markera VeraCrypt och klicka på ”Avinstallera”.\n\nPå liknande sätt måste du, om du försöker köra VeraCrypt i portabelt läge och en annan version av VeraCrypt redan körs i portabelt läge, först starta om datorn och därefter köra enbart den nya versionen.</string>
@@ -561,6 +567,7 @@
     <string lang="sv" key="MAX_HIDVOL_SIZE_KB">Maximalt möjliga utrymme för den dolda volymen är %.2f kB.</string>
     <string lang="sv" key="MAX_HIDVOL_SIZE_MB">Maximalt möjliga utrymme för den dolda volymen är %.2f MB.</string>
     <string lang="sv" key="MAX_HIDVOL_SIZE_GB">Maximalt möjliga utrymme för den dolda volymen är %.2f GB.</string>
+    <string lang="sv" key="MAX_HIDVOL_SIZE_TB">Maximalt möjliga utrymme för den dolda volymen är %.2f TB.</string>
     <string lang="sv" key="MOUNTED_NOPWCHANGE">Volymlösenord eller -nyckelfiler kan inte ändras medan volymen är monterad. Volymen måste demonteras först.</string>
     <string lang="sv" key="MOUNTED_NO_PKCS5_PRF_CHANGE">Härledningsalgoritmen för volymhuvudets nyckel kan inte ändras medan volymen är monterad. Demontera volymen först.</string>
     <string lang="sv" key="MOUNT_BUTTON">&amp;Montera</string>
@@ -591,12 +598,12 @@
     <string lang="sv" key="SELECT_PKCS11_MODULE">Välj PKCS #11-bibliotek</string>
     <string lang="sv" key="OUTOFMEMORY">Slut på ledigt minne</string>
     <string lang="sv" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">VIKTIGT: Oerfarna användare rekommenderas att skapa en volymbehållare i stället för att försöka kryptera en hel enhet eller partition.\n\nNär du skapar en volymbehållare (till skillnad från när du krypterar en enhet eller partition) finns det exempelvis ingen risk att ett stort antal filer går förlorade. Observera att en volymbehållare – även om den innehåller en virtuell krypterad disk – är som vilken annan fil som helst. För mer information, läs kapitlet ”Beginner’s Tutorial” i VeraCrypts användarhandbok.\n\nÄr du säker på att du vill kryptera hela enheten eller partitionen?</string>
-    <string lang="sv" key="OVERWRITEPROMPT">VARNING: Filen ”%hs” finns redan!\n\nVIKTIGT: VERACRYPT KOMMER ATT TA BORT FILEN OCH INTE KRYPTERA DEN. Är du säker på att du vill ta bort filen och ersätta den med en ny volymbehållare?</string>
+    <string lang="sv" key="OVERWRITEPROMPT">VARNING: Filen ”%s” finns redan!\n\nVIKTIGT: VERACRYPT KOMMER ATT TA BORT FILEN OCH INTE KRYPTERA DEN. Är du säker på att du vill ta bort filen och ersätta den med en ny volymbehållare?</string>
-    <string lang="sv" key="OVERWRITEPROMPT_DEVICE">VARNING: ALLA FILER SOM FINNS LAGRADE PÅ DEN %s DU VALT, ”%hs”%s, KOMMER ATT TAS BORT OCH GÅ FÖRLORADE! (DE KOMMER INTE ATT KRYPTERAS.)\n\nÄr du säker på att du vill gå vidare med formateringen?</string>
+    <string lang="sv" key="OVERWRITEPROMPT_DEVICE">VARNING: ALLA FILER SOM FINNS LAGRADE PÅ DEN %s DU VALT, ”%s”%s, KOMMER ATT TAS BORT OCH GÅ FÖRLORADE! (DE KOMMER INTE ATT KRYPTERAS.)\n\nÄr du säker på att du vill gå vidare med formateringen?</string>
-    <string lang="sv" key="NONSYS_INPLACE_ENC_CONFIRM">VARNING: Du kommer inte att kunna montera volymen eller ha tillgång till några filer lagrade på den förrän krypteringen har slutförts.\n\nÄr du säker på att du vill påbörja krypteringen av %s ”%hs”%s?</string>
+    <string lang="sv" key="NONSYS_INPLACE_ENC_CONFIRM">VARNING: Du kommer inte att kunna montera volymen eller ha tillgång till några filer lagrade på den förrän krypteringen har slutförts.\n\nÄr du säker på att du vill påbörja krypteringen av %s ”%s”%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="sv" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">VARNING: Delar av dina data kan bli skadade eller gå förlorade, om strömförsörjningen plötsligt bryts eller om operativsystemet kraschar beroende på program- eller maskinvarufel medan existerande data på plats-krypteras. Därför bör du, innan krypteringsprocessen startar, kontrollera att du har säkerhetskopior av de filer du vill kryptera.\n\nHar du sådana säkerhetskopior?</string>
-    <string lang="sv" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">VARNING: ALLA FILER SOM FINNS LAGRADE PÅ PARTITIONEN ”%hs”%s, D.V.S. PÅ DEN FÖRSTA PARTITIONEN EFTER SYSTEMPARTITIONEN, KOMMER ATT TAS BORT OCH GÅ FÖRLORADE! (DE KOMMER INTE ATT KRYPTERAS.)\n\nÄr du säker på att du vill gå vidare med formateringen?</string>
+    <string lang="sv" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">VARNING: ALLA FILER SOM FINNS LAGRADE PÅ PARTITIONEN ”%s”%s, D.V.S. PÅ DEN FÖRSTA PARTITIONEN EFTER SYSTEMPARTITIONEN, KOMMER ATT TAS BORT OCH GÅ FÖRLORADE! (DE KOMMER INTE ATT KRYPTERAS.)\n\nÄr du säker på att du vill gå vidare med formateringen?</string>
     <string lang="sv" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">VARNING: DEN VALDA PARTITIONEN INNEHÅLLER EN STOR MÄNGD DATA! Alla filer som finns lagrade på partitionen kommer att tas bort och gå förlorade (de kommer INTE att krypteras)!</string>
     <string lang="sv" key="ERASE_FILES_BY_CREATING_VOLUME">Ta bort alla filer lagrade på partitionen genom att skapa en VeraCrypt-volym inuti den</string>
     <string lang="sv" key="PASSWORD">Lösenord</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="sv" key="PREV">&lt; &amp;Föregående</string>
     <string lang="sv" key="RAWDEVICES">Det gick inte att sammanställa en lista över raw-enheter installerade i ditt system!</string>
-    <string lang="sv" key="READONLYPROMPT">Volymen ”%hs” finns redan och är skrivskyddad. Är du säker på att du vill ersätta den?</string>
+    <string lang="sv" key="READONLYPROMPT">Volymen ”%s” finns redan och är skrivskyddad. Är du säker på att du vill ersätta den?</string>
     <string lang="sv" key="SELECT_DEST_DIR">Välj målmapp</string>
     <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>
@@ -680,13 +687,13 @@
     <string lang="sv" key="TEST_CIPHERTEXT_SIZE">Den krypterade texten du angett är antingen för lång eller för kort.</string>
     <string lang="sv" key="TEST_KEY_SIZE">Testnyckeln du angett är antingen för lång eller för kort.</string>
     <string lang="sv" key="TEST_PLAINTEXT_SIZE">Klartexten du angett är antingen för lång eller för kort.</string>
-    <string lang="sv" key="TWO_LAYER_CASCADE_HELP">Två nästade krypteringsmetoder som arbetar i XTS-läge. Varje block krypteras först med %hs (%d-bitars nyckel) och sedan med %hs (%d-bitars nyckel). Varje krypteringsmetod använder sig av sin egen nyckel, som är oberoende den andra.</string>
+    <string lang="sv" key="TWO_LAYER_CASCADE_HELP">Två nästade krypteringsmetoder som arbetar i XTS-läge. Varje block krypteras först med %s (%d-bitars nyckel) och sedan med %s (%d-bitars nyckel). Varje krypteringsmetod använder sig av sin egen nyckel, som är oberoende den andra.</string>
-    <string lang="sv" key="THREE_LAYER_CASCADE_HELP">Tre nästade krypteringsmetoder som arbetar i XTS-läge. Varje block krypteras först med %hs (%d-bitars nyckel), sedan med %hs (%d-bitars nyckel) och slutligen med %hs (%d-bitars nyckel). Varje krypteringsmetod använder sig av sin egen nyckel, som är oberoende av de övriga två.</string>
+    <string lang="sv" key="THREE_LAYER_CASCADE_HELP">Tre nästade krypteringsmetoder som arbetar i XTS-läge. Varje block krypteras först med %s (%d-bitars nyckel), sedan med %s (%d-bitars nyckel) och slutligen med %s (%d-bitars nyckel). Varje krypteringsmetod använder sig av sin egen nyckel, som är oberoende av de övriga två.</string>
     <string lang="sv" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Observera att det, beroende på operativsystemets konfiguration, kan hända att funktionerna för automatisk körning och montering endast fungerar när Traveler-skivans filer installerats på ett skrivskyddat CD- eller DVD-liknande medium. Detta är inte ett fel på VeraCrypt utan en begränsning i Windows.</string>
     <string lang="sv" key="TRAVELER_DISK_CREATED">VeraCrypt Traveler-skivan har skapats utan fel.\n\nObservera att du behöver administratörsbehörighet för att köra VeraCrypt Traveler. Observera också att det genom att undersöka registret kan vara möjligt att se att VeraCrypt har körts i ett Windows-system, även om VeraCrypt körts utan att installeras.</string>
     <string lang="sv" key="TC_TRAVELER_DISK">VeraCrypt Traveler-skiva</string>
     <string lang="sv" key="TWOFISH_HELP">Utvecklad av Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall och Niels Ferguson. Publicerad 1998. 256-bitars nyckel, 128-bitars block. Arbetsläget är XTS. Twofish var en av AES-finalisterna.</string>
-    <string lang="sv" key="MORE_INFO_ABOUT">Ytterligare information om %hs</string>
+    <string lang="sv" key="MORE_INFO_ABOUT">Ytterligare information om %s</string>
     <string lang="sv" key="UNKNOWN">Okänt</string>
     <string lang="sv" key="ERR_UNKNOWN">Ett odefinierat eller okänt fel inträffade (%d).</string>
     <string lang="sv" key="UNMOUNTALL_LOCK_FAILED">Några volymer innehåller filer som används av operativsystemet eller andra applikationer.\n\nSka en demontering tvingas fram?</string>
@@ -851,7 +858,7 @@
     <string lang="sv" key="INSTALL_FAILED">Installationen misslyckades.</string>
     <string lang="sv" key="UNINSTALL_FAILED">Avinstallationen misslyckades.</string>
     <string lang="sv" key="DIST_PACKAGE_CORRUPTED">Installationspaketet är skadat. Försök att ladda ned det igen (företrädelsevis från VeraCrypts officiella webbplats, https://veracrypt.codeplex.com).</string>
-    <string lang="sv" key="CANNOT_WRITE_FILE_X">Kan inte skapa filen %hs</string>
+    <string lang="sv" key="CANNOT_WRITE_FILE_X">Kan inte skapa filen %s</string>
     <string lang="sv" key="EXTRACTING_VERB">Packar upp</string>
     <string lang="sv" key="CANNOT_READ_FROM_PACKAGE">Det går inte att läsa från installationspaketet.</string>
     <string lang="sv" key="CANT_VERIFY_PACKAGE_INTEGRITY">Det går inte att verifiera installationspaketets integritet.</string>
@@ -861,7 +868,7 @@
     <string lang="sv" key="SETUP_UPDATE_OK">VeraCrypt har uppdaterats utan fel.</string>
     <string lang="sv" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt har uppgraderats utan fel, men innan du kan börja använda programmet måste datorn startas om.\n\nVill du starta om datorn nu?</string>
     <string lang="sv" key="SYS_ENC_UPGRADE_FAILED">Det gick inte att uppgradera VeraCrypt!\n\nVIKTIGT: Innan du stänger av eller startar om datorn, rekommenderar vi att du kör programmet Systemåterställning (under ”Tillbehör” och ”Systemverktyg” i Start-menyn) och återställer datorn till återställningspunkten ”VeraCrypt installation”. Om Systemåterställning inte är tillgängligt, bör du försöka installera den ursprungliga eller nya versionen av VeraCrypt igen innan du stänger av eller startar om datorn.</string>
-    <string lang="sv" key="UNINSTALL_OK">VeraCrypt har avinstallerats utan fel.\n\nKlicka på ”Slutför” för att ta bort VeraCrypts installationspaket och mappen %hs. Observera att mappen inte kommer att tas bort om den innehåller filer som inte installerats av VeraCrypts installationspaket eller skapats av VeraCrypt.</string>
+    <string lang="sv" key="UNINSTALL_OK">VeraCrypt har avinstallerats utan fel.\n\nKlicka på ”Slutför” för att ta bort VeraCrypts installationspaket och mappen %s. Observera att mappen inte kommer att tas bort om den innehåller filer som inte installerats av VeraCrypts installationspaket eller skapats av VeraCrypt.</string>
     <string lang="sv" key="REMOVING_REG">Tar bort VeraCrypts registerposter</string>
     <string lang="sv" key="ADDING_REG">Lägger till registerposten</string>
     <string lang="sv" key="REMOVING_APPDATA">Tar bort applikationsspecifika data</string>
@@ -872,10 +879,10 @@
     <string lang="sv" key="CREATING_SYS_RESTORE">En systemåterställningspunkt skapas</string>
     <string lang="sv" key="FAILED_SYS_RESTORE">Skapande av en systemåterställningspunkt misslyckades!</string>
     <string lang="sv" key="INSTALLER_UPDATING_BOOT_LOADER">Uppdaterar startinläsaren</string>
-    <string lang="sv" key="INSTALL_OF_FAILED">Installationen av ”%hs” misslyckades. %hs\nVill du fortsätta med installationen?</string>
+    <string lang="sv" key="INSTALL_OF_FAILED">Installationen av ”%s” misslyckades. %s\nVill du fortsätta med installationen?</string>
-    <string lang="sv" key="UNINSTALL_OF_FAILED">Avinstallationen av ”%hs” misslyckades. %hs\nVill du fortsätta med avinstallationen?</string>
+    <string lang="sv" key="UNINSTALL_OF_FAILED">Avinstallationen av ”%s” misslyckades. %s\nVill du fortsätta med avinstallationen?</string>
     <string lang="sv" key="INSTALL_COMPLETED">Installationen slutförd.</string>
-    <string lang="sv" key="CANT_CREATE_FOLDER">Mappen ”%hs” kunde inte skapas</string>
+    <string lang="sv" key="CANT_CREATE_FOLDER">Mappen ”%s” kunde inte skapas</string>
     <string lang="sv" key="CLOSE_TC_FIRST">VeraCrypts drivrutin kan inte stängas.\n\nStäng först alla öppna VeraCrypt-fönster. Om detta inte hjälper, starta om Windows och försök sedan igen.</string>
     <string lang="sv" key="DISMOUNT_ALL_FIRST">Alla VeraCrypt-volymer måste demonteras innan VeraCrypt kan installeras eller avinstalleras.</string>
     <string lang="sv" key="UNINSTALL_OLD_VERSION_FIRST">Det finns redan en gammal version av VeraCrypt installerad. Innan en ny version av VeraCrypt kan installeras, måste den gamla versionen avinstalleras.\n\nDen gamla versionen kommer att avinstalleras så snart detta meddelande stängts. Observera att ingen volym kommer att dekrypteras under avinstallationen. Kör installationspaketet för den nya versionen av VeraCrypt igen, efter att den gamla versionen avinstallerats.</string>
@@ -928,7 +935,7 @@
     <string lang="sv" key="FAVORITE_LABEL_DEVICE_PATH_ERR">Enheten som visas nedan är varken en partition eller en dynamisk volym. Därför kan den inte ges något eget namn.</string>
     <string lang="sv" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Ändra typen för den partition som visas nedan till en typ som av Windows känner igen. (Använd SETID-kommandot i Windows-verktyget ”diskpart”.) Ta sedan bort partitionen från listan med favoriter och lägg till den igen. Detta gör det möjligt för VeraCrypt att ge partitionen ett eget namn.</string>
     <string lang="sv" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Beroende på en begränsning i Windows kan en volymbehållare som lagras i ett fjärrfilsystem som delas över nätverket inte monteras som en systemvolymfavorit. (Emellertid kan den monteras som en icke-systemvolymfavorit när en användare loggar in.)</string>
-    <string lang="sv" key="ENTER_PASSWORD_FOR">Ange lösenordet för %hs</string>
+    <string lang="sv" key="ENTER_PASSWORD_FOR">Ange lösenordet för %s</string>
     <string lang="sv" key="ENTER_PASSWORD_FOR_LABEL">Ange lösenordet för ”%s”</string>
     <string lang="sv" key="ENTER_NORMAL_VOL_PASSWORD">Ange lösenordet för den normala eller yttre volymen</string>
     <string lang="sv" key="ENTER_HIDDEN_VOL_PASSWORD">Ange lösenordet för den dolda volymen</string>
@@ -943,8 +950,8 @@
     <string lang="sv" key="VOL_HEADER_BACKED_UP">En säkerhetskopia av volymhuvudet har skapats utan fel.\n\nVIKTIGT: En återställning av volymhuvudet återställer även det aktuella lösenordet för volymen. Om nyckelfiler används för att montera volymen, kommer dessutom samma nyckelfiler att behövas för att montera volymen igen när volymhuvudet återställts.\n\nVARNING: Denna säkerhetskopia kan endast användas för att återställa detta specifika volymhuvud. Om du använder denna säkerhetskopia för att återställa ett annat volymhuvud kommer du visserligen att kunna montera volymen, men du kommer INTE att kunna dekryptera några data lagrade på den (eftersom du ändrar dess primära nyckel).</string>
     <string lang="sv" key="VOL_HEADER_RESTORED">Volymhuvudet har återställts utan fel.\n\nVIKTIGT: Observera att även ett gammalt lösenord kan ha återställts. Om nyckelfiler användes för att montera volymen när säkerhetskopian skapades, kommer dessutom samma nyckelfiler att behövas för att montera volymen igen.</string>
     <string lang="sv" key="EXTERNAL_VOL_HEADER_BAK_FIRST_INFO">Av säkerhetsskäl måste du ange rätt lösenord och/eller nyckelfiler för volymen.\n\nObservera: Om volymen innehåller en dold volym, måste du först ange rätt lösenord och/eller nyckelfiler för den yttre volymen. Efter det måste du, om du väljer att säkerhetskopiera det dolda volymhuvudet, ange rätt lösenord och/eller nyckelfiler för den dolda volymen.</string>
-    <string lang="sv" key="CONFIRM_VOL_HEADER_BAK">Är du säker på att du vill skapa en säkerhetskopia av volymhuvudet för %hs?\n\nEfter att du klickat på Ja, kommer du att få ange ett filnamn för säkerhetskopian.\n\nObservera: Både det normala och det dolda volymhuvudet kommer att omkrypteras med nytt salt och lagras i säkerhetskopian. Om det inte finns någon dold volym inuti denna volym, kommer det område som reserverats i säkerhetskopian för det dolda volymhuvudet att fyllas med slumpmässiga data (för att bevara trovärdigheten i ett förnekande). Vid en återställning av volymhuvudet från säkerhetskopian måste du ange det lösenord och/eller de nyckelfiler som gällde när säkerhetskopian av volymhuvudet skapades. Lösenordet och/eller nyckelfilerna bestämmer automatiskt vilken typ av volymhuvud (normalt eller dolt) som kommer att återställas. (Observera att VeraCrypt avgör typen genom att prova sig fram.)</string>
+    <string lang="sv" key="CONFIRM_VOL_HEADER_BAK">Är du säker på att du vill skapa en säkerhetskopia av volymhuvudet för %s?\n\nEfter att du klickat på Ja, kommer du att få ange ett filnamn för säkerhetskopian.\n\nObservera: Både det normala och det dolda volymhuvudet kommer att omkrypteras med nytt salt och lagras i säkerhetskopian. Om det inte finns någon dold volym inuti denna volym, kommer det område som reserverats i säkerhetskopian för det dolda volymhuvudet att fyllas med slumpmässiga data (för att bevara trovärdigheten i ett förnekande). Vid en återställning av volymhuvudet från säkerhetskopian måste du ange det lösenord och/eller de nyckelfiler som gällde när säkerhetskopian av volymhuvudet skapades. Lösenordet och/eller nyckelfilerna bestämmer automatiskt vilken typ av volymhuvud (normalt eller dolt) som kommer att återställas. (Observera att VeraCrypt avgör typen genom att prova sig fram.)</string>
-    <string lang="sv" key="CONFIRM_VOL_HEADER_RESTORE">Är du säker på att du vill återställa volymhuvudet för %hs?\n\nVARNING: En återställning av volymhuvudet återställer även lösenordet till det som gällde när säkerhetskopian skapades. Om nyckelfiler användes för att montera volymen, kommer dessutom samma nyckelfiler att behövas för att montera volymen igen när volymhuvudet återställts.\n\nEfter att du klickat på Ja, kommer du att få ange ett filnamn för säkerhetskopian.</string>
+    <string lang="sv" key="CONFIRM_VOL_HEADER_RESTORE">Är du säker på att du vill återställa volymhuvudet för %s?\n\nVARNING: En återställning av volymhuvudet återställer även lösenordet till det som gällde när säkerhetskopian skapades. Om nyckelfiler användes för att montera volymen, kommer dessutom samma nyckelfiler att behövas för att montera volymen igen när volymhuvudet återställts.\n\nEfter att du klickat på Ja, kommer du att få ange ett filnamn för säkerhetskopian.</string>
     <string lang="sv" key="DOES_VOLUME_CONTAIN_HIDDEN">Innehåller volymen en dold volym?</string>
     <string lang="sv" key="VOLUME_CONTAINS_HIDDEN">Volymen innehåller en dold volym</string>
     <string lang="sv" key="VOLUME_DOES_NOT_CONTAIN_HIDDEN">Volymen innehåller inte en dold volym</string>
@@ -956,11 +963,13 @@
     <string lang="sv" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">Du försöker säkerhetskopiera systempartitionens eller -enhetens volymhuvud. Detta är inte tillåtet. Säkerhetskopierings- och återställningsåtgärder på systempartitionen eller -enheten kan endast utföras med hjälp av VeraCrypts återställningsskiva.\n\nVill du skapa en återställningsskiva?</string>
     <string lang="sv" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">Du försöker återställa ett virtuellt volymhuvud men du valde systempartitionen eller -enheten som mål. Detta är inte tillåtet. Säkerhetskopierings- och återställningsåtgärder på systempartitionen eller -enheten kan endast utföras med hjälp av VeraCrypts återställningsskiva.\n\nVill du skapa en återställningsskiva?</string>
     <string lang="sv" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">Efter att du klickat på OK kommer du att få välja ett filnamn för ISO-avbildningen av den nya återställningsskivan och den mapp du vill placera den i.</string>
-    <string lang="sv" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">Avbildningen av återställningsskivan har skapats och lagrats i denna fil:\n%hs\n\nNu måste du bränna avbildningen av återställningsskivan till en CD eller DVD.\n\nVIKTIGT: Observera att filen måste skrivas till CD:n eller DVD:n som en ISO-avbildning och inte som en individuell fil. Läs mer i din CD/DVD-brännarprogramvaras dokumentation för information om hur detta går till.\n\nVerifiera att återställningsskivan fungerar som den ska efter att du bränt den genom att välja ”Verifiera återställningsskiva” under ”System” i VeraCrypts rullgardinsmeny.</string>
+    <string lang="sv" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">Avbildningen av återställningsskivan har skapats och lagrats i denna fil:\n%s\n\nNu måste du bränna avbildningen av återställningsskivan till en CD eller DVD.\n\nVIKTIGT: Observera att filen måste skrivas till CD:n eller DVD:n som en ISO-avbildning och inte som en individuell fil. Läs mer i din CD/DVD-brännarprogramvaras dokumentation för information om hur detta går till.\n\nVerifiera att återställningsskivan fungerar som den ska efter att du bränt den genom att välja ”Verifiera återställningsskiva” under ”System” i VeraCrypts rullgardinsmeny.</string>
-    <string lang="sv" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">Återställningsskivans ISO-avbildning har skapats och sparats i följande fil:\n%hs\n\nNu måste du bränna ISO-avbildningen till en CD eller DVD.\n\nVill du starta programmet Bränn skivavbildning i Windows nu?\n\nObservera: Välj ”Verifiera återställningsskiva” under ”System” i rullgardinsmenyn, efter att återställningsskivan är bränd, för att säkerställa att bränningen utförts utan fel.</string>
+    <string lang="sv" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">Återställningsskivans ISO-avbildning har skapats och sparats i följande fil:\n%s\n\nNu måste du bränna ISO-avbildningen till en CD eller DVD.\n\nVill du starta programmet Bränn skivavbildning i Windows nu?\n\nObservera: Välj ”Verifiera återställningsskiva” under ”System” i rullgardinsmenyn, efter att återställningsskivan är bränd, för att säkerställa att bränningen utförts utan fel.</string>
     <string lang="sv" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Sätt in återställningsskivan i din CD- eller DVD-enhet och klicka på OK för att verifiera den.</string>
     <string lang="sv" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">Återställningsskivan har verifierats utan att några fel hittades.</string>
     <string lang="sv" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">Det går inte att säkerställa att bränningen av återställningsskivan utförts utan fel.\n\nOm du har bränt återställningsskivan, mata ut och sätt in CD:n eller DVD:n igen och försök en gång till. Använd sedan en annan bränningsprogramvara och/eller andra medier.\n\nVerifiering av en återställningsskiva skapad för en annan primär nyckel, annat lösenord eller annat salt kommer alltid att misslyckas. Välj ”Skapa återställningsskiva” under ”System” i rullgardinsmenyn för att skapa en ny återställningsskiva som är helt kompatibel med din aktuella konfiguration.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk image fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
     <string lang="sv" key="ERROR_CREATING_RESCUE_DISK">Fel vid skapandet av en återställningsskiva.</string>
     <string lang="sv" key="CANNOT_CREATE_RESCUE_DISK_ON_HIDDEN_OS">Det går inte att skapa en återställningsskiva medan ett dolt operativsystem körs.\n\nFör att skapa en återställningsskiva, starta skenoperativsystemet och välj sedan ”Skapa återställningsskiva” under ”System” i rullgardinsmenyn.</string>
     <string lang="sv" key="RESCUE_DISK_CHECK_FAILED">Det går inte att säkerställa att bränningen av återställningsskivan utförts utan fel.\n\nOm du har bränt återställningsskivan, mata ut och sätt in CD:n eller DVD:n igen och klicka på Nästa för att försöka en gång till. Använd andra medier om detta inte hjälper%s.\n\nBränn återställningsskivan, om du inte gjort det än, och klicka på Nästa.\n\nAtt verifiera en återställningsskiva som skapats innan du körde denna guide fungerar inte, eftersom den skapades för en annan primär nyckel. Du måste bränna den nyligen genererade återställningsskivan.</string>
@@ -989,8 +998,8 @@
     <string lang="sv" key="DRIVE_LETTER_ITEM">Enhetsbeteckning:   </string>
     <string lang="sv" key="UNSUPPORTED_CHARS_IN_PWD">Fel: Lösenord får endast innehålla ASCII-tecken.\n\nIcke-ASCII-tecken i lösenord kan orsaka att volymen blir omöjlig att montera när din systemkonfiguration ändras.\n\nFöljande tecken är tillåtna:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="sv" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">Varning: Lösenordet innehåller icke-ASCII-tecken. Detta kan orsaka att volymen blir omöjlig att montera när din systemkonfiguration ändras.\n\nDu bör ersätta alla icke-ASCII-tecken i lösenordet med ASCII-tecken. För att göra det, välj ”Ändra volymlösenord” under ”Volymer” i rullgardinsmenyn.\n\nFöljande tecken är ASCII-tecken:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="sv" key="EXE_FILE_EXTENSION_CONFIRM">VARNING: Du rekommenderas att undvika filnamnstillägg som används av körbara filer (som exempelvis .exe, .sys och .dll) och andra liknande problematiska filnamnstillägg. Användning av sådana filnamnstillägg kan medföra att Windows och antivirusprogramvaror stör volymbehållaren, vilket har en avsevärd påverkan på volymens prestanda och även kan orsaka andra allvarliga problem.\n\nDu rekommenderas att ta bort filnamnstillägget eller ändra det (till exempelvis ”.tc”).\n\nÄr du säker på att du vill använda det problematiska filnamnstillägget?</string>
+    <string lang="sv" key="EXE_FILE_EXTENSION_CONFIRM">VARNING: Du rekommenderas att undvika filnamnstillägg som används av körbara filer (som exempelvis .exe, .sys och .dll) och andra liknande problematiska filnamnstillägg. Användning av sådana filnamnstillägg kan medföra att Windows och antivirusprogramvaror stör volymbehållaren, vilket har en avsevärd påverkan på volymens prestanda och även kan orsaka andra allvarliga problem.\n\nDu rekommenderas att ta bort filnamnstillägget eller ändra det (till exempelvis ”.hc”).\n\nÄr du säker på att du vill använda det problematiska filnamnstillägget?</string>
-    <string lang="sv" key="EXE_FILE_EXTENSION_MOUNT_WARNING">VARNING: Denna volymbehållare har ett filnamnstillägg som används av körbara filer (som exempelvis .exe, .sys och .dll) eller ett annat problematiskt filnamnstillägg. Det är mycket troligt att det kommer att medföra att Windows och antivirusprogramvaror stör volymbehållaren, vilket har en avsevärd påverkan på volymens prestanda och även kan orsaka andra allvarliga problem.\n\nDu rekommenderas att ta bort filnamnstillägget eller ändra det (till exempelvis ”.tc”) efter att du har demonterat volymen.</string>
+    <string lang="sv" key="EXE_FILE_EXTENSION_MOUNT_WARNING">VARNING: Denna volymbehållare har ett filnamnstillägg som används av körbara filer (som exempelvis .exe, .sys och .dll) eller ett annat problematiskt filnamnstillägg. Det är mycket troligt att det kommer att medföra att Windows och antivirusprogramvaror stör volymbehållaren, vilket har en avsevärd påverkan på volymens prestanda och även kan orsaka andra allvarliga problem.\n\nDu rekommenderas att ta bort filnamnstillägget eller ändra det (till exempelvis ”.hc”) efter att du har demonterat volymen.</string>
     <string lang="sv" key="HOMEPAGE">Webbplats</string>
     <string lang="sv" key="LARGE_IDE_WARNING_XP">VARNING: Det verkar som att du inte har installerat något servicepaket för Windows. Du bör inte skriva till IDE-diskar större än 128 GB i ett Windows XP som inte har uppdaterats med servicepaket 1 eller nyare! Om du gör det, kan data bli skadade (vare sig det handlar om en VeraCrypt-volym eller ej). Observera att detta beror på en begränsning i Windows, inte ett fel på VeraCrypt.</string>
     <string lang="sv" key="LARGE_IDE_WARNING_2K">VARNING: Det verkar som att du inte har installerat servicepaket 3 eller nyare för Windows. Du bör inte skriva till IDE-diskar större än 128 GB i ett Windows 2000 som inte har uppdaterats med servicepaket 3 eller nyare! Om du gör det, kan data bli skadade (vare sig det handlar om en VeraCrypt-volym eller ej). Observera att detta beror på en begränsning i Windows, inte ett fel på VeraCrypt.\n\nObservera: Du kan komma att behöva aktivera 48-bitars LBA-stöd i registret; läs mer om detta på sidan http://support.microsoft.com/kb/305098/EN-US</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="sv" key="CHECKING_FS">Kontrollerar filsystemet på VeraCrypt-volymen monterad som %s …</string>
-    <string lang="sv" key="REPAIRING_FS">Försöker reparera filsystemet på VeraCrypt-volymen monterad som %hs …</string>
+    <string lang="sv" key="REPAIRING_FS">Försöker reparera filsystemet på VeraCrypt-volymen monterad som %s …</string>
-    <string lang="sv" key="WARN_CBC_MODE">Varning: Denna volym är krypterad i CBC-läge. På grund av säkerhetsproblem togs stödet för CBC-läget bort i VeraCrypt 4.1.\n\nDu rekommenderas att flytta data från denna VeraCrypt-volym till en ny volym skapad av denna version av VeraCrypt. Efter att du gjort det, bör du skriva över eller förstöra den gamla volymen. Se versionshistoriken för ytterligare information eller de lanseringsnotiser som distribueras med VeraCrypt 4.1 eller nyare.</string>
     <string lang="sv" key="WARN_64_BIT_BLOCK_CIPHER">Varning: Denna volym är krypterad med en föråldrad krypteringsalgoritm.\n\nKrypteringsalgoritmer med 64-bitars block (som t.ex. Blowfish, CAST-128 och Triple DES) stöds inte längre. Det kommer visserligen att vara möjligt att montera denna volym även med framtida versioner av VeraCrypt, men någon utveckling kring dessa föråldrade krypteringsalgoritmer kommer inte att ske. Du rekommenderas att skapa en ny VeraCrypt-volym med en krypteringsalgoritm som använder sig av 128-bitars block (som t.ex. AES, Serpent, Twofish etc.) och att flytta alla filer från den gamla volymen till den nya.</string>
     <string lang="sv" key="SYS_AUTOMOUNT_DISABLED">Ditt system är inte konfigurerat för automatisk montering av volymer, och det kan vara omöjligt att montera enhetsbaserade VeraCrypt-volymer. Automatisk montering kan aktiveras genom att köra nedanstående kommando följt av en omstart av datorn.\n\nmountvol.exe /E</string>
     <string lang="sv" key="SYS_ASSIGN_DRIVE_LETTER">Tilldela en enhetsbeteckning till partitionen eller enheten innan du fortsätter. (Högerklicka på ”Dator” i Start-menyn och välj ”Hantera”. Gå sedan till ”Diskhantering” i konsolträdet.)\n\nObservera att detta är ett krav från operativsystemets sida.</string>
@@ -1069,7 +1077,7 @@
     <string lang="sv" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt stöder inte längre kryptering av systempartitionen eller -enheten i Windows Vista utan något servicepaket installerat. Installera servicepaket 1 eller nyare för Windows Vista innan du uppgraderar VeraCrypt.</string>
     <string lang="sv" key="FEATURE_REQUIRES_INSTALLATION">Fel: Denna funktion kräver att VeraCrypt installeras. (Du kör VeraCrypt i portabelt läge.)\n\nInstallera VeraCrypt och försök igen.</string>
     <string lang="sv" key="WINDOWS_NOT_ON_BOOT_DRIVE_ERROR">VARNING: Windows verkar inte vara installerat på samma enhet som det startar från, vilket inte stöds.\n\nDu bör endast fortsätta om du är säker på att Windows är installerat på samma enhet som det startar från.\n\nVill du fortsätta?</string>
-    <string lang="sv" key="GPT_BOOT_DRIVE_UNSUPPORTED">Din systemenhet har en GUID-partitionstabell (GPT). För närvarande stöds endast enheter med en MBR-partitionstabell.</string>
+    <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</string>
     <string lang="sv" key="TC_BOOT_LOADER_ALREADY_INSTALLED">VARNING: VeraCrypts startinläsare är redan installerad på din systemenhet!\n\nDet är möjligt att ett annat operativsystem i din dator redan är krypterat.\n\nVARNING: OM DU FORTSÄTTER MED KRYPTERINGEN AV DET AKTUELLA OPERATIVSYSTEMET KAN DET ORSAKA ATT ANDRA SYSTEM BLIR OMÖJLIGA ATT STARTA OCH ATT RELATERADE DATA INTE GÅR ATT KOMMA ÅT.\n\nÄr du säker på att du vill fortsätta?</string>
     <string lang="sv" key="SYS_LOADER_RESTORE_FAILED">Det gick inte att återställa den ursprungliga systeminläsaren.\n\nAnvänd din återställningsskiva (välj ”Restore original system loader” under ”Repair Options”) eller Windows installationsskiva för att ersätta VeraCrypt startinläsare med Windows startinläsare.</string>
     <string lang="sv" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">Den ursprungliga startinläsaren kommer inte att lagras på återställningsskivan. En trolig orsak är att en säkerhetskopia saknas.</string>
@@ -1108,8 +1116,8 @@
     <string lang="sv" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Observera: 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. Det är emellertid viktigt att notera att du INTE behöver använda ett riktigt amerikanskt tangentbord. VeraCrypt säkerställer automatiskt att du på ett säkert sätt kan ange lösenordet (nu och i förstartsmiljön), även om du INTE har tillgång till ett riktigt amerikanskt tangentbord.</string>
     <string lang="sv" key="RESCUE_DISK_INFO">Innan du kan kryptera partitionen eller enheten måste du skapa en återställningsskiva, som kan användas i följande situationer:\n\n· Om VeraCrypts startinläsare, primära nyckel eller andra kritiska data skadas, kan återställningsskivan användas för att rekonstruera dessa. (Rätt lösenord måste fortfarande anges.)\n\n· Om Windows skadats och inte går att starta, kan återställnings- skivan användas för att utföra en permanent dekryptering av partitionen eller enheten innan Windows startas.\n\n· Återställningsskivan innehåller en säkerhetskopia av den första diskens startspår (vilket normalt innehåller en systemstartinläsare eller starthanterare) och kan användas för att återställa det.\n\nAnge nedan var återställningsskivans ISO-avbildning ska skapas.</string>
     <string lang="sv" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">Efter att du klickat på OK kommer programmet Bränn skivavbildning i Windows att startas. Använd det för att bränna återställningsskivans ISO-avbildning till en CD eller DVD.\n\nÅtergå därefter till guiden Skapa VeraCrypt-volym och följ instruktionerna för att fortsätta.</string>
-    <string lang="sv" key="RESCUE_DISK_BURN_INFO">Återställningsskivans ISO-avbildning har skapats och sparats som följande fil:\n%hs\n\nNu måste du bränna ISO-avbildningen till en CD eller DVD.\n\n%lsKlicka på Nästa, efter att återställningsskivan är bränd, för att säkerställa att bränningen utförts utan fel.</string>
+    <string lang="sv" key="RESCUE_DISK_BURN_INFO">Återställningsskivans ISO-avbildning har skapats och sparats som följande fil:\n%s\n\nNu måste du bränna ISO-avbildningen till en CD eller DVD.\n\n%lsKlicka på Nästa, efter att återställningsskivan är bränd, för att säkerställa att bränningen utförts utan fel.</string>
-    <string lang="sv" key="RESCUE_DISK_BURN_INFO_NO_CHECK">Återställningsskivan har skapats och lagrats i denna fil:\n%hs\n\nNu bör du antingen bränna avbildningen av återställningsskivan till en CD eller DVD eller flytta den till en säker plats och bränna den vid ett senare tillfälle.\n\n%lsKlicka på Nästa för att fortsätta.</string>
+    <string lang="sv" key="RESCUE_DISK_BURN_INFO_NO_CHECK">Återställningsskivan har skapats och lagrats i denna fil:\n%s\n\nNu bör du antingen bränna avbildningen av återställningsskivan till en CD eller DVD eller flytta den till en säker plats och bränna den vid ett senare tillfälle.\n\n%lsKlicka på Nästa för att fortsätta.</string>
     <string lang="sv" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">VIKTIGT: Observera att filen måste brännas till en CD eller DVD som en ISO-avbildning (och inte som en enskild fil). Läs i CD/DVD-bränningsprogramvarans dokumentation för information hur det går till. Klicka på länken nedan för att ladda ned programvara för CD/DVD-bränning, om du inte har någon CD/DVD-bränningsprogramvara som kan bränna ISO-avbildningar till en CD eller DVD.\n\n</string>
     <string lang="sv" key="LAUNCH_WIN_ISOBURN">Kör programmet Bränn skivavbildning i Windows</string>
     <string lang="sv" key="RESCUE_DISK_BURN_NO_CHECK_WARN">VARNING: En återställningsskiva som skapats vid ett tidigare tillfälle kan inte användas för denna systempartition eller -enhet, eftersom den skapades för en annan primär nyckel! Varje gång du krypterar en systempartition eller -enhet måste du även skapa en ny återställningsskiva för den, även om du använder samma lösenord.</string>
@@ -1372,6 +1380,39 @@
     <string lang="sv" key="TB_PER_SEC">TB/s</string>
     <string lang="sv" key="PB_PER_SEC">PB/s</string>
     <string lang="sv" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.tr.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="tr" name="Türkçe" en-name="Turkish" version="0.1.0" translators="Ali İskender Turan, Zeynel Abidin Öztürk" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="en" key="IDC_BROWSE">Bro&amp;wse...</control>
     <control lang="tr" key="IDC_DESKTOP_ICON">VeraCrypt simgesini &amp;masaüstüne ekle</control>
     <control lang="en" key="IDC_DONATE">Donate now...</control>
-    <control lang="en" key="IDC_FILE_TYPE">Associate the .tc file &amp;extension with VeraCrypt</control>
+    <control lang="en" key="IDC_FILE_TYPE">Associate the .hc file &amp;extension with VeraCrypt</control>
     <control lang="en" key="IDC_OPEN_CONTAINING_FOLDER">&amp;Open the destination location when finished</control>
     <control lang="tr" key="IDC_PROG_GROUP">VeraCrypt'i &amp;Başlat menüsüne ekle</control>
     <control lang="tr" key="IDC_SYSTEM_RESTORE">Sistem Geri Yükleme &amp;noktası oluştur</control>
@@ -37,6 +37,7 @@
     <control lang="en" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Download CD/DVD recording software</control>
     <control lang="en" key="IDC_FILE_CONTAINER">Create an encrypted file container</control>
     <control lang="en" key="IDC_GB">&amp;GB</control>
+    <control lang="en" key="IDC_TB">&amp;TB</control>
     <control lang="en" key="IDC_HIDDEN_SYSENC_INFO_LINK">More information</control>
     <control lang="en" key="IDC_HIDDEN_VOL">Hi&amp;dden VeraCrypt volume </control>
     <control lang="en" key="IDC_HIDDEN_VOL_HELP">More information about hidden volumes</control>
@@ -44,6 +45,7 @@
     <control lang="en" key="IDC_HIDVOL_WIZ_MODE_FULL">Normal mode</control>
     <control lang="tr" key="IDC_KB">&amp;KB</control>
     <control lang="tr" key="IDC_KEYFILES_ENABLE">Anah&amp;tar dosya kullan</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="tr" key="IDC_KEY_FILES">&amp;Anahtar Dosyalar</control>
     <control lang="tr" key="IDC_LINK_HASH_INFO">Karma algoritmaları hakkında bilgi</control>
@@ -58,7 +60,8 @@
     <control lang="tr" key="IDC_NO_HISTORY">Geçmi&amp;şi asla kaydetme</control>
     <control lang="tr" key="IDC_OPEN_OUTER_VOLUME">Dış Birimi Aç</control>
     <control lang="en" key="IDC_PAUSE">&amp;Pause</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="tr" key="IDC_QUICKFORMAT">Hızlı Biçimlendirme</control>
     <control lang="tr" key="IDC_SHOW_PASSWORD">&amp;Parolayı göster</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Display password</control>
@@ -118,6 +121,7 @@
     <control lang="tr" key="IDC_CREATE">Oluştur</control>
     <control lang="tr" key="IDC_CREATE_VOLUME">Birim Oluş&amp;tur</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <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="tr" key="IDC_ENABLE_KEYFILES">Anahtar dosya kullan</control>
     <control lang="tr" key="IDC_ENABLE_NEW_KEYFILES">Anahtar dosya kullan</control>
@@ -132,6 +136,7 @@
     <control lang="en" key="IDC_FAVORITE_MOVE_UP">Move &amp;Up</control>
     <control lang="en" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Open &amp;Explorer window for selected volume when successfully mounted</control>
     <control lang="en" key="IDC_FAVORITE_REMOVE">&amp;Remove</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="en" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Global Settings</control>
     <control lang="en" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Display balloon tooltip after successful hot-key dismount</control>
     <control lang="en" key="IDC_HK_DISMOUNT_PLAY_SOUND">Play system notification sound after successful hot-key dismount</control>
@@ -189,7 +194,7 @@
     <control lang="tr" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="en" key="IDD_PASSWORDCHANGE_DLG">Change Password or Keyfiles</control>
     <control lang="tr" key="IDD_PASSWORD_DLG">VeraCrypt Birimi Parolasını Girin</control>
-    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance Options</control>
+    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance and Driver Options</control>
     <control lang="tr" key="IDD_PREFERENCES_DLG">VeraCrypt - Seçenekler</control>
     <control lang="en" key="IDD_SYSENC_SETTINGS">VeraCrypt - System Encryption Settings</control>
     <control lang="en" key="IDD_TOKEN_PREFERENCES">VeraCrypt - Security Token Preferences</control>
@@ -235,7 +240,7 @@
     <control lang="tr" key="IDM_ONLINE_TUTORIAL">Yeni Başlayanlar İçin Eğitim</control>
     <control lang="en" key="IDM_ORGANIZE_FAVORITES">Organize Favorite Volumes...</control>
     <control lang="en" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organize System Favorite Volumes...</control>
-    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance...</control>
+    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance/Driver Configuration</control>
     <control lang="en" key="IDM_PERMANENTLY_DECRYPT_SYS">Permanently Decrypt System Partition/Drive</control>
     <control lang="tr" key="IDM_PREFERENCES">Seçenekler...</control>
     <control lang="tr" key="IDM_REFRESH_DRIVE_LETTERS">Sürücü Harflerini Yenile</control>
@@ -256,6 +261,7 @@
     <control lang="tr" key="IDM_UNMOUNTALL">Bağlı Olan Birimlerin Bağlantısını Kes</control>
     <control lang="tr" key="IDM_UNMOUNT_VOLUME">Birimin Bağlantısını Kes</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 Image</control>
     <control lang="tr" key="IDM_VERSION_HISTORY">Sürüm Geçmişi</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="tr" key="IDM_VOLUME_PROPERTIES">Birim Özellikleri</control>
@@ -365,7 +371,7 @@
     <control lang="en" key="IDT_SECURITY_TOKEN">Security token:</control>
     <control lang="tr" key="IDT_SORT_METHOD">Sıralama Yöntemi:</control>
     <control lang="en" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Please wait. This process may take a long time...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="en" key="IDT_TEST_BLOCK_NUMBER">Block number:</control>
     <control lang="tr" key="IDT_TEST_CIPHERTEXT">Ciphertext (onaltılık)</control>
     <control lang="en" key="IDT_TEST_DATA_UNIT_NUMBER">Data unit number (64-bit hexadecimal, data unit size is 512 bytes)</control>
@@ -410,13 +416,13 @@
     <string lang="tr" key="CIPHER_TITLE">Şifreleme Özellikleri</string>
     <string lang="tr" key="CLEAN_WINMRU_FAILED">UYARI: Son seçilen birim/anahtar dosyasının konumunu temizleme başarısız (dosya seçicisi tarafından hatırlanan konum)!</string>
     <string lang="tr" key="COMPRESSION_NOT_SUPPORTED">Hata: Konteyner, dosya sistemi seviyesinde sıkıştırılmış. VeraCrypt sıkıştırılmış konteynerleri desteklemez (şifrelenmiş veriyi sıkıştırmanın etkisiz ve gereksiz olduğuna dikkat edin).\n\nLütfen bu adımları takip ederek konteyner için sıkıştırmayı kapatın: 1) Windows Gezgininde konteynere sağ tıklayın (VeraCrypt'te değil). 2) 'Özellikler'i seçin. 3) 'Özellikler' iletişim kutusunda 'Gelişmiş'e tıklayın. 4) 'Gelişmiş öznitelikler' iletişim kutusunda 'Disk alanını korumak için içeriği sıkıştır' seçeneğini devre dışı bırakın ve 'Tamam'a tıklayın. 5) 'Özellikler' iletişim kutusunda 'Tamam'a tıklayın.</string>
-    <string lang="tr" key="CREATE_FAILED">Birim oluşturulamadı %hs</string>
+    <string lang="tr" key="CREATE_FAILED">Birim oluşturulamadı %s</string>
-    <string lang="tr" key="DEVICE_FREE_BYTES">%hs bölümünde %.2f bayt boş yer var</string>
+    <string lang="tr" key="DEVICE_FREE_BYTES">%s bölümünde %.2f bayt boş yer var</string>
-    <string lang="tr" key="DEVICE_FREE_KB">%hs bölümünde %.2f KB boş yer var</string>
+    <string lang="tr" key="DEVICE_FREE_KB">%s bölümünde %.2f KB boş yer var</string>
-    <string lang="tr" key="DEVICE_FREE_MB">%hs bölümünde %.2f MB boş yer var</string>
+    <string lang="tr" key="DEVICE_FREE_MB">%s bölümünde %.2f MB boş yer var</string>
-    <string lang="en" key="DEVICE_FREE_GB">Size of %hs is %.2f GB</string>
+    <string lang="en" key="DEVICE_FREE_GB">Size of %s is %.2f GB</string>
-    <string lang="en" key="DEVICE_FREE_TB">Size of %hs is %.2f TB</string>
+    <string lang="en" key="DEVICE_FREE_TB">Size of %s is %.2f TB</string>
-    <string lang="en" key="DEVICE_FREE_PB">Size of %hs is %.2f PB</string>
+    <string lang="en" key="DEVICE_FREE_PB">Size of %s is %.2f PB</string>
     <string lang="tr" key="DEVICE_IN_USE_FORMAT">UYARI: Aygıt/bölüm işletim sistemi veya uygulamalar tarafından kullanımda. Bu aygıtı/bölümü biçimlendirmek veri bozukluğuna ve sistemin kararsız hale gelmesine neden olabilir.\n\nDevam etmek istiyor musunuz?</string>
     <string lang="en" key="DEVICE_IN_USE_INPLACE_ENC">Warning: The partition is in use by the operating system or applications. You should close any applications that might be using the partition (including antivirus software).\n\nContinue?</string>
     <string lang="tr" key="FORMAT_CANT_DISMOUNT_FILESYS">Hata: aygıt/bölüm bağlantısı kesilemeyen bir dosya sistemi içeriyor. Bu dosya sistemi işletim sistemi tarafından kullanımda olabilir. Aygıtı/bölümü biçimlendirmek büyük ihtimalle veri bozulmasına ve sistemin kararsız haline gelmesine neden olacaktır.\n\nBu sorunu gidermek için, önce bölümü silmenizi ve biçimlendirmeden yeniden oluşturmanızı tavsiye ediyoruz. Bunu yapmak için şu adımları takip edin: 1) 'Başlat Menüsü'ndeki 'Bilgisayar' (veya 'Bilgisayarım') simgesine sağ tıklayın ve 'Yönet'i seçin. 'Bilgisayar Yönetimi' penceresi ekrana gelecektir. 2) 'Bilgisayar Yönetimi' penceresinde, 'Depolama' &gt;  'Disk Yönetimi'ni seçin. 3) Şifrelemek istediğiniz bölüme sağ tıklayın ve bunlardan birini seçin: 'Bölümü Sil' veya 'Birimi Sil' veya 'Mantıksal Sürücüyü Sil'. 4) 'Evet'e tıklayın. Windows sizden bilgisayarı yeniden başlatmanızı isterse bunu yapın. Bundan sonra 1. ve 2. adımları tekrarlayıp 5. adımdan devam edin. 5) Ayrılmamış/boş alana sağ tıklayın ve bunlardan birini seçin: 'Yeni Bölüm' veya 'Yeni Basit Birim' veya 'Yeni Mantıksal Sürücü'. 6) 'Yeni Bölüm Sihirbazı' veya 'Yeni Basit Birim Sihirbazı' penceresi belirecektir, bu sihirbazın yönergelerini takip edin. 'Bölümü Biçimlendir' başlıklı sihirbaz sayfasında 'Bu bölümü biçimlendirme' veya 'Bu birimi biçimlendirme' seçeneklerinden birini seçin. Aynı sihirbazda 'İleri' düğmesine basın ve 'Son' düğmesine basın. 7) VeraCrypt'te seçtiğiniz aygıt yolunun şimdi hatalı olabileceğine dikkat edin. Bu nedenle VeraCrypt Birim Oluşturma Sihirbazı'ndan çıkın (halen çalışıyorsa) ve bunu tekrar başlatın. 8) Aygıtı/bölümü şifrelemeyi tekrar deneyin.\n\nEğer VeraCrypt aygıtı/bölümü şifrelemekte tekrar tekrar başarısız oluyorsa, bunun yerine dosya konteyneri oluşturmayı düşünebilirsiniz.</string>
@@ -435,15 +441,15 @@
     <string lang="en" key="INPLACE_ENC_INVALID_PATH">Error: VeraCrypt can in-place encrypt only a partition, a dynamic volume, or an entire system drive. Please make sure the specified path is valid.</string>
     <string lang="en" key="CANNOT_RESIZE_FILESYS">Error: Cannot shrink the filesystem (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPossible causes and solutions:\n\n- Not enough free space on the volume. Please make sure no other application is writing to the filesystem.\n\n- Corrupted file system. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
     <string lang="en" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Error: There is not enough free space on the volume and so the filesystem cannot be shrunk (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPlease delete any redundant files and empty the Recycle Bin so as to free at least 256 KB of space and then try again. Note that due to a Windows issue, the amount of free space reported by the Windows Explorer may be incorrect until the operating system is restarted. If restarting the system does not help, the file system may be corrupted. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
-    <string lang="tr" key="DISK_FREE_BYTES">%hs bölümünde %.2f bayt boş yer var.</string>
+    <string lang="tr" key="DISK_FREE_BYTES">%s bölümünde %.2f bayt boş yer var.</string>
-    <string lang="en" key="DISK_FREE_KB">Free space on drive %hs is %.2f KB</string>
+    <string lang="en" key="DISK_FREE_KB">Free space on drive %s is %.2f KB</string>
-    <string lang="en" key="DISK_FREE_MB">Free space on drive %hs is %.2f MB</string>
+    <string lang="en" key="DISK_FREE_MB">Free space on drive %s is %.2f MB</string>
-    <string lang="en" key="DISK_FREE_GB">Free space on drive %hs is %.2f GB</string>
+    <string lang="en" key="DISK_FREE_GB">Free space on drive %s is %.2f GB</string>
-    <string lang="en" key="DISK_FREE_TB">Free space on drive %hs is %.2f TB</string>
+    <string lang="en" key="DISK_FREE_TB">Free space on drive %s is %.2f TB</string>
-    <string lang="en" key="DISK_FREE_PB">Free space on drive %hs is %.2f PB</string>
+    <string lang="en" key="DISK_FREE_PB">Free space on drive %s is %.2f PB</string>
     <string lang="tr" key="DRIVELETTERS">Uygun sürücü harfleri alınamadı.</string>
     <string lang="en" key="DRIVER_NOT_FOUND">Error: VeraCrypt driver not found.\n\nPlease copy the files 'veracrypt.sys' and 'veracrypt-x64.sys' to the directory where the main VeraCrypt application (VeraCrypt.exe) is located.</string>
-    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall; on Windows XP, select 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
+    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' > Computer > 'Uninstall or change a program' > VeraCrypt > Uninstall; on Windows XP, select 'Start Menu' > Settings > 'Control Panel' > 'Add Or Remove Programs' > VeraCrypt > Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
     <string lang="tr" key="ERR_CIPHER_INIT_FAILURE">Hata: Şifreleyici başlatma başarısız.</string>
     <string lang="tr" key="ERR_CIPHER_INIT_WEAK_KEY">Hata: Zayıf veya potansiyel olarak zayıf bir anahtar algılandı. Anahtar atılacak. Lütfen tekrar deneyin.</string>
     <string lang="en" key="EXCEPTION_REPORT">A critical error has occurred and VeraCrypt must be terminated. If this is caused by a bug in VeraCrypt, we would like to fix it. To help us, you can send us an automatically generated error report containing the following items:\n\n- Program version\n- Operating system version\n- Type of CPU\n- VeraCrypt component name\n- Checksum of VeraCrypt executable\n- Symbolic name of dialog window\n- Error category\n- Error address\n- VeraCrypt call stack\n\nIf you select 'Yes', the following URL (which contains the entire error report) will be opened in your default Internet browser.\n\n%hs\n\nDo you want to send us the above error report?</string>
@@ -497,7 +503,7 @@
     <string lang="en" key="WIPE_FINISHED">The content of the partition/device has been successfully erased.</string>
     <string lang="en" key="WIPE_FINISHED_DECOY_SYSTEM_PARTITION">The content of the partition where the original system (of which the hidden system is a clone) resided has been successfully erased.</string>
     <string lang="en" key="DECOY_OS_VERSION_WARNING">Please make sure the version of Windows you are going to install (on the wiped partition) is the same as the version of Windows you are currently running. This is required due to the fact that both systems will share a common boot partition.</string>
-    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' &gt; 'Add Mounted Volume to System Favorites').</string>
+    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' > 'Add Mounted Volume to System Favorites').</string>
     <string lang="en" key="SYSTEM_DECRYPTION_FINISHED">The system partition/drive has been successfully decrypted.</string>
     <string lang="tr" key="FORMAT_FINISHED_HELP">\n\nVeraCrypt birimi oluşturuldu ve birim şu an kullanıma hazır. Başka bir VeraCrypt birimi oluşturmak istiyorsanız Sonraki'ye tıklayın. Aksi halde Çıkış'a tıklayın.</string>
     <string lang="en" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nThe hidden VeraCrypt volume has been successfully created (the hidden operating system will reside within this hidden volume).\n\nClick Next to continue.</string>
@@ -561,6 +567,7 @@
     <string lang="tr" key="MAX_HIDVOL_SIZE_KB">Bu birim için en fazla gizli birim boyutu %.2f KB.</string>
     <string lang="tr" key="MAX_HIDVOL_SIZE_MB">Bu birim için en fazla gizli birim boyutu %.2f MB.</string>
     <string lang="en" key="MAX_HIDVOL_SIZE_GB">Maximum possible hidden volume size for this volume is %.2f GB.</string>
+    <string lang="en" key="MAX_HIDVOL_SIZE_TB">Maximum possible hidden volume size for this volume is %.2f TB.</string>
     <string lang="tr" key="MOUNTED_NOPWCHANGE">Birim bağlıyken birim parolaları/anahtar dosyaları değiştirilemez. Lütfen önce birimin bağlantısını kesin.</string>
     <string lang="tr" key="MOUNTED_NO_PKCS5_PRF_CHANGE">Üstbilgi anahtarı türetme algoritması birim bağlıyken değiştirilemez. Lütfen önce birimin bağlantısını kesin.</string>
     <string lang="tr" key="MOUNT_BUTTON">Bağ&amp;la</string>
@@ -591,12 +598,12 @@
     <string lang="en" key="SELECT_PKCS11_MODULE">Select PKCS #11 Library</string>
     <string lang="tr" key="OUTOFMEMORY">Yetersiz Bellek</string>
     <string lang="en" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">IMPORTANT: We strongly recommend that inexperienced users create a VeraCrypt file container on the selected device/partition, instead of attempting to encrypt the entire device/partition.\n\nWhen you create a VeraCrypt file container (as opposed to encrypting a device or partition) there is, for example, no risk of destroying a large number of files. Note that a VeraCrypt file container (even though it contains a virtual encrypted disk) is actually just like any normal file. For more information, see the chapter Beginner's Tutorial in the VeraCrypt User Guide.\n\nAre you sure you want to encrypt the entire device/partition?</string>
-    <string lang="en" key="OVERWRITEPROMPT">WARNING: The file '%hs' already exists!\n\nIMPORTANT: VERACRYPT WILL NOT ENCRYPT THE FILE, BUT IT WILL DELETE IT. Are you sure you want to delete the file and replace it with a new VeraCrypt container?</string>
+    <string lang="en" key="OVERWRITEPROMPT">WARNING: The file '%s' already exists!\n\nIMPORTANT: VERACRYPT WILL NOT ENCRYPT THE FILE, BUT IT WILL DELETE IT. Are you sure you want to delete the file and replace it with a new VeraCrypt container?</string>
-    <string lang="en" key="OVERWRITEPROMPT_DEVICE">CAUTION: ALL FILES CURRENTLY STORED ON THE SELECTED %s '%hs'%s WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
+    <string lang="en" key="OVERWRITEPROMPT_DEVICE">CAUTION: ALL FILES CURRENTLY STORED ON THE SELECTED %s '%s'%s WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
-    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%s'%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting/decrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting/decrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting/decrypting, please make sure that you have backup copies of the files you want to encrypt/decrypt.\n\nDo you have such a backup?</string>
-    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%hs'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
+    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%s'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
     <string lang="en" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">WARNING: THE SELECTED PARTITION CONTAINS A LARGE AMOUNT OF DATA! Any files stored on the partition will be erased and lost (they will NOT be encrypted)!</string>
     <string lang="en" key="ERASE_FILES_BY_CREATING_VOLUME">Erase any files stored on the partition by creating a VeraCrypt volume within it</string>
     <string lang="tr" key="PASSWORD">Parola</string>
@@ -645,7 +652,7 @@
     <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
     <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
     <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 &gt; Organize &gt; 'Folder and search options' &gt; View).</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="SELECTED_PARTITION_ALREADY_INPLACE_ENC">The selected partition/device is already fully encrypted.\nHeader Flags = 0x%.8X</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="en" key="PREV">&lt; &amp;Back</string>
     <string lang="tr" key="RAWDEVICES">Sisteminizde yüklü ham sürücüler listelenemiyor!</string>
-    <string lang="tr" key="READONLYPROMPT">Birim '%hs' bulunuyor ve salt okunur. Değiştirmek istediğinizden emin misiniz?</string>
+    <string lang="tr" key="READONLYPROMPT">Birim '%s' bulunuyor ve salt okunur. Değiştirmek istediğinizden emin misiniz?</string>
     <string lang="tr" key="SELECT_DEST_DIR">Hedef dizini seçin</string>
     <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>
@@ -680,13 +687,13 @@
     <string lang="tr" key="TEST_CIPHERTEXT_SIZE">Verdiğiniz sınama ciphertext'i çok uzun veya kısa.</string>
     <string lang="tr" key="TEST_KEY_SIZE">Verdiğiniz sınama anahtarı çok uzun veya kısa.</string>
     <string lang="tr" key="TEST_PLAINTEXT_SIZE">Verdiğiniz sınama plaintext'i çok uzun veya kısa.</string>
-    <string lang="en" key="TWO_LAYER_CASCADE_HELP">Two ciphers in a cascade operating in XTS mode. Each block is first encrypted with %hs (%d-bit key) and then with %hs (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
+    <string lang="en" key="TWO_LAYER_CASCADE_HELP">Two ciphers in a cascade operating in XTS mode. Each block is first encrypted with %s (%d-bit key) and then with %s (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
-    <string lang="en" key="THREE_LAYER_CASCADE_HELP">Three ciphers in a cascade operating in XTS mode. Each block is first encrypted with %hs (%d-bit key), then with %hs (%d-bit key), and finally with %hs (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
+    <string lang="en" key="THREE_LAYER_CASCADE_HELP">Three ciphers in a cascade operating in XTS mode. Each block is first encrypted with %s (%d-bit key), then with %s (%d-bit key), and finally with %s (%d-bit key). Each cipher uses its own key. All keys are mutually independent.</string>
     <string lang="en" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Note that, depending on the operating system configuration, these auto-run and auto-mount features may work only when the traveler disk files are created on a non-writable CD/DVD-like medium. Also note that this is not a bug in VeraCrypt (it is a limitation of Windows).</string>
     <string lang="en" key="TRAVELER_DISK_CREATED">VeraCrypt traveler disk has been successfully created.\n\nNote that you need administrator privileges to run VeraCrypt in portable mode. Also note that, after examining the registry file, it may be possible to tell that VeraCrypt was run on a Windows system even if it is run in portable mode.</string>
     <string lang="en" key="TC_TRAVELER_DISK">VeraCrypt Traveler Disk</string>
     <string lang="en" key="TWOFISH_HELP">Designed by Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall, and Niels Ferguson. Published in 1998. 256-bit key, 128-bit block. Mode of operation is XTS. Twofish was one of the AES finalists.</string>
-    <string lang="tr" key="MORE_INFO_ABOUT">%hs hakkında daha fazla bilgi</string>
+    <string lang="tr" key="MORE_INFO_ABOUT">%s hakkında daha fazla bilgi</string>
     <string lang="tr" key="UNKNOWN">Bilinmeyen</string>
     <string lang="en" key="ERR_UNKNOWN">An unspecified or unknown error occurred (%d).</string>
     <string lang="tr" key="UNMOUNTALL_LOCK_FAILED">Bazı birimler, uygulamalar veya sistem tarafından kullanımda olan dosyalar veya klasörler içeriyor.\n\nBağlantı kesilmeye zorlansın mı?</string>
@@ -706,7 +713,7 @@
     <string lang="tr" key="WRONG_VOL_TYPE">VeraCrypt yabancı bir birim için parolayı değiştiremiyor.</string>
     <string lang="tr" key="SELECT_FREE_DRIVE">Lütfen listeden bir boş sürücü harfi seçin.</string>
     <string lang="tr" key="SELECT_A_MOUNTED_VOLUME">Lütfen sürücü harfi listesinden bir bağlı birim seçin.</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="tr" key="CANT_CREATE_AUTORUN">Hata: autorun.inf oluşturulamıyor.</string>
     <string lang="tr" key="ERR_PROCESS_KEYFILE">Anahtar dosyayı işlerken hata oluştu!</string>
     <string lang="tr" key="ERR_PROCESS_KEYFILE_PATH">Anahtar dosya konumunu işlerken hata oluştu!</string>
@@ -851,7 +858,7 @@
     <string lang="en" key="INSTALL_FAILED">Installation failed.</string>
     <string lang="en" key="UNINSTALL_FAILED">Uninstallation failed.</string>
     <string lang="en" key="DIST_PACKAGE_CORRUPTED">This distribution package is damaged. Please try downloading it again (preferably from the official VeraCrypt website at https://veracrypt.codeplex.com).</string>
-    <string lang="en" key="CANNOT_WRITE_FILE_X">Cannot write file %hs</string>
+    <string lang="en" key="CANNOT_WRITE_FILE_X">Cannot write file %s</string>
     <string lang="en" key="EXTRACTING_VERB">Extracting</string>
     <string lang="en" key="CANNOT_READ_FROM_PACKAGE">Cannot read data from the package.</string>
     <string lang="en" key="CANT_VERIFY_PACKAGE_INTEGRITY">Cannot verify the integrity of this distribution package.</string>
@@ -860,8 +867,8 @@
     <string lang="tr" key="INSTALL_OK">VeraCrypt başarıyla yüklendi.</string>
     <string lang="en" key="SETUP_UPDATE_OK">VeraCrypt has been successfully updated.</string>
     <string lang="en" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt has been successfully upgraded. However, before you can start using it, the computer must be restarted.\n\nDo you want to restart it now?</string>
-    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
+    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu > All programs > Accessories > System Tools > System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
-    <string lang="tr" key="UNINSTALL_OK">VeraCrypt başarıyla kaldırıldı.\n\nVeraCrypt yükleyicisini ve %hs klasörünü silmek için 'Bitir'e tıklayın. Buna dikkat edin: Klasör, VeraCrypt yükleyicisi tarafından yüklenmeyen veya VeraCrypt tarafından oluşturulan dosyalar içeriyorsa silinmeyecektir.</string>
+    <string lang="tr" key="UNINSTALL_OK">VeraCrypt başarıyla kaldırıldı.\n\nVeraCrypt yükleyicisini ve %s klasörünü silmek için 'Bitir'e tıklayın. Buna dikkat edin: Klasör, VeraCrypt yükleyicisi tarafından yüklenmeyen veya VeraCrypt tarafından oluşturulan dosyalar içeriyorsa silinmeyecektir.</string>
     <string lang="tr" key="REMOVING_REG">VeraCrypt kayıt defteri girdileri kaldırılıyor</string>
     <string lang="tr" key="ADDING_REG">Kayıt defteri girişi ekleniyor</string>
     <string lang="tr" key="REMOVING_APPDATA">Uygulamaya özel veri kaldırılıyor</string>
@@ -872,10 +879,10 @@
     <string lang="tr" key="CREATING_SYS_RESTORE">Sistem Geri Yükleme noktası oluşturuluyor</string>
     <string lang="tr" key="FAILED_SYS_RESTORE">Sistem Geri Yükleme noktası oluşturma başarısız!</string>
     <string lang="en" key="INSTALLER_UPDATING_BOOT_LOADER">Updating boot loader</string>
-    <string lang="en" key="INSTALL_OF_FAILED">Failed to install '%hs'. %hs\nDo you want to continue installing?</string>
+    <string lang="en" key="INSTALL_OF_FAILED">Failed to install '%s'. %s\nDo you want to continue installing?</string>
-    <string lang="en" key="UNINSTALL_OF_FAILED">Failed to uninstall '%hs'. %hs\nDo you want to continue uninstalling?</string>
+    <string lang="en" key="UNINSTALL_OF_FAILED">Failed to uninstall '%s'. %s\nDo you want to continue uninstalling?</string>
     <string lang="tr" key="INSTALL_COMPLETED">Yükleme tamamlandı.</string>
-    <string lang="tr" key="CANT_CREATE_FOLDER">Klasör '%hs' oluşturulamadı</string>
+    <string lang="tr" key="CANT_CREATE_FOLDER">Klasör '%s' oluşturulamadı</string>
     <string lang="tr" key="CLOSE_TC_FIRST">VeraCrypt aygıt sürücüsü bellekten kaldırılamadı.\n\nLütfen önce açık tüm VeraCrypt pencerelerini kapatın. Bu işe yaramazsa lütfen Windows'u yeniden başlatın ve tekrar deneyin.</string>
     <string lang="tr" key="DISMOUNT_ALL_FIRST">VeraCrypt'i yüklemeden veya kaldırmadan önce tüm VeraCrypt birimlerinin bağlantısı kesilmelidir.</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>
@@ -921,14 +928,14 @@
     <string lang="en" key="SYS_FAVORITE_VOLUMES_SAVED">System favorite volumes saved.\n\nTo enable mounting of system favorite volumes when the system starts, please select 'Settings' &gt; 'System Favorite Volumes' &gt; 'Mount system favorite volumes when Windows starts'.</string>
     <string lang="en" key="FAVORITE_ADD_DRIVE_DEV_WARNING">The volume you are adding to favorites is neither a partition nor a dynamic volume. Therefore, VeraCrypt will be unable to mount this favorite volume if the device number changes.</string>
     <string lang="en" key="FAVORITE_ADD_PARTITION_TYPE_WARNING">The volume you are adding to favorites is a partition not recognized by Windows.\n\nVeraCrypt will be unable to mount this favorite volume if the device number changes. Please set the type of the partition to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then add the partition to favorites again.</string>
-    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings &gt; Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
+    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings > Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_NETWORK_PATH_ERR">A container stored in a remote filesystem shared over a network cannot be automatically mounted when its host device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, the volume hosted on the device cannot be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable the volume hosted on the device to be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_LABEL_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, no label can be assigned to it.</string>
     <string lang="en" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable VeraCrypt to assign a label to the partition.</string>
     <string lang="en" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Due to a Windows limitation, a container stored in a remote filesystem shared over a network cannot be mounted as a system favorite volume (however, it can be mounted as a non-system favorite volume when a user logs on).</string>
-    <string lang="tr" key="ENTER_PASSWORD_FOR">%hs için parolayı girin</string>
+    <string lang="tr" key="ENTER_PASSWORD_FOR">%s için parolayı girin</string>
     <string lang="en" key="ENTER_PASSWORD_FOR_LABEL">Enter password for '%s'</string>
     <string lang="en" key="ENTER_NORMAL_VOL_PASSWORD">Enter password for the normal/outer volume</string>
     <string lang="en" key="ENTER_HIDDEN_VOL_PASSWORD">Enter password for the hidden volume</string>
@@ -943,8 +950,8 @@
     <string lang="tr" key="VOL_HEADER_BACKED_UP">Birim üstbilgi yedeği başarıyla oluşturuldu.\n\nÖNEMLİ: Bu yedeği kullanarak birim üstbilgisini geri yüklemek, şu anki birim parolasını da geri yükleyecektir. Ayrıca, birimi bağlamak için anahtar dosya(lar) gerekli ise, birim üstbilgisi geri yüklendiğinde aynı anahtar dosyalar gerekli olacaktır.\n\nUYARI: Bu birim üstbilgi yedeği, sadece bu birime özgüdür ve SADECE bu birimin üstbilgisini geri yüklemek için kullanılabilir. Bu üstbilgi yedeğini farklı bir birimin üstbilgisini geri yüklemek için kullanırsanız, birimi bağlayabilirsiniz fakat birimde depolanmış olan hiçbir verinin ŞİFRESİNİ ÇÖZEMEZSİNİZ (onun ana anahtarını değiştirdiğinizden).</string>
     <string lang="tr" key="VOL_HEADER_RESTORED">Birim üstbilgisi başarıyla geri yüklendi.\n\nÖNEMLİ: Lütfen eski bir parolanın da geri yüklenmiş olabileceğine dikkat edin. Ayrıca, yedek oluşturulduğu zaman birimi bağlamak için anahtar dosyalara ihtiyaç duyulduysa, birimi bağlamak için aynı anahtar dosyaları gerekli olacaktır.</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) for the hidden volume.</string>
-    <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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</string>
+    <string lang="en" key="CONFIRM_VOL_HEADER_BAK">Are you sure you want to create volume header backup for %s?\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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</string>
-    <string lang="tr" key="CONFIRM_VOL_HEADER_RESTORE">%hs birimine ait birim üstbilgisini geri yüklemek istediğinizden emin misiniz?\n\nUYARI: Bir birim üstbilgisini geri yüklemek, yedek oluşturulduğunda geçerli olan birim parolasını da geri yükler. Ayrıca, yedek oluşturulduğunda anahtar dosyalar kullanımdaysa, birim üstbilgisi geri yüklendikten sonra birimi tekrar bağlamak için aynı anahtar dosyaları gerekli olacaktır.\n\nEvet'e tıkladıktan sonra, üstbilgi yedek dosyasını seçeceksiniz.</string>
+    <string lang="tr" key="CONFIRM_VOL_HEADER_RESTORE">%s birimine ait birim üstbilgisini geri yüklemek istediğinizden emin misiniz?\n\nUYARI: Bir birim üstbilgisini geri yüklemek, yedek oluşturulduğunda geçerli olan birim parolasını da geri yükler. Ayrıca, yedek oluşturulduğunda anahtar dosyalar kullanımdaysa, birim üstbilgisi geri yüklendikten sonra birimi tekrar bağlamak için aynı anahtar dosyaları gerekli olacaktır.\n\nEvet'e tıkladıktan sonra, üstbilgi yedek dosyasını seçeceksiniz.</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>
@@ -955,12 +962,14 @@
     <string lang="en" key="VOLUME_HAS_NO_BACKUP_HEADER">There is no backup header embedded in this volume (note that only volumes created by VeraCrypt 6.0 or later contain embedded backup headers).</string>
     <string lang="en" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">You are attempting to back up the header of the system partition/drive. This is not allowed. Backup/restore operations pertaining to the system partition/drive can be performed only using the VeraCrypt Rescue Disk.\n\nDo you want to create a VeraCrypt Rescue Disk?</string>
     <string lang="en" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">You are attempting to restore the header of a virtual VeraCrypt volume but you selected the system partition/drive. This is not allowed. Backup/restore operations pertaining to the system partition/drive can be performed only using the VeraCrypt Rescue Disk.\n\nDo you want to create a VeraCrypt Rescue Disk?</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">After you click OK, you will select a filename for the new VeraCrypt Rescue Disk ISO image and the location where you wish to place it.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">After you click OK, you will select a filename for the new VeraCrypt Rescue Disk image and the location where you wish to place it.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <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_INSERT">Please insert your VeraCrypt Rescue Disk 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 a new Rescue Disk fully compatible with your current configuration, select 'System' &gt; 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk 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' &gt; '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 be used, because it was created for a different master key. You need to burn the newly generated Rescue Disk.</string>
@@ -989,8 +998,8 @@
     <string lang="en" key="DRIVE_LETTER_ITEM">Drive Letter:   </string>
     <string lang="tr" key="UNSUPPORTED_CHARS_IN_PWD">Hata: Parola sadece ASCII karakterleri içermelidir.\n\nParoladaki ASCII olmayan karakterler, sistem yapılandırması değiştiğinde birimin bağlanmasını imkansız hale getirebilir.\n\nAşağıdaki karakterlere izin verilmektedir:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="tr" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">Uyarı: Parola ASCII olmayan karakterler içeriyor. Bu, sistem yapılandırmanız değiştiğinde birimi bağlamayı imkansız hale getirebilir.\n\nParoladaki tüm ASCII olmayan karakterleri ASCII karakterlerle değiştirmelisiniz. Bunu yapmak için 'Birimler'e tıkayın -&gt; 'Birim Parolasını Değiştir' düğmesine basın.\n\nBunlar ASCII karakterleridir:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="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 change it (e.g., to '.tc').\n\nAre you sure you want to use the problematic file extension?</string>
+    <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 change it (e.g., to '.hc').\n\nAre you sure you want to use the problematic file extension?</string>
-    <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 container or change it (e.g., to '.tc') after you dismount the volume.</string>
+    <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 container or change it (e.g., to '.hc') after you dismount the volume.</string>
     <string lang="tr" key="HOMEPAGE">Giriş Sayfası</string>
     <string lang="tr" key="LARGE_IDE_WARNING_XP">UYARI: Windows yüklemenize hiçbir Hizmet Paketi (Service Pack) yüklememişsiniz. Hizmet Paketi 1 veya daha sonrasını uygulamadığınız bir Windows XP'de 128 GB'tan büyük IDE disklere yazmamalısınız! Yazarsanız, disk üzerindeki veri (VeraCrypt birimi olsun veya olmasın) bozulabilir. Bunun Windows'un bir kısıtlaması olduğuna ve VeraCrypt içindeki bir hata olmadığına dikkat edin.</string>
     <string lang="tr" key="LARGE_IDE_WARNING_2K">UYARI: Windows yüklemenize Hizmet Paketi 3 (Service Pack 3) veya daha sonrasını uygulamamışsınız. Hizmet Paketi 3 veya daha sonrasını uygulamadığınız bir Windows 2000'de 128 GB'tan büyük IDE disklerine yazmamalısınız! Yazarsanız, disk üzerindeki veri (VeraCrypt birimi olsun veya olmasın) bozulabilir. Bunun Windows'un bir kısıtlaması olduğuna ve VeraCrypt içindeki bir hata olmadığına dikkat edin.\n\nUyarı: Kayıt defterinde 48-bit LBA desteğini etkinleştirmeniz de gerekebilir. Daha fazla bilgi için http://support.microsoft.com/kb/305098/EN-US adresine bakın.</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="tr" key="CHECKING_FS">%s olarak bağlanan VeraCrypt biriminin dosya sistemi kontrol ediliyor...</string>
-    <string lang="tr" key="REPAIRING_FS">%hs olarak bağlanan VeraCrypt biriminin dosya sistemi onarılmaya çalışılıyor...</string>
+    <string lang="tr" key="REPAIRING_FS">%s olarak bağlanan VeraCrypt biriminin dosya sistemi onarılmaya çalışılıyor...</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 later.</string>
     <string lang="tr" key="WARN_64_BIT_BLOCK_CIPHER">Uyarı: Bu birim eski bir şifreleme algoritmasıyla şifrelenmiş.\n\nHiçbir 64-bit-blok şifreleme algoritması (örn. Blowfish, CAST-128, veya Triple DES) onaylanmamıştır. Bu birimi VeraCrypt'in ileriki sürümlerini kullanarak bağlamak mümkün olacaktır. Bununla birlikte, bu eski şifreleme algoritmalarının yürütülmesi için geliştirmeler olmayacaktır. 128-bit-blok şifreleme algoritmasıyla (örn. AES, Serpent, Twofish, vs.) şifreli yeni bir VeraCrypt birimi oluşturmanızı ve bu birimdeki tüm dosyaları yeni birime taşımanızı tavsiye ediyoruz.</string>
     <string lang="tr" key="SYS_AUTOMOUNT_DISABLED">Sisteminiz yeni birimleri otomatik olarak bağlamak üzere yapılandırılmamış. Aygıt sunumlu VeraCrypt birimlerini bağlamak imkansız olabilir. Otomatik bağlama, aşağıdaki komutu çalıştırıp sistemi yeniden başlatarak etkinleştirilebilir.n\n\nmountvol.exe /E</string>
     <string lang="tr" key="SYS_ASSIGN_DRIVE_LETTER">Lütfen devam etmeden önce bölüme/aygıta bir sürücü harfi atayın ('Denetim Masası' &gt; 'Sistem ve Bakım' &gt; 'Yönetimsel Araçlar' - 'Sabit disk bölümleri oluştur ve biçimlendir').\n\nBunun işletim sisteminin bir gereksinimi olduğuna dikkat edin.</string>
@@ -1069,7 +1077,7 @@
     <string lang="en" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt no longer supports encryption of the system partition/drive on Windows Vista with no Service Pack installed. Before upgrading VeraCrypt, please install Service Pack 1 or higher for Windows Vista.</string>
     <string lang="en" key="FEATURE_REQUIRES_INSTALLATION">Error: This feature requires VeraCrypt to be installed on the system (you are running VeraCrypt in portable mode).\n\nPlease install VeraCrypt and then try again.</string>
     <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="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</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' &gt; '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>
@@ -1093,7 +1101,7 @@
     <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 medium (or using a service partition)?</string>
     <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 Hidden Volumes" in the VeraCrypt User's Guide.\n\nImportant: Before proceeding, please make sure you have read the section "Security Requirements and Precautions Pertaining to Hidden Volumes" in the VeraCrypt User's Guide.\n\n\nDoes the currently running operating system meet the above condition?</string>
     <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 from writing to the shared boot partition and from hibernating.\n\n\nDo you want to continue? If you select 'No', instructions for removing the extra boot partition will be displayed.</string>
-    <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' &gt; '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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
+    <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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
     <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>
@@ -1108,8 +1116,8 @@
     <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 you do NOT have a real US keyboard.</string>
     <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 starts.\n\n- The VRD will contain a backup of the present content of the first drive track (which typically contains a system loader or boot manager) and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ISO image will be created in the location specified below.</string>
     <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">The Rescue Disk image has been created and stored in this file:\n%s\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>
+    <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%s\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>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">IMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software. If you do not have any CD/DVD recording software that can write the ISO disk image to a CD/DVD, click the link below to download such free software.\n\n</string>
     <string lang="en" key="LAUNCH_WIN_ISOBURN">Launch Microsoft Windows Disc Image Burner</string>
     <string lang="en" key="RESCUE_DISK_BURN_NO_CHECK_WARN">WARNING: If you already created a VeraCrypt Rescue Disk in the past, it cannot be reused for this system partition/drive because it was created for a different master key! Every time you encrypt a system partition/drive, you must create a new VeraCrypt Rescue Disk for it even if you use the same password.</string>
@@ -1247,7 +1255,7 @@
     <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 system (but not on the decoy system), the decoy system would contain a VeraCrypt driver and VeraCrypt applications whose version numbers are different from the version number of the VeraCrypt Boot Loader. Such a discrepancy might indicate that there is a hidden operating system on this computer.\n\n\nDo you want to continue?</string>
     <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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' &gt; '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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' > 'Create Rescue Disk').</string>
     <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' &gt; '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' &gt; 'Create Rescue Disk'.</string>
     <string lang="en" key="BOOT_LOADER_UPGRADE_FAILED">Failed to upgrade the VeraCrypt Boot Loader.</string>
@@ -1272,7 +1280,7 @@
     <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' &gt; '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>
@@ -1297,8 +1305,8 @@
     <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 system.</string>
     <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' &gt; 'Performance' and enable 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' &gt; 'Performance' and disable 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>
@@ -1372,6 +1380,39 @@
     <string lang="tr" key="TB_PER_SEC">TB/s</string>
     <string lang="tr" key="PB_PER_SEC">PB/s</string>
     <string lang="en" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.uk.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="uk" name="Українська" en-name="Ukrainian" version="1.0.0" translators="Kravchuk Olexandr, Babchuk Volodymyr" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="uk" key="IDC_BROWSE">О&amp;гляд...</control>
     <control lang="uk" key="IDC_DESKTOP_ICON">&amp;Значок VeraCrypt на Рабочому столі</control>
     <control lang="uk" key="IDC_DONATE">допомога проекту...</control>
-    <control lang="uk" key="IDC_FILE_TYPE">Ассоціювати роз&amp;ширення '.tc' с VeraCrypt</control>
+    <control lang="uk" key="IDC_FILE_TYPE">Ассоціювати роз&amp;ширення '.hc' с VeraCrypt</control>
     <control lang="uk" key="IDC_OPEN_CONTAINING_FOLDER">По закінченні відкр&amp;ити місце призначення</control>
     <control lang="uk" key="IDC_PROG_GROUP">&amp;Додати VeraCrypt в меню 'Пуск'</control>
     <control lang="uk" key="IDC_SYSTEM_RESTORE">Створити то&amp;чку воідновлення системи</control>
@@ -37,6 +37,7 @@
     <control lang="uk" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Завантажити ПЗ для запису CD/DVD</control>
     <control lang="uk" key="IDC_FILE_CONTAINER">Створити зашифрований файловий контейнер</control>
     <control lang="uk" key="IDC_GB">&amp;Гб</control>
+    <control lang="uk" key="IDC_TB">&amp;ТБ</control>
     <control lang="uk" key="IDC_HIDDEN_SYSENC_INFO_LINK">Детальніше</control>
     <control lang="uk" key="IDC_HIDDEN_VOL">&amp;Прихований том VeraCrypt </control>
     <control lang="uk" key="IDC_HIDDEN_VOL_HELP">Що таке 'прихований том'?</control>
@@ -44,6 +45,7 @@
     <control lang="uk" key="IDC_HIDVOL_WIZ_MODE_FULL">Звичайний режим</control>
     <control lang="uk" key="IDC_KB">&amp;Кб</control>
     <control lang="uk" key="IDC_KEYFILES_ENABLE">Кл&amp;юч. файли</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="uk" key="IDC_KEY_FILES">Клю&amp;ч. файли...</control>
     <control lang="uk" key="IDC_LINK_HASH_INFO">Свідчення про хеш-алгоритмах</control>
@@ -58,7 +60,8 @@
     <control lang="uk" key="IDC_NO_HISTORY">&amp;Не зберігати історію</control>
     <control lang="uk" key="IDC_OPEN_OUTER_VOLUME">Відкрити зовнішній том</control>
     <control lang="uk" key="IDC_PAUSE">&amp;Павза</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="uk" key="IDC_QUICKFORMAT">Швидке форматування.</control>
     <control lang="uk" key="IDC_SHOW_PASSWORD">&amp;Показ пароля</control>
     <control lang="uk" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Показ пароля</control>
@@ -118,6 +121,7 @@
     <control lang="uk" key="IDC_CREATE">Створити</control>
     <control lang="uk" key="IDC_CREATE_VOLUME">&amp;Створити том</control>
     <control lang="uk" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Не відображати текст на &amp;екрані футентифікації (за винятком нижче вказаного тексту)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="uk" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Пришвидшення AES шифрування/дешифрування з використанням AES інструкцій процесора (якщо є)</control>
     <control lang="uk" key="IDC_ENABLE_KEYFILES">Використовувати файл-ключі</control>
     <control lang="uk" key="IDC_ENABLE_NEW_KEYFILES">Використовувати файл-ключі</control>
@@ -132,6 +136,7 @@
     <control lang="uk" key="IDC_FAVORITE_MOVE_UP">Вгор&amp;у</control>
     <control lang="uk" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Відкрити том у &amp;вікні Провідника яшо змонтовано</control>
     <control lang="uk" key="IDC_FAVORITE_REMOVE">&amp;Вилучити</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="uk" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Глобальні налаштування</control>
     <control lang="uk" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Повідомири після розмонтування за допомогою гарячої клавіші</control>
     <control lang="uk" key="IDC_HK_DISMOUNT_PLAY_SOUND">Звуковий сигнал після розмонтування за допомогою гарячої клавіші</control>
@@ -256,6 +261,7 @@
     <control lang="uk" key="IDM_UNMOUNTALL">Розмонтувати всі змонтовані томи</control>
     <control lang="uk" key="IDM_UNMOUNT_VOLUME">Розмонтувати том</control>
     <control lang="uk" key="IDM_VERIFY_RESCUE_DISK">Провірити диск відновленння</control>
+    <control lang="en" key="IDM_VERIFY_RESCUE_DISK_ISO">Verify Rescue Disk Image</control>
     <control lang="uk" key="IDM_VERSION_HISTORY">Історія версії</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="uk" key="IDM_VOLUME_PROPERTIES">Властивості тома</control>
@@ -365,7 +371,7 @@
     <control lang="uk" key="IDT_SECURITY_TOKEN">Токен безпеки:</control>
     <control lang="uk" key="IDT_SORT_METHOD">Сортування:</control>
     <control lang="uk" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Будь ласка, зачекайте. Цей процес може зайняти тривалий час...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="uk" key="IDT_TEST_BLOCK_NUMBER">Число блоків:</control>
     <control lang="uk" key="IDT_TEST_CIPHERTEXT">Зашифрованний текст (16-кове)</control>
     <control lang="uk" key="IDT_TEST_DATA_UNIT_NUMBER">Число одиниць з данними (64-біт 16-кове, розмір одиниці з данними - 512 байт)</control>
@@ -410,13 +416,13 @@
     <string lang="uk" key="CIPHER_TITLE">Налаштування шифрування</string>
     <string lang="uk" key="CLEAN_WINMRU_FAILED">УВАГА: Помилка очищення шляху до останнього вибраного тома/ключового файлу (записаному в памяті селектором файлів).</string>
     <string lang="uk" key="COMPRESSION_NOT_SUPPORTED">ПОМИЛКА: Контейнер був зжатий на рівні файлової системи. VeraCrypt не підтримує зжаті контейнери (зжаття зашифрованних данних неефективне).\n\nВідключіть зжаття контейнера, виконавши наступні кроки: 1) Щолкніть правою кнопкою миші в Провіднику Windows (не в VeraCrypt). 2) Виберіть пункт 'Властивості'. 3) В діалоговім вікні 'Властивості' нажміть кнопку 'Додатково'. 4) В діплоговому вікні 'Додаткові атрибути' виключіть параметер 'Зжимати вміст для економії місця на диску' і натисніть 'Гаразд'. 5) Натисніть 'Гаразд' в діалоговім вікні 'Властивості'.</string>
-    <string lang="uk" key="CREATE_FAILED">Помилка створення тома %hs</string>
+    <string lang="uk" key="CREATE_FAILED">Помилка створення тома %s</string>
-    <string lang="uk" key="DEVICE_FREE_BYTES">Розмір %hs - %.2f байт</string>
+    <string lang="uk" key="DEVICE_FREE_BYTES">Розмір %s - %.2f байт</string>
-    <string lang="uk" key="DEVICE_FREE_KB">Розмір %hs - %.2f Кб</string>
+    <string lang="uk" key="DEVICE_FREE_KB">Розмір %s - %.2f Кб</string>
-    <string lang="uk" key="DEVICE_FREE_MB">Розмір %hs - %.2f Мб</string>
+    <string lang="uk" key="DEVICE_FREE_MB">Розмір %s - %.2f Мб</string>
-    <string lang="uk" key="DEVICE_FREE_GB">Размір %hs - %.2f Гб</string>
+    <string lang="uk" key="DEVICE_FREE_GB">Размір %s - %.2f Гб</string>
-    <string lang="uk" key="DEVICE_FREE_TB">Розмір %hs - %.2f Тб</string>
+    <string lang="uk" key="DEVICE_FREE_TB">Розмір %s - %.2f Тб</string>
-    <string lang="uk" key="DEVICE_FREE_PB">Розмір %hs - %.2f Пб</string>
+    <string lang="uk" key="DEVICE_FREE_PB">Розмір %s - %.2f Пб</string>
     <string lang="uk" key="DEVICE_IN_USE_FORMAT">УВАГА: Пристрій/розділ використовується операційною системою або пошкоджений. Форматування пристрою/розділу може призвести до втрати данних або нестабільності системи.\n\nПродовжити?</string>
     <string lang="uk" key="DEVICE_IN_USE_INPLACE_ENC">УВАГА: Пристрій/розділ використовується операційною системою або додатком. Потрібно закрити всі программи, які можуть використовувати розділ (включаючи антивірусне ПЗ).\n\nПродовжити?</string>
     <string lang="uk" key="FORMAT_CANT_DISMOUNT_FILESYS">ПОМИЛКА: Пристрій/розділ містить файлову систему, яка не може бути розмонтована. Ця файлова система може використовуватись операційною системою. Форматування пристрою/розділу ймовірніше за все призведе до пошкодження данних і нестабільності системи.\n\nДля вирішення цієї проблеми ми рекомендуємо зпочатку видалити цей розділ, після чого знову створити його без форматування. Ось як це зробити: 1) Клацніть правою кнопкою миші по значку 'Комп'ютер' (або 'Мій комп’ютер') в меню 'Пуск' і виберіть пункт 'Керування'. Повинно появитися вікно 'Керування комп’ютером'. 2) В вікні 'Управління комп'ютером' виберіть 'Запамятовуючі пристрої' &gt; 'Керування дисками'. 3) Клайніть правою кнопкою миші по розділу, який ви хочете зашифрувати, і виберіть або 'Видалити розділ', або 'Видалити том', або 'Видалити логічний диск'. 4) Натисніть 'Так'. Якщо Windows попросить перезагрузити комп'ютер, виконайте це. Потім повторіть кроки 1 і 2 і перейдіть до кроку 5. 5) Клацніть правою кнопкою по пустому участку (воно повинно містити надпис 'Не розподілено') і виберіть 'Основний розділ', 'Додатковий розділ' або 'Логічний диск'. 6) Повинно появитися вікно майстра створення розділів або томів; дотримуйтесь його інструкціям. В вікні майстра на сторінці 'Форматування розділу' виберіть або 'Не форматувати цей розділ', або 'Не форматувати цей том'. В тому ж вікні майстра натисніть кнопку 'Далі' і потім 'Готово'. 7) Майте на увазі, що вибраний вами в VeraCrypt шлях до пристрою може бути тепер невірним. Тому завершіть роботу майстра створення томів VeraCrypt (якщо він все ще виконкється) і запустіть йго знову. 8) Спробуйте знову зашифрувати пристрій/розділ в VeraCrypt.\n\nЯкщо VeraCrypt знову відмовиться шифрувати пристрій/розділ, зкоректуйте свої плани і створіть замість цього файловий контейнер.</string>
@@ -435,12 +441,12 @@
     <string lang="uk" key="INPLACE_ENC_INVALID_PATH">ПОМИЛКА: Шифрування 'на місці' можливе тільки для розділу, динамічного тому або всього системного диску. Впевніться в правильності вказаного шляху.</string>
     <string lang="uk" key="CANNOT_RESIZE_FILESYS">ПОМИЛКА: Неможливо зменшити файлову систему (це необхідно для звільнення місця під заголовок тому і резервну копію заголовка).\n\nМожлимі причини і рішення:\n\n- Недостатньо вільного місця на томі. Спробуйте дефрагментувати файлову систему (щолкніть ПКМ на букві відповідного диска у вікні '(Мій) Комп'ютер', виберіть 'Властивості' &gt; 'Сервіс' &gt; 'Виконати' дефрагментацію &gt; 'Дефрагментація'). Якщо це не допоможе, видаліть непотрібні файли і очистіть Кошик.\n\n- Пошкоджена файлова система. Спробуйте використовувти її (щолкніть ПКМ на букві відповідного диска у вікні '(Мій) Комп'ютер', ввиберіть 'Властивості' &gt; 'Сервіс' &gt; 'Виконати перевірку', включіть опцію 'Автоматично виправляти системні помилки' і натисніть 'Запуск').\n\nЯкщо нічого не допомагає, виконуйте рекомендації подані нижче.</string>
     <string lang="uk" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">ПОМИЛКА: Недостатньо вільного місця на томі, неможливо зменшити файлову систему (це необхідно для звільнення місця під заголовок тому і резервну копію заголовку).\n\nВидаліть непотрідні файли і очистіть кошик, звільнивши декілька мегабайт, повторіть спробу. Якщо це прийнятно, виконуйте рекомендаії наведені нижче.</string>
-    <string lang="uk" key="DISK_FREE_BYTES">На диску %hs вільно %.2f байт</string>
+    <string lang="uk" key="DISK_FREE_BYTES">На диску %s вільно %.2f байт</string>
-    <string lang="uk" key="DISK_FREE_KB">На диску %hs вільно %.2f Кб</string>
+    <string lang="uk" key="DISK_FREE_KB">На диску %s вільно %.2f Кб</string>
-    <string lang="uk" key="DISK_FREE_MB">На диску %hs вільно %.2f Мб</string>
+    <string lang="uk" key="DISK_FREE_MB">На диску %s вільно %.2f Мб</string>
-    <string lang="uk" key="DISK_FREE_GB">На диску %hs вільно %.2f Гб</string>
+    <string lang="uk" key="DISK_FREE_GB">На диску %s вільно %.2f Гб</string>
-    <string lang="uk" key="DISK_FREE_TB">На диску %hs вільно %.2f Тб</string>
+    <string lang="uk" key="DISK_FREE_TB">На диску %s вільно %.2f Тб</string>
-    <string lang="uk" key="DISK_FREE_PB">На диску %hs вільно %.2f Пб</string>
+    <string lang="uk" key="DISK_FREE_PB">На диску %s вільно %.2f Пб</string>
     <string lang="uk" key="DRIVELETTERS">Неможливо отримати доступні літери дисків.</string>
     <string lang="uk" key="DRIVER_NOT_FOUND">Помилка: не знайдено драйвер VeraCrypt.\n\nБудь ласка, скопіюйте файли 'veracrypt.sys' та 'veracrypt-x64.sys' до теки, де розташовується основний застосунок VeraCrypt (VeraCrypt.exe).</string>
     <string lang="uk" key="DRIVER_VERSION">Запущено драйвер VeraCrypt несумісної версії.\n\nВерсія що потрібна: VeraCrypt</string>
@@ -524,7 +530,7 @@
     <string lang="uk" key="HIDVOL_HOST_FILLING_HELP_SYSENC">Зовнішній том створений і змонтований як диск %hc:. Скопіюйте в цей зовнішній том які небуть файли. Вони знадобляться для демонстрації, якщо вас змусять повідомити пароль від першого розділу ззаду системного, де будуть розположені зовнішній том і прихований том (з прихованою ОС). Ви зможете відкрити пароль від цього зовнішнього тому, а існування прихованого тому (і прихованої ОС) залишеться засикречиним.\n\nВАЖЛИВО: Файли, копіюючі в зовнішній том, не повинні займати більше %s. В іншому випадку на зовнішньому томі може виявитися недостатньо вільного місця для прихованого тому (і ви не зможете продовжити). Коли закінчете копіювання, натисніть 'Далі' (не розмонтуйте том).</string>
     <string lang="uk" key="HIDVOL_HOST_FILLING_HELP">Зовнішній том успішно створений і змонтований як диск %hc:. До цього тому зараз слід скопіювати будь-які файли що мають осмислений вигляд, які насправді вам НЕ потрібно ховати. Ці файли потрібні для того, щоб показати їх тим, хто змусить вас повідомити пароль. У цьому випадку ви скажете лише пароль для цього зовнішнього тому, але не для прихованого. Дійсно цінні для вас файли будуть зберігатись у прихованому томі, що буде створено пізніше. Натисніть 'Далі', коли скопіюєте файли. Не розмонтовуйте цей том.\n\nПам'ятайте: після натискання 'Далі' буде просканована карта кластерів зовнішнього тому в пошуку неперервної вільної ділянки, кінець якої стане кінцем тому. Цей блок буде підігнаний під прихований том, тому від нього залежить максимально можливий розмір. Сканування карти необхідне, щоб прихований том не затер дані у зовнішньому томі.</string>
     <string lang="uk" key="HIDVOL_HOST_FILLING_TITLE">Вміст зовнішнього тому</string>
-    <string lang="uk" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nНаступними кроками Майстра буде встановлення опцій для зовнішнього тому (всередині якого пізніше буде створено прихований том). </string>
+    <string lang="uk" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nНаступними кроками Майстра буде встановлення опцій для зовнішнього тому (всередині якого пізніше буде створено прихований том).</string>
     <string lang="uk" key="HIDVOL_HOST_PRE_CIPHER_HELP_SYSENC">\n\nНа наступних етапах ви створете так званий зовнішній том VeraCrypt всередині першого розділу за системним розділом (це було пояснено на попередньому етапі).</string>
     <string lang="uk" key="HIDVOL_HOST_PRE_CIPHER_TITLE">Зовнішній том</string>
     <string lang="uk" key="HIDDEN_OS_PRE_CIPHER_HELP">На наступних етапах потрібно встановити параметри і пароль для прихованого тому, який буде містити приховану ОС. Примітка: для визначення розміру неперерваної незанятої області, закінчення якої буде вирівняно по кінці зовнішнього тому, виконується сканування його карти кластирів. Ця область буде підігнана для прихованого тому, щоб його границі не перевищували максимально можливий розмір. Максимально можливий розмір прихованого тому визначено і він гарантовано більший, чим у системного розділу (це необхідно, оскільки весь вміст системного розділу має бути скопійовано в прихований том). Тобто ніякі дані, що знеаходяться в даний момент в зовнішньому томі, не будуть перезаписані данними, записаними в область прихованого тому.</string>
@@ -561,6 +567,7 @@
     <string lang="uk" key="MAX_HIDVOL_SIZE_KB">Максимальний розмір прихованого тому для цього тому дорівнює %.2f Кб</string>
     <string lang="uk" key="MAX_HIDVOL_SIZE_MB">Максимальний розмір прихованого тому для цього тому дорівнює %.2f Мб</string>
     <string lang="uk" key="MAX_HIDVOL_SIZE_GB">Максимальний розмір прихованого тому для цього тому дорівнює %.2f Гб.</string>
+    <string lang="uk" key="MAX_HIDVOL_SIZE_TB">Максимальний розмір прихованого тому для цього тому дорівнює %.2f Tб.</string>
     <string lang="uk" key="MOUNTED_NOPWCHANGE">Поки том змонтований, змінити пароль/файл-ключі цього тому неможливо. Будь ласка, перш розмонтуйте том.</string>
     <string lang="uk" key="MOUNTED_NO_PKCS5_PRF_CHANGE">Поки том змонтований, змінити алгоритм деривації ключа заголовку цього тому неможливо. Будь ласка, перш розмонтуйте том.</string>
     <string lang="uk" key="MOUNT_BUTTON">&amp;Монтувати</string>
@@ -591,12 +598,12 @@
     <string lang="uk" key="SELECT_PKCS11_MODULE">Виберіть бібліотеку PKCS #11</string>
     <string lang="uk" key="OUTOFMEMORY">Брак пам'яті</string>
     <string lang="uk" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">ВАЖЛИВО: рекомендовано, щоб недосвічені користувачі створювали файл-контейнери на обраних пристроях/розділах замість шифрування усього пристрою/розділу.\n\nКоли ви створите файл-контейнер (як заміна шифрування пристрою або розділу), це, наприклад, не викличе ризик пошкодження великої кількості файлів. Пам'ятайте, що файл-контейнери VeraCrypt (навіть якщо вони містять віртуальні шифровані диски) - це фактично звичайні файли. Відповідно, їх можна, наприклад, легко перейменувати, перемістити або скопіювати як будь-який звичайний файл. Докладніше можна дізнатись у главі для початківців Посібника Користувача VeraCrypt.\n\nВи дійсно бажаєте зашифрувати весь пристрій/розділ?</string>
-    <string lang="uk" key="OVERWRITEPROMPT">УВАГА: файл '%hs' вже існує!\n\nВАЖЛИВО: VERACRYPT НЕ БУДЕ ШИФРУВАТИ ЦЕЙ ФАЙЛ, А ЗНИЩИТЬ ЙОГО. Ви дійсно бажаєте видалити цей файл та замінити його новим контейнером VeraCrypt?</string>
+    <string lang="uk" key="OVERWRITEPROMPT">УВАГА: файл '%s' вже існує!\n\nВАЖЛИВО: VERACRYPT НЕ БУДЕ ШИФРУВАТИ ЦЕЙ ФАЙЛ, А ЗНИЩИТЬ ЙОГО. Ви дійсно бажаєте видалити цей файл та замінити його новим контейнером VeraCrypt?</string>
-    <string lang="uk" key="OVERWRITEPROMPT_DEVICE">ОБЕРЕЖНО: ВСІ ФАЙЛИ, ЩО МІСТЯТЬСЯ У %s '%hs'%s, БУДЕ ВИДАЛЕНО ТА ВТРАЧЕНО (ЇХ НЕ БУДЕ ЗАШИФРОВАНО)!\n\nВи наполягаєте на форматуванні?</string>
+    <string lang="uk" key="OVERWRITEPROMPT_DEVICE">ОБЕРЕЖНО: ВСІ ФАЙЛИ, ЩО МІСТЯТЬСЯ У %s '%s'%s, БУДЕ ВИДАЛЕНО ТА ВТРАЧЕНО (ЇХ НЕ БУДЕ ЗАШИФРОВАНО)!\n\nВи наполягаєте на форматуванні?</string>
-    <string lang="uk" key="NONSYS_INPLACE_ENC_CONFIRM">УВАГА: Монтування тома і доступ до файлів , що в ньому зберігаються неможливе, поки том не буде повністю зашифрований.\n\nВи дійсно бажаєте розпочати шифрування %s '%hs'%s?</string>
+    <string lang="uk" key="NONSYS_INPLACE_ENC_CONFIRM">УВАГА: Монтування тома і доступ до файлів , що в ньому зберігаються неможливе, поки том не буде повністю зашифрований.\n\nВи дійсно бажаєте розпочати шифрування %s '%s'%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="uk" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">УВАГА: Неочікуване зникнення електро живлення під час шифрування даних 'на місці' або збій операційної системи через програмну/апаратну помилку може призвести до часткового пошкодження або втраті даних. Тому перш ніж приступити до шифрування, зробіть резервну копію файлів, які ви бажаєте зашифрувати.\n\nВи зробили резервну копію?</string>
-    <string lang="uk" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">ОБЕРЕЖНО: ВСІ ФАЙЛИ НА РОЗДІЛІ '%hs'%s (Т.Т. НА ПЕРШОМУ РОЗДІЛІ ЗА СИСТЕМНИМ) БУДУТЬ ЗНИЩЕНІ (ВОНИ НЕ БУДУТЬ ЗАШИФРОВАНІ)!\n\nВи наполягаєте на форматуванні?</string>
+    <string lang="uk" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">ОБЕРЕЖНО: ВСІ ФАЙЛИ НА РОЗДІЛІ '%s'%s (Т.Т. НА ПЕРШОМУ РОЗДІЛІ ЗА СИСТЕМНИМ) БУДУТЬ ЗНИЩЕНІ (ВОНИ НЕ БУДУТЬ ЗАШИФРОВАНІ)!\n\nВи наполягаєте на форматуванні?</string>
     <string lang="uk" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">УВАГА: ВИБРАНИЙ РОЗДІЛ МІСТИТЬ ВЕЛИКИЙ ОБЄМ ДАНИХ! Всі файли на цьому розділі будуть видалені (вони НЕ будуть зашифровані)!</string>
     <string lang="uk" key="ERASE_FILES_BY_CREATING_VOLUME">Стерти файли на розділі при створені тому VeraCrypt всередині нього</string>
     <string lang="uk" key="PASSWORD">Пароль</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="uk" key="PREV">&lt; &amp;Назад</string>
     <string lang="uk" key="RAWDEVICES">Неможливо показати перелік установлених у системі raw-пристроїв.</string>
-    <string lang="uk" key="READONLYPROMPT">Том '%hs' існує й призначений лише для читання. Ви дійсно бажаєте його замінити?</string>
+    <string lang="uk" key="READONLYPROMPT">Том '%s' існує й призначений лише для читання. Ви дійсно бажаєте його замінити?</string>
     <string lang="uk" key="SELECT_DEST_DIR">Оберіть теку призначення</string>
     <string lang="uk" key="SELECT_KEYFILE">Оберіть файл-ключ</string>
     <string lang="uk" key="SELECT_KEYFILE_PATH">Оберіть шлях пошуку файл-ключів. УВАГА: запам'ятовується лише шлях, але не імена файлів!</string>
@@ -680,13 +687,13 @@
     <string lang="uk" key="TEST_CIPHERTEXT_SIZE">Довжина тестового зашифрованого тексту, що ви пропонуєте, надто довга або коротка.</string>
     <string lang="uk" key="TEST_KEY_SIZE">Довжина тестового ключа, що ви пропонуєте, надто довга або коротка.</string>
     <string lang="uk" key="TEST_PLAINTEXT_SIZE">Довжина тестового тексту, що ви пропонуєте, надто довга або коротка.</string>
-    <string lang="uk" key="TWO_LAYER_CASCADE_HELP">Два шифри, що послідовно оперують у режимі XTS. Спочатку кожний блок шифрується %hs (%d-біт ключ), а потім %hs (%d-біт ключ). Кожний шифр застосовує свій власний ключ. Усі ключі взаємно незалежні.</string>
+    <string lang="uk" key="TWO_LAYER_CASCADE_HELP">Два шифри, що послідовно оперують у режимі XTS. Спочатку кожний блок шифрується %s (%d-біт ключ), а потім %s (%d-біт ключ). Кожний шифр застосовує свій власний ключ. Усі ключі взаємно незалежні.</string>
-    <string lang="uk" key="THREE_LAYER_CASCADE_HELP">Три шифри, що послідовно оперують у режимі XTS. Кожний блок спочатку шифрується %hs (%d-біт ключ), потім %hs (%d-біт ключ), і, нарешті, %hs (%d-біт ключ). Кожний шифр застосовує свій власний ключ. Усі ключі взаємно незалежні.</string>
+    <string lang="uk" key="THREE_LAYER_CASCADE_HELP">Три шифри, що послідовно оперують у режимі XTS. Кожний блок спочатку шифрується %s (%d-біт ключ), потім %s (%d-біт ключ), і, нарешті, %s (%d-біт ключ). Кожний шифр застосовує свій власний ключ. Усі ключі взаємно незалежні.</string>
     <string lang="uk" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Зверніть увагу, що залежно від конфігурації ОС, функції автозавантаження і автомонтування можуть працювати, тільки якщо файли портативного диску знаходяться на недоступному для запису CD/DVD-носії. Це не помилка VeraCrypt, а обмеження Windows.</string>
     <string lang="uk" key="TRAVELER_DISK_CREATED">Переносний диск VeraCrypt успішно створено.\n\nПам'ятайте, що для завантаження VeraCrypt у портативному режимі необхідно мати права адміністратора. Також врахуйте, що при дослідженні файлу реєстру можна дізнатись, що в системі Windows був завантажений VeraCrypt, навіть якщо він працював у портативному режимі.</string>
     <string lang="uk" key="TC_TRAVELER_DISK">Переносний диск VeraCrypt</string>
     <string lang="uk" key="TWOFISH_HELP">Автори: Bruce Schneier, David Wagner, John Kelsey, Niels Ferguson, Doug Whiting та Chris Hall. Опублікований у 1998 р. 256-біт ключ, 128-біт блок. Режим роботи - XTS. Twofish - один з фіналістів AES.</string>
-    <string lang="uk" key="MORE_INFO_ABOUT">Докладніше про %hs</string>
+    <string lang="uk" key="MORE_INFO_ABOUT">Докладніше про %s</string>
     <string lang="uk" key="UNKNOWN">Невідомо</string>
     <string lang="uk" key="ERR_UNKNOWN">Невідома помилка (%d).</string>
     <string lang="uk" key="UNMOUNTALL_LOCK_FAILED">Деякі томи містять файли або теки, що використовуються застосунками або системою.\n\nНаполягаєте на розмонтуванні?</string>
@@ -851,7 +858,7 @@
     <string lang="uk" key="INSTALL_FAILED">Невдале встановлювання.</string>
     <string lang="uk" key="UNINSTALL_FAILED">Невдале видалення.</string>
     <string lang="uk" key="DIST_PACKAGE_CORRUPTED">Цей файл встановлення пошкоджено. Будь ласка, спробуйте завантажити його знову (рекомендовано з офіційної сторінки VeraCrypt на https://veracrypt.codeplex.com).</string>
-    <string lang="uk" key="CANNOT_WRITE_FILE_X">Неможливо записати файл %hs</string>
+    <string lang="uk" key="CANNOT_WRITE_FILE_X">Неможливо записати файл %s</string>
     <string lang="uk" key="EXTRACTING_VERB">Видобування</string>
     <string lang="uk" key="CANNOT_READ_FROM_PACKAGE">Неможливо прочитати дані з файлу встановлювання.</string>
     <string lang="uk" key="CANT_VERIFY_PACKAGE_INTEGRITY">Неможливо перевірити цілісність цього файлу встановлювання.</string>
@@ -861,7 +868,7 @@
     <string lang="uk" key="SETUP_UPDATE_OK">Программа VeraCrypt успешно обновлена.</string>
     <string lang="uk" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt було відновлено до нової версії. Перед початком її використання, комп'ютер потрібно перезавантажити.\n\nБажаєте перезавантажити зараз?</string>
     <string lang="uk" key="SYS_ENC_UPGRADE_FAILED">Помилка оновлення VeraCrypt!\n\nВАЖЛИВО: Наполегливо рекомендується до завершення роботи або перезавантаження ОС скористатися функцією відновлення системи ('Пуск &gt; Програми &gt; Стандартні &gt; Службові &gt; Відновлення системи') і повернути систему в точку 'VeraCrypt installation'. Якщо функція 'Відновлення системи' недоступна, спробуйте знову встановити вихідну або нову версію версію VeraCrypt до завершення або перезавантаження системи.</string>
-    <string lang="uk" key="UNINSTALL_OK">Програму VeraCrypt успішно видалено.\n\nНатисніть 'Завершити' для видалення встановлювача VeraCrypt та теки %hs. Пам'ятайте, що тека не буде видалена, якщо вона містить будь-які файли не встановлені встановлювачем VeraCrypt або самим VeraCrypt.</string>
+    <string lang="uk" key="UNINSTALL_OK">Програму VeraCrypt успішно видалено.\n\nНатисніть 'Завершити' для видалення встановлювача VeraCrypt та теки %s. Пам'ятайте, що тека не буде видалена, якщо вона містить будь-які файли не встановлені встановлювачем VeraCrypt або самим VeraCrypt.</string>
     <string lang="uk" key="REMOVING_REG">Видалення з реєстру ключів VeraCrypt</string>
     <string lang="uk" key="ADDING_REG">Додавання запису до реєстру</string>
     <string lang="uk" key="REMOVING_APPDATA">Видалення даних, що відносяться до VeraCrypt</string>
@@ -872,10 +879,10 @@
     <string lang="uk" key="CREATING_SYS_RESTORE">Створення точки відновлення системи</string>
     <string lang="uk" key="FAILED_SYS_RESTORE">Помилка створення точки відновлення системи.</string>
     <string lang="uk" key="INSTALLER_UPDATING_BOOT_LOADER">Оновлення завантажувача</string>
-    <string lang="uk" key="INSTALL_OF_FAILED">Не вдалося встановити '%hs'. %hs Бажаєте продовжити встановлення?</string>
+    <string lang="uk" key="INSTALL_OF_FAILED">Не вдалося встановити '%s'. %s Бажаєте продовжити встановлення?</string>
-    <string lang="uk" key="UNINSTALL_OF_FAILED">Не вдалося видалити '%hs'. %hs Бажаєте продовжити видалення?</string>
+    <string lang="uk" key="UNINSTALL_OF_FAILED">Не вдалося видалити '%s'. %s Бажаєте продовжити видалення?</string>
     <string lang="uk" key="INSTALL_COMPLETED">Встановлення завершено.</string>
-    <string lang="uk" key="CANT_CREATE_FOLDER">Не вдалося створити теку '%hs'</string>
+    <string lang="uk" key="CANT_CREATE_FOLDER">Не вдалося створити теку '%s'</string>
     <string lang="uk" key="CLOSE_TC_FIRST">Драйвер пристроїв VeraCrypt не можливо вимкнути.\n\n Будь ласка, закрийте всі відкриті вікна VeraCrypt. Якщо це не допоможе, перезавантажте Windows та спробуйте ще.</string>
     <string lang="uk" key="DISMOUNT_ALL_FIRST">Перед встановленням або перевстановленням VeraCrypt, всі томи мають бути розмонтовані.</string>
     <string lang="uk" key="UNINSTALL_OLD_VERSION_FIRST">В цій системі встановлено застарілу версію VeraCrypt. Перед встановленням нової версії потрібно видалити стару.\n\nОдразу, як ви закриєте це вікно, буде запущено програму видалення старої версії. Після видалення старої версії VeraCrypt, знову запустіть встановлювач нової версії.</string>
@@ -928,7 +935,7 @@
     <string lang="uk" key="FAVORITE_LABEL_DEVICE_PATH_ERR">Зазначений пристрій - не розділ і не динамічний том. Тому присвоїти йому мітку неможливо.</string>
     <string lang="uk" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Привласніть показаному розділу тип, розпізнається Windows (використовуйте команду SETID в Windows-утиліті 'DiskPart'). Потім видаліть розділ зі списку обраних і додайте його знову. Це дозволить VeraCrypt присвоїти розділу позначку.</string>
     <string lang="uk" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Через системні обмеження Windows контейнер, що знаходиться у віддаленій мережевій файловій системі, не можна монтувати як обраний системний том (але його можна змонтувати як несистемний обраний том при вході користувача в свій обліковий запис).</string>
-    <string lang="uk" key="ENTER_PASSWORD_FOR">Введіть пароль для %hs</string>
+    <string lang="uk" key="ENTER_PASSWORD_FOR">Введіть пароль для %s</string>
     <string lang="uk" key="ENTER_PASSWORD_FOR_LABEL">Уведіть пароль для '%s'</string>
     <string lang="uk" key="ENTER_NORMAL_VOL_PASSWORD">Введіть пароль для звичайного/зовнішнього тому</string>
     <string lang="uk" key="ENTER_HIDDEN_VOL_PASSWORD">Введіть пароль для прихованого тому</string>
@@ -943,8 +950,8 @@
     <string lang="uk" key="VOL_HEADER_BACKED_UP">Резервну копію заголовку тому успішно створено.\n\nВАЖЛИВО: при відновленні заголовку з цієї резерної копії також буде відновлено і поточний пароль тому. Більш того, якщо для монтування тому потрібні файл-ключі, після відновлення заголовку з копії для монтування тому будуть потрібні ті ж файл-ключі.\n\nУВАГА: ця резервна копія заголовку тому може бути використована для відновлення заголовку ЛИШЕ цього конкретного тому. Якщо ви використаєте цю резервну копію для відновлення заголовку інших томів, ви зможете монтувати такі томи, але НЕ зможете розшифрувати будь-яку інформацію з нього (тому що зміниться головний ключ).</string>
     <string lang="uk" key="VOL_HEADER_RESTORED">Заголовок тому успішно відновлений.\n\nВАЖЛИВО: майте на увазі, що разом із заголовком також міг бути відновлений і колишній пароль. Більш того, якщо на момент створення резервної копії для монтування тому були потрібні файл-ключі, ці ж файл-ключі знадобляться для монтування цього тому й зараз.</string>
     <string lang="uk" key="EXTERNAL_VOL_HEADER_BAK_FIRST_INFO">В цілях безпеки вам буде потрібно ввести для цього тому правильний пароль (та/або надати коректні ключові файли).\n\nПримітка: якщо в цьому томі міститься прихований тому, спочатку потрібно ввести правильний пароль (та/або надати коректні ключові файли) для зовнішнього томи. Потім, якщо ви вибрали резервне копіювання заголовка прихованого томи, потрібно буде вказати правильний пароль (та/або надати коректні ключові файли) для прихованого томи.</string>
-    <string lang="uk" key="CONFIRM_VOL_HEADER_BAK">Ви дійсно хочете створити резервну копію заголовка томи для %hs?\n\nЯкщо виборі 'Так' вам буде потрібно вказати ім'я файлу для резервної копії заголовка.\n\nПрімечаніе: обидва заголовка - для звичайного і прихованого томів - будуть повторно зашифровані з використанням нової 'солі' і збережені у файлі резервної копії. Якщо всередині цього тому немає прихованого томи, область, зарезервований в резервної копії під заголовок прихованого томи, буде заповнена випадковими даними (для збереження можливості правдоподібного заперечення). При відновленні заголовка томи з файлу резервної копії вам буде потрібно ввести правильний пароль та/або надати коректні ключові файли, дійсні на момент створення резервної копії заголовка томи. За паролем (та/або ключовим файлів) також буде автоматично визначатися тип заголовка том для відновлення - звичайний або прихований (врахуйте, що VeraCrypt визначає тип методом проб і помилок).</string>
+    <string lang="uk" key="CONFIRM_VOL_HEADER_BAK">Ви дійсно хочете створити резервну копію заголовка томи для %s?\n\nЯкщо виборі 'Так' вам буде потрібно вказати ім'я файлу для резервної копії заголовка.\n\nПрімечаніе: обидва заголовка - для звичайного і прихованого томів - будуть повторно зашифровані з використанням нової 'солі' і збережені у файлі резервної копії. Якщо всередині цього тому немає прихованого томи, область, зарезервований в резервної копії під заголовок прихованого томи, буде заповнена випадковими даними (для збереження можливості правдоподібного заперечення). При відновленні заголовка томи з файлу резервної копії вам буде потрібно ввести правильний пароль та/або надати коректні ключові файли, дійсні на момент створення резервної копії заголовка томи. За паролем (та/або ключовим файлів) також буде автоматично визначатися тип заголовка том для відновлення - звичайний або прихований (врахуйте, що VeraCrypt визначає тип методом проб і помилок).</string>
-    <string lang="uk" key="CONFIRM_VOL_HEADER_RESTORE">Ви дійсно бажаєте відновити заголовок тому %hs?\n\nУВАГА: при відновленні заголовку також буде відновлений пароль тому, що діяв на момент створення резервної копії. Більш того, якщо на момент створення резервної копії для монтування тому були потрібні файл-ключі, після відновлення заголовку для монтування цього тому знадобляться ці ж файл-ключі.\n\nНатисніть 'Так', щоб обрати файл з резервною копією заголовку.</string>
+    <string lang="uk" key="CONFIRM_VOL_HEADER_RESTORE">Ви дійсно бажаєте відновити заголовок тому %s?\n\nУВАГА: при відновленні заголовку також буде відновлений пароль тому, що діяв на момент створення резервної копії. Більш того, якщо на момент створення резервної копії для монтування тому були потрібні файл-ключі, після відновлення заголовку для монтування цього тому знадобляться ці ж файл-ключі.\n\nНатисніть 'Так', щоб обрати файл з резервною копією заголовку.</string>
     <string lang="uk" key="DOES_VOLUME_CONTAIN_HIDDEN">Чи є в томі прихований том?</string>
     <string lang="uk" key="VOLUME_CONTAINS_HIDDEN">В томі є прихований том</string>
     <string lang="uk" key="VOLUME_DOES_NOT_CONTAIN_HIDDEN">В томі немає прихованого тому</string>
@@ -955,12 +962,14 @@
     <string lang="uk" key="VOLUME_HAS_NO_BACKUP_HEADER">В цьому томі немає вмонтованої копії заголовку (вмонтовані копії заголовків містять тільки томи, створені VeraCrypt 6.0 або новіша).</string>
     <string lang="uk" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">Ви намагаєтесь зробити резервну копію заголовку системного розділу/пристрою. Це не дозволено. Резервні/відновлювальні операції з системним розділом/пристроєм можуть бути здійснені лише за допомогою Диску Відновлення VeraCrypt.\n\nВи бажаєте створити Диск Відновлення VeraCrypt?</string>
     <string lang="uk" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">Ви намагаєтесь відновити заголовок віртуального тому VeraCrypt, але ви обрали системний розділ/пристрій. Це не дозволено. Резервні/відновлювальні операції з системним розділом/пристроєм можуть бути здійснені лише за допомогою Диску Відновлення VeraCrypt.\n\nВи бажаєте створити Диск Відновлення VeraCrypt?</string>
-    <string lang="uk" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">Після натискання 'Добре', вам потрібно обрати ім'я файлу для ISO-образу нового Диску Відновлення VeraCrypt та шляху його розміщення.</string>
+    <string lang="uk" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">Після натискання 'Добре', вам потрібно обрати ім'я файлу для образу нового Диску Відновлення VeraCrypt та шляху його розміщення.</string>
-    <string lang="uk" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">Образ Диску Відновлення створено та збережено у файлі: %hs\n\nЗараз вам потрібно записати Диск Відновлення на CD або DVD.\n\nВАЖЛИВО: пам'ятайте, що файл потрібно записати на CD/DVD як ISO-образ (а не як окремий файл). Більш докладніше про те, як це зробити, наведено у документації вашого CD/DVD-записувального програмного забезпечення.\n\nПісля запису Диску Відновлення, оберіть 'Система' &gt; 'Перевірити Диск Відновлення', щоб перевірити чи коректно записано Диск Відновлення.</string>
+    <string lang="uk" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">Образ Диску Відновлення створено та збережено у файлі: %s\n\nЗараз вам потрібно записати Диск Відновлення на CD або DVD.\n\nВАЖЛИВО: пам'ятайте, що файл потрібно записати на CD/DVD як ISO-образ (а не як окремий файл). Більш докладніше про те, як це зробити, наведено у документації вашого CD/DVD-записувального програмного забезпечення.\n\nПісля запису Диску Відновлення, оберіть 'Система' &gt; 'Перевірити Диск Відновлення', щоб перевірити чи коректно записано Диск Відновлення.</string>
-    <string lang="uk" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">Образ диска відновлення створений і збережений у файлі:%hs\n\nЗараз вам потрібно записати цей образ на CD або DVD.\n\nБажаєте запустити програму запису оптичних дисків Windows?\n\nЗаписавши диск відновлення на CD/DVD, виберіть 'Система' &gt; 'Перевірити диск відновлення', щоб переконатися в коректності запису створеного диска.</string>
+    <string lang="uk" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">Образ диска відновлення створений і збережений у файлі:%s\n\nЗараз вам потрібно записати цей образ на CD або DVD.\n\nБажаєте запустити програму запису оптичних дисків Windows?\n\nЗаписавши диск відновлення на CD/DVD, виберіть 'Система' &gt; 'Перевірити диск відновлення', щоб переконатися в коректності запису створеного диска.</string>
     <string lang="uk" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Будь ласка, вставте Диск Відновлення VeraCrypt у CD/DVD-пристрій та натисніть 'Добре' для перевірки.</string>
     <string lang="uk" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">Диск Відновлення VeraCrypt успішно перевірено.</string>
     <string lang="uk" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">Неможливо перевірити чи коректно записано Диск Відновлення.\n\nЯкщо у вас є записаний Диск Відновлення, будь ласка, дістаньте, вставте CD/DVD; потім спробуйте ще. Якщо це не допоможе, будь ласка спробуйте іншу CD/DVD-записувальну програму та/або носій.\n\nЯкщо ви захочете перевірити Диск Відновлення VeraCrypt, створений з іншим головний ключем, паролем, "сіллю" тощо, будь ласка пам'ятайте, що перевірка такого Диску Відновлення завжди буде невдалою. Щоб створити новий Диск Відновлення повністю сумісний з вашою поточною конфігурацією, оберіть 'Система' &gt; 'Створити Диск Відновлення'.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk image fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
     <string lang="uk" key="ERROR_CREATING_RESCUE_DISK">Помилка створення Диску Відновлення VeraCrypt.</string>
     <string lang="uk" key="CANNOT_CREATE_RESCUE_DISK_ON_HIDDEN_OS">Диск відновлення VeraCrypt неможна створити при запущеній прихованій операційній системі.\n\nЩоб створити диск відновлення, завантажте підставну операційну систему, а потім виберіть 'Система' &gt; 'Створити диск відновлення'.</string>
     <string lang="uk" key="RESCUE_DISK_CHECK_FAILED">Неможливо перевірити чи коректно записано Диск Відновлення.\n\nЯкщо у вас є записаний Диск Відновлення, будь ласка, вставте в CD/DVD; потім натисніть 'Далі' для наступної спроби. Якщо це не допоможе, будь ласка спробуйте іншу CD/DVD-записувальну програму та/або носій.%s\n\nЯкщо у вас ще немає записаного Диску Відновлення, будь ласка, запишіть його та потім натисніть 'Далі'.\n\nЯкщо ви захочете перевірити Диск Відновлення VeraCrypt, створений перед запуском цього майстра, будь ласка памятайте, що такий Диск Відновлення не можна використовувати, тому що він створений з іншим головним ключем. Вам потрібно записати заново створений Диск Відновлення.</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="uk" key="CHECKING_FS">Перевірка файлової системи тому VeraCrypt, змонтованого як %s...</string>
-    <string lang="uk" key="REPAIRING_FS">Спроба налагодити файлову систему тому VeraCrypt, змонтованого як %hs...</string>
+    <string lang="uk" key="REPAIRING_FS">Спроба налагодити файлову систему тому VeraCrypt, змонтованого як %s...</string>
-    <string lang="uk" key="WARN_CBC_MODE">Увага: цей том зашифровано у режимі CBC. Через міркування секретності, режим CBC не підтримується VeraCrypt з версії 4.1.\n\nрекомендовано, щоб ви перемістили дані з цього тому до нового, створеного поточною версією VeraCrypt. Після того, як ви це зробите, вам слід непомітно видалити або вивести з ладу старий том. Більш докладніше, будь ласка, дивіться в історії змін версій в документації або у повідомленні про програму, що розповсюджується з VeraCrypt, починаючи з версії 4.1.</string>
     <string lang="uk" key="WARN_64_BIT_BLOCK_CIPHER">Увага: цей том зашифрований застарілим алгоритмом шифрування.\n\nУсі алгоритми 64-біт-блокового шифрування  (наприклад, Blowfish, CAST-128, або Triple DES) є небажані до використання. Такі томи можна буде монтувати у майбутніх версіях VeraCrypt. Проте, подальший розвиток та покращення таких алгоритмів не буде відбуватись. рекомендовано створити новий том VeraCrypt із застосуванням 128-біт-блокового алгоритму шифрування (наприклад, AES, Serpent, Twofish тощо) та перемістити усі файли з цього тому у новий.</string>
     <string lang="uk" key="SYS_AUTOMOUNT_DISABLED">Вашу систему не настроєно на автомонтування нових томів. Монтування томів VeraCrypt на основі пристроїв може виявитися неможливим. Щоб включити автомонтування, виконайте наступну команду й перезавантажте систему:\n\nmountvol.exe /E</string>
     <string lang="uk" key="SYS_ASSIGN_DRIVE_LETTER">Будь ласка, призначте літеру розділу/пристрою перед продовженням ('Control Panel' &gt; 'System and Maintenance' &gt; 'Administrative Tools' - 'Create and format hard disk partitions').\n\nПам'ятайте, це вимога операційної системи.</string>
@@ -1069,7 +1077,7 @@
     <string lang="uk" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt більше не підтримує шифрування системного розділу/диску в Windows Vista без встановленого пакета оновлення (Service Pack). Перш ніж оновити VeraCrypt, встановіть Service Pack 1 (або новіший) для Windows Vista.</string>
     <string lang="uk" key="FEATURE_REQUIRES_INSTALLATION">Помилка! Щоб скористатися даною функцією, потрібно щоб VeraCrypt був встановлений на цьому комп’ютері (зараз ви використовуєте VeraCrypt в 'портативному' режимі).\n\nВстановіть (інсталюйте) VeraCrypt і повторіть спробу.</string>
     <string lang="uk" key="WINDOWS_NOT_ON_BOOT_DRIVE_ERROR">Помилка! Windows не встановлений на диску, з якого він завантажується. Це не підтримується.</string>
-    <string lang="uk" key="GPT_BOOT_DRIVE_UNSUPPORTED">Ваш системний диск має таблицю розділів GUID (GPT). На даний момент підтримуються тільки диски з таблицею розділів MBR.</string>
+    <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</string>
     <string lang="uk" key="TC_BOOT_LOADER_ALREADY_INSTALLED">ОБЕРЕЖНО: На системному диску вже встановлено завантажувач VeraCrypt!\n\nМожливо, у вашому комп'ютер є інша вже Зашифрована система.\n\nУВАГА: У разі продовження Шифрування поточна система є вірогідність, що ІНШІ СИСТЕМИ НЕ зможуть завантажувати, А СТОСУЮТЬСЯ НИМ ДАНІ стануть недоступними.\n\nВи дійсно бажаєте продовжити?</string>
     <string lang="uk" key="SYS_LOADER_RESTORE_FAILED">Помилка відновлення початкового завантажувача системи.\n\nВикористовується інсталяційний диск Windows, щоб замінити завантажувач VeraCrypt системний завантажувач Windows.</string>
     <string lang="uk" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">Вихідний системний завантажувач не буде збережений на диску відновлення (можлива причина: немає файлу з резервної копією).</string>
@@ -1108,8 +1116,8 @@
     <string lang="uk" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Примітка: пароль вводиться ДО завантаження Windows, коли будь-які розкладки клавіатури, що відрізняються від американської, ще недоступні. Тому пароль завжди повинен вводиться при стандартній американської розкладці. Важливо, однак, мати на увазі, що вам не потрібно мати справжню американську клавіатуру. VeraCrypt автоматично забезпечує вам безпечний введення пароля (прямо зараз і на стадії перед завантаженням ОС), навіть якщо у вас НЕ справжня американська клавіатура.</string>
     <string lang="uk" key="RESCUE_DISK_INFO">Перш ніж приступити до шифруванню розділу / диска, ви повинні створити диск відновлення VeraCrypt Rescue Disk (VRD), що забезпечує наступне:\n\n-У випадку пошкодження завантажувача VeraCrypt, майстер-ключа або інших критичних даних, VRD дозволяє їх відновити (майте на увазі, що вам все одно буде потрібно ввести правильний пароль).\n\n-Если завантажувач VeraCrypt виявиться пошкодженим або інфікованим вірусом, ви зможете уникнути його запуску, завантажившись прямо з VRD.\n\n-У випадку пошкодження Windows і неможливості її завантаження, VRD дозволяє перманентно розшифрувати розділ/диск перед стартом Windows.\n\n-VRD буде містити резервну копію поточного вмісту першого циліндра диска (в якому зазвичай знаходиться системний завантажувач або менеджер завантаження), і у разі необхідності дозволить відновити його.</string>
     <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>
+    <string lang="uk" key="RESCUE_DISK_BURN_INFO">Образ диска відновлення створений та збережений у файлі:%s\n\nЗараз вам потрібно записати цей образ на CD або DVD.\n\nВАЖНО: Файл-образ має бути записаний на CD/DVD як ISO-образ диска (а не як окремий файл). Про те, як це зробити, див документацію на ваше ПЗ для запису CD/DVD. Якщо у вас немає програми, здатної записати ISO-образ на CD/DVD, клацніть за посиланням нижче, щоб отримати таке безкоштовне ПЗ.\n\nПісля запису диска відновлення натисніть 'Далі', щоб перевірити, чи коректно він був записаний.</string>
-    <string lang="uk" key="RESCUE_DISK_BURN_INFO_NO_CHECK">Диск відновлення створено та збережено в цьому файлі:%hs\n\nЗараз вам слід або записати (пропалити) диск відновлення на CD/DVD, або перемістити його ISO-образ в безпечне місце для використання в подальшому.\n\nЯкщо у вас немає програми, здатної записати ISO-образ на CD/DVD, клацніть на посилання нижче, щоб отримати таке безкоштовне ПЗ.\n\nНатисніть кнопку 'Далі' для продовження.</string>
+    <string lang="uk" key="RESCUE_DISK_BURN_INFO_NO_CHECK">Диск відновлення створено та збережено в цьому файлі:%s\n\nЗараз вам слід або записати (пропалити) диск відновлення на CD/DVD, або перемістити його ISO-образ в безпечне місце для використання в подальшому.\n\nЯкщо у вас немає програми, здатної записати ISO-образ на CD/DVD, клацніть на посилання нижче, щоб отримати таке безкоштовне ПЗ.\n\nНатисніть кнопку 'Далі' для продовження.</string>
     <string lang="uk" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">ВАЖЛИВО: Файл-образ повинен бути записаний на CD/DVD як ISO-образ диска (а не як окремий файл). Про те, як це зробити, див. документацію на ПЗ для запису CD/DVD. Якщо у вас немає програми, здатної записати ISO-образ на CD/DVD, клацніть за посиланням нижче, щоб завантажити таке безкоштовне ПЗ.\n\n</string>
     <string lang="uk" key="LAUNCH_WIN_ISOBURN">Запустити засіб запису образів дисків Windows</string>
     <string lang="uk" key="RESCUE_DISK_BURN_NO_CHECK_WARN">УВАГА: Якщо раніше ви вже створювали диск відновлення VeraCrypt, ви не зможете ним скористатися знову для цього системного розділу/диска, так як він був створений для іншого майстер-ключа! При кожному шифруванні системного розділу/диска потрібно створювати новий диск відновлення VeraCrypt, навіть якщо ви використовуєте той самий пароль.</string>
@@ -1372,6 +1380,39 @@
     <string lang="uk" key="TB_PER_SEC">Тб/с</string>
     <string lang="uk" key="PB_PER_SEC">Пб/с</string>
     <string lang="uk" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.uz.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="uz" name="Ўзбекча" en-name="Uzbek (Cyrillic)" version="0.1.0" translators="Abdurauf Azizov, Dmitry Yerokhin" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="uz" key="IDC_BROWSE">О&amp;чиш...</control>
     <control lang="uz" key="IDC_DESKTOP_ICON">&amp; VeraCrypt Рабочий столда</control>
     <control lang="en" key="IDC_DONATE">Donate now...</control>
-    <control lang="uz" key="IDC_FILE_TYPE">'.tc' кенгайтмасини VeraCrypt билан келиштириш</control>
+    <control lang="uz" key="IDC_FILE_TYPE">'.hc' кенгайтмасини VeraCrypt билан келиштириш</control>
     <control lang="uz" key="IDC_OPEN_CONTAINING_FOLDER">Иш охирида белгиланган жойни очиш</control>
     <control lang="uz" key="IDC_PROG_GROUP">&amp; VeraCrypt ни 'Пуск' га кўшиш</control>
     <control lang="uz" key="IDC_SYSTEM_RESTORE">Кайта тиклаш ну&amp;қтасини яратиш</control>
@@ -37,6 +37,7 @@
     <control lang="uz" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">CD/DVD ёзиш учун Дастурни ишга тушириш</control>
     <control lang="uz" key="IDC_FILE_CONTAINER">Шифрланган файл контейнерини яратиш</control>
     <control lang="uz" key="IDC_GB">&amp;Гб</control>
+    <control lang="uz" key="IDC_TB">&amp;ТБ</control>
     <control lang="uz" key="IDC_HIDDEN_SYSENC_INFO_LINK">Тўлиқрок</control>
     <control lang="uz" key="IDC_HIDDEN_VOL">&amp;Яширилган VeraCrypt томи</control>
     <control lang="uz" key="IDC_HIDDEN_VOL_HELP">'Яширилган том' узи нима?</control>
@@ -44,6 +45,7 @@
     <control lang="uz" key="IDC_HIDVOL_WIZ_MODE_FULL">Оддий режим</control>
     <control lang="uz" key="IDC_KB">&amp;Кб</control>
     <control lang="uz" key="IDC_KEYFILES_ENABLE">Ка&amp;лит. файллар</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="uz" key="IDC_KEY_FILES">Ка&amp;лит. файллар...</control>
     <control lang="uz" key="IDC_LINK_HASH_INFO">Хэш-алгоритмлар буйича маълумотлар</control>
@@ -58,7 +60,8 @@
     <control lang="uz" key="IDC_NO_HISTORY">&amp;Тарихни сакламаслик</control>
     <control lang="uz" key="IDC_OPEN_OUTER_VOLUME">Ташқи томни очиш</control>
     <control lang="uz" key="IDC_PAUSE">&amp;Пауза</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="uz" key="IDC_QUICKFORMAT">Тезда форматлаш.</control>
     <control lang="uz" key="IDC_SHOW_PASSWORD">&amp;Паролни кўрсатишлик</control>
     <control lang="uz" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Паролни кўрсатишлик</control>
@@ -118,6 +121,7 @@
     <control lang="uz" key="IDC_CREATE">Создать</control>
     <control lang="uz" key="IDC_CREATE_VOLUME">&amp;Том(файл) яратиш</control>
     <control lang="uz" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Ни&amp;чего не показывать на экране авторизации (кроме указанного ниже текста)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <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="uz" key="IDC_ENABLE_KEYFILES">Ключ. файлы</control>
     <control lang="uz" key="IDC_ENABLE_NEW_KEYFILES">Ключ. файлы</control>
@@ -132,6 +136,7 @@
     <control lang="en" key="IDC_FAVORITE_MOVE_UP">Move &amp;Up</control>
     <control lang="en" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Open &amp;Explorer window for selected volume when successfully mounted</control>
     <control lang="en" key="IDC_FAVORITE_REMOVE">&amp;Remove</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="en" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Global Settings</control>
     <control lang="en" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Display balloon tooltip after successful hot-key dismount</control>
     <control lang="en" key="IDC_HK_DISMOUNT_PLAY_SOUND">Play system notification sound after successful hot-key dismount</control>
@@ -189,7 +194,7 @@
     <control lang="uz" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="uz" key="IDD_PASSWORDCHANGE_DLG">Изменение пароля или ключевых файлов</control>
     <control lang="uz" key="IDD_PASSWORD_DLG">Введите пароль тома VeraCrypt</control>
-    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance Options</control>
+    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance and Driver Options</control>
     <control lang="uz" key="IDD_PREFERENCES_DLG">VeraCrypt - Настройки</control>
     <control lang="uz" key="IDD_SYSENC_SETTINGS">VeraCrypt - Настройки шифрования системы</control>
     <control lang="uz" key="IDD_TOKEN_PREFERENCES">VeraCrypt - Настройки токена безопасности</control>
@@ -235,7 +240,7 @@
     <control lang="uz" key="IDM_ONLINE_TUTORIAL">Руководство для начинающих</control>
     <control lang="en" key="IDM_ORGANIZE_FAVORITES">Organize Favorite Volumes...</control>
     <control lang="en" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organize System Favorite Volumes...</control>
-    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance...</control>
+    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance/Driver Configuration</control>
     <control lang="uz" key="IDM_PERMANENTLY_DECRYPT_SYS">Перманентно расшифровать системный раздел/диск</control>
     <control lang="uz" key="IDM_PREFERENCES">Настройки...</control>
     <control lang="uz" key="IDM_REFRESH_DRIVE_LETTERS">Обновить буквы дисков</control>
@@ -256,6 +261,7 @@
     <control lang="uz" key="IDM_UNMOUNTALL">Размонтировать все смонтированные тома</control>
     <control lang="uz" key="IDM_UNMOUNT_VOLUME">Размонтировать том</control>
     <control lang="uz" key="IDM_VERIFY_RESCUE_DISK">Проверить диск восстановления</control>
+    <control lang="en" key="IDM_VERIFY_RESCUE_DISK_ISO">Verify Rescue Disk Image</control>
     <control lang="uz" key="IDM_VERSION_HISTORY">История версий</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="uz" key="IDM_VOLUME_PROPERTIES">Свойства тома</control>
@@ -365,7 +371,7 @@
     <control lang="uz" key="IDT_SECURITY_TOKEN">Токен:</control>
     <control lang="uz" key="IDT_SORT_METHOD">Сортировка:</control>
     <control lang="en" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Please wait. This process may take a long time...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="uz" key="IDT_TEST_BLOCK_NUMBER">Число блоков:</control>
     <control lang="uz" key="IDT_TEST_CIPHERTEXT">Зашифрованный текст (16-ричное)</control>
     <control lang="uz" key="IDT_TEST_DATA_UNIT_NUMBER">Число единиц с данными (64-бит 16-ричное, размер единицы с данными - 512 байт)</control>
@@ -410,13 +416,13 @@
     <string lang="uz" key="CIPHER_TITLE">Настройки шифрования</string>
     <string lang="uz" key="CLEAN_WINMRU_FAILED">ВНИМАНИЕ: Ошибка очистки пути к последнему выбранному тому/ключевому файлу (запомненному селектором файлов).</string>
     <string lang="uz" key="COMPRESSION_NOT_SUPPORTED">ОШИБКА: Контейнер был сжат на уровне файловой системы. VeraCrypt не поддерживает сжатые контейнеры (сжатие зашифрованных данных неэффективно и избыточно).\n\nОтключите сжатие контейнера, выполнив следующие шаги: 1) Щёлкните правой кнопкой мыши в Проводнике Windows (не в VeraCrypt). 2) Выберите пункт 'Свойства'. 3) В диалоговом окне 'Свойства' нажмите кнопку 'Дополнительно'. 4) В диалоговом окне 'Дополнительные атрибуты' выключите параметр 'Сжимать содержимое для экономии места на диске' и нажмите 'OK'. 5) Нажмите 'OK' в диалоговом окне 'Свойства'.</string>
-    <string lang="uz" key="CREATE_FAILED">Ошибка создания тома %hs</string>
+    <string lang="uz" key="CREATE_FAILED">Ошибка создания тома %s</string>
-    <string lang="uz" key="DEVICE_FREE_BYTES">Хажми %hs - %.2f байт</string>
+    <string lang="uz" key="DEVICE_FREE_BYTES">Хажми %s - %.2f байт</string>
-    <string lang="uz" key="DEVICE_FREE_KB">Хажми %hs - %.2f Кб</string>
+    <string lang="uz" key="DEVICE_FREE_KB">Хажми %s - %.2f Кб</string>
-    <string lang="uz" key="DEVICE_FREE_MB">Хажми %hs - %.2f Мб</string>
+    <string lang="uz" key="DEVICE_FREE_MB">Хажми %s - %.2f Мб</string>
-    <string lang="uz" key="DEVICE_FREE_GB">Хажми %hs - %.2f Гб</string>
+    <string lang="uz" key="DEVICE_FREE_GB">Хажми %s - %.2f Гб</string>
-    <string lang="uz" key="DEVICE_FREE_TB">Хажми %hs - %.2f Тб</string>
+    <string lang="uz" key="DEVICE_FREE_TB">Хажми %s - %.2f Тб</string>
-    <string lang="uz" key="DEVICE_FREE_PB">Хажми %hs - %.2f Пб</string>
+    <string lang="uz" key="DEVICE_FREE_PB">Хажми %s - %.2f Пб</string>
     <string lang="uz" key="DEVICE_IN_USE_FORMAT">ВНИМАНИЕ: Устройство/раздел используется операционной системой или приложениями. Форматирование устройства/раздела может привести к потере данных или нестабильности системы.\n\nПродолжить?</string>
     <string lang="uz" key="DEVICE_IN_USE_INPLACE_ENC">ВНИМАНИЕ: Устройство/раздел используется операционной системой или приложениями. Следует закрыть все программы, которые могут использовать раздел (включая антивирусное ПО).\n\nПродолжить?</string>
     <string lang="uz" key="FORMAT_CANT_DISMOUNT_FILESYS">ОШИБКА: Устройство/раздел содержит файловую систему, которая не может быть размонтирована. Эта файловая система может использоваться операционной системой. Форматирование устройства/раздела вероятнее всего приведёт к повреждению данных и нестабильности системы.\n\nДля решения этой проблемы мы рекомендуем сначала удалить этот раздел, после чего вновь создать его без форматирования. Вот как это сделать: 1) Щёлкните правой кнопкой мыши по значку 'Компьютер' (или 'Мой компьютер') в меню 'Пуск' и выберите пункт 'Управление'. Должно появиться окно 'Управление компьютером'. 2) В окне 'Управление компьютером' выберите 'Запоминающие устройства' &gt; 'Управление дисками'. 3) Щёлкните правой кнопкой мыши по разделу, который вы хотите зашифровать, и выберите либо 'Удалить раздел', либо 'Удалить том', либо 'Удалить логический диск'. 4) Нажмите 'Да'. Если Windows попросит перезагрузить компьютер, сделайте это. Затем повторите шаги 1 и 2 и перейдите к шагу 5. 5) Щёлкните правой кнопкой на участке с пустым местом (оно должно содержать надпись 'Не распределено') и выберите 'Основной раздел', 'Дополнительный раздел' или 'Логический диск'. 6) Должно появиться окно мастера создания разделов или томов; следуйте его инструкциям. В окне мастера на странице 'Форматирование раздела' выберите либо 'Не форматировать этот раздел', либо 'Не форматировать этот том'. В том же окне мастера нажмите кнопку 'Далее' и затем 'Готово'. 7) Учтите, что выбранный вами в VeraCrypt путь к устройству может быть теперь неверным. Поэтому завершите работу мастера создания томов VeraCrypt (если он всё ещё выполняется) и запустите его снова. 8) Попробуйте снова зашифровать устройство/раздел в VeraCrypt.\n\nЕсли VeraCrypt по-прежнему откажется шифровать устройство/раздел, скорректируйте свои планы и создайте вместо этого файловый контейнер.</string>
@@ -435,15 +441,15 @@
     <string lang="uz" key="INPLACE_ENC_INVALID_PATH">ОШИБКА: Шифрование 'на месте' возможно только для раздела, динамического тома или всего системного диска. Убедитесь в правильности указанного пути.</string>
     <string lang="en" key="CANNOT_RESIZE_FILESYS">Error: Cannot shrink the filesystem (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPossible causes and solutions:\n\n- Not enough free space on the volume. Please make sure no other application is writing to the filesystem.\n\n- Corrupted file system. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
     <string lang="en" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Error: There is not enough free space on the volume and so the filesystem cannot be shrunk (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPlease delete any redundant files and empty the Recycle Bin so as to free at least 256 KB of space and then try again. Note that due to a Windows issue, the amount of free space reported by the Windows Explorer may be incorrect until the operating system is restarted. If restarting the system does not help, the file system may be corrupted. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
-    <string lang="uz" key="DISK_FREE_BYTES">На диске %hs свободно %.2f байт</string>
+    <string lang="uz" key="DISK_FREE_BYTES">На диске %s свободно %.2f байт</string>
-    <string lang="uz" key="DISK_FREE_KB">На диске %hs свободно %.2f Кб</string>
+    <string lang="uz" key="DISK_FREE_KB">На диске %s свободно %.2f Кб</string>
-    <string lang="uz" key="DISK_FREE_MB">На диске %hs свободно %.2f Мб</string>
+    <string lang="uz" key="DISK_FREE_MB">На диске %s свободно %.2f Мб</string>
-    <string lang="uz" key="DISK_FREE_GB">На диске %hs свободно %.2f Гб</string>
+    <string lang="uz" key="DISK_FREE_GB">На диске %s свободно %.2f Гб</string>
-    <string lang="uz" key="DISK_FREE_TB">На диске %hs свободно %.2f Тб</string>
+    <string lang="uz" key="DISK_FREE_TB">На диске %s свободно %.2f Тб</string>
-    <string lang="uz" key="DISK_FREE_PB">На диске %hs свободно %.2f Пб</string>
+    <string lang="uz" key="DISK_FREE_PB">На диске %s свободно %.2f Пб</string>
     <string lang="uz" key="DRIVELETTERS">Невозможно получить доступные буквы дисков.</string>
     <string lang="uz" key="DRIVER_NOT_FOUND">ОШИБКА: Не найден драйвер VeraCrypt.\n\nСкопируйте файлы 'veracrypt.sys' и 'veracrypt-x64.sys' в папку, где находится программа VeraCrypt (файл VeraCrypt.exe).</string>
-    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall; on Windows XP, select 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
+    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' > Computer > 'Uninstall or change a program' > VeraCrypt > Uninstall; on Windows XP, select 'Start Menu' > Settings > 'Control Panel' > 'Add Or Remove Programs' > VeraCrypt > Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
     <string lang="uz" key="ERR_CIPHER_INIT_FAILURE">Ошибка инициализации шифра.</string>
     <string lang="uz" key="ERR_CIPHER_INIT_WEAK_KEY">Ошибка: слабый или потенциально слабый ключ! Этот ключ не принят. Повторите попытку.</string>
     <string lang="en" key="EXCEPTION_REPORT">A critical error has occurred and VeraCrypt must be terminated. If this is caused by a bug in VeraCrypt, we would like to fix it. To help us, you can send us an automatically generated error report containing the following items:\n\n- Program version\n- Operating system version\n- Type of CPU\n- VeraCrypt component name\n- Checksum of VeraCrypt executable\n- Symbolic name of dialog window\n- Error category\n- Error address\n- VeraCrypt call stack\n\nIf you select 'Yes', the following URL (which contains the entire error report) will be opened in your default Internet browser.\n\n%hs\n\nDo you want to send us the above error report?</string>
@@ -497,7 +503,7 @@
     <string lang="uz" key="WIPE_FINISHED">Содержимое раздела/устройства успешно удалено (затёрто).</string>
     <string lang="uz" key="WIPE_FINISHED_DECOY_SYSTEM_PARTITION">Содержимое раздела с исходной системой (клоном которой является скрытая система) успешно удалено (затёрто).</string>
     <string lang="en" key="DECOY_OS_VERSION_WARNING">Please make sure the version of Windows you are going to install (on the wiped partition) is the same as the version of Windows you are currently running. This is required due to the fact that both systems will share a common boot partition.</string>
-    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' &gt; 'Add Mounted Volume to System Favorites').</string>
+    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' > 'Add Mounted Volume to System Favorites').</string>
     <string lang="uz" key="SYSTEM_DECRYPTION_FINISHED">Системный раздел/диск успешно дешифрован.</string>
     <string lang="uz" key="FORMAT_FINISHED_HELP">\n\nТом VeraCrypt создан и готов к использованию.\n\nЕсли вы хотите создать ещё один том VeraCrypt, нажмите кнопку 'Далее'. Иначе нажмите 'Выход'.</string>
     <string lang="uz" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nСкрытый том VeraCrypt успешно создан (внутри него будет находиться скрытая операционная система).\n\nНажмите 'Далее' для продолжения.</string>
@@ -524,7 +530,7 @@
     <string lang="uz" key="HIDVOL_HOST_FILLING_HELP_SYSENC">Внешний том создан и смонтирован как диск %hc:. Скопируйте в этот внешний том какие-нибудь осмысленно выглядящие файлы, которые на самом деле вам прятать НЕ нужно. Они понадобятся для демонстрации, если вас вынудят сообщить пароль от первого раздела позади системного, где будут расположены внешний том и скрытый том (со скрытой ОС). Вы сможете открыть пароль от этого внешнего тома, а существование скрытого тома (и скрытой ОС) останется в тайне.\n\nВАЖНО: Файлы, копируемые во внешний том, не должны занимать больше, чем %s. В противном случае на внешнем томе может оказаться недостаточно свободного места для скрытого тома (и вы не сможете продолжить). Когда закончите копирование, нажмите 'Далее' (не размонтируйте том).</string>
     <string lang="uz" key="HIDVOL_HOST_FILLING_HELP">Внешний том успешно создан и смонтирован как диск %hc:. В этот том сейчас следует скопировать какие-нибудь осмысленно выглядящие файлы, которые на самом деле вам прятать НЕ нужно, чтобы ввести в заблуждение неприятеля, если он вынудит вас сообщить пароль. В этом случае вы скажете только пароль для этого внешнего тома, но не для скрытого. Действительно ценные для вас файлы будут храниться в скрытом томе, создаваемом позже. Когда закончите копировать файлы, нажмите 'Далее'. Не размонтируйте этот том. ПРИМЕЧАНИЕ: Нажатие 'Далее' запустит сканирование карты кластеров внешнего тома для выяснения размера непрерывной свободной области, конец которой станет концом тома. Этот участок будет приспособлен под скрытый том, т.е. именно им определяется его максимально возможный размер. Сканирование карты кластеров гарантирует, что никакие данные во внешнем томе не будут перезаписаны скрытым томом.</string>
     <string lang="uz" key="HIDVOL_HOST_FILLING_TITLE">Содержимое внешнего тома</string>
-    <string lang="uz" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nНа следующих экранах мастера установите параметры для внешнего тома (внутри которого затем будет создан скрытый том). </string>
+    <string lang="uz" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\nНа следующих экранах мастера установите параметры для внешнего тома (внутри которого затем будет создан скрытый том).</string>
     <string lang="uz" key="HIDVOL_HOST_PRE_CIPHER_HELP_SYSENC">\n\nНа следующих этапах вы создадите так называемый внешний том VeraCrypt внутри первого раздела за системным разделом (как это было объяснено на одном из предыдущих этапов).</string>
     <string lang="uz" key="HIDVOL_HOST_PRE_CIPHER_TITLE">Внешний том</string>
     <string lang="uz" key="HIDDEN_OS_PRE_CIPHER_HELP">На следующих этапах потребуется установить параметры и пароль для скрытого тома, который будет содержать скрытую ОС. Примечание: для определения размера непрерывной незанятой области, окончание которой будет выровнено по концу внешнего тома, выполняется сканирование его карты кластеров. Эта область будет подогнана для скрытого тома, чтобы его границы не превышали максимально возможный размер. Максимально возможный размер скрытого тома определён и он гарантированно больше, чем у системного раздела (это необходимо, поскольку всё содержимое системного раздела должно быть скопировано в скрытый том). Т.е. никакие данные, находящиеся в данный момент во внешнем томе, не будут перезаписаны данными, записанными в область скрытого тома.</string>
@@ -561,6 +567,7 @@
     <string lang="uz" key="MAX_HIDVOL_SIZE_KB">Максимальный размер скрытого тома для этого тома: %.2f Кб</string>
     <string lang="uz" key="MAX_HIDVOL_SIZE_MB">Максимальный размер скрытого тома для этого тома: %.2f Мб</string>
     <string lang="uz" key="MAX_HIDVOL_SIZE_GB">Максимальный размер скрытого тома для этого тома: %.2f Гб.</string>
+    <string lang="uz" key="MAX_HIDVOL_SIZE_TB">Максимальный размер скрытого тома для этого тома: %.2f Tб.</string>
     <string lang="uz" key="MOUNTED_NOPWCHANGE">Пока том смонтирован, изменять пароль/ключевые файлы этого тома невозможно. Сначала необходимо размонтировать том.</string>
     <string lang="uz" key="MOUNTED_NO_PKCS5_PRF_CHANGE">Пока том смонтирован, изменять алгоритм деривации ключа заголовка этого тома невозможно. Сначала необходимо размонтировать том.</string>
     <string lang="uz" key="MOUNT_BUTTON">У&amp;ламоқ</string>
@@ -591,12 +598,12 @@
     <string lang="uz" key="SELECT_PKCS11_MODULE">Выберите библиотеку PKCS #11</string>
     <string lang="uz" key="OUTOFMEMORY">Мало памяти</string>
     <string lang="en" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">IMPORTANT: We strongly recommend that inexperienced users create a VeraCrypt file container on the selected device/partition, instead of attempting to encrypt the entire device/partition.\n\nWhen you create a VeraCrypt file container (as opposed to encrypting a device or partition) there is, for example, no risk of destroying a large number of files. Note that a VeraCrypt file container (even though it contains a virtual encrypted disk) is actually just like any normal file. For more information, see the chapter Beginner's Tutorial in the VeraCrypt User Guide.\n\nAre you sure you want to encrypt the entire device/partition?</string>
-    <string lang="uz" key="OVERWRITEPROMPT">ВНИМАНИЕ: Файл '%hs' уже существует!\n\nВАЖНО: VERACRYPT НЕ БУДЕТ ШИФРОВАТЬ ЭТОТ ФАЙЛ, ОН ЕГО УДАЛИТ.\n\nВы действительно хотите удалить этот файл и заменить его новым контейнером VeraCrypt?</string>
+    <string lang="uz" key="OVERWRITEPROMPT">ВНИМАНИЕ: Файл '%s' уже существует!\n\nВАЖНО: VERACRYPT НЕ БУДЕТ ШИФРОВАТЬ ЭТОТ ФАЙЛ, ОН ЕГО УДАЛИТ.\n\nВы действительно хотите удалить этот файл и заменить его новым контейнером VeraCrypt?</string>
-    <string lang="uz" key="OVERWRITEPROMPT_DEVICE">ОСТОРОЖНО: ВСЕ ДАННЫЕ, КОТОРЫЕ СОДЕРЖИТ  %s '%hs'%s, БУДУТ УНИЧТОЖЕНЫ (А НЕ ЗАШИФРОВАНЫ)!\n\nВы настаиваете на форматировании?</string>
+    <string lang="uz" key="OVERWRITEPROMPT_DEVICE">ОСТОРОЖНО: ВСЕ ДАННЫЕ, КОТОРЫЕ СОДЕРЖИТ  %s '%s'%s, БУДУТ УНИЧТОЖЕНЫ (А НЕ ЗАШИФРОВАНЫ)!\n\nВы настаиваете на форматировании?</string>
-    <string lang="uz" key="NONSYS_INPLACE_ENC_CONFIRM">ВНИМАНИЕ: Монтирование тома и доступ к хранящимся на нём файлам невозможны, пока том не будет полностью зашифрован.\n\nВы действительно хотите приступить к шифрованию %s '%hs'%s?</string>
+    <string lang="uz" key="NONSYS_INPLACE_ENC_CONFIRM">ВНИМАНИЕ: Монтирование тома и доступ к хранящимся на нём файлам невозможны, пока том не будет полностью зашифрован.\n\nВы действительно хотите приступить к шифрованию %s '%s'%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="uz" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">ВНИМАНИЕ: Учтите, что неожиданное пропадание электропитания во время шифрования имеющихся данных 'на месте' или сбой операционной системы из-за программной/аппаратной ошибки может привести к частичному повреждению или потере данных. Поэтому прежде чем приступить к шифрованию, сделайте резервную копию файлов, которые вы хотите зашифровать.\n\nВы сделали такую резервную копию?</string>
-    <string lang="uz" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">ОСТОРОЖНО: ВСЕ ФАЙЛЫ НА РАЗДЕЛЕ '%hs'%s (Т.Е. НА ПЕРВОМ РАЗДЕЛЕ ЗА СИСТЕМНЫМ) БУДУТ УНИЧТОЖЕНЫ (ОНИ НЕ БУДУТ ЗАШИФРОВАНЫ)!\n\nВы действительно настаиваете на форматировании?</string>
+    <string lang="uz" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">ОСТОРОЖНО: ВСЕ ФАЙЛЫ НА РАЗДЕЛЕ '%s'%s (Т.Е. НА ПЕРВОМ РАЗДЕЛЕ ЗА СИСТЕМНЫМ) БУДУТ УНИЧТОЖЕНЫ (ОНИ НЕ БУДУТ ЗАШИФРОВАНЫ)!\n\nВы действительно настаиваете на форматировании?</string>
     <string lang="uz" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">ВНИМАНИЕ: ВЫБРАННЫЙ РАЗДЕЛ СОДЕРЖИТ БОЛЬШОЙ ОБЪЁМ ДАННЫХ! Все файлы на этом разделе будут удалены (они НЕ будут зашифрованы)!</string>
     <string lang="uz" key="ERASE_FILES_BY_CREATING_VOLUME">Стереть файлы на разделе при создании тома VeraCrypt внутри него</string>
     <string lang="uz" key="PASSWORD">Пароль</string>
@@ -645,7 +652,7 @@
     <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
     <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
     <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 &gt; Organize &gt; 'Folder and search options' &gt; View).</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="uz" key="FOUND_NO_PARTITION_W_DEFERRED_INPLACE_ENC">Не найдено ни одного несистемного тома с прерванной операцией шифрования и заголовком, для которого подходит указанный пароль и/или ключевые файлы.\n\nПроверьте, правильно ли указан пароль и/или ключевые файлы, и не используется ли раздел/том системой или приложениями (включая антивирусное ПО).</string>
     <string lang="en" key="SELECTED_PARTITION_ALREADY_INPLACE_ENC">The selected partition/device is already fully encrypted.\nHeader Flags = 0x%.8X</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="uz" key="PREV">&lt; &amp;Назад</string>
     <string lang="uz" key="RAWDEVICES">Невозможно показать список установленных в системе raw-устройств.</string>
-    <string lang="uz" key="READONLYPROMPT">Том '%hs' существует и предназначен только для чтения. Вы действительно хотите его заменить?</string>
+    <string lang="uz" key="READONLYPROMPT">Том '%s' существует и предназначен только для чтения. Вы действительно хотите его заменить?</string>
     <string lang="uz" key="SELECT_DEST_DIR">Выберите папку назначения</string>
     <string lang="uz" key="SELECT_KEYFILE">Выберите ключевой файл</string>
     <string lang="uz" key="SELECT_KEYFILE_PATH">Выберите путь поиска ключевых файлов. ВНИМАНИЕ: Запоминается только путь, но не имена файлов.</string>
@@ -680,13 +687,13 @@
     <string lang="uz" key="TEST_CIPHERTEXT_SIZE">Неверная длина тестового зашифрованного текста.</string>
     <string lang="uz" key="TEST_KEY_SIZE">Неверная длина тестового ключа.</string>
     <string lang="uz" key="TEST_PLAINTEXT_SIZE">Неверная длина тестового незашифрованного текста.</string>
-    <string lang="uz" key="TWO_LAYER_CASCADE_HELP">Два шифра, последовательно оперирующие в режиме XTS. Каждый блок сначала шифруется %hs (%d-бит ключ), а затем %hs (%d-бит ключ). Каждый шифр применяет свой собственный ключ. Все ключи взаимно независимы.</string>
+    <string lang="uz" key="TWO_LAYER_CASCADE_HELP">Два шифра, последовательно оперирующие в режиме XTS. Каждый блок сначала шифруется %s (%d-бит ключ), а затем %s (%d-бит ключ). Каждый шифр применяет свой собственный ключ. Все ключи взаимно независимы.</string>
-    <string lang="uz" key="THREE_LAYER_CASCADE_HELP">Три шифра, последовательно оперирующие в режиме XTS. Каждый блок сначала шифруется %hs (%d-бит ключ), затем %hs (%d-бит ключ), и, наконец, %hs (%d-бит ключ). Каждый шифр применяет свой собственный ключ. Все ключи взаимно независимы.</string>
+    <string lang="uz" key="THREE_LAYER_CASCADE_HELP">Три шифра, последовательно оперирующие в режиме XTS. Каждый блок сначала шифруется %s (%d-бит ключ), затем %s (%d-бит ключ), и, наконец, %s (%d-бит ключ). Каждый шифр применяет свой собственный ключ. Все ключи взаимно независимы.</string>
     <string lang="en" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Note that, depending on the operating system configuration, these auto-run and auto-mount features may work only when the traveler disk files are created on a non-writable CD/DVD-like medium. Also note that this is not a bug in VeraCrypt (it is a limitation of Windows).</string>
     <string lang="en" key="TRAVELER_DISK_CREATED">VeraCrypt traveler disk has been successfully created.\n\nNote that you need administrator privileges to run VeraCrypt in portable mode. Also note that, after examining the registry file, it may be possible to tell that VeraCrypt was run on a Windows system even if it is run in portable mode.</string>
     <string lang="uz" key="TC_TRAVELER_DISK">Переносной диск VeraCrypt</string>
     <string lang="uz" key="TWOFISH_HELP">Авторы: Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall и Niels Ferguson. Опубликован в 1998 г. 256-бит ключ, 128-бит блок. Режим работы -- XTS. Twofish -- один из финалистов AES.</string>
-    <string lang="uz" key="MORE_INFO_ABOUT">Тўлиқрок о %hs</string>
+    <string lang="uz" key="MORE_INFO_ABOUT">Тўлиқрок о %s</string>
     <string lang="uz" key="UNKNOWN">Неизвестно</string>
     <string lang="en" key="ERR_UNKNOWN">An unspecified or unknown error occurred (%d).</string>
     <string lang="uz" key="UNMOUNTALL_LOCK_FAILED">Некоторые тома содержат файлы или папки, используемые приложениями или системой.\n\nНастаиваете на размонтировании?</string>
@@ -706,7 +713,7 @@
     <string lang="uz" key="WRONG_VOL_TYPE">VeraCrypt не может изменить пароль для чуждого ему тома.</string>
     <string lang="uz" key="SELECT_FREE_DRIVE">Выберите из списка незанятую букву диска.</string>
     <string lang="uz" key="SELECT_A_MOUNTED_VOLUME">Выберите в списке букв дисков смонтированный том.</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="uz" key="CANT_CREATE_AUTORUN">Ошибка! Невозможно создать autorun.inf</string>
     <string lang="uz" key="ERR_PROCESS_KEYFILE">Ошибка обработки ключевого файла.</string>
     <string lang="uz" key="ERR_PROCESS_KEYFILE_PATH">Ошибка обработки пути ключевого файла.</string>
@@ -851,7 +858,7 @@
     <string lang="uz" key="INSTALL_FAILED">Установка не выполнена.</string>
     <string lang="uz" key="UNINSTALL_FAILED">Удаление не выполнено.</string>
     <string lang="uz" key="DIST_PACKAGE_CORRUPTED">Этот дистрибутивный пакет повреждён. Загрузите его снова (желательно с официального сайта VeraCrypt - https://veracrypt.codeplex.com).</string>
-    <string lang="uz" key="CANNOT_WRITE_FILE_X">Невозможно записать файл %hs</string>
+    <string lang="uz" key="CANNOT_WRITE_FILE_X">Невозможно записать файл %s</string>
     <string lang="uz" key="EXTRACTING_VERB">Извлечение</string>
     <string lang="uz" key="CANNOT_READ_FROM_PACKAGE">Невозможно прочитать данные из дистрибутива.</string>
     <string lang="uz" key="CANT_VERIFY_PACKAGE_INTEGRITY">Невозможно проверить целостность этого дистрибутивного пакета.</string>
@@ -860,8 +867,8 @@
     <string lang="uz" key="INSTALL_OK">Программа VeraCrypt успешно установлена.</string>
     <string lang="uz" key="SETUP_UPDATE_OK">Программа VeraCrypt успешно обновлена.</string>
     <string lang="en" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt has been successfully upgraded. However, before you can start using it, the computer must be restarted.\n\nDo you want to restart it now?</string>
-    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
+    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu > All programs > Accessories > System Tools > System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
-    <string lang="uz" key="UNINSTALL_OK">Программа VeraCrypt успешно удалена.\n\nНажмите 'Готово', чтобы удалить инсталлятор VeraCrypt и папку %hs. Папка не будет удалена, если в ней содержатся какие-либо файлы, созданные не инсталлятором и не самой программой VeraCrypt.</string>
+    <string lang="uz" key="UNINSTALL_OK">Программа VeraCrypt успешно удалена.\n\nНажмите 'Готово', чтобы удалить инсталлятор VeraCrypt и папку %s. Папка не будет удалена, если в ней содержатся какие-либо файлы, созданные не инсталлятором и не самой программой VeraCrypt.</string>
     <string lang="uz" key="REMOVING_REG">Удаление записей VeraCrypt в реестре</string>
     <string lang="uz" key="ADDING_REG">Добавление элемента в реестр</string>
     <string lang="uz" key="REMOVING_APPDATA">Удаление относящихся к программе данных</string>
@@ -872,10 +879,10 @@
     <string lang="uz" key="CREATING_SYS_RESTORE">Создание точки восстановления системы</string>
     <string lang="uz" key="FAILED_SYS_RESTORE">Ошибка создания точки восстановления системы.</string>
     <string lang="uz" key="INSTALLER_UPDATING_BOOT_LOADER">Обновление загрузчика</string>
-    <string lang="uz" key="INSTALL_OF_FAILED">Установка '%hs' не выполнена. %hs Продолжить установку?</string>
+    <string lang="uz" key="INSTALL_OF_FAILED">Установка '%s' не выполнена. %s Продолжить установку?</string>
-    <string lang="uz" key="UNINSTALL_OF_FAILED">Удаление '%hs' не выполнено. %hs Продолжить удаление?</string>
+    <string lang="uz" key="UNINSTALL_OF_FAILED">Удаление '%s' не выполнено. %s Продолжить удаление?</string>
     <string lang="uz" key="INSTALL_COMPLETED">Установка завершена.</string>
-    <string lang="uz" key="CANT_CREATE_FOLDER">Не удалось создать папку '%hs'</string>
+    <string lang="uz" key="CANT_CREATE_FOLDER">Не удалось создать папку '%s'</string>
     <string lang="uz" key="CLOSE_TC_FIRST">Невозможно выгрузить драйвер VeraCrypt.\n\nСначала закройте все открытые окна VeraCrypt. Если это не поможет, перезагрузите Windows и попробуйте ещё раз.</string>
     <string lang="uz" key="DISMOUNT_ALL_FIRST">Прежде чем продолжить установку или удаление VeraCrypt, нужно размонтировать все 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>
@@ -921,14 +928,14 @@
     <string lang="en" key="SYS_FAVORITE_VOLUMES_SAVED">System favorite volumes saved.\n\nTo enable mounting of system favorite volumes when the system starts, please select 'Settings' &gt; 'System Favorite Volumes' &gt; 'Mount system favorite volumes when Windows starts'.</string>
     <string lang="en" key="FAVORITE_ADD_DRIVE_DEV_WARNING">The volume you are adding to favorites is neither a partition nor a dynamic volume. Therefore, VeraCrypt will be unable to mount this favorite volume if the device number changes.</string>
     <string lang="en" key="FAVORITE_ADD_PARTITION_TYPE_WARNING">The volume you are adding to favorites is a partition not recognized by Windows.\n\nVeraCrypt will be unable to mount this favorite volume if the device number changes. Please set the type of the partition to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then add the partition to favorites again.</string>
-    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings &gt; Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
+    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings > Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_NETWORK_PATH_ERR">A container stored in a remote filesystem shared over a network cannot be automatically mounted when its host device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, the volume hosted on the device cannot be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable the volume hosted on the device to be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_LABEL_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, no label can be assigned to it.</string>
     <string lang="en" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable VeraCrypt to assign a label to the partition.</string>
     <string lang="en" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Due to a Windows limitation, a container stored in a remote filesystem shared over a network cannot be mounted as a system favorite volume (however, it can be mounted as a non-system favorite volume when a user logs on).</string>
-    <string lang="uz" key="ENTER_PASSWORD_FOR">Введите пароль для %hs</string>
+    <string lang="uz" key="ENTER_PASSWORD_FOR">Введите пароль для %s</string>
     <string lang="en" key="ENTER_PASSWORD_FOR_LABEL">Enter password for '%s'</string>
     <string lang="uz" key="ENTER_NORMAL_VOL_PASSWORD">Введите пароль для обычного/внешнего тома</string>
     <string lang="uz" key="ENTER_HIDDEN_VOL_PASSWORD">Введите пароль для скрытого тома</string>
@@ -943,8 +950,8 @@
     <string lang="uz" key="VOL_HEADER_BACKED_UP">Резервная копия заголовка тома успешно создана.\n\nВАЖНО: При восстановлении заголовка из этой резервной копии также будет восстановлен и текущий пароль тома. Более того, если для монтирования тома требуются ключевые файлы, после восстановления заголовка из копии для монтирования тома понадобятся те же ключевые файлы.\n\nВНИМАНИЕ: Эту копию заголовка тома можно использовать для восстановления заголовка ТОЛЬКО этого конкретного тома. Если применить эту копию для восстановления заголовка другого тома, смонтировать том вы сможете, но вам НЕ удастся расшифровать никаких данных, хранящихся в этом томе (так как это изменит его мастер-ключ).</string>
     <string lang="uz" key="VOL_HEADER_RESTORED">Заголовок тома успешно восстановлен.\n\nВАЖНО: Имейте в виду, что вместе с заголовком также был восстановлен и прежний пароль. Более того, если на момент создания резервной копии для монтирования тома также требовались ключевые файлы, эти же ключевые файлы понадобятся для монтирования данного тома сейчас.</string>
     <string lang="uz" key="EXTERNAL_VOL_HEADER_BAK_FIRST_INFO">В целях безопасности вам будет нужно ввести для этого тома правильный пароль (и/или предоставить корректные ключевые файлы).\n\nПримечание: если в этом томе содержится скрытый том, сначала нужно ввести правильный пароль (и/или предоставить корректные ключевые файлы) для внешнего тома. Затем, если вы выбрали резервное копирование заголовка скрытого тома, нужно будет указать правильный пароль (и/или предоставить корректные ключевые файлы) для скрытого тома.</string>
-    <string lang="uz" key="CONFIRM_VOL_HEADER_BAK">Вы действительно хотите создать резервную копию заголовка тома для %hs?\n\nПри выборе 'Да' вам потребуется указать имя файла для резервной копии заголовка.\n\nПримечание: оба заголовка -- для обычного и скрытого томов -- будут повторно зашифрованы с использованием новой 'соли' и сохранены в файле резервной копии. Если внутри этого тома нет скрытого тома, область, зарезервированная в резервной копии под заголовок скрытого тома, будет заполнена случайными данными (для сохранения возможности правдоподобного отрицания). При восстановлении заголовка тома из файла резервной копии вам потребуется ввести правильный пароль и/или предоставить корректные ключевые файлы, действительные на момент создания резервной копии заголовка тома. По паролю (и/или ключевым файлам) также будет автоматически определяться тип заголовка тома для восстановления -- обычный или скрытый (учтите, что VeraCrypt определяет тип методом проб и ошибок).</string>
+    <string lang="uz" key="CONFIRM_VOL_HEADER_BAK">Вы действительно хотите создать резервную копию заголовка тома для %s?\n\nПри выборе 'Да' вам потребуется указать имя файла для резервной копии заголовка.\n\nПримечание: оба заголовка -- для обычного и скрытого томов -- будут повторно зашифрованы с использованием новой 'соли' и сохранены в файле резервной копии. Если внутри этого тома нет скрытого тома, область, зарезервированная в резервной копии под заголовок скрытого тома, будет заполнена случайными данными (для сохранения возможности правдоподобного отрицания). При восстановлении заголовка тома из файла резервной копии вам потребуется ввести правильный пароль и/или предоставить корректные ключевые файлы, действительные на момент создания резервной копии заголовка тома. По паролю (и/или ключевым файлам) также будет автоматически определяться тип заголовка тома для восстановления -- обычный или скрытый (учтите, что VeraCrypt определяет тип методом проб и ошибок).</string>
-    <string lang="uz" key="CONFIRM_VOL_HEADER_RESTORE">Вы действительно хотите восстановить заголовок тома %hs?\n\nВНИМАНИЕ: При восстановлении заголовка также будет восстановлен пароль тома, который действовал на момент изготовления резервной копии. Более того, если на момент создания резервной копии для монтирования тома также требовались ключевые файлы, после восстановления заголовка для монтирования данного тома понадобятся эти же ключевые файлы.\n\nНажмите 'Да', чтобы выбрать файл с резервной копией заголовка.</string>
+    <string lang="uz" key="CONFIRM_VOL_HEADER_RESTORE">Вы действительно хотите восстановить заголовок тома %s?\n\nВНИМАНИЕ: При восстановлении заголовка также будет восстановлен пароль тома, который действовал на момент изготовления резервной копии. Более того, если на момент создания резервной копии для монтирования тома также требовались ключевые файлы, после восстановления заголовка для монтирования данного тома понадобятся эти же ключевые файлы.\n\nНажмите 'Да', чтобы выбрать файл с резервной копией заголовка.</string>
     <string lang="uz" key="DOES_VOLUME_CONTAIN_HIDDEN">Имеется ли в томе скрытый том?</string>
     <string lang="uz" key="VOLUME_CONTAINS_HIDDEN">В томе имеется скрытый том</string>
     <string lang="uz" key="VOLUME_DOES_NOT_CONTAIN_HIDDEN">В томе нет скрытого тома</string>
@@ -955,12 +962,14 @@
     <string lang="uz" key="VOLUME_HAS_NO_BACKUP_HEADER">В этом томе нет встроенной копии заголовка (учтите, что встроенные копии заголовков содержат только тома, созданные VeraCrypt 6.0 или новее).</string>
     <string lang="uz" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">Вы пытаетесь сделать резервную копию заголовка системного раздела/диска. Это не разрешено. Операции резервного копирования/восстановления, относящиеся к системному разделу/диску, можно выполнять только с помощью диска восстановления VeraCrypt (Rescue Disk).\n\nСоздать диск восстановления VeraCrypt?</string>
     <string lang="uz" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">Вы пытаетесь восстановить из резервной копии заголовок виртуального тома VeraCrypt, но выбрали системный раздел/диск. Это не разрешено. Операции резервного копирования/восстановления, относящиеся к системному разделу/диску, можно выполнять только с помощью диска восстановления VeraCrypt (Rescue Disk).\n\nСоздать диск восстановления VeraCrypt?</string>
-    <string lang="uz" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">После нажатия OK выберите имя файла для ISO-образа нового диска восстановления VeraCrypt (Rescue Disk) и место, где его нужно сохранить.</string>
+    <string lang="uz" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">После нажатия OK выберите имя файла для образа нового диска восстановления VeraCrypt (Rescue Disk) и место, где его нужно сохранить.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
     <string lang="uz" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Чтобы проверить диск восстановления VeraCrypt, вставьте его в CD/DVD-накопитель и нажмите OK.</string>
     <string lang="uz" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">Диск восстановления VeraCrypt успешно прошёл проверку.</string>
     <string lang="uz" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">Невозможно проверить правильность записи диска восстановления.\n\nЕсли вы записали диск восстановления, выньте CD/DVD из накопителя и вставьте снова; затем нажмите 'Далее', чтобы повторить попытку. Если это не поможет, попробуйте воспользоваться другим ПО для записи CD/DVD и/или другим CD/DVD.\n\nЕсли вы пытались проверить диск восстановления VeraCrypt, созданный с другим мастер-ключом, паролем, 'солью' и т.д., знайте, что такой диск восстановления не пройдёт эту проверку никогда. Чтобы создать новый диск восстановления, полностью совместимый с текущей конфигурацией, выберите меню 'Система' &gt; 'Создать диск восстановления'.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk image fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
     <string lang="uz" key="ERROR_CREATING_RESCUE_DISK">Ошибка создания диска аварийного восстановления VeraCrypt.</string>
     <string lang="uz" key="CANNOT_CREATE_RESCUE_DISK_ON_HIDDEN_OS">Диск восстановления VeraCrypt нельзя создавать при запущенной скрытой операционной системе.\n\nЧтобы создать диск восстановления, загрузите обманную операционную систему, а затем выберите 'Система' &gt; 'Создать диск восстановления'.</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 be used, because it was created for a different master key. You need to burn the newly generated Rescue Disk.</string>
@@ -989,8 +998,8 @@
     <string lang="uz" key="DRIVE_LETTER_ITEM">Буква диска:   </string>
     <string lang="uz" key="UNSUPPORTED_CHARS_IN_PWD">Ошибка! Пароль должен содержать только символы стандартного набора ASCII.\n\nСимволы не из набора ASCII могут привести к невозможности монтирования тома при смене настроек в конфигурации системы.\n\nРазрешается использовать следующие символы:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4  5 6 7 8 9 : ; &lt; = &gt; ? @ 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="uz" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">Внимание! Пароль содержит не-ASCII символы. Это может привести к невозможности монтирования тома при смене конфигурации системы.\n\nВам следует заменить все не-ASCII символы в пароле на символы ASCII. Для этого щёлкните на меню 'Тома' -&gt; 'Изменить пароль тома'.\n\nК символам ASCII относятся:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4  5 6 7 8 9 : ; &lt; = &gt; ? @ 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="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 change it (e.g., to '.tc').\n\nAre you sure you want to use the problematic file extension?</string>
+    <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 change it (e.g., to '.hc').\n\nAre you sure you want to use the problematic file extension?</string>
-    <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 container or change it (e.g., to '.tc') after you dismount the volume.</string>
+    <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 container or change it (e.g., to '.hc') after you dismount the volume.</string>
     <string lang="uz" key="HOMEPAGE">Домашняя страница</string>
     <string lang="uz" key="LARGE_IDE_WARNING_XP">ВНИМАНИЕ: В системе не установлено ни одного пакета обновлений (Service Pack) Windows. Если в Windows XP не установлен Service Pack 1 (или новее), не следует выполнять запись на диски IDE объёмом более 128 Гб, иначе возможно повреждение данных (неважно, относятся они к тому VeraCrypt или нет). Это ограничение Windows, а не ошибка в VeraCrypt.</string>
     <string lang="uz" key="LARGE_IDE_WARNING_2K">ВНИМАНИЕ: В системе не установлен пакет обновлений Windows Service Pack 3 (или новее). Если в Windows 2000 не установлен Service Pack 3 (или новее), не следует выполнять запись на диски IDE объёмом более 128 Гб, иначе возможно повреждение данных (неважно, относятся они к тому VeraCrypt или нет). Это ограничение Windows, а не ошибка в VeraCrypt. Кроме того, может потребоваться включить в реестре поддержку 48-бит адресации LBA; подробности см. на http://support.microsoft.com/kb/305098/EN-US</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="uz" key="CHECKING_FS">Проверка файловой системы тома VeraCrypt, смонтированного как %s...</string>
-    <string lang="uz" key="REPAIRING_FS">Попытка починить файловую систему тома VeraCrypt, смонтированного как %hs...</string>
+    <string lang="uz" key="REPAIRING_FS">Попытка починить файловую систему тома VeraCrypt, смонтированного как %s...</string>
-    <string lang="uz" key="WARN_CBC_MODE">ВНИМАНИЕ: Этот том зашифрован в режиме CBC. Из соображений безопасности, режим CBC считается неудовлетворительным начиная с VeraCrypt 4.1.\n\nНастоятельно рекомендуем вам перенести данные из этого тома VeraCrypt в новый том, созданный текущей версией VeraCrypt. После того, как вы это сделаете, старый том следует надёжно стереть или уничтожить. Подробности см. в истории версий программы в документации или в примечаниях к программе, распространяемых вместе с VeraCrypt 4.1 и новее.</string>
     <string lang="uz" key="WARN_64_BIT_BLOCK_CIPHER">ВНИМАНИЕ: Этот том зашифрован с использованием устаревшего алгоритма.\n\nВсе алгоритмы шифрования с 64-бит блоками (например, Blowfish, CAST-128, Triple DES) вышли из употребления. В последующих версиях VeraCrypt монтирование этого тома будет возможно, однако никаких улучшений в реализации этих устаревших алгоритмов шифрования не предвидится. Рекомендуем вам создать новый том VeraCrypt с шифрованием по алгоритму со 128-бит блоками (например, AES, Serpent, Twofish и др.) и перенести все файлы из этого тома в новый.</string>
     <string lang="uz" key="SYS_AUTOMOUNT_DISABLED">Ваша система не настроена на автомонтирование новых томов. Монтирование томов VeraCrypt на основе устройств может оказаться невозможным. Чтобы включить автомонтирование, выполните следующую команду и перезагрузите систему:\n\nmountvol.exe /E</string>
     <string lang="uz" key="SYS_ASSIGN_DRIVE_LETTER">Прежде чем продолжить, присвойте разделу/устройству букву диска ('Панель управления' &gt; 'Администрирование' &gt; 'Управление компьютером' - 'Управление дисками').\n\nПримечание: это требование операционной системы.</string>
@@ -1069,7 +1077,7 @@
     <string lang="en" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt no longer supports encryption of the system partition/drive on Windows Vista with no Service Pack installed. Before upgrading VeraCrypt, please install Service Pack 1 or higher for Windows Vista.</string>
     <string lang="en" key="FEATURE_REQUIRES_INSTALLATION">Error: This feature requires VeraCrypt to be installed on the system (you are running VeraCrypt in portable mode).\n\nPlease install VeraCrypt and then try again.</string>
     <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="uz" key="GPT_BOOT_DRIVE_UNSUPPORTED">Ваш системный диск имеет таблицу разделов GUID (GPT). В настоящий момент поддерживаются только диски с таблицей разделов MBR.</string>
+    <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</string>
     <string lang="uz" key="TC_BOOT_LOADER_ALREADY_INSTALLED">ОСТОРОЖНО: На системном диске уже установлен загрузчик VeraCrypt!\n\nВозможно, в вашем компьютере имеется другая уже зашифрованная система.\n\nВНИМАНИЕ: В СЛУЧАЕ ПРОДОЛЖЕНИЯ ШИФРОВАНИЯ ТЕКУЩЕЙ СИСТЕМЫ ЕСТЬ ВЕРОЯТНОСТЬ, ЧТО ДРУГИЕ СИСТЕМЫ НЕ СМОГУТ ЗАГРУЖАТЬСЯ, А ОТНОСЯЩИЕСЯ К НИМ ДАННЫЕ СТАНУТ НЕДОСТУПНЫМИ.\n\nВы действительно хотите продолжить?</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' &gt; 'Restore original system loader') or Windows installation medium to replace the VeraCrypt Boot Loader with the Windows system loader.</string>
     <string lang="uz" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">Исходный системный загрузчик не будет сохранён на диске восстановления (возможная причина: нет файла с резервной копией).</string>
@@ -1093,7 +1101,7 @@
     <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 medium (or using a service partition)?</string>
     <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 Hidden Volumes" in the VeraCrypt User's Guide.\n\nImportant: Before proceeding, please make sure you have read the section "Security Requirements and Precautions Pertaining to Hidden Volumes" in the VeraCrypt User's Guide.\n\n\nDoes the currently running operating system meet the above condition?</string>
     <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 from writing to the shared boot partition and from hibernating.\n\n\nDo you want to continue? If you select 'No', instructions for removing the extra boot partition will be displayed.</string>
-    <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' &gt; '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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
+    <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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
     <string lang="uz" key="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">Внимание! Между системным разделом и первым разделом за ним имеется нераспределённое место. После создания скрытой операционной системы вы не должны создавать в этой нераспределённой области никаких новых разделов. В противном случае скрытая ОС не сможет загрузиться (до тех пор, пока не будут удалены такие вновь созданные разделы).</string>
     <string lang="uz" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">В данный момент этот алгоритм для шифрования системы не поддерживается.</string>
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
@@ -1108,8 +1116,8 @@
     <string lang="uz" 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 (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 starts.\n\n- The VRD will contain a backup of the present content of the first drive track (which typically contains a system loader or boot manager) and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ISO image will be created in the location specified below.</string>
     <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">The Rescue Disk image has been created and stored in this file:\n%s\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>
+    <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%s\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>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">IMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software. If you do not have any CD/DVD recording software that can write the ISO disk image to a CD/DVD, click the link below to download such free software.\n\n</string>
     <string lang="en" key="LAUNCH_WIN_ISOBURN">Launch Microsoft Windows Disc Image Burner</string>
     <string lang="uz" key="RESCUE_DISK_BURN_NO_CHECK_WARN">ВНИМАНИЕ: Если ранее вы уже создавали диск восстановления VeraCrypt, вы не сможете им воспользоваться снова для этого системного раздела/диска, так как он был создан для другого мастер-ключа! При каждом шифровании системного раздела/диска нужно создавать новый диск восстановления VeraCrypt, даже если вы используете тот же самый пароль.</string>
@@ -1247,7 +1255,7 @@
     <string lang="uz" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">Если вы столкнулись с любой из ранее описанных проблем, дешифруйте раздел/диск (если он зашифрован), после чего попробуйте зашифровать его снова, используя не-каскадный Шифрлаш алгоритми (например, 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 system (but not on the decoy system), the decoy system would contain a VeraCrypt driver and VeraCrypt applications whose version numbers are different from the version number of the VeraCrypt Boot Loader. Such a discrepancy might indicate that there is a hidden operating system on this computer.\n\n\nDo you want to continue?</string>
     <string lang="uz" key="UPDATE_TC_IN_HIDDEN_OS_TOO">Номер версии загрузчика VeraCrypt, с помощью которого была загружена эта ОС, отличается от номера версии драйвера и приложений VeraCrypt, установленных в этой системе.\n\nВам следует запустить инсталлятор VeraCrypt (той же версии, что и у загрузчика VeraCrypt), чтобы обновить VeraCrypt в этой операционной системе.</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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' &gt; '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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' > 'Create Rescue Disk').</string>
     <string lang="uz" key="BOOT_LOADER_UPGRADE_OK">Загрузчик VeraCrypt обновлён.\n\nНастоятельно рекомендуется создать новый диск восстановления VeraCrypt (Rescue Disk), который будет содержать новую версию загрузчика VeraCrypt. Для этого после перезагрузки компьютера выберите меню 'Система' &gt; 'Создать диск восстановления'.</string>
     <string lang="uz" key="BOOT_LOADER_UPGRADE_OK_HIDDEN_OS">Загрузчик VeraCrypt обновлён.\n\nНастоятельно рекомендуется загрузить обманную операционную систему и затем создать новый диск восстановления VeraCrypt (который будет содержать новую версию загрузчика VeraCrypt). Для этого выберите меню 'Система' &gt; 'Создать диск восстановления'.</string>
     <string lang="uz" key="BOOT_LOADER_UPGRADE_FAILED">Ошибка обновления загрузчика VeraCrypt.</string>
@@ -1272,7 +1280,7 @@
     <string lang="uz" key="INVALID_TOKEN_KEYFILE_PATH">Путь к ключевому файлу токена безопасности неверен.</string>
     <string lang="uz" key="SECURITY_TOKEN_ERROR">Ошибка токена безопасности</string>
     <string lang="uz" key="CKR_PIN_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' &gt; '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="uz" key="ALL_TOKEN_SESSIONS_CLOSED">Все открытые токен-сессии были закрыты.</string>
     <string lang="uz" key="SELECT_TOKEN_KEYFILES">Выберите ключевые файлы токена безопасности</string>
     <string lang="uz" key="TOKEN_SLOT_ID">Слот</string>
@@ -1297,8 +1305,8 @@
     <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 system.</string>
     <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' &gt; 'Performance' and enable 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' &gt; 'Performance' and disable 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>
@@ -1372,6 +1380,39 @@
     <string lang="uz" key="TB_PER_SEC">Тб/с</string>
     <string lang="uz" key="PB_PER_SEC">Пб/с</string>
     <string lang="en" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.vi.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="vi" name="Tiếng Việt" en-name="Vietnamese" version="0.1.0" translators="Nguyễn Kim Huy" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="vi" key="IDC_BROWSE">X&amp;em...</control>
     <control lang="vi" key="IDC_DESKTOP_ICON">Thêm biểu tượng VeraCrypt vào &amp;màn hình</control>
     <control lang="en" key="IDC_DONATE">Donate now...</control>
-    <control lang="vi" key="IDC_FILE_TYPE">Liên hệ tập tin có &amp;đuôi .tc với VeraCrypt</control>
+    <control lang="vi" key="IDC_FILE_TYPE">Liên hệ tập tin có &amp;đuôi .hc với VeraCrypt</control>
     <control lang="vi" key="IDC_OPEN_CONTAINING_FOLDER">&amp;Mở vị trí đích khi chấm dứt</control>
     <control lang="vi" key="IDC_PROG_GROUP">Thêm VeraCrypt vào trình đơn &amp;Start</control>
     <control lang="vi" key="IDC_SYSTEM_RESTORE">Cấu tạo điểm &amp;Phục hồi Hệ thống</control>
@@ -37,6 +37,7 @@
     <control lang="vi" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Tải nhu liệu thâu CD/DVD xuống</control>
     <control lang="vi" key="IDC_FILE_CONTAINER">Cấu tạo một bộ chứa tập tin được mã hóa</control>
     <control lang="vi" key="IDC_GB">&amp;GB</control>
+    <control lang="vi" key="IDC_TB">&amp;TB</control>
     <control lang="vi" key="IDC_HIDDEN_SYSENC_INFO_LINK">Thêm thông tin</control>
     <control lang="vi" key="IDC_HIDDEN_VOL">Tập đĩa VeraCrypt được &amp;ẩn</control>
     <control lang="vi" key="IDC_HIDDEN_VOL_HELP">Thêm thông tin về tập đĩa được ẩn</control>
@@ -44,6 +45,7 @@
     <control lang="vi" key="IDC_HIDVOL_WIZ_MODE_FULL">Phương thức thông thường</control>
     <control lang="vi" key="IDC_KB">&amp;KB</control>
     <control lang="vi" key="IDC_KEYFILES_ENABLE">X&amp;ử dụng tập tin khóa</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="vi" key="IDC_KEY_FILES">&amp;Tập tin khóa..</control>
     <control lang="vi" key="IDC_LINK_HASH_INFO">Thông tin về các thuật toán ước tính</control>
@@ -58,7 +60,8 @@
     <control lang="vi" key="IDC_NO_HISTORY">Đừng bao giờ &amp;lưu lược sử</control>
     <control lang="vi" key="IDC_OPEN_OUTER_VOLUME">Mở tập đĩa bên ngoài</control>
     <control lang="vi" key="IDC_PAUSE">&amp;Tạm dừng</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="vi" key="IDC_QUICKFORMAT">Định dạng nhanh</control>
     <control lang="vi" key="IDC_SHOW_PASSWORD">&amp;Hiển thị mật mã</control>
     <control lang="vi" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Hiển thị mật mã</control>
@@ -118,6 +121,7 @@
     <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>
     <control lang="vi" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Đừng cho thấy bất cứ văn bản nào trong màn ảnh chứng thực tiền khởi động (ngoại trừ thông điệp riêng bên dưới)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <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="vi" key="IDC_ENABLE_KEYFILES">Xử dụng tập tin khóa</control>
     <control lang="vi" key="IDC_ENABLE_NEW_KEYFILES">Xử dụng tập tin khóa</control>
@@ -132,6 +136,7 @@
     <control lang="en" key="IDC_FAVORITE_MOVE_UP">Move &amp;Up</control>
     <control lang="en" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Open &amp;Explorer window for selected volume when successfully mounted</control>
     <control lang="en" key="IDC_FAVORITE_REMOVE">&amp;Remove</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="en" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Global Settings</control>
     <control lang="en" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Display balloon tooltip after successful hot-key dismount</control>
     <control lang="en" key="IDC_HK_DISMOUNT_PLAY_SOUND">Play system notification sound after successful hot-key dismount</control>
@@ -189,7 +194,7 @@
     <control lang="vi" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="vi" key="IDD_PASSWORDCHANGE_DLG">Thay đổi Mật mã hoặc Tập tin khóa</control>
     <control lang="vi" key="IDD_PASSWORD_DLG">Nhập vào Mật mã của Tập đĩa VeraCrypt</control>
-    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance Options</control>
+    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance and Driver Options</control>
     <control lang="vi" key="IDD_PREFERENCES_DLG">VeraCrypt - Tùy thích</control>
     <control lang="vi" key="IDD_SYSENC_SETTINGS">VeraCrypt - Thiết lập Mã hóa Hệ thống</control>
     <control lang="vi" key="IDD_TOKEN_PREFERENCES">VeraCrypt - Các tùy thích của Hiệu bài Bảo mật</control>
@@ -235,7 +240,7 @@
     <control lang="vi" key="IDM_ONLINE_TUTORIAL">Bài học cho người bắt đầu</control>
     <control lang="en" key="IDM_ORGANIZE_FAVORITES">Organize Favorite Volumes...</control>
     <control lang="en" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organize System Favorite Volumes...</control>
-    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance...</control>
+    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance/Driver Configuration</control>
     <control lang="vi" key="IDM_PERMANENTLY_DECRYPT_SYS">Giải mã vĩnh viễn Phân vùng Hệ thống/Ổ đĩa</control>
     <control lang="vi" key="IDM_PREFERENCES">Sở thích...</control>
     <control lang="vi" key="IDM_REFRESH_DRIVE_LETTERS">Cập nhật các Chữ hiệu Ổ đĩa</control>
@@ -256,6 +261,7 @@
     <control lang="vi" key="IDM_UNMOUNTALL">Tháo Tất cả các Tập đĩa xuống</control>
     <control lang="vi" key="IDM_UNMOUNT_VOLUME">Tháo Tập đĩa xuống</control>
     <control lang="vi" key="IDM_VERIFY_RESCUE_DISK">Kiểm tra Đĩa Cứu hộ</control>
+    <control lang="en" key="IDM_VERIFY_RESCUE_DISK_ISO">Verify Rescue Disk Image</control>
     <control lang="vi" key="IDM_VERSION_HISTORY">Lịch sử phiên bản</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="vi" key="IDM_VOLUME_PROPERTIES">Đặc tính của Tập đĩa</control>
@@ -365,7 +371,7 @@
     <control lang="vi" key="IDT_SECURITY_TOKEN">Hiệu bài bảo mật:</control>
     <control lang="vi" key="IDT_SORT_METHOD">Phương pháp sắp xếp:</control>
     <control lang="en" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Please wait. This process may take a long time...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="vi" key="IDT_TEST_BLOCK_NUMBER">Số khối:</control>
     <control lang="vi" key="IDT_TEST_CIPHERTEXT">Chữ mã hóa (hexadecimal)</control>
     <control lang="vi" key="IDT_TEST_DATA_UNIT_NUMBER">Số đơn vị dữ liệu (64-bit hexadecimal, kích cỡ đơn vị dữ liệu là 512 bytes)</control>
@@ -410,13 +416,13 @@
     <string lang="vi" key="CIPHER_TITLE">Tùy chọn mã hóa</string>
     <string lang="vi" key="CLEAN_WINMRU_FAILED">CẢNH BÁO: Không dọn sạch được đường dẫn của tập đĩa/tập tin khóa được chọn (được nhớ bởi bộ chọn tập tin)!</string>
     <string lang="vi" key="COMPRESSION_NOT_SUPPORTED">Lỗi: Bộ chứa đã bị ép lại ở cấp hệ thống tập tin. VeraCrypt không hỗ trợ các bộ chứa bị ép lại (lưu ý là việc ép những dữ liệu được mã hóa lại là vô ích và dư thừa).\n\nXin tắt việc ép bộ chứa lại bằng cách theo những bước sau đây:\n1) Nhấn phải vào bộ chứa trong Windows Explorer (không phải trong VeraCrypt).\n2) Chọn 'Đặc tính'.\n3) Trong hộp thoại 'Đặc tính', nhấn 'Cấp cao'.\n4) Trong hộp thoại 'Thuộc tính Cấp cao', tắt tùy chọn 'Ép nội dung lại để tiết kiệm chỗ trống trong đĩa' và nhấn 'OK'.\n5) Trong hộp thoại 'Đặc tính', nhấn 'OK'.</string>
-    <string lang="vi" key="CREATE_FAILED">Không cấu tạo tập đĩa %hs được</string>
+    <string lang="vi" key="CREATE_FAILED">Không cấu tạo tập đĩa %s được</string>
-    <string lang="vi" key="DEVICE_FREE_BYTES">Kích cỡ của %hs là %.2f bytes</string>
+    <string lang="vi" key="DEVICE_FREE_BYTES">Kích cỡ của %s là %.2f bytes</string>
-    <string lang="vi" key="DEVICE_FREE_KB">Kích cỡ của %hs là %.2f KB</string>
+    <string lang="vi" key="DEVICE_FREE_KB">Kích cỡ của %s là %.2f KB</string>
-    <string lang="vi" key="DEVICE_FREE_MB">Kích cỡ của %hs là %.2f MB</string>
+    <string lang="vi" key="DEVICE_FREE_MB">Kích cỡ của %s là %.2f MB</string>
-    <string lang="vi" key="DEVICE_FREE_GB">Kích cỡ của %hs là %.2f GB</string>
+    <string lang="vi" key="DEVICE_FREE_GB">Kích cỡ của %s là %.2f GB</string>
-    <string lang="vi" key="DEVICE_FREE_TB">Kích cỡ của %hs là %.2f TB</string>
+    <string lang="vi" key="DEVICE_FREE_TB">Kích cỡ của %s là %.2f TB</string>
-    <string lang="vi" key="DEVICE_FREE_PB">Kích cỡ của %hs là %.2f PB</string>
+    <string lang="vi" key="DEVICE_FREE_PB">Kích cỡ của %s là %.2f PB</string>
     <string lang="vi" key="DEVICE_IN_USE_FORMAT">CẢNH BÁO: Thiết bị/phân vùng đang được dùng bởi hệ điều hành hoặc các ứng dụng. Định dạng thiết bị/phân vùng có thể làm cho dữ liệu bị hỏng và hệ thống không ổn định.\n\nTiếp tục không?</string>
     <string lang="vi" key="DEVICE_IN_USE_INPLACE_ENC">Cảnh báo: Phân vùng đang được dùng bởi hệ điều hành hoặc các ứng dụng. Bạn nên đóng bất cứ ứng dụng nào có thể đang sử dụng phân vùng này (kể luôn nhu liệu chống vi-rút).\n\nTiếp tục không?</string>
     <string lang="vi" key="FORMAT_CANT_DISMOUNT_FILESYS">Lỗi: Thiết bị/phân vùng có chứa một hệ thống tập tin mà không thể tháo xuống được. Hệ thống tập tin có thể đang được dùng bởi hệ điều hành. Định dạng thiết bị/phân vùng sẽ rất có thể làm cho dữ liệu bị hỏng và hệ thống bị bất ổn.\n\nĐể giải quyết vấn đề này, chúng tôi đề nghị trước tiên bạn xóa bỏ phân vùng và sau đó cấu tạo nó lại mà không có định dạng. Để làm thế, theo những bước sau đây:\n1) Nhấn phải vào biểu tượng 'Computer' (hoặc 'My Computer') trong 'Trình đơn Start' và chọn 'Quản lý'. Cửa sổ 'Computer Management' sẽ hiện ra.\n2) Trong cửa sổ 'Computer Management', chọn 'Lưu trữ' &gt; 'Disk Management'.\n3) Nhấn phải vào phân vùng mà bạn muốn mã hóa và chọn 'Xóa Phân vùng', hay 'Xóa Tập đĩa', hay 'Xóa Ổ đĩa theo Lôgic'.\n4) Nhấn 'Có'. Nếu Windows yêu cầu bạn bắt đầu máy lại thì làm vậy. Sau đó, lập lại các bước 1 và 2 và tiếp tục từ bước 5.\n5) Nhấn phải vào khu vực chỗ chưa được phân phối/trống và chọn 'Phân vùng Mới', hay 'Tập đĩa Đơn giản Mới', hay 'Ổ đĩa Lôgic Mới'.\n6) Cửa sổ 'Trợ lý Phân vùng Mới' hay 'Trợ lý Tập đĩa Đơn giản Mới' sẽ hiện ra bây giờ; theo những chỉ dẫn của nó. Trên trang trợ lý mang tựa đề 'Định dạng Phân vùng', chọn 'Đừng định dạng phân vùng này' hay 'Đừng định dạng tập đĩa này'. Trên cùng trợ lý, nhấn 'Kế tiếp' và sau đó 'Kết thúc'.\n7) Lưu ý là đường dẫn thiết bị mà bạn đã chọn trong VeraCrypt bây giờ có thể sai. Vì vậy, ra khỏi Trợ lý Cấu tạo Tập đĩa VeraCrypt (nếu nó vẫn còn chạy) và sau đó bắt đầu lại.\n8) Thử mã hóa thiết bị/phân vùng lại.\n\nNếu VeraCrypt nhiều lần không mã hóa thiết bị/phân vùng được thì thay vào đó, bạn có thể tính đến chuyện cấu tạo một bộ chứa tập tin.</string>
@@ -435,15 +441,15 @@
     <string lang="vi" key="INPLACE_ENC_INVALID_PATH">Lỗi: VeraCrypt chỉ có thể mã hóa tại chỗ một phân vùng, một tập đĩa động, hoặc toàn bộ một ổ đĩa hệ thống. Xin đảm bảo là đường dẫn được điền rõ có hợp lệ.</string>
     <string lang="vi" key="CANNOT_RESIZE_FILESYS">Lỗi: Không thể thu nhỏ hệ thống tập tin (hệ thống tập tin cần được thu nhỏ để dành chỗ cho phần đầu và bản sao phần đầu của tập đĩa).\n\nNhững nguyên nhân và giải pháp có thể xảy ra:\n\n- Không đủ chỗ trống trong tập đĩa. Xin đảm bảo là không có ứng dụng nào khác đang viết vào hệ thống tập tin.\n\n- Hệ thống tập tin bị tổn hại. Thử kiểm soát nó và sửa bất cứ lỗi nào (nhấn phải chữ hiệu ổ đĩa tương ứng trong danh sách 'Computer', sau đó chọn Đặc tính &gt; Tools &gt; 'Check Now', đảm bảo là tùy chọn 'Automatically fix tập tin hệ thống errors' được bật lên và nhấn Start).\n\nNếu những bước trên không giúp được gì, xin theo những bước bên dưới.</string>
     <string lang="vi" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Lỗi: Không đủ chỗ trống trong tập đĩa và vì thế hệ thống tập đĩa không thể được thu nhỏ (hệ thống tập tin cần được thu nhỏ để dành chỗ cho phần đầu và bản sao phần đầu của tập đĩa).\n\nXin xóa bỏ bất cứ tập tin nào dư thừa và trút bỏ Recycle Bin để có được ít nhất 256 KB chỗ trống và sau đó thử lại. Lưu ý là vì một vấn đề của Windows, số lượng chỗ trống báo bởi Windows Explorer có thể không đúng cho đến khi hệ điều hành được bắt đầu lại. Nếu bắt đầu hệ thống lại không giúp được thì hệ thống tập tin có thể bị tổn hại. Thử kiểm soát nó và sửa bất cứ lỗi nào (nhấn phải chữ hiệu ổ đĩa tương ứng trong danh sách 'Computer', sau đó chọn Đặc tính &gt; Tools &gt; 'Check Now', đảm bảo là tùy chọn 'Automatically fix tập tin hệ thống errors' được bật lên và nhấn Start).\n\nNếu những bước trên không giúp được gì, xin theo những bước bên dưới.</string>
-    <string lang="vi" key="DISK_FREE_BYTES">Chỗ trống trên ổ đĩa %hs là %.2f bytes.</string>
+    <string lang="vi" key="DISK_FREE_BYTES">Chỗ trống trên ổ đĩa %s là %.2f bytes.</string>
-    <string lang="vi" key="DISK_FREE_KB">Chỗ trống trên ổ đĩa %hs là %.2f KB</string>
+    <string lang="vi" key="DISK_FREE_KB">Chỗ trống trên ổ đĩa %s là %.2f KB</string>
-    <string lang="vi" key="DISK_FREE_MB">Chỗ trống trên ổ đĩa %hs là %.2f MB</string>
+    <string lang="vi" key="DISK_FREE_MB">Chỗ trống trên ổ đĩa %s là %.2f MB</string>
-    <string lang="vi" key="DISK_FREE_GB">Chỗ trống trên ổ đĩa %hs là %.2f GB</string>
+    <string lang="vi" key="DISK_FREE_GB">Chỗ trống trên ổ đĩa %s là %.2f GB</string>
-    <string lang="vi" key="DISK_FREE_TB">Chỗ trống trên ổ đĩa %hs là %.2f TB</string>
+    <string lang="vi" key="DISK_FREE_TB">Chỗ trống trên ổ đĩa %s là %.2f TB</string>
-    <string lang="vi" key="DISK_FREE_PB">Chỗ trống trên ổ đĩa %hs là %.2f PB</string>
+    <string lang="vi" key="DISK_FREE_PB">Chỗ trống trên ổ đĩa %s là %.2f PB</string>
     <string lang="vi" key="DRIVELETTERS">Không thể lấy chữ hiệu ổ đĩa có sẵn.</string>
     <string lang="vi" key="DRIVER_NOT_FOUND">Lỗi: Không tìm được trình điều khiển VeraCrypt.\n\nXin chép các tập tin 'veracrypt.sys' và 'veracrypt-x64.sys' vào thư mục nơi mà ứng dụng chính của VeraCrypt (VeraCrypt.exe) đang nằm.</string>
-    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall; on Windows XP, select 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
+    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' > Computer > 'Uninstall or change a program' > VeraCrypt > Uninstall; on Windows XP, select 'Start Menu' > Settings > 'Control Panel' > 'Add Or Remove Programs' > VeraCrypt > Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
     <string lang="vi" key="ERR_CIPHER_INIT_FAILURE">Lỗi: Sơ khởi mã hóa thất bại.</string>
     <string lang="vi" key="ERR_CIPHER_INIT_WEAK_KEY">Lỗi: Một khóa yếu hoặc có thể yếu đã được phát hiện. Khóa này sẽ được bỏ. Xin thử lại lần nữa.</string>
     <string lang="vi" key="EXCEPTION_REPORT">Một lỗi nghiêm trọng đã xảy ra và VeraCrypt phải được chấm dứt. Nếu chuyện này gây ra bởi một lỗi trong VeraCrypt thì chúng tôi muốn sửa nó. Để giúp chúng tôi, bạn có thể gởi cho chúng tôi một báo cáo lỗi được làm tự động có chứa những khoản sau đây:\n\n- Phiên bản của chương trình\n- Phiên bản của hệ điều hành\n- Loại CPU\n- Tên bộ phận của VeraCrypt\n- Tổng kiểm của tập tin thực hiện của VeraCrypt\n- Tên tượng trưng của cửa sổ hộp thoại\n- Loại lỗi\n- Địa chỉ lỗi \n- Cụm gọi của VeraCrypt\n\nNếu bạn chọn 'Có', URL sau đây (which có chứas the toàn bộ error report) sẽ được mở ra trong Internet browser mặc định của bạn.\n\n%hs\n\nBạn có muốn gởi cho chúng tôi báo cáo lỗi bên trên không?</string>
@@ -497,7 +503,7 @@
     <string lang="vi" key="WIPE_FINISHED">Nội dung của phân vùng/ổ đĩa đã được xóa bỏ thành công.</string>
     <string lang="vi" key="WIPE_FINISHED_DECOY_SYSTEM_PARTITION">Nội dung của phân vùng nơi hệ thống gốc (mà hệ ẩn là một bản sao) ở đã được xóa bỏ thành công.</string>
     <string lang="vi" key="DECOY_OS_VERSION_WARNING">Xin đảm bảo là phiên bản Windows bạn sắp cài đặt (on the tẩyd phân vùng) giống như phiên bản Windows bạn đang cho chạy hiện tại. Chuyện này cần thiết vì cả hai hệ thống sẽ cùng dùng một phân vùng khởi động giống nhau.</string>
-    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' &gt; 'Add Mounted Volume to System Favorites').</string>
+    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' > 'Add Mounted Volume to System Favorites').</string>
     <string lang="vi" key="SYSTEM_DECRYPTION_FINISHED">Phân vùng/ổ đĩa hệ thống đã được giải mã thành công.</string>
     <string lang="vi" key="FORMAT_FINISHED_HELP">\n\nTập đĩa VeraCrypt đã được cấu tạo và sẵn sàng để dùng. Nếu bạn muốn cấu tạo một tập đĩa VeraCrypt khác thì nhấn Kế tiếp. Không thôi thì nhấn Thoát ra.</string>
     <string lang="vi" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nTập đĩa ẩn VeraCrypt đã được cấu tạo thành công (hệ điều hành ẩn sẽ nằm bên trong tập đĩa ẩn này).\n\nNhấn Kế tiếp để tiếp tục.</string>
@@ -561,6 +567,7 @@
     <string lang="vi" key="MAX_HIDVOL_SIZE_KB">Kích cỡ tối đa có thể xài được cho tập đĩa ẩn trong tập đĩa này là %.2f KB.</string>
     <string lang="vi" key="MAX_HIDVOL_SIZE_MB">Kích cỡ tối đa có thể xài được cho tập đĩa ẩn trong tập đĩa này là %.2f MB.</string>
     <string lang="vi" key="MAX_HIDVOL_SIZE_GB">Kích cỡ tối đa có thể xài được cho tập đĩa ẩn trong tập đĩa này là %.2f GB.</string>
+    <string lang="vi" key="MAX_HIDVOL_SIZE_TB">Kích cỡ tối đa có thể xài được cho tập đĩa ẩn trong tập đĩa này là %.2f TB.</string>
     <string lang="vi" key="MOUNTED_NOPWCHANGE">Mật mã/tập tin khóa không thể được thay đổi trong lúc tập đĩa đang được nạp lên. Xin tháo tập đĩa xuống trước.</string>
     <string lang="vi" key="MOUNTED_NO_PKCS5_PRF_CHANGE">Khóa đầu của thuật toán chuyển hóa không thể được thay đổi trong lúc tập đĩa đang được nạp lên. Xin tháo tập đĩa xuống trước.</string>
     <string lang="vi" key="MOUNT_BUTTON">&amp;Nạp lên</string>
@@ -591,12 +598,12 @@
     <string lang="vi" key="SELECT_PKCS11_MODULE">Chọn Thư viện PKCS #11</string>
     <string lang="vi" key="OUTOFMEMORY">Hết bộ nhớ</string>
     <string lang="vi" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">QUAN TRỌNG: Chúng tôi cực lực khuyên rằng những người sử dụng ít kinh nghiệm nên cấu tạo một bộ chứa tập tin VeraCrypt trong thiết bị/phân vùng được chọn, thay vì thử mã hóa toàn bộ thiết bị/phân vùng.\n\nKhi bạn cấu tạo một bộ chứa tập tin VeraCrypt (thay vì mã hóa một thiết bị hoặc phân vùng) thì sẽ không có rủi ro hủy bỏ một số lượng lớn tập tin. Lưu ý là một bộ nhớ tập tin VeraCrypt (ngay cả khi nó có chứa một đĩa mã hóa ảo) thật ra giống như bất cứ tập tin thông thường khác. Để có thêm tin tức, xem chương Bài tập cho Người bắt đầu trong Hướng dẫn cho Người dùng của VeraCrypt.\n\nBạn có chắc là bạn muốn mã hóa toàn bộ thiết bị/phân vùng không?</string>
-    <string lang="vi" key="OVERWRITEPROMPT">CẢNH BÁO: Tập tin '%hs' đã có sẵn!\n\nQUAN TRỌNG: VERACRYPT SẼ KHÔNG MÃ HÓA TẬP TIN, NHƯNG NÓ SẼ XÓA BỎ NÓ. Bạn có chắc là bạn muốn xóa bỏ tập tin và thay thế nó với một bộ nhớ VeraCrypt mới không?</string>
+    <string lang="vi" key="OVERWRITEPROMPT">CẢNH BÁO: Tập tin '%s' đã có sẵn!\n\nQUAN TRỌNG: VERACRYPT SẼ KHÔNG MÃ HÓA TẬP TIN, NHƯNG NÓ SẼ XÓA BỎ NÓ. Bạn có chắc là bạn muốn xóa bỏ tập tin và thay thế nó với một bộ nhớ VeraCrypt mới không?</string>
-    <string lang="vi" key="OVERWRITEPROMPT_DEVICE">CHÚ Ý: TẤT CẢ CÁC TẬP TIN ĐANG ĐƯỢC GIỮ TRONG %s '%hs'%s ĐƯỢC CHỌN SẼ BỊ XÓA BỎ VÀ MẤT ĐI (CHÚNG SẼ KHÔNG ĐƯỢC MÃ HÓA)!\n\nBạn có chắc là bạn muốn tiến hành với định dạng không?</string>
+    <string lang="vi" key="OVERWRITEPROMPT_DEVICE">CHÚ Ý: TẤT CẢ CÁC TẬP TIN ĐANG ĐƯỢC GIỮ TRONG %s '%s'%s ĐƯỢC CHỌN SẼ BỊ XÓA BỎ VÀ MẤT ĐI (CHÚNG SẼ KHÔNG ĐƯỢC MÃ HÓA)!\n\nBạn có chắc là bạn muốn tiến hành với định dạng không?</string>
-    <string lang="vi" key="NONSYS_INPLACE_ENC_CONFIRM">CẢNH BÁO: Bạn sẽ không thể nạp tập đĩa lên hoặc truy cập bất cứ tập tin nào được giữ trong nó cho đến khi nó được hoàn toàn mã hóa.\n\nBạn có chắc là bạn muốn bắt đầu mã hóa %s '%hs'%s được chọn không?</string>
+    <string lang="vi" key="NONSYS_INPLACE_ENC_CONFIRM">CẢNH BÁO: Bạn sẽ không thể nạp tập đĩa lên hoặc truy cập bất cứ tập tin nào được giữ trong nó cho đến khi nó được hoàn toàn mã hóa.\n\nBạn có chắc là bạn muốn bắt đầu mã hóa %s '%s'%s được chọn không?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="vi" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">CẢNH BÁO: Xin lưu ý là nếu nguồn điện bị gián đoạn đột ngột trong lúc mã hóa dữ liệu tại chỗ, hoặc khi hệ điều hành sụp đổ vì một lỗi của nhu liệu hoặc cương liệu bị trục trặc trong lúc VeraCrypt đang mã hóa dữ liệu tại chỗ, vài phần của dữ liệu sẽ bị hỏng hay mất. Vì vậy, trước khi bạn bắt đầu mã hóa, xin đảm bảo là bạn có bản sao của các tập tin bạn muốn mã hóa.\n\nBạn có một bản sao như thế không?</string>
-    <string lang="vi" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CHÚ Ý: BẤT CỨ TẬP TIN NÀO ĐANG ĐƯỢC GIỮ TRONG PHÂN VÙNG '%hs'%s (NGHĨA LÀ TRONG PHÂN VÙNG ĐẦU TIÊN ĐẰNG SAU PHÂN VÙNG HỆ THỐNG) SẼ BỊ XÓA BỎ VÀ MẤT ĐI (CHÚNG SẼ KHÔNG ĐƯỢC MÃ HÓA)!\n\nBạn có chắc là bạn muốn tiến hành với định dạng không?</string>
+    <string lang="vi" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CHÚ Ý: BẤT CỨ TẬP TIN NÀO ĐANG ĐƯỢC GIỮ TRONG PHÂN VÙNG '%s'%s (NGHĨA LÀ TRONG PHÂN VÙNG ĐẦU TIÊN ĐẰNG SAU PHÂN VÙNG HỆ THỐNG) SẼ BỊ XÓA BỎ VÀ MẤT ĐI (CHÚNG SẼ KHÔNG ĐƯỢC MÃ HÓA)!\n\nBạn có chắc là bạn muốn tiến hành với định dạng không?</string>
     <string lang="vi" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">CẢNH BÁO: PHÂN VÙNG ĐƯỢC CHỌN CÓ CHỨA MỘT SỐ LƯỢNG DỮ LIỆU LỚN! Bất cứ tập tin nào được giữ trong phân vùng sẽ bị xóa bỏ và mất đi (chúng sẽ KHÔNG được mã hóa)!</string>
     <string lang="vi" key="ERASE_FILES_BY_CREATING_VOLUME">Xóa bỏ bất cứ tập tin nào được giữ trong phân vùng bằng cách cấu tạo một tập đĩa VeraCrypt bên trong nó</string>
     <string lang="vi" key="PASSWORD">Mật mã</string>
@@ -645,7 +652,7 @@
     <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
     <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
     <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 &gt; Organize &gt; 'Folder and search options' &gt; View).</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="vi" key="HIDDEN_VOL_PROT_PASSWORD_US_KEYB_LAYOUT">Nếu bạn thử bảo vệ một tập đĩa ẩn có chứa một hệ ẩn thì xin đảm bảo là bạn đang dùng bố trí bàn phím căn bản của Mỹ khi nhập mật mã vào cho tập đĩa ẩn. Việc này cần thiết vì trên thực tế 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.</string>
     <string lang="vi" key="FOUND_NO_PARTITION_W_DEFERRED_INPLACE_ENC">VeraCrypt không tìm được bất cứ tập đĩa nào mà sự mã hóa vô hệ đã bị gián đoạn và nơi mà phần đầu tập đĩa có thể được giải mã khi dùng mật mã và/hay (các) tập tin khóa được cung cấp.\n\nXin đảm bảo là mật mã và/hay (các) tập tin đúng và phân vùng/tập đĩa không đang được dùng bởi hệ thống hoặc các ứng dụng (kể luôn cả nhu liệu chống vi rút).</string>
     <string lang="en" key="SELECTED_PARTITION_ALREADY_INPLACE_ENC">The selected partition/device is already fully encrypted.\nHeader Flags = 0x%.8X</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="vi" key="PREV">&lt;&amp;Trở lại</string>
     <string lang="vi" key="RAWDEVICES">Không thể liệt kê những thiết bị thô được cài đặt trong hệ thống của bạn!</string>
-    <string lang="vi" key="READONLYPROMPT">Tập đĩa '%hs' hiện có, và chỉ-đọc được. Bạn có chắc là bạn muốn thay thế nó không?</string>
+    <string lang="vi" key="READONLYPROMPT">Tập đĩa '%s' hiện có, và chỉ-đọc được. Bạn có chắc là bạn muốn thay thế nó không?</string>
     <string lang="vi" key="SELECT_DEST_DIR">Chọn thư mục đích</string>
     <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>
@@ -680,13 +687,13 @@
     <string lang="vi" key="TEST_CIPHERTEXT_SIZE">Văn bản mật mã mà bạn cung cấp quá dài hoặc quá ngắn.</string>
     <string lang="vi" key="TEST_KEY_SIZE">Khóa kiểm tra mà bạn cung cấp quá dài hoặc quá ngắn.</string>
     <string lang="vi" key="TEST_PLAINTEXT_SIZE">Văn bản thô mà bạn cung cấp quá dài hoặc quá ngắn.</string>
-    <string lang="vi" key="TWO_LAYER_CASCADE_HELP">Hai thuật toán mã hóa trong một thác hoạt động trong phương thức XTS. Mỗi khối trước tiên được mã hóa với %hs (%d-bit key) và sau đó với %hs (%d-bit key). Mỗi thuật toán mã hóa dùng khóa riêng của nó. Tất cả các khóa đều độc lập với nhau.</string>
+    <string lang="vi" key="TWO_LAYER_CASCADE_HELP">Hai thuật toán mã hóa trong một thác hoạt động trong phương thức XTS. Mỗi khối trước tiên được mã hóa với %s (%d-bit key) và sau đó với %s (%d-bit key). Mỗi thuật toán mã hóa dùng khóa riêng của nó. Tất cả các khóa đều độc lập với nhau.</string>
-    <string lang="vi" key="THREE_LAYER_CASCADE_HELP">Ba thuật toán mã hóa tromg một thác hoạt động trong phương thức XTS. Mỗi khối trước tiên được mã hóa với %hs (%d-bit key), và sau đó với %hs (%d-bit key), và sau cùng với %hs (%d-bit key). Mỗi thuật toán mã hóa dùng khóa riêng của nó. Tất cả các khóa đều độc lập với nhau.</string>
+    <string lang="vi" key="THREE_LAYER_CASCADE_HELP">Ba thuật toán mã hóa tromg một thác hoạt động trong phương thức XTS. Mỗi khối trước tiên được mã hóa với %s (%d-bit key), và sau đó với %s (%d-bit key), và sau cùng với %s (%d-bit key). Mỗi thuật toán mã hóa dùng khóa riêng của nó. Tất cả các khóa đều độc lập với nhau.</string>
     <string lang="vi" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Lưu ý là tùy vào cấu hình của hệ điều hành, những tính năng tự-chạy và tự-nạp chỉ có thể làm việc được khi những tập tin trong đĩa của người lữ hành được cấu tạo trong một môi trường như CD/DVD không viết. Cũng lưu ý là đây không phải một lỗi trong VeraCrypt (nó là một giới hạn của Windows).</string>
     <string lang="vi" key="TRAVELER_DISK_CREATED">Đĩa di chuyển VeraCrypt đã được cấu tạo thành công.\n\nLưu ý là bạn cần quyền quản lý để cho VeraCrypt chạy trong phương thức lưu động. Đồng thời cũng lưu ý là, sau khi khám nghiệm tập tin thanh ghi, có thể biết được là VeraCrypt được chạy trong hệ thống Windows ngay cả nếu nó chạy trong phương thức lưu động.</string>
     <string lang="vi" key="TC_TRAVELER_DISK">Đĩa Di chuyển của VeraCrypt</string>
     <string lang="vi" key="TWOFISH_HELP">Thiết kế bởi Bruce Schneier, John Kelsey, Doug Whiting, David Wagner, Chris Hall, và Niels Ferguson. Phát hành năm 1998. 256-bit key, 128-bit block. Phương thức của thao tác là XTS. Twcủaish đã vào các vòng kết của AES.</string>
-    <string lang="vi" key="MORE_INFO_ABOUT">Thêm tin tức về %hs</string>
+    <string lang="vi" key="MORE_INFO_ABOUT">Thêm tin tức về %s</string>
     <string lang="vi" key="UNKNOWN">Không rõ</string>
     <string lang="en" key="ERR_UNKNOWN">An unspecified or unknown error occurred (%d).</string>
     <string lang="vi" key="UNMOUNTALL_LOCK_FAILED">Một vài tập đĩa có chứa tập tin hoặc thư mục đang được dung bởi các ứng dụng hoặc hệ thống.\n\nBuộc tháo xuống không?</string>
@@ -706,7 +713,7 @@
     <string lang="vi" key="WRONG_VOL_TYPE">VeraCrypt không thể thay đổi mật mã cho một tập đĩa lạ được.</string>
     <string lang="vi" key="SELECT_FREE_DRIVE">Xin chọn một chữ hiệu ổ đĩa trống từ danh sách.</string>
     <string lang="vi" key="SELECT_A_MOUNTED_VOLUME">Xin chọn một tập đĩa được nạp lên trong danh sách chữ hiệu ổ đĩa.</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="vi" key="CANT_CREATE_AUTORUN">Lỗi: Không thể cấu tạo autorun.inf</string>
     <string lang="vi" key="ERR_PROCESS_KEYFILE">Lỗi trong lúc xử lý tập tin khóa!</string>
     <string lang="vi" key="ERR_PROCESS_KEYFILE_PATH">Lỗi xử lý đường dẫn của tập tin khóa!</string>
@@ -851,7 +858,7 @@
     <string lang="vi" key="INSTALL_FAILED">Không cài đặt được.</string>
     <string lang="vi" key="UNINSTALL_FAILED">Không hủy cài đặt được.</string>
     <string lang="vi" key="DIST_PACKAGE_CORRUPTED">Kiện đồ phân phối này bị tổn hại. Xin tải nó xuống lại (tốt hơn là từ trang web chính thức của VeraCrypt tại https://veracrypt.codeplex.com).</string>
-    <string lang="vi" key="CANNOT_WRITE_FILE_X">Không thể viết vào tập tin %hs</string>
+    <string lang="vi" key="CANNOT_WRITE_FILE_X">Không thể viết vào tập tin %s</string>
     <string lang="vi" key="EXTRACTING_VERB">Đang rút ra</string>
     <string lang="vi" key="CANNOT_READ_FROM_PACKAGE">Không thể đọc dữ liệu từ kiện đồ được.</string>
     <string lang="vi" key="CANT_VERIFY_PACKAGE_INTEGRITY">Không thể kiểm chứng tính toàn vẹn của kiện đồ phân phối này đuợc.</string>
@@ -860,8 +867,8 @@
     <string lang="vi" key="INSTALL_OK">VeraCrypt đã được cài đặt thành công.</string>
     <string lang="vi" key="SETUP_UPDATE_OK">VeraCrypt đã được cập nhật thành công.</string>
     <string lang="en" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt has been successfully upgraded. However, before you can start using it, the computer must be restarted.\n\nDo you want to restart it now?</string>
-    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
+    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu > All programs > Accessories > System Tools > System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
-    <string lang="vi" key="UNINSTALL_OK">VeraCrypt đã được gỡ bỏ thành công.\n\nNhấn 'Kết thúc' để bỏ bộ cài đặt của VeraCrypt và thư mục  %hs. Lưu ý là thư mục sẽ không được bỏ nếu nó có chứa bất cứ tập tin nào không được cài đặt bởi bộ cài đặt của VeraCrypt hoặc được cấu tạo bởi VeraCrypt.</string>
+    <string lang="vi" key="UNINSTALL_OK">VeraCrypt đã được gỡ bỏ thành công.\n\nNhấn 'Kết thúc' để bỏ bộ cài đặt của VeraCrypt và thư mục  %s. Lưu ý là thư mục sẽ không được bỏ nếu nó có chứa bất cứ tập tin nào không được cài đặt bởi bộ cài đặt của VeraCrypt hoặc được cấu tạo bởi VeraCrypt.</string>
     <string lang="vi" key="REMOVING_REG">Đang bỏ các mục nhập thanh ghi của VeraCrypt</string>
     <string lang="vi" key="ADDING_REG">Đang thêm mục nhập thanh ghi</string>
     <string lang="vi" key="REMOVING_APPDATA">Đang bỏ dữ liệu ứng dụng riêng</string>
@@ -872,10 +879,10 @@
     <string lang="vi" key="CREATING_SYS_RESTORE">Đang cấu tạo điểm Phục hồi Hệ thống</string>
     <string lang="vi" key="FAILED_SYS_RESTORE">Không cấu tạo điểm Phục hồi Hệ thống được!</string>
     <string lang="vi" key="INSTALLER_UPDATING_BOOT_LOADER">Đang cập nhật Bộ tải Khởi nạp</string>
-    <string lang="vi" key="INSTALL_OF_FAILED">Không cài đặt '%hs'.%hs được\nBạn có muốn tiếp tục cài đặt không?</string>
+    <string lang="vi" key="INSTALL_OF_FAILED">Không cài đặt '%s'.%s được\nBạn có muốn tiếp tục cài đặt không?</string>
-    <string lang="vi" key="UNINSTALL_OF_FAILED">Không hủu cài đặt '%hs' được. %hs\nBạn có muốn tiếp tục hủy cài đặt không?</string>
+    <string lang="vi" key="UNINSTALL_OF_FAILED">Không hủu cài đặt '%s' được. %s\nBạn có muốn tiếp tục hủy cài đặt không?</string>
     <string lang="vi" key="INSTALL_COMPLETED">Việc cài đặt được hoàn thành.</string>
-    <string lang="vi" key="CANT_CREATE_FOLDER">Thư mục '%hs' không thể được cấu tạo</string>
+    <string lang="vi" key="CANT_CREATE_FOLDER">Thư mục '%s' không thể được cấu tạo</string>
     <string lang="vi" key="CLOSE_TC_FIRST">Trình điều khiển thiết bị của VeraCrypt không thể được hủy nạp.\n\nXin đóng tất cả cửa sổ đang mở của VeraCrypt trước. Nếu nó không giúp được, xin vui long bắt đầu Windows lại và sau đó thử lần nữa.</string>
     <string lang="vi" key="DISMOUNT_ALL_FIRST">Tất cả các tập đĩa của VeraCrypt phải được tháo xuống trước khi cài đặt hay gỡ bỏ 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>
@@ -921,14 +928,14 @@
     <string lang="vi" key="SYS_FAVORITE_VOLUMES_SAVED">Các tập đĩa hệ thống được chuộng đã được bảo lưu.\n\nĐể bật việc nạp các tập đĩa hệ thống được chuộng lên khi hệ thống bắt đầu, xin 'Settings' &gt; 'Các Tập đĩa Hệ thống được Chuộng' &gt; 'Nạp các tập đĩa hệ thống được chuộng lên khi Windows bắt đầu'.</string>
     <string lang="en" key="FAVORITE_ADD_DRIVE_DEV_WARNING">The volume you are adding to favorites is neither a partition nor a dynamic volume. Therefore, VeraCrypt will be unable to mount this favorite volume if the device number changes.</string>
     <string lang="en" key="FAVORITE_ADD_PARTITION_TYPE_WARNING">The volume you are adding to favorites is a partition not recognized by Windows.\n\nVeraCrypt will be unable to mount this favorite volume if the device number changes. Please set the type of the partition to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then add the partition to favorites again.</string>
-    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings &gt; Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
+    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings > Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_NETWORK_PATH_ERR">A container stored in a remote filesystem shared over a network cannot be automatically mounted when its host device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, the volume hosted on the device cannot be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable the volume hosted on the device to be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_LABEL_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, no label can be assigned to it.</string>
     <string lang="en" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable VeraCrypt to assign a label to the partition.</string>
     <string lang="en" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Due to a Windows limitation, a container stored in a remote filesystem shared over a network cannot be mounted as a system favorite volume (however, it can be mounted as a non-system favorite volume when a user logs on).</string>
-    <string lang="vi" key="ENTER_PASSWORD_FOR">Nhập mật mã cho %hs</string>
+    <string lang="vi" key="ENTER_PASSWORD_FOR">Nhập mật mã cho %s</string>
     <string lang="en" key="ENTER_PASSWORD_FOR_LABEL">Enter password for '%s'</string>
     <string lang="vi" key="ENTER_NORMAL_VOL_PASSWORD">Nhập mật mã cho tập đĩa thông thường/bên ngoài</string>
     <string lang="vi" key="ENTER_HIDDEN_VOL_PASSWORD">Nhập mật mã cho tập đĩa ẩn</string>
@@ -943,8 +950,8 @@
     <string lang="vi" key="VOL_HEADER_BACKED_UP">Bản sao phần đầu tập đĩa phần đầu đã được cấu tạo thành công.\n\nQUAN TRỌNG: Hồi phục phần đầu tập đĩa bằng cách dùng bản sao này cũng sẽ hồi phục mật mã hiện tại của tập đĩa. Hơn nữa, nếu (những) tập tin khóa cần có để nạp tập đĩa lên thì (những) tập tin khóa đó sẽ cần lại để nạp tập đĩa khi phần đầu tập đĩa được hồi phục.\n\nCẢNH BÁO: Bản sao phần đầu tập đĩa này có thể được dùng để hồi phục phần đầu của RIÊNG tập đĩa này thôi. Nếu bạn dùng bản sao phần đầu này để hồi phục một phần đầu của một tập đĩa khác thì bạn sẽ có thể nạp tập đĩa lên, nhưng bạn sẽ KHÔNG thể giải mã bất cứ dữ liệu nào được lưu trữ trong tập đĩa (bởi vì bạn sẽ thay đổi khóa chính của nó).</string>
     <string lang="vi" key="VOL_HEADER_RESTORED">Phần đầu tập đĩa đã được hồi phục thành công.\n\nQUAN TRỌNG: Xin lưu ý là một mật mã cũ cũng có thể được hồi phục luôn. Hơn nữ, nếu (những) tập tin khóa cần có để nạp tập đĩa lên khi bản sao được cấu tạo thì (những) tập tin khóa đó bây giờ cần có để nạp tập đĩa lần nữa.</string>
     <string lang="vi" key="EXTERNAL_VOL_HEADER_BAK_FIRST_INFO">Vì lý do bảo mật, bạn sẽ phải nhập đúng mật mã vào (và/hay cung cấp đúng các tập tin khóa) cho tập đĩa.\n\nLưu ý: Nếu tập đĩa có chứa một tập đĩa ẩn, bạn sẽ phải nhập đúng mật mã vào (và/hay cung cấp đúng các tập tin khóa) cho tập đĩa bên ngoài trước. Sau đó, nếu bạn chọn sao lưu phần đầu của tập đĩa ẩn, bạn sẽ phải nhập đúng mật mã vào (và/hay cung cấp đúng các tập tin khóa) cho tập đĩa ẩn.</string>
-    <string lang="vi" key="CONFIRM_VOL_HEADER_BAK">Bạn có chắc là bạn muốn cấu tạo bản sao phần đầu tập đĩa cho %hs không?\n\nSau khi bạn nhấn Có, bạn sẽ được hỏi tên cho một tập tin cho bản sao phần đầu.\n\nLưu ý: Phần đầu của cả hai tập đĩa thông thường và ẩn sẽ được mã hóa lại bằng cách dùng một muối mới và lưu trữ trong bản sao của tập tin. Không thôi có tập đĩa ẩn bên trong tập đĩa này thì khu vực dành riêng cho phần đầu của tập đĩa ẩn trong bản sao của tập tin sẽ được làm đầy với dữ liệu ngẫu nhiên (để duy trì sự phủ nhận có vẻ hợp lý). Khi hồi phục một phần đầu tập đĩa từ bản sao của tập tin, bạn sẽ cần nhập vào đúng mật mã (và/hay cung cấp đúng các tập tin khóa) mà đã có hiệu lực khi bản sao phần đầu tập đĩa được cấu tạo. Mật mã (và/hay các tập tin khóa) cũng sẽ tự động xác định loại phần đầu tập đĩa nào để hồi phục, nghĩa là thông thường hay ẩn (lưu ý là VeraCrypt xác định loại nào qua quá trình thử và lỗi).</string>
+    <string lang="vi" key="CONFIRM_VOL_HEADER_BAK">Bạn có chắc là bạn muốn cấu tạo bản sao phần đầu tập đĩa cho %s không?\n\nSau khi bạn nhấn Có, bạn sẽ được hỏi tên cho một tập tin cho bản sao phần đầu.\n\nLưu ý: Phần đầu của cả hai tập đĩa thông thường và ẩn sẽ được mã hóa lại bằng cách dùng một muối mới và lưu trữ trong bản sao của tập tin. Không thôi có tập đĩa ẩn bên trong tập đĩa này thì khu vực dành riêng cho phần đầu của tập đĩa ẩn trong bản sao của tập tin sẽ được làm đầy với dữ liệu ngẫu nhiên (để duy trì sự phủ nhận có vẻ hợp lý). Khi hồi phục một phần đầu tập đĩa từ bản sao của tập tin, bạn sẽ cần nhập vào đúng mật mã (và/hay cung cấp đúng các tập tin khóa) mà đã có hiệu lực khi bản sao phần đầu tập đĩa được cấu tạo. Mật mã (và/hay các tập tin khóa) cũng sẽ tự động xác định loại phần đầu tập đĩa nào để hồi phục, nghĩa là thông thường hay ẩn (lưu ý là VeraCrypt xác định loại nào qua quá trình thử và lỗi).</string>
-    <string lang="vi" key="CONFIRM_VOL_HEADER_RESTORE">Bạn có chắc là bạn muốn hồi phục phần đầu tập đĩa của %hs không?\n\nCẢNH BÁO: Hồi phục phần đầu một tập đĩa cũng hồi phục mật mã của tập đĩa mà đã có hiệu lực khi bản sao được cấu tạo. Hơn nữa, nếu (những) tập tin khóa cần có để nạp tập đĩa lên khi bản sao được cấu tạo thì (những) tập tin khóa đó sẽ cần lại để để nạp tập đĩa sau khi phần đầu tập đĩa được hồi phục.\n\nSau khi bạn nhấn Có, bạn sẽ chọn phần đầu bản sao tập tin.</string>
+    <string lang="vi" key="CONFIRM_VOL_HEADER_RESTORE">Bạn có chắc là bạn muốn hồi phục phần đầu tập đĩa của %s không?\n\nCẢNH BÁO: Hồi phục phần đầu một tập đĩa cũng hồi phục mật mã của tập đĩa mà đã có hiệu lực khi bản sao được cấu tạo. Hơn nữa, nếu (những) tập tin khóa cần có để nạp tập đĩa lên khi bản sao được cấu tạo thì (những) tập tin khóa đó sẽ cần lại để để nạp tập đĩa sau khi phần đầu tập đĩa được hồi phục.\n\nSau khi bạn nhấn Có, bạn sẽ chọn phần đầu bản sao tập tin.</string>
     <string lang="vi" key="DOES_VOLUME_CONTAIN_HIDDEN">Tập đĩa có chứa một tập đĩa ẩn không?</string>
     <string lang="vi" key="VOLUME_CONTAINS_HIDDEN">Tập đĩa có chứa một tập đĩa ẩn</string>
     <string lang="vi" key="VOLUME_DOES_NOT_CONTAIN_HIDDEN">Tập đĩa không có chứa một tập đĩa ẩn</string>
@@ -955,12 +962,14 @@
     <string lang="vi" key="VOLUME_HAS_NO_BACKUP_HEADER">Không có bản sao phần đầu được gắn trong tập đĩa này (lưu ý là chỉ có các tập đĩa được cấu tạo bởi VeraCrypt 6.0 hay sau này có chứa những bản sao phần đầu được gắn vào).</string>
     <string lang="vi" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">Bạn đang thử sao lại phần đầu của phân vùng/ổ đĩa hệ thống. Chuyện này không được cho phép. Sao lại/hồi phục những thao tác liên quan đến phân vùng/ổ đĩa hệ thống chỉ có thể thực hiện bằng cách dùng Đĩa Cứu hộ VeraCrypt.\n\nBạn có muốn cấu tạo một Đĩa Cứu hộ VeraCrypt không?</string>
     <string lang="vi" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">Bạn đang thử hồi phục phần đầu của một tập đĩa VeraCrypt ảo nhưng bạn đã chọn phân vùng/ổ đĩa hệ thống. Chuyện này không được cho phép. Sao lại/hồi phục những thao tác liên quan đến phân vùng/ổ đĩa hệ thống chỉ có thể thực hiện bằng cách dùng Đĩa Cứu hộ VeraCrypt.\n\nBạn có muốn cấu tạo một Đĩa Cứu hộ VeraCrypt không?</string>
-    <string lang="vi" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">Sau khi bạn nhấn OK, bạn sẽ chọn tên một tập tin cho bản ảnh ISO của Đĩa Cứu hộ VeraCrypt và vị trí bạn muốn để nó.</string>
+    <string lang="vi" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">Sau khi bạn nhấn OK, bạn sẽ chọn tên một tập tin cho bản ảnh của Đĩa Cứu hộ VeraCrypt và vị trí bạn muốn để nó.</string>
-    <string lang="vi" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">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 bản ảnh của Đĩa Cứu hộ qua một CD hay DVD.\n\nQUAN TRỌNG: Lưu ý là tập tin phải được viết vào CD/DVD như là một bản ảnh ISO của đĩa (chứ không phải như là một tập tin cá nhân). Để có hướng dẫn làm như thế nào, xin tham khảo tài liệu của nhu liệu thâu CD/DVD của bạn.\n\nSau khi bạn sang Đĩa Cứu hộ, chọn 'Hệ thống' &gt; 'Xác nhận Đĩa Cứu hộ' để xác nhận là nó đã được sang đúng cách.</string>
+    <string lang="vi" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">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%s\n\nBây giờ bạn cần sang bản ảnh của Đĩa Cứu hộ qua một CD hay DVD.\n\nQUAN TRỌNG: Lưu ý là tập tin phải được viết vào CD/DVD như là một bản ảnh ISO của đĩa (chứ không phải như là một tập tin cá nhân). Để có hướng dẫn làm như thế nào, xin tham khảo tài liệu của nhu liệu thâu CD/DVD của bạn.\n\nSau khi bạn sang Đĩa Cứu hộ, chọn 'Hệ thống' &gt; 'Xác nhận Đĩa Cứu hộ' để xác nhận là nó đã được sang đúng cách.</string>
-    <string lang="vi" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">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 bản ảnh của Đĩa Cứu hộ qua một CD hay DVD.\n\nBạn có muốn khởi chạy Microsoft Windows Disc Image Burner bây giờ không?\n\nLưu ý: Sau khi bạn sang Đĩa Cứu hộ, chọn 'Hệ thống' &gt; 'Xác nhận Đĩa Cứu hộ' để xác nhận là nó đã được sang đúng cách.</string>
+    <string lang="vi" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">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%s\n\nBây giờ bạn cần sang bản ảnh của Đĩa Cứu hộ qua một CD hay DVD.\n\nBạn có muốn khởi chạy Microsoft Windows Disc Image Burner bây giờ không?\n\nLưu ý: Sau khi bạn sang Đĩa Cứu hộ, chọn 'Hệ thống' &gt; 'Xác nhận Đĩa Cứu hộ' để xác nhận là nó đã được sang đúng cách.</string>
     <string lang="vi" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">Xin chèn Đĩa Cứu hộ VeraCrypt của bạn vào ổ đĩa CD/DVD của bạn và nhấn OK để xác nhận nó.</string>
     <string lang="vi" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">Đĩa Cứu hộ VeraCrypt đã được xác nhận thành công.</string>
     <string lang="vi" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">Không thể xác nhận là Đĩa Cứu hộ đã được sang đúng cách.\n\nNếu bạn đã sang Đĩa Cứu hộ, xin đẩy CD/DVD ra và chèn vào lại; sau đó thử lại. Nếu việc này không giúp được, xin thử nhu liệu thâu CD/DVD và/hay môi trường khác.\n\nNếu bạn thử xác nhận một Đĩa Cứu hộ VeraCrypt được cấu tạo cho một khóa chính, mật mã, salt, v.v. khác, xin lưu ý là Đĩa Cứu hộ như thế sẽ luôn luôn thất bại sự xác nhận này. Để cấu tạo một Đĩa Cứu hộ mới hoàn toàn tương đương với cấu hình hiện tại của bạn, chọn 'Hệ thống' &gt; 'Cấu tạo Đĩa Cứu hộ'.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk image fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
     <string lang="vi" key="ERROR_CREATING_RESCUE_DISK">Lỗi cấu tạo Đĩa Cứu hộ VeraCrypt.</string>
     <string lang="vi" key="CANNOT_CREATE_RESCUE_DISK_ON_HIDDEN_OS">Đĩa Cứu hộ VeraCrypt không thể được cấu tạo khi một hệ điều hành ẩn đang chạy.\n\nĐể cấu tạo một Đĩa Cứu hộ VeraCrypt, khởi động hệ điều hành nghi trang và sau đó chọn 'Hệ thống' &gt; 'Cấu tạo Đĩa Cứu hộ'.</string>
     <string lang="vi" key="RESCUE_DISK_CHECK_FAILED">Không thể xác nhận là Đĩa Cứu hộ đã được sang đúng cách.\n\nNếu bạn đã sang Đĩa Cứu hộ, xin đẩy CD/DVD ra và chèn vào lại; sau đó nhấn Kế tiếp để thử lại. Nếu việc này không giúp được, xin thử môi trường khác%s.\n\nNếu bạn chưa sang Đĩa Cứu hộ, xin làm thế, và sau đó nhấn Kế tiếp.\n\nNếu bạn thử xác nhận một Đĩa Cứu hộ VeraCrypt được cấu tạo trước khi bạn bắt đầu trợ lý này thì xin lưu ý là Đĩa Cứu hộ như thế không thể dùng được bởi vì nó được cấu tạo cho  một khóa chính  khác. Bạn cần sang Đĩa Cứu hộ mới được tạo ra.</string>
@@ -989,8 +998,8 @@
     <string lang="vi" key="DRIVE_LETTER_ITEM">Chữ của Ổ đĩa:</string>
     <string lang="vi" key="UNSUPPORTED_CHARS_IN_PWD">Lỗi: Mật mã phải chỉ chứa ký tự ASCII.\n\nKý tự không phải ASCII trong mật mã có thể làm cho tập đĩa không thể nào nạp được khi cấu hình hệ thống của bạn thay đổi.\n\nNhững ký tự sau đây được phép dùng:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="vi" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">Cảnh báo: Mật mã có chứa những ký tự không phải ASCII. Việc này có thể làm cho tập đĩa không thể nào nạp được khi cấu hình hệ thống của bạn thay đổi.\n\nBạn nên thay thế tất cả những ký tự không phải ASCII trong mật mã với những ký tự ASCII. Để làm thế, nhấn 'Tập đĩa' -&gt; 'Thay đổi Mật mã của Tập đĩa'.\n\nSau đây là những ký tự ASCII:\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; &lt; = &gt; ? @ 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="vi" key="EXE_FILE_EXTENSION_CONFIRM">CẢNH BÁO: Chúng tôi cực lực khuyên bạn nên tránh những tập tin có đuôi được dùng cho những tập tin thực hiện (như .exe, .sys, hay .dll) và những tập tin có đuôi với những vấn đề tương tự. Dùng những tập tin có đuôi như thế làm cho Windows và nhu liệu chống vi-rút gây trở ngại cho bộ nhớ, mà có ảnh hưởng bất lợi đến hiệu suất của tập đĩa và có thể gây ra những vấn đề nghiêm trọng khác.\n\nChúng tôi cực lực khuyên bạn gỡ bỏ tập tin có đuôi hoặc thay đổi nó (ví dụ thành '.tc').\n\nBạn có chắc là bạn muốn sử dụng tập tin có đuôi có vấn đề không?</string>
+    <string lang="vi" key="EXE_FILE_EXTENSION_CONFIRM">CẢNH BÁO: Chúng tôi cực lực khuyên bạn nên tránh những tập tin có đuôi được dùng cho những tập tin thực hiện (như .exe, .sys, hay .dll) và những tập tin có đuôi với những vấn đề tương tự. Dùng những tập tin có đuôi như thế làm cho Windows và nhu liệu chống vi-rút gây trở ngại cho bộ nhớ, mà có ảnh hưởng bất lợi đến hiệu suất của tập đĩa và có thể gây ra những vấn đề nghiêm trọng khác.\n\nChúng tôi cực lực khuyên bạn gỡ bỏ tập tin có đuôi hoặc thay đổi nó (ví dụ thành '.hc').\n\nBạn có chắc là bạn muốn sử dụng tập tin có đuôi có vấn đề không?</string>
-    <string lang="vi" key="EXE_FILE_EXTENSION_MOUNT_WARNING">CẢNH BÁO: Bộ nhớ này có một tập tin có đuôi mà được dùng cho những tập tin thực hiện (such as .exe, .sys, or .dll) hoặc những tập tin có đuôi khác với những vấn đề tương tự. Nó sẽ rất có thể làm cho Windows và nhu liệu chống vi-rút gây trở ngại cho bộ nhớ, mà có ảnh hưởng bất lợi đến hiệu suất của tập đĩa và có thể gây ra những vấn đề nghiêm trọng khác.\n\nChúng tôi cực lực khuyên bạn gỡ bỏ tập tin có đuôi của bộ nhớ hoặc thay đổi nó (ví dụ thành '.tc') sau khi bạn tháo tập đĩa xuống.</string>
+    <string lang="vi" key="EXE_FILE_EXTENSION_MOUNT_WARNING">CẢNH BÁO: Bộ nhớ này có một tập tin có đuôi mà được dùng cho những tập tin thực hiện (such as .exe, .sys, or .dll) hoặc những tập tin có đuôi khác với những vấn đề tương tự. Nó sẽ rất có thể làm cho Windows và nhu liệu chống vi-rút gây trở ngại cho bộ nhớ, mà có ảnh hưởng bất lợi đến hiệu suất của tập đĩa và có thể gây ra những vấn đề nghiêm trọng khác.\n\nChúng tôi cực lực khuyên bạn gỡ bỏ tập tin có đuôi của bộ nhớ hoặc thay đổi nó (ví dụ thành '.hc') sau khi bạn tháo tập đĩa xuống.</string>
     <string lang="vi" key="HOMEPAGE">Trang chủ</string>
     <string lang="vi" key="LARGE_IDE_WARNING_XP">CẢNH BÁO: Dường như là bạn chưa áp dụng bất cứ Service Pack nào vào việc cài đặt Windows của bạn. Bạn không nên viết vào các đĩa IDE lớn hơn 128 GB trong Windows XP mà bạn đã không áp dụng Service Pack 1 hay mới hơn! Nếu bạn có làm, dữ liệu trong đĩa (không cần biết nếu nó là một tập đĩa VeraCrypt hay không) có thể bị hỏng. Lưu ý đây là một giới hạn của Windows chứ không phải là một lỗi trong VeraCrypt.</string>
     <string lang="vi" key="LARGE_IDE_WARNING_2K">CẢNH BÁO: Dường như là bạn chưa áp dụng Service Pack 3 hay mới hơn vào việc cài đặt Windows của bạn. Bạn không nên viết vào các đĩa IDE lớn hơn 128 GB trong Windows 2000 mà bạn chưa áp dụng Service Pack 3 hay mới hơn! Nếu bạn có làm, dữ liệu trong đĩa (không cần biết nếu nó là một tập đĩa VeraCrypt hay không) có thể bị hỏng. Lưu ý đây là một giới hạn của Windows chứ không phải một lỗi trong VeraCrypt.\n\nLưu ý: Bạn có thể cần phải bật hỗ trợ cho 48-bit LBA trong thanh ghi lên; để có thêm tin tức, xem http://support.microsoft.com/kb/305098/EN-US</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <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ư %s...</string>
-    <string lang="vi" key="REPAIRING_FS">Đang thử sửa hệ thống tập tin trong tập đĩa VeraCrypt được nạp như %hs...</string>
+    <string lang="vi" key="REPAIRING_FS">Đang thử sửa hệ thống tập tin trong tập đĩa VeraCrypt được nạp như %s...</string>
-    <string lang="vi" key="WARN_CBC_MODE">Cảnh báo: Tập đĩa này được mã hóa với phương thức CBC. Vì những lý do bảo mật, phương thức CBC đã bị bãi bỏ kể từ VeraCrypt 4.1.\n\nChúng tôi cực lực khuyên bạn nên dời dữ liệu từ tập đĩa VeraCrypt này sang một tập đĩa mới được cấu tạo bởi phiên bản này của VeraCrypt. Sau khi bạn làm thế, bạn nên xóa tẩy hoặc phá hủy tập đĩa cũ một cách an toàn. Để có thêm tin tức, xin xem Quá trình Phiên bản trong tài liệu hoặc những thông báo xuất bản được phân phối với VeraCrypt 4.1 hoặc mới hơn.</string>
     <string lang="vi" key="WARN_64_BIT_BLOCK_CIPHER">Cảnh báo: Tập đĩa này được mã hóa với một thuật toán mã hóa thừa tự.\n\nTất cả các thuật toán mã hóa 64-bit-block (ví dụ như Blowfish, CAST-128, hay Triple DES) bị bãi bỏ. Sẽ không thể nào nạp tập đĩa này khi dùng những phiên bản tương lai của VeraCrypt. Tuy nhiên, sẽ không còn những tiến triển cho việc thực hiện những thuật toán mã hóa thừa tự này nữa. Chúng tôi khuyên bạn cấu tạo một tập đĩa VeraCrypt mới được mã hóa với một thuật toán mã hóa 128-bit-block (ví dụ như AES, Serpent, Twcủaish, v.v.) và dời tất cả các tập tin từ tập đĩa này sang tập đĩa mới.</string>
     <string lang="vi" key="SYS_AUTOMOUNT_DISABLED">Hệ thống của bạn không được cấu hình để tự-nạp các tập đĩa mới. Có thể nạp các tập đĩa VeraCrypt có thiết bị làm chủ được. Tự-nạp có thể được bật lên bằng cách thực thi lệnh sau đây và bắt đầu hệ thống lại.\n\nmountvol.exe /E</string>
     <string lang="vi" key="SYS_ASSIGN_DRIVE_LETTER">Xin gán một chữ hiệu ổ đĩa cho phân vùng/thiết bị trước khi tiến hành ('Control Panel' &gt; 'System and Maintenance' &gt; 'Administrative Tools' - 'Cấu tạo và định dạng phân vùng đĩa cứng').\n\nLưu ý rằng đây là một yêu cầu của hệ điều hành.</string>
@@ -1069,7 +1077,7 @@
     <string lang="en" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt no longer supports encryption of the system partition/drive on Windows Vista with no Service Pack installed. Before upgrading VeraCrypt, please install Service Pack 1 or higher for Windows Vista.</string>
     <string lang="vi" key="FEATURE_REQUIRES_INSTALLATION">Lỗi: Tính năng này cần VeraCrypt được cài đặt trong hệ thống của bạn (bạn đang cho VeraCrypt chạy trong dạng lưu động).\n\nXin cài đặt VeraCrypt và sau đó thử lại.</string>
     <string lang="vi" key="WINDOWS_NOT_ON_BOOT_DRIVE_ERROR">CẢNH BÁO: Dường như Windows không được cài đặt trong ổ đĩa nơi mà nó khởi nạp. Việc này không được hỗ trợ.\n\nBạn chỉ nên tiếp tục nếu bạn chắc là Windows được cài đặt trong ổ đĩa nơi mà nó khởi nạp.\n\nBạn có muốn tiếp tục không?</string>
-    <string lang="vi" key="GPT_BOOT_DRIVE_UNSUPPORTED">Ổ đĩa hệ thống của bạn có một bảng phân vùng GUID (GPT). Hiện tại, chỉ có những ổ đĩa với bảng phân vùng MBR được hỗ trợ.</string>
+    <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</string>
     <string lang="vi" key="TC_BOOT_LOADER_ALREADY_INSTALLED">CHÚ Ý: Bộ tải Khởi nạp VeraCrypt đã được cài đặt trong ổ đĩa hệ thống của bạn!\n\nCó thể một hệ thống khác trong máy của bạn đã được mã hóa.\n\nCẢNH BÁO: TIẾN HÀNH VIỆC MÃ HÓA HỆ THỐNG ĐANG ĐƯỢC CHẠY CÓ THỂ LÀM CHO (CÁC) HỆ THỐNG KHÁC KHÔNG TÀI NÀO BẮT ĐẦU ĐƯỢC VÀ DỮ LIỆU LIÊN HỆ KHÔNG TRUY CẬP ĐƯỢC.\n\nBạn có chắc là bạn muốn tiếp tục không?</string>
     <string lang="vi" key="SYS_LOADER_RESTORE_FAILED">Không thể phục hồi bộ tải hệ thống nguyên thủy.\n\nXin sử dụng Đĩa Cứu hộ VeraCrypt ('Tùy chọn Sửa chửa' &gt; 'Phục hồi bộ tải hệ thống nguyên thủy') hoặc môi trường cài đặt Windows để thay thế Bộ tải Khởi nạp VeraCrypt với bộ tải hệ thống Windows.</string>
     <string lang="vi" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">Bộ tải hệ thống nguyên thủy sẽ không được giữ trong Đĩa Cứu hộ (lý do có thể là tập tin sao lưu bị mất).</string>
@@ -1093,7 +1101,7 @@
     <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 medium (or using a service partition)?</string>
     <string lang="vi" key="DECOY_OS_REQUIREMENTS">Vì những lý do bảo mật, nếu hệ điều hành hiện đang chạy cần kích hoạt thì nó phải được kích hoạt trước khi tiến hành. Lưu ý là hệ điều hành ẩn sẽ được cấu tạo bằng cách chép nội dung của phân vùng hệ thống vào một tập đĩa ẩn (vì thế nếu hệ điều hành này không được kích hoạt thì hệ điều hành ẩn cũng sẽ không được kích hoạt luôn). Để có thêm tin tức, xem phần "Những Yêu cầu và Đề phòng Bảo mật Liên quan đến những Tập đĩa ẩn" trong Hướng dẫn cho Người dùng của VeraCrypt.\n\nQuan trọng: Trước khi tiến hành, xin đảm bảo là bạn đã đọc phần "Những Yêu cầu và Đề phòng Bảo mật Liên quan đến những Tập đĩa ẩn" trong Hướng dẫn cho Người dùng.\n\n\nHệ điều hành hiện đang chạy có đạt được điều kiện bên trên không?</string>
     <string lang="vi" key="CONFIRM_HIDDEN_OS_EXTRA_BOOT_PARTITION">Hệ thống của bạn dùng thêm một phân vùng khởi động. VeraCrypt không hỗ trợ vô động trong những hệ điều hành ẩn mà sử dụng thêm một phân vùng khởi động (hệ thốngs nghi trang có thể được vô động mà không gặp vấn đề gì cả).\n\nXin lưu ý là phân vùng khởi động sẽ được xài chung bởi cả hệ nghi trang lẫn hệ ẩn. Vì vậy, để ngăn cản những thất thoát và vấn đề của dữ liệu trong lúc bắt đầu lại từ sự vô động, VeraCrypt phải ngăn cản hệ ẩn viết vào phân vùng khởi động xài chung và vào trạng thái vô động.\n\n\nBạn có muốn tiếp tục không? Nếu bạn chọn 'Không', những chỉ dẫn để tháo bỏ phân vùng khởi động thêm sẽ được hiển thị.</string>
-    <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' &gt; '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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
+    <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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
     <string lang="vi" key="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">Cảnh báo: Có chỗ trống chưa phân phát giữa phân vùng hệ thống và phân vùng đầu tiên phía sau nó. Sau khi bạn cấu tạo hệ điều hành ẩn, bạn không được cấu tạo bất cứ phân vùng mới nào trong chỗ trống chưa phân phát đó. Không thôi, hệ điều hành ẩn sẽ không thể nào khởi động được (cho đến khi bạn xóa bỏ những phân vùng được cấu tạo như thế).</string>
     <string lang="vi" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Thuật toán này hiện không được hỗ trợ cho việc mã hóa hệ thống.</string>
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
@@ -1108,8 +1116,8 @@
     <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ởi động) ngay cả nếu bạn KHÔNG có một bàn phím thật của Mỹ.</string>
     <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ẽ có chứa một bản sao của nội dung hiện tại của phần đường đầu tiên của ổ đĩa (cái mà thường có chứa một hệ thống khởi nạp hoặc hàm quản lý khởi động) và sẽ để cho bạn hồi phục nếu cần thiết.\n\nBản ảnh ISO của Đĩa Cứu hộ VeraCrypt sẽ được cấu tạo ở vị trí xác định bên dưới.</string>
     <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">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%s\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>
+    <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%s\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>
     <string lang="vi" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">QUAN TRỌNG: Lưu ý là tập tin phải được viết vào CD/DVD như là một bản ảnh ISO của đĩa (chứ không phải như là một tập tin cá nhân). Để có hướng dẫn làm như thế nào, xin tham khảo tài liệu của nhu liệu thâu CD/DVD của bạn. Nếu bạn không có nhu liệu thâu CD/DVD nào có thể viết bản ảnh ISO của đĩa vào một CD/DVD, nhấn liên kết bên dưới để tải nhu liệu miễn phí như thế xuống.\n\n</string>
     <string lang="vi" key="LAUNCH_WIN_ISOBURN">Khởi chạy Microsoft Windows Disc Image Burner</string>
     <string lang="vi" key="RESCUE_DISK_BURN_NO_CHECK_WARN">CẢNH BÁO: Nếu bạn đã cấu tạo một Đĩa Cứu hộ VeraCrypt trong quá khứ, nó không thể đuợc dùng lại cho phân vùng/ổ đĩa hệ thống này vì nó được cấu tạo cho một khóa chính khác! Mỗi khi bạn mã hóa một phân vùng/ổ đĩa hệ thống, bạn phải cấu tạo một Đĩa Cứu hộ VeraCrypt mới cho nó ngay cả nếu bạn sử dụng cùng một mật mã.</string>
@@ -1247,7 +1255,7 @@
     <string lang="vi" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">Nếu bạn gặp bất kỳ vấn đề nào được mô tả trước đây, giải mã phân vùng/ổ đĩa (nếu nó được mã hóa) và sau đó thử mã hóa nó một lần nữa bằng cách dùng một thuật toán mã hóa phi-thác (ví dụ như 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 system (but not on the decoy system), the decoy system would contain a VeraCrypt driver and VeraCrypt applications whose version numbers are different from the version number of the VeraCrypt Boot Loader. Such a discrepancy might indicate that there is a hidden operating system on this computer.\n\n\nDo you want to continue?</string>
     <string lang="vi" key="UPDATE_TC_IN_HIDDEN_OS_TOO">Số phiên bản của Bộ nạp Khởi động của VeraCrypt mà đã khởi động hệ điều hành này khác với số phiên bản của trình điều khiển VeraCrypt (và các ứng dụng của VeraCrypt) được cài đặt trên hệ thống này.\n\n Bạn nên cho chạy trình cài đặt VeraCrypt (mà số phiên bản giống như cái của Bộ nạp Khởi động của VeraCrypt) để cập nhật VeraCrypt trên hệ điều hành này.</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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' &gt; '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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' > 'Create Rescue Disk').</string>
     <string lang="vi" key="BOOT_LOADER_UPGRADE_OK">Bộ nạp Khởi động của VeraCrypt đã được nâng cấp.\n\nCực lực khuyên bạn nên cấu tạo một Đĩa Cứu hộ VeraCrypt mới (mà sẽ có chứa phiên bản mới của Bộ nạp Khởi động của VeraCrypt) bằng cách chọn 'Hệ thống' &gt; 'Cấu tạo Đĩa Cứu hộ' sau khi bạn khởi động máy điện toán của bạn lại.</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' &gt; 'Create Rescue Disk'.</string>
     <string lang="vi" key="BOOT_LOADER_UPGRADE_FAILED">Không nâng cấp Bộ nạp Khởi động của VeraCrypt được.</string>
@@ -1272,7 +1280,7 @@
     <string lang="vi" key="INVALID_TOKEN_KEYFILE_PATH">Đường dẫn đến tập tin khóa của hiệu bài bảo mật không hợp lệ.</string>
     <string lang="vi" key="SECURITY_TOKEN_ERROR">Lỗi của hiệu bài bảo mật</string>
     <string lang="vi" key="CKR_PIN_INCORRECT">Mật mã cho hiệu bài bảo mật không đúng.</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' &gt; '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="vi" key="ALL_TOKEN_SESSIONS_CLOSED">Tất cả các phiên chạy của hiệu bài bảo mật đã được đóng.</string>
     <string lang="vi" key="SELECT_TOKEN_KEYFILES">Chọn các Tập tin khóa của Hiệu bài Bảo mật</string>
     <string lang="vi" key="TOKEN_SLOT_ID">Rãnh</string>
@@ -1297,8 +1305,8 @@
     <string lang="vi" key="MOUNTED_DEVICE_FORCED_READ_ONLY_WRITE_PROTECTION">Tập đĩa '%s' đã được nạp kiểu chỉ-đọc lên vì hệ điều hành báo cáo thiết bị làm chủ được bảo vệ chống ghi.\n\nXin lưu ý là một số trình điều khiển chipset riêng đã được báo cáo là làm cho các môi trường chứa ghi được nhìn giả giống như được bảo vệ chống ghi. Vấn đề này không phải do VeraCrypt gây ra. Nó có thể được giải quyết bằng cách cập nhật hoặc hủy cài đặt bất cứ trình điều khiển chipset riêng (không phải của Microsoft) hiện đang được cài đặt trên hệ thống này.</string>
     <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' &gt; 'Performance' and enable 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' &gt; 'Performance' and disable 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="vi" key="ASK_REMOVE_DEVICE_WRITE_PROTECTION">Bạn có muốn VeraCrypt thử tắt bảo vệ chống ghi của phân vùng/ổ đĩa không?</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>
@@ -1372,6 +1380,39 @@
     <string lang="vi" key="TB_PER_SEC">TB/s</string>
     <string lang="vi" key="PB_PER_SEC">PB/s</string>
     <string lang="en" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.zh-cn.xml

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
-    <language langid="zh-cn" name="简体中文" en-name="Chinese (Simplified)" version="1.0.0" translators="Barney Li" />
+    <language langid="zh-cn" name="简体中文" en-name="Chinese (Simplified)" version="1.0.0" translators="Barney Li and Zhangjintao" />
     <!-- Fonts -->
     <font lang="zh-cn" class="normal" size="11" face="Tahoma" />
     <font lang="zh-cn" class="bold" size="14" face="Tahoma" />
@@ -14,7 +14,7 @@
     <control lang="zh-cn" key="IDC_BROWSE">浏览(&amp;W)...</control>
     <control lang="zh-cn" key="IDC_DESKTOP_ICON">在桌面添加 VeraCrypt 图标(&amp;D)</control>
     <control lang="zh-cn" key="IDC_DONATE">现在捐助...</control>
-    <control lang="zh-cn" key="IDC_FILE_TYPE">关联 .tc 文件到 VeraCrypt(&amp;E) </control>
+    <control lang="zh-cn" key="IDC_FILE_TYPE">关联 .hc 文件到 VeraCrypt(&amp;E)</control>
     <control lang="zh-cn" key="IDC_OPEN_CONTAINING_FOLDER">完成后打开目标位置(&amp;O)</control>
     <control lang="zh-cn" key="IDC_PROG_GROUP">创建 VeraCrypt 开始菜单项目(&amp;S)</control>
     <control lang="zh-cn" key="IDC_SYSTEM_RESTORE">创建系统还原点(&amp;R)</control>
@@ -37,6 +37,7 @@
     <control lang="zh-cn" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">下载 CD/DVD 刻录软件（联网）</control>
     <control lang="zh-cn" key="IDC_FILE_CONTAINER">创建文件型加密卷</control>
     <control lang="zh-cn" key="IDC_GB">GB(&amp;G)</control>
+    <control lang="zh-cn" key="IDC_TB">TB(&amp;T)</control>
     <control lang="zh-cn" key="IDC_HIDDEN_SYSENC_INFO_LINK">更多信息（联网）</control>
     <control lang="zh-cn" key="IDC_HIDDEN_VOL">隐藏的 VeraCrypt 加密卷(&amp;D) </control>
     <control lang="zh-cn" key="IDC_HIDDEN_VOL_HELP">关于隐藏加密卷的更多信息（联网）</control>
@@ -44,11 +45,12 @@
     <control lang="zh-cn" key="IDC_HIDVOL_WIZ_MODE_FULL">常规模式</control>
     <control lang="zh-cn" key="IDC_KB">KB(&amp;K)</control>
     <control lang="zh-cn" key="IDC_KEYFILES_ENABLE">使用密钥文件(&amp;S)</control>
-    <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
+    <control lang="zh-cn" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">首先尝试以空密码挂载</control>
-    <control lang="zh-cn" key="IDC_KEY_FILES">密钥文件(&amp;K)..</control>
+    <control lang="zh-cn" key="IDC_KEYFILES_RANDOM_SIZE">随机大小 ( 64 &lt;-&gt; 1048576 )</control>
+    <control lang="zh-cn" key="IDC_KEY_FILES">密钥文件(&amp;K)...</control>
     <control lang="zh-cn" key="IDC_LINK_HASH_INFO">混杂算法的更多信息（联网）</control>
     <control lang="zh-cn" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">更多信息（联网）</control>
-    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
+    <control lang="zh-cn" key="IDC_LINK_PIM_INFO">关于PIM的更多信息（联网）</control>
     <control lang="zh-cn" key="IDC_MB">MB(&amp;M)</control>
     <control lang="zh-cn" key="IDC_MORE_INFO_ON_CONTAINERS">更多信息（联网）</control>
     <control lang="zh-cn" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">关于系统盘加密的更多信息（联网）</control>
@@ -58,11 +60,12 @@
     <control lang="zh-cn" key="IDC_NO_HISTORY">从不保留历史记录(&amp;R)</control>
     <control lang="zh-cn" key="IDC_OPEN_OUTER_VOLUME">打开外层加密卷</control>
     <control lang="zh-cn" key="IDC_PAUSE">暂停(&amp;P)</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="zh-cn" key="IDC_PIM_ENABLE">使用 P&amp;IM</control>
+    <control lang="zh-cn" key="IDC_NEW_PIM_ENABLE">使用 PIM</control>
     <control lang="zh-cn" key="IDC_QUICKFORMAT">快速格式化</control>
     <control lang="zh-cn" key="IDC_SHOW_PASSWORD">显示密码(&amp;D)</control>
     <control lang="zh-cn" key="IDC_SHOW_PASSWORD_SINGLE">显示密码(&amp;D)</control>
-    <control lang="en" key="IDC_SHOW_PIM">&amp;Display PIM</control>
+    <control lang="zh-cn" key="IDC_SHOW_PIM">&amp;显示 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">隐藏(&amp;D)</control>
@@ -71,35 +74,35 @@
     <control lang="zh-cn" key="IDC_SYS_PARTITION">加密 Windows 系统分区</control>
     <control lang="zh-cn" key="IDC_WHOLE_SYS_DRIVE">加密整个硬盘驱动器</control>
     <control lang="zh-cn" key="IDD_VOL_CREATION_WIZARD_DLG">VeraCrypt 加密卷创建向导</control>
-    <control lang="zh-cn" key="IDT_CLUSTER">簇</control>
+    <control lang="zh-cn" key="IDT_CLUSTER">簇 </control>
     <control lang="zh-cn" key="IDT_COLLECTING_RANDOM_DATA_NOTE">重要：在窗口范围内尽量任意移动鼠标。移动时间越长越好。这将会极大的增强密钥的加密强度。之后点击〖下一步〗按钮继续。</control>
     <control lang="zh-cn" key="IDT_CONFIRM">确认(&amp;C)：</control>
-    <control lang="zh-cn" key="IDT_DONE">完成 </control>
+    <control lang="zh-cn" key="IDT_DONE">完成</control>
-    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
+    <control lang="zh-cn" key="IDT_DRIVE_LETTER">卷标:</control>
     <control lang="zh-cn" key="IDT_ENCRYPTION_ALGO">加密算法</control>
     <control lang="zh-cn" key="IDT_FILESYSTEM">文件系统 </control>
     <control lang="zh-cn" key="IDT_FILE_CONTAINER">创建一个文件类型的加密盘，推荐入门用户使用。</control>
     <control lang="zh-cn" key="IDT_FORMAT_OPTIONS">选项</control>
     <control lang="zh-cn" key="IDT_HASH_ALGO">哈希算法</control>
-    <control lang="zh-cn" key="IDT_HEADER_KEY">首密钥：</control>
+    <control lang="zh-cn" key="IDT_HEADER_KEY">首密钥： </control>
-    <control lang="zh-cn" key="IDT_LEFT">剩余 </control>
+    <control lang="zh-cn" key="IDT_LEFT">剩余</control>
-    <control lang="zh-cn" key="IDT_MASTER_KEY">主密钥：</control>
+    <control lang="zh-cn" key="IDT_MASTER_KEY">主密钥： </control>
     <control lang="zh-cn" key="IDT_MULTI_BOOT">如果此计算机上安装了两个或多个操作系统请选择此项。\n\n例如：\n- Windows XP 和 Windows XP\n- Windows XP 和 Windows Vista\n- Windows 和 Mac OS X\n- Windows 和 Linux\n- Windows，Linux 和 Mac OS X</control>
-    <control lang="zh-cn" key="IDT_NON_SYS_DEVICE">加密一个内部或者外部驱动器上的非系统分区（例如. 优盘）。也可以创建一个隐藏的加密卷。</control>
+    <control lang="zh-cn" key="IDT_NON_SYS_DEVICE">加密一个内部或者外部驱动器上的非系统分区（例如：优盘）。也可以创建一个隐藏的加密卷。</control>
     <control lang="zh-cn" key="IDT_PARTIAL_POOL_CONTENTS">当前缓存内容（部分）</control>
     <control lang="zh-cn" key="IDT_PASS">密码</control>
     <control lang="zh-cn" key="IDT_PASSWORD">密码：</control>
-    <control lang="en" key="IDT_PIM">Volume PIM:</control>
+    <control lang="zh-cn" key="IDT_PIM">新的卷 PIM:</control>
-    <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
+    <control lang="zh-cn" key="IDT_OLD_PIM">旧的卷 PIM:</control>
     <control lang="zh-cn" key="IDT_PROGRESS">进程：</control>
-    <control lang="zh-cn" key="IDT_RANDOM_POOL">随机缓冲：</control>
+    <control lang="zh-cn" key="IDT_RANDOM_POOL">随机缓冲： </control>
     <control lang="zh-cn" key="IDT_SINGLE_BOOT">如果计算机上只安装了一个操作系统请选择此项（尽管该操作系统下可能有多个用户）。</control>
-    <control lang="zh-cn" key="IDT_SPEED">速度 </control>
+    <control lang="zh-cn" key="IDT_SPEED">速度</control>
     <control lang="zh-cn" key="IDT_STATUS">状态</control>
     <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_VOLUME_LABEL">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 按键跳过启动验证（启用启动管理器）(&amp;A)</control>
@@ -113,11 +116,12 @@
     <control lang="zh-cn" key="IDC_CACHE">在内存中缓存密码和密钥文件(&amp;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">在有加密卷成功加载后关闭口令牌会话（登出）(&amp;C)</control>
-    <control lang="en" key="IDC_COPY_EXPANDER">Include VeraCrypt Volume Expander</control>
+    <control lang="zh-cn" key="IDC_COPY_EXPANDER">包含 VeraCrypt 加密卷扩展向导</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">创建加密卷(&amp;C)</control>
     <control lang="zh-cn" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">在启动验证屏幕不显示任何文本（仅显示下面自定义的信息）(&amp;S)</control>
+    <control lang="zh-cn" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">停用"Evil Maid"攻击检测</control>
     <control lang="zh-cn" key="IDC_ENABLE_HARDWARE_ENCRYPTION">使用处理器指令加速 AES 加解密（如果功能可用）</control>
     <control lang="zh-cn" key="IDC_ENABLE_KEYFILES">使用密钥文件</control>
     <control lang="zh-cn" key="IDC_ENABLE_NEW_KEYFILES">使用密钥文件</control>
@@ -132,8 +136,9 @@
     <control lang="zh-cn" key="IDC_FAVORITE_MOVE_UP">上移(&amp;U)</control>
     <control lang="zh-cn" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">成功加载选定加密卷后，为其打开资源管理器窗口(&amp;E)</control>
     <control lang="zh-cn" key="IDC_FAVORITE_REMOVE">移除(&amp;R)</control>
+    <control lang="zh-cn" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">使用收藏卷的标签作为资源管理器中卷的名称</control>
     <control lang="zh-cn" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">全局设置</control>
-    <control lang="zh-cn" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">热键卸载后显示气球状提示</control>
+    <control lang="zh-cn" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">热键卸载后显示气球提示</control>
     <control lang="zh-cn" key="IDC_HK_DISMOUNT_PLAY_SOUND">热键卸载后播放系统提示音</control>
     <control lang="zh-cn" key="IDC_HK_MOD_ALT">Alt</control>
     <control lang="zh-cn" key="IDC_HK_MOD_CTRL">Ctrl</control>
@@ -150,13 +155,13 @@
     <control lang="zh-cn" key="IDC_MOUNT_OPTIONS">加载选项(&amp;A)...</control>
     <control lang="zh-cn" key="IDC_MOUNT_READONLY">以只读模式加载加密卷(&amp;O)</control>
     <control lang="zh-cn" key="IDC_NEW_KEYFILES">密钥文件...</control>
-    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="zh-cn" key="IDC_OLD_PIM_HELP">(留空或输入0以使用默认迭代参数)</control>
-    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
+    <control lang="zh-cn" key="IDC_PIM_HELP">(留空或输入0以使用默认迭代参数)</control>
     <control lang="zh-cn" key="IDC_PREF_BKG_TASK_ENABLE">启用</control>
     <control lang="zh-cn" key="IDC_PREF_CACHE_PASSWORDS">在驱动内存中缓存密码</control>
     <control lang="zh-cn" key="IDC_PREF_DISMOUNT_INACTIVE">自动卸载加密卷，在无数据读写动作下面时间后</control>
     <control lang="zh-cn" key="IDC_PREF_DISMOUNT_LOGOFF">用户注销时</control>
-    <control lang="en" key="IDC_PREF_DISMOUNT_SESSION_LOCKED">User session locked</control>
+    <control lang="zh-cn" key="IDC_PREF_DISMOUNT_SESSION_LOCKED">用户锁定会话时</control>
     <control lang="zh-cn" key="IDC_PREF_DISMOUNT_POWERSAVING">进入待机状态时</control>
     <control lang="zh-cn" key="IDC_PREF_DISMOUNT_SCREENSAVER">屏幕保护加载时</control>
     <control lang="zh-cn" key="IDC_PREF_FORCE_AUTO_DISMOUNT">强制自动卸载，无论加密卷是否有被打开的文件或目录</control>
@@ -165,7 +170,7 @@
     <control lang="zh-cn" key="IDC_PREF_MOUNT_READONLY">以只读模式加载加密卷</control>
     <control lang="zh-cn" key="IDC_PREF_MOUNT_REMOVABLE">以可移动介质模式加载加密卷</control>
     <control lang="zh-cn" key="IDC_PREF_OPEN_EXPLORER">为成功加载的加密卷打开资源管理器窗口</control>
-    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</control>
+    <control lang="zh-cn" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">在加载收藏加密卷时临时保存密码</control>
     <control lang="zh-cn" key="IDC_PREF_USE_DIFF_TRAY_ICON_IF_VOL_MOUNTED">有加密卷加载时启用不同颜色的任务栏图标</control>
     <control lang="zh-cn" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">自动卸载时擦除缓存的密码</control>
     <control lang="zh-cn" key="IDC_PREF_WIPE_CACHE_ON_EXIT">退出时擦除缓存的密码</control>
@@ -178,12 +183,12 @@
     <control lang="zh-cn" key="IDC_SHOW_PASSWORD_CHPWD_ORI">显示密码</control>
     <control lang="zh-cn" key="IDC_TRAVEL_OPEN_EXPLORER">为加载的加密卷打开资源管理器窗口(&amp;E)</control>
     <control lang="zh-cn" key="IDC_TRAV_CACHE_PASSWORDS">在驱动内存中缓存密码(&amp;C)</control>
-    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="zh-cn" key="IDC_TRUECRYPT_MODE">TrueCrypt 模式</control>
     <control lang="zh-cn" key="IDC_UNMOUNTALL">全部卸载(&amp;S)</control>
     <control lang="zh-cn" key="IDC_VOLUME_PROPERTIES">加密卷属性(&amp;X)...</control>
     <control lang="zh-cn" key="IDC_VOLUME_TOOLS">加密卷工具(&amp;T)...</control>
     <control lang="zh-cn" key="IDC_WIPE_CACHE">擦除缓存(&amp;W)</control>
-    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
+    <control lang="zh-cn" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - 挂载参数</control>
     <control lang="zh-cn" key="IDD_FAVORITE_VOLUMES">VeraCrypt - 收藏加密卷</control>
     <control lang="zh-cn" key="IDD_HOTKEYS_DLG">VeraCrypt - 系统热键</control>
     <control lang="zh-cn" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -212,9 +217,9 @@
     <control lang="zh-cn" key="IDM_CREATE_HIDDEN_OS">创建隐形操作系统...</control>
     <control lang="zh-cn" key="IDM_CREATE_RESCUE_DISK">创建应急盘...</control>
     <control lang="zh-cn" key="IDM_CREATE_VOLUME">创建加密卷...</control>
-    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
+    <control lang="zh-cn" key="IDM_DECRYPT_NONSYS_VOL">永久解密...</control>
     <control lang="zh-cn" key="IDM_DEFAULT_KEYFILES">默认密钥文件...</control>
-    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
+    <control lang="zh-cn" key="IDM_DEFAULT_MOUNT_PARAMETERS">默认挂载参数...</control>
     <control lang="zh-cn" key="IDM_DONATE">现在捐助...</control>
     <control lang="zh-cn" key="IDM_ENCRYPT_SYSTEM_DEVICE">加密系统分区/驱动器...</control>
     <control lang="zh-cn" key="IDM_FAQ">常见问题（联网）</control>
@@ -256,8 +261,9 @@
     <control lang="zh-cn" key="IDM_UNMOUNTALL">卸载全部加载的加密卷</control>
     <control lang="zh-cn" key="IDM_UNMOUNT_VOLUME">卸载所选加密卷</control>
     <control lang="zh-cn" key="IDM_VERIFY_RESCUE_DISK">验证应急盘</control>
+    <control lang="zh-cn" key="IDM_VERIFY_RESCUE_DISK_ISO">验证应急盘镜像</control>
     <control lang="zh-cn" key="IDM_VERSION_HISTORY">版本历史（联网）</control>
-    <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
+    <control lang="zh-cn" key="IDM_VOLUME_EXPANDER">加密卷扩展向导</control>
     <control lang="zh-cn" key="IDM_VOLUME_PROPERTIES">加密卷属性</control>
     <control lang="zh-cn" key="IDM_VOLUME_WIZARD">加密卷创建向导</control>
     <control lang="zh-cn" key="IDM_WEBSITE">官方网站（联网）</control>
@@ -274,8 +280,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="zh-cn" key="IDT_DRIVER_OPTIONS">设置驱动程序...</control>
-    <control lang="en" key="IDC_ENABLE_EXTENDED_IOCTL_SUPPORT">Enable extended disk control codes support</control>
+    <control lang="zh-cn" key="IDC_ENABLE_EXTENDED_IOCTL_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>
@@ -289,12 +295,12 @@
     <control lang="zh-cn" key="IDT_PARALLELIZATION_OPTIONS">基于线程的并行计算</control>
     <control lang="zh-cn" key="IDT_PKCS11_LIB_PATH">PKCS #11 运行库路径</control>
     <control lang="zh-cn" key="IDT_PKCS5_PRF">PKCS-5 PRF：</control>
-    <control lang="en" key="IDT_NEW_PKCS5_PRF">PKCS-5 PRF:</control>
+    <control lang="zh-cn" key="IDT_NEW_PKCS5_PRF">PKCS-5 PRF:</control>
     <control lang="zh-cn" key="IDT_PW_CACHE_OPTIONS">密码缓存</control>
     <control lang="zh-cn" key="IDT_SECURITY_OPTIONS">安全选项</control>
     <control lang="zh-cn" key="IDT_TASKBAR_ICON">VeraCrypt 后台任务</control>
     <control lang="zh-cn" key="IDT_TRAVELER_MOUNT">要加载的 VeraCrypt 加密卷（相对于便携磁盘的根目录）：</control>
-    <control lang="zh-cn" key="IDT_TRAVEL_INSERTION">在插入便携磁盘时：</control>
+    <control lang="zh-cn" key="IDT_TRAVEL_INSERTION">在插入便携磁盘时： </control>
     <control lang="zh-cn" key="IDT_TRAVEL_ROOT">创建便携磁盘文件于（便携磁盘根目录）：</control>
     <control lang="zh-cn" key="IDT_VOLUME">加密卷</control>
     <control lang="zh-cn" key="IDT_WINDOWS_RELATED_SETTING">Windows</control>
@@ -352,9 +358,9 @@
     <control lang="zh-cn" key="IDT_KEYFILE_GENERATOR_NOTE">重要：请在此窗口内随机移动鼠标，移动时间越长越好。这将会显著增加密钥的加密强度。</control>
     <control lang="zh-cn" key="IDT_KEYFILE_WARNING">警告：如果您丢失了密钥文件或者密钥文件的前 1024 KB 字节已改变，将不可能再加载使用该密钥的加密卷！</control>
     <control lang="zh-cn" key="IDT_KEY_UNIT">位</control>
-    <control lang="en" key="IDT_NUMBER_KEYFILES">Number of keyfiles:</control>
+    <control lang="zh-cn" key="IDT_NUMBER_KEYFILES">密钥文件数量:</control>
-    <control lang="en" key="IDT_KEYFILES_SIZE">Keyfiles size (in Bytes):</control>
+    <control lang="zh-cn" key="IDT_KEYFILES_SIZE">密钥文件大小(以字节计算):</control>
-    <control lang="en" key="IDT_KEYFILES_BASE_NAME">Keyfiles base name:</control>
+    <control lang="zh-cn" key="IDT_KEYFILES_BASE_NAME">密钥文件名:</control>
     <control lang="zh-cn" key="IDT_LANGPACK_AUTHORS">翻译人员：</control>
     <control lang="zh-cn" key="IDT_PLAINTEXT">明文密码长度：</control>
     <control lang="zh-cn" key="IDT_PLAINTEXT_SIZE_UNIT">位</control>
@@ -365,7 +371,7 @@
     <control lang="zh-cn" key="IDT_SECURITY_TOKEN">安全口令牌：</control>
     <control lang="zh-cn" key="IDT_SORT_METHOD">排序方式：</control>
     <control lang="zh-cn" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">请耐心等待，此过程可能需要较长时间...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="zh-cn" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">请耐心等待...\n此过程可能需要较长时间并且VeraCrypt可能失去响应.</control>
     <control lang="zh-cn" key="IDT_TEST_BLOCK_NUMBER">块数值：</control>
     <control lang="zh-cn" key="IDT_TEST_CIPHERTEXT">加密文本（十六进制）</control>
     <control lang="zh-cn" key="IDT_TEST_DATA_UNIT_NUMBER">数据单元数值（64-位十六进制，数据单元大小为 512 字节）</control>
@@ -410,13 +416,13 @@
     <string lang="zh-cn" key="CIPHER_TITLE">加密选项</string>
     <string lang="zh-cn" key="CLEAN_WINMRU_FAILED">警告：清除上次选择的加密卷或密钥文件路径失败（由文件选择器记忆）！</string>
     <string lang="zh-cn" key="COMPRESSION_NOT_SUPPORTED">错误：此加密卷在 NTFS 格式分区上压缩过。VeraCrypt 不支持压缩过的加密卷（这是因为压缩过的加密数据会低效和存在数据冗余）。\n\n请使用以下步骤取消压缩： 1）在Windows资源管理器中右键单击加密卷（不是在 VeraCrypt 窗口中）。 2）选择“属性”。 3）在“属性”对话框，单击〖高级〗。 4）在“高级属性”对话框，禁用“压缩内容以节省磁盘空间”并点击〖确定〗。 5）返回到“属性”对话框，点〖确定〗。</string>
-    <string lang="zh-cn" key="CREATE_FAILED">创建加密卷  %hs 失败</string>
+    <string lang="zh-cn" key="CREATE_FAILED">创建加密卷  %s 失败</string>
-    <string lang="zh-cn" key="DEVICE_FREE_BYTES">%hs 的大小为 %.2f 字节</string>
+    <string lang="zh-cn" key="DEVICE_FREE_BYTES">%s 的大小为 %.2f 字节</string>
-    <string lang="zh-cn" key="DEVICE_FREE_KB">%hs 的大小为 %.2f KB</string>
+    <string lang="zh-cn" key="DEVICE_FREE_KB">%s 的大小为 %.2f KB</string>
-    <string lang="zh-cn" key="DEVICE_FREE_MB">%hs 的大小为 %.2f MB</string>
+    <string lang="zh-cn" key="DEVICE_FREE_MB">%s 的大小为 %.2f MB</string>
-    <string lang="zh-cn" key="DEVICE_FREE_GB">%hs 的大小为 %.2f GB</string>
+    <string lang="zh-cn" key="DEVICE_FREE_GB">%s 的大小为 %.2f GB</string>
-    <string lang="zh-cn" key="DEVICE_FREE_TB">%hs 的大小为 %.2f TB</string>
+    <string lang="zh-cn" key="DEVICE_FREE_TB">%s 的大小为 %.2f TB</string>
-    <string lang="zh-cn" key="DEVICE_FREE_PB">%hs 的大小为 %.2f PB</string>
+    <string lang="zh-cn" key="DEVICE_FREE_PB">%s 的大小为 %.2f PB</string>
     <string lang="zh-cn" key="DEVICE_IN_USE_FORMAT">警告：设备/分区正在被系统或应用程序占用。格式化该设备/分区它可能导致数据丢失或系统不稳定。\n\n继续进行格式化吗？</string>
     <string lang="zh-cn" key="DEVICE_IN_USE_INPLACE_ENC">警告：该分区正在被操作系统或应用程序使用。您应当关闭任何可能占用此分区的程序（包括反病毒软件）。\n\n确认继续吗？</string>
     <string lang="zh-cn" key="FORMAT_CANT_DISMOUNT_FILESYS">错误：该设备/分区包含不能被卸载的文件系统。此文件系统可能被操作系统使用。格式化此设备/分区很可能会导致数据损坏或者是系统不稳定。\n\n要解决此问题，我们推荐您首先删除该分区之后在不格式化的情况下重新创建这个分区。要达成此目的，请遵照下面步骤： 1）在“开始”菜单右键单击“计算机”（或者“我的电脑”）图标，之后选择“管理”，显示“计算机管理”窗口。 2）在“计算机管理”窗口，选择“磁盘管理”。 3）右键单击要加密的分区，您可以选择“删除分区”或者是“删除卷”，或者是“删除逻辑驱动器”。 4）如果 Windows 提示重启计算机，点〖是〗重启。之后在第 5 个步骤中重复第 1 和第 2 步。 5）右键单击未分配/自由空间并选择“新建分区”，或者“新的卷”，或者“新逻辑驱动器”。 6）在“新分区向导”或者“新建卷向导”窗口中，在带有“格式化分区”标题的对话框中，选择“不格式化此分区”或者是“不格式化此卷”。在同样的向导里面，点〖下一步〗之后点〖完成〗按钮。 7）注意：您现在在 Veracrypt 中选择的设备路径可能是错误的，因此，退出并重新启动 VeraCrypt 加密卷创建向导（如果正在运行）。 8）尝试重新加密该设备/分区。\n\n如果 VeraCrypt 仍然会加密失败，您可以考虑创建文件类型的加密卷。</string>
@@ -428,19 +434,19 @@
     <string lang="zh-cn" key="AFTER_FORMAT_DRIVE_LETTER_WARN">重要：请牢记，此加密卷不能使用当前赋给它的驱动器盘符 %c: 加载/访问，这个盘符已经赋给了该加密卷所在分区！\n\n要加载此加密卷，点击 VeraCrypt 主窗口的〖自动加载设备〗（也可以这样，在 VeraCrypt 主窗口，点击〖选择设备〗，之后选择该分区/驱动器，然后点〖加载〗按钮）。这个加密卷便会以其它盘符加载（此盘符可在 VeraCrypt 主窗口的盘符列表中选择）。\n\n原始的驱动盘符 %c: 仅应当在您需要移除对该分区/驱动器的加密时使用（例如：如果您不再需要加密）。在这种情况下，右键单击“我的电脑”（或者“资源管理器”）中的驱动器盘符 %c: 并选择〖格式化〗。否则该驱动器盘符 %c: 应当一直都不要使用（除非您移除它并把它指定给其它分区/驱动器）。</string>
     <string lang="zh-cn" key="OS_NOT_SUPPORTED_FOR_NONSYS_INPLACE_ENC">您的操作系统不支持就地加密非系统卷（仅在 Windows Vista 和以后版本中支持）。\n\n原因是当前操作系统不支持文件系统压缩（需要压缩文件系统以便为加密卷头信息以及备份头信息获取空间）。</string>
     <string lang="zh-cn" key="ONLY_NTFS_SUPPORTED_FOR_NONSYS_INPLACE_ENC">所选的分区看起来不包含 NTFS 文件系统。仅在 NTFS 文件系统下才支持就地加密。\n\n说明：当前操作系统不支持文件系统压缩（需要压缩文件系统以便为加密卷头信息以及备份头信息获取空间）。</string>
-    <string lang="zh-cn" key="ONLY_MOUNTED_VOL_SUPPORTED_FOR_NONSYS_INPLACE_ENC">选择的分区看起来不包含 NTFS 文件系统。仅在 NTFS 文件系统下才支持就地加密。\n\n如果您想在此分区内创建 VeraCrypt 加密卷，请选择“创建加密卷并格式化”（而不是选择“就地加密分区”）.</string>
+    <string lang="zh-cn" key="ONLY_MOUNTED_VOL_SUPPORTED_FOR_NONSYS_INPLACE_ENC">选择的分区看起来不包含 NTFS 文件系统。仅在 NTFS 文件系统下才支持就地加密。\n\n如果您想在此分区内创建 VeraCrypt 加密卷，请选择“创建加密卷并格式化”（而不是选择“就地加密分区”）。</string>
     <string lang="zh-cn" key="PARTITION_TOO_SMALL_FOR_NONSYS_INPLACE_ENC">错误：分区太小，VeraCrypt 不能实现就地加密。</string>
     <string lang="zh-cn" key="INPLACE_ENC_ALTERNATIVE_STEPS">要加密此分区的数据，请遵循以下步骤：\n\n1）在一个空的 分区/设备 上创建一个 VeraCrypt 加密卷之后加载此加密卷。\n\n2）复制待加密分区中的所有数据到这个已经加载的 VeraCrypt 加密卷（该加密卷已经在步骤 1) 中创建）。这种方式下，您就创建了一个被 VeraCrypt 加密了的数据备份。\n\n3）在要加密的分区上创建一个 VeraCrypt 加密卷并确认您在向导中选择了“创建加密卷并格式化”（而不是选择“就地加密分区”）。注意，所有存储于该分区的数据都会被擦除。加密卷创建之后，加载这个加密卷。\n\n4）复制备份加密卷（在步骤 1)  中创建的）中的所有文件到这个新创建的加密卷中（在步骤 3) 中创建和加载的）。\n\n完成以上步骤之后，数据将会被加密，并且也会额外的备份了数据的加密副本。</string>
     <string lang="zh-cn" key="RAW_DEV_NOT_SUPPORTED_FOR_INPLACE_ENC">VeraCrypt 只能就地加密分区、动态卷，或者整个系统启动器。\n\n如果您想在选择的非系统设备中创建加密卷，请选择选项“创建加密卷并格式化”（而不是选择选项“就地加密分区”）。</string>
     <string lang="zh-cn" key="INPLACE_ENC_INVALID_PATH">错误：VeraCrypt 只能就地加密分区、动态卷，或者整个系统启动器。请确认指定的路径有效。</string>
     <string lang="zh-cn" key="CANNOT_RESIZE_FILESYS">错误：不能压缩文件系统（需要压缩文件系统以便为加密卷头信息以及备份头信息获取空间）。\n\n可能原因及解决：\n\n- 该卷上无足够的剩余空间。请确认没有其它程序正在写入此文件系统。\n\n- 损坏的文件系统。尝试检查和修复错误（在“我的电脑”里右键单击相应的驱动器盘符，之后选择 属性 -&gt; 工具 -&gt;“开始检查”，确认已经选择了选项“自动修复文件系统错误”，之后单击〖开始〗按钮）。\n\n如果以上方法都不起作用，请遵循以下步骤。</string>
     <string lang="zh-cn" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">错误：剩余空间不足，因此文件系统不能被压缩（需要压缩文件系统以便为加密卷头信息以及备份头信息获取空间）。\n\n请删除任何多余文件并清空回收站以便释放 256KB 的空间之后再尝试。注意由于 Windows 的问题，Windows 资源管理器报告的自由空间数量在操作系统重新启动前可能是不正确的。如果重启系统后并无帮助，文件系统可能已经损坏了。尝试检查和修复错误（在“我的电脑”里右键单击相应的驱动器盘符，之后选择 属性 -&gt; 工具 -&gt; “开始检查”，确认已经选择了选项“自动修复文件系统错误”，之后单击〖开始〗按钮）。\n\n如果以上方法都不起作用，请遵循以下步骤。</string>
-    <string lang="zh-cn" key="DISK_FREE_BYTES">驱动器 %hs 上的自由空间为 %.2f 字节。</string>
+    <string lang="zh-cn" key="DISK_FREE_BYTES">驱动器 %s 上的自由空间为 %.2f 字节。</string>
-    <string lang="zh-cn" key="DISK_FREE_KB">驱动器 %hs 的自由空间大小为 %.2f KB</string>
+    <string lang="zh-cn" key="DISK_FREE_KB">驱动器 %s 的自由空间大小为 %.2f KB</string>
-    <string lang="zh-cn" key="DISK_FREE_MB">驱动器 %hs 的自由空间大小为 %.2f MB</string>
+    <string lang="zh-cn" key="DISK_FREE_MB">驱动器 %s 的自由空间大小为 %.2f MB</string>
-    <string lang="zh-cn" key="DISK_FREE_GB">驱动器 %hs 的自由空间大小为 %.2f GB</string>
+    <string lang="zh-cn" key="DISK_FREE_GB">驱动器 %s 的自由空间大小为 %.2f GB</string>
-    <string lang="zh-cn" key="DISK_FREE_TB">驱动器 %hs 的自由空间大小为 %.2f TB</string>
+    <string lang="zh-cn" key="DISK_FREE_TB">驱动器 %s 的自由空间大小为 %.2f TB</string>
-    <string lang="zh-cn" key="DISK_FREE_PB">驱动器 %hs 的自由空间大小为 %.2f PB</string>
+    <string lang="zh-cn" key="DISK_FREE_PB">驱动器 %s 的自由空间大小为 %.2f PB</string>
     <string lang="zh-cn" key="DRIVELETTERS">无法得到可用的驱动器盘符。</string>
     <string lang="zh-cn" key="DRIVER_NOT_FOUND">错误：未发现 VeraCrypt 驱动程序！\n\n请复制“veracrypt.sys”和“veracrypt-x64.sys”文件到 VeraCrypt.exe 程序所在的目录。</string>
     <string lang="zh-cn" key="DRIVER_VERSION">错误：正在运行不兼容版本的 VeraCrypt 设备驱动。\n\n如果您想在便携模式下运行 VeraCrypt（即不安装它）但是却安装了不同版本的 VeraCrypt，您必须先卸载已安装版本（或使用 VeraCrypt 安装程序升级）。要卸载 VeraCrypt，请按如下步骤进行：在 Windows Vista 或其后版本中，选择〖开始〗菜单 -&gt; 计算机 -&gt;〖卸载或更改程序〗-&gt; VeraCrypt -&gt; 卸载；在 Windows XP 中，选择〖开始〗菜单 -&gt; 〖设置〗 -&gt; 〖控制面板〗 -&gt; 〖添加或删除程序〗 -&gt; VeraCrypt -&gt; 删除\n\n与此相似，如果您尝试以便携版运行 VeraCrypt 但是却已经运行了其它版本的便携 VeraCrypt，您必须重启电脑之后再运行新的版本。</string>
@@ -458,7 +464,7 @@
     <string lang="zh-cn" key="SYSTEM_CRASH_ANALYSIS_INFO">点击〖确定〗按钮之后，VeraCrypt 将会分析系统崩溃原因，这可能需要几分钟时间。</string>
     <string lang="zh-cn" key="DEBUGGER_NOT_FOUND">请确认环境变量“PATH”包含“kd.exe”（内核调试器）的路径。</string>
     <string lang="zh-cn" key="SYSTEM_CRASH_NO_VERACRYPT">看起来VeraCrypt并未导致系统崩溃。系统崩溃是其它原因导致的（例如，硬件故障，设备驱动BUG等等）</string>
-    <string lang="zh-cn" key="SYSTEM_CRASH_UPDATE_DRIVER">分析结果表明更新以下驱动可能会解决问题：</string>
+    <string lang="zh-cn" key="SYSTEM_CRASH_UPDATE_DRIVER">分析结果表明更新以下驱动可能会解决问题： </string>
     <string lang="zh-cn" key="SYSTEM_CRASH_REPORT">要协助我们确认这是否为 Veracrypt 的错误，您可以向我们提交软件自动生成的错误报告，错误报告包括下面内容：\n- 程序版本\n- 操作系统版本\n- CPU类型\n- 错误类型\n- 驱动名称和版本\n- 系统调用堆栈\n\n如果选择〖是〗，下面的 URL 网址（包含错误报告）将会在您的默认浏览器中打开。</string>
     <string lang="zh-cn" key="ASK_SEND_ERROR_REPORT">您希望向我们提交此错误报告吗？</string>
     <string lang="zh-cn" key="ENCRYPT">加密(&amp;E)</string>
@@ -502,11 +508,11 @@
     <string lang="zh-cn" key="FORMAT_FINISHED_HELP">\n\n已成功创建 VeraCrypt 加密卷并准备就绪。要创建另外的 VeraCrypt 加密卷，请单击〖下一步〗，否则请单击〖退出〗按钮。</string>
     <string lang="zh-cn" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\n隐藏的 VeraCrypt 加密卷已成功创建（隐形操作系统将包含在这个隐藏加密卷之内）。\n\n单击〖下一步〗按钮继续。</string>
     <string lang="zh-cn" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">已成功加密该卷</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
+    <string lang="zh-cn" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">已解密加密卷</string>
     <string lang="zh-cn" key="NONSYS_INPLACE_ENC_FINISHED_INFO">重要：要加载这个新建的 VERACRYPT 加密卷和访问存储于其中的数据，在 VERACRYPT 窗口中点击〖自动加载设备〗。在您输入正确密码之后（和/或 提供正确的密钥文件），加密卷将会以您在 VERACRYPT 列表中选择的盘符加载（您也将能够以该盘符访问加密数据）。\n\n【请记住或写下上述步骤】。您在希望加载这个加密卷和访问其中的数据时必须遵循上述步骤。另外一种方式是在 VeraCrypt 主窗口，点击〖选择设备〗，之后选择此 分区/设备，之后点〖加载〗。\n\n此分区/设备 已成功加密（选择包含完全加密的 VeraCrypt 加密卷）并为使用准备就绪。</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="zh-cn" key="NONSYS_INPLACE_DEC_FINISHED_INFO">已成功解密VeraCrypt加密卷。</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="zh-cn" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">对此VeraCrypt加密卷的解密已经完成。\n\n请选择一个盘符来挂载解密后的卷。\n\n重要: 你必须将解密后的卷挂载到一个盘符上来读取卷中的数据。</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="zh-cn" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">警告: 你必须将解密后的卷挂载到一个盘符上来读取卷中的数据，但没有可用的盘符。\n\n请释放一个盘符 (例如移除一个USB存储设备或外置硬盘) 然后点击 OK 。</string>
     <string lang="zh-cn" key="FORMAT_FINISHED_INFO">VeraCrypt 加密卷已成功创建。</string>
     <string lang="zh-cn" key="FORMAT_FINISHED_TITLE">加密卷已创建</string>
     <string lang="zh-cn" key="FORMAT_HELP">重要：请在此窗口内随机移动鼠标，移动时间越长越好。这将会显著增加密钥的加密强度。之后点击〖格式化〗按钮创建加密卷。</string>
@@ -542,18 +548,18 @@
     <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="zh-cn" key="ERR_PASSWORD_MISSING">不能创建加密卷，因为没有提供密码。</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="zh-cn" key="ERR_SIZE_MISSING">不能创建加密卷，因为没有提供加密卷的大小。</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="zh-cn" key="ERR_NTFS_INVALID_VOLUME_SIZE">输入的加密卷的大小不兼容所选择的NTFS文件系统。</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="zh-cn" key="ERR_FAT_INVALID_VOLUME_SIZE">输入的加密卷的大小不兼容所选择的FAT文件系统。</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="zh-cn" key="ERR_DYNAMIC_NOT_SUPPORTED">因为需要动态卷支持，目标文件系统上不支持建立稀疏文件。</string>
-    <string lang="en" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">Only container files can be created through the command line.</string>
+    <string lang="zh-cn" key="ERR_DEVICE_CLI_CREATE_NOT_SUPPORTED">只能使用命令行建立容器文件。</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="zh-cn" key="ERR_CONTAINER_SIZE_TOO_BIG">不能创建加密卷，因为所输入的加密卷的大小大于加密卷所在磁盘的剩余空间。</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="zh-cn" key="ERR_VOLUME_SIZE_TOO_SMALL">不能创建加密卷，因为所输入的加密卷的大小太小。</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="ERR_VOLUME_SIZE_TOO_BIG">不能创建加密卷，因为所输入的加密卷的大小太大。</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>
+    <string lang="zh-cn" key="CAPI_RAND">Windows Crypto API 调用失败!\n\n\n(如果你要提交一个关于此的错误报告，请附上下面的技术信息: bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="zh-cn" key="INIT_REGISTER">无法初始化应用程序。注册对话框类失败。</string>
     <string lang="zh-cn" key="INIT_RICHEDIT">错误：加载富文本编辑系统运行库失败。</string>
     <string lang="zh-cn" key="INTRO_TITLE">VeraCrypt 加密卷创建向导</string>
@@ -561,12 +567,13 @@
     <string lang="zh-cn" key="MAX_HIDVOL_SIZE_KB">该加密卷能创建的最大隐藏加密卷大小为 %.2f KB。</string>
     <string lang="zh-cn" key="MAX_HIDVOL_SIZE_MB">该加密卷能创建的最大隐藏加密卷大小为 %.2f MB。</string>
     <string lang="zh-cn" key="MAX_HIDVOL_SIZE_GB">该加密卷能创建的最大隐藏加密卷大小为 %.2f GB.</string>
+    <string lang="zh-cn" key="MAX_HIDVOL_SIZE_TB">该加密卷能创建的最大隐藏加密卷大小为 %.2f TB.</string>
     <string lang="zh-cn" key="MOUNTED_NOPWCHANGE">当此加密卷被加载时，无法修改加密卷密码/密钥文件。 请首先卸载此加密卷。</string>
     <string lang="zh-cn" key="MOUNTED_NO_PKCS5_PRF_CHANGE">当加密卷被加载时不能修改首密钥衍生算法。 请首先卸载加密卷。</string>
     <string lang="zh-cn" key="MOUNT_BUTTON">加载(&amp;M)</string>
     <string lang="zh-cn" key="NEW_VERSION_REQUIRED">需要新版本的 VeraCrypt 来加载此加密卷。</string>
     <string lang="zh-cn" key="VOL_CREATION_WIZARD_NOT_FOUND">错误：未发现加密卷创建向导。\n\n请确认文件“VeraCrypt Format.exe”位于“VeraCrypt.exe”的目录之中。如果不是 这样，请重新安装 VeraCrypt，或在磁盘中定位“VeraCrypt Format.exe”并运行它。</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>
+    <string lang="zh-cn" key="VOL_EXPANDER_NOT_FOUND">错误：未发现加密卷扩展向导。\n\n请确认文件“VeraCryptExpander.exe”位于“VeraCrypt.exe”的目录之中。如果不是 这样，请重新安装 VeraCrypt，或在磁盘中定位“VeraCryptExpander.exe”并运行它。</string>
     <string lang="zh-cn" key="NEXT">下一步(&amp;N) &gt;</string>
     <string lang="zh-cn" key="FINALIZE">完成(&amp;F)</string>
     <string lang="zh-cn" key="INSTALL">安装(&amp;I)</string>
@@ -574,7 +581,7 @@
     <string lang="zh-cn" key="NODRIVER">不能连接到 VeraCrypt 设备驱动。如果设备驱动不能运行则 VeraCrypt 也无法正常工作。\n\n请注意，由于 Windows 系统问题，在能够正常加载设备驱动前可能需要注销或者重启计算机。</string>
     <string lang="zh-cn" key="NOFONT">加载/准备字体时出错。</string>
     <string lang="zh-cn" key="NOT_FOUND">驱动器盘符未发现或没有指定驱动器盘符。</string>
-    <string lang="en" key="ERR_CANNOT_ASSIGN_DRIVE_LETTER_NONSYS_DEC">Error: Cannot assign drive letter.\n\nUntil a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.\n\nRetry?</string>
+    <string lang="zh-cn" key="ERR_CANNOT_ASSIGN_DRIVE_LETTER_NONSYS_DEC">错误:无法制定一个盘符。\n\n你必须将解密后的卷挂载到一个盘符上来读取卷中的数据.\n\n再次尝试？</string>
     <string lang="zh-cn" key="DRIVE_LETTER_UNAVAILABLE">驱动器盘符不可用。</string>
     <string lang="zh-cn" key="NO_FILE_SELECTED">未选定文件！</string>
     <string lang="zh-cn" key="NO_FREE_DRIVES">无可用驱动器盘符。</string>
@@ -591,33 +598,33 @@
     <string lang="zh-cn" key="SELECT_PKCS11_MODULE">选择 PKCS #11 运行库</string>
     <string lang="zh-cn" key="OUTOFMEMORY">内存不足</string>
     <string lang="zh-cn" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">重要：我们强烈建议非熟练用户在选定的分区/设备里面建立文件类型的加密卷，而不是尝试加密整个分区/驱动器。\n\n例如，当您创建一个 VeraCrypt 文件类型加密卷时（相对于加密整个分区/驱动器），则不存在毁坏大量的文件的风险。请注意，一个 VeraCrypt 文件类型加密卷（尽管其包含虚拟的加密磁盘）事实上就象任意一个普通的文件一样。如若获取更多信息，请参考VeraCrypt User Guide中的 Beginner's Tutorial 章节。\n\n您确认要加密整个设备/分区吗？</string>
-    <string lang="zh-cn" key="OVERWRITEPROMPT">警告：加密卷 '%hs' 已存在！\n\n重要：VeraCrypt 并不会加密这个文件，而是会删除这个文件。 您确定要删除这个文件并用一个新的 VeraCrypt 加密卷来替换它吗？</string>
+    <string lang="zh-cn" key="OVERWRITEPROMPT">警告：加密卷 '%s' 已存在！\n\n重要：VeraCrypt 并不会加密这个文件，而是会删除这个文件。 您确定要删除这个文件并用一个新的 VeraCrypt 加密卷来替换它吗？</string>
-    <string lang="zh-cn" key="OVERWRITEPROMPT_DEVICE">务必小心：当前存储在选择的 %s '%hs'%s 上的所有数据将会丢失（它们并不会被加密）！\n\n您一定要继续格式化吗？</string>
+    <string lang="zh-cn" key="OVERWRITEPROMPT_DEVICE">务必小心：当前存储在选择的 %s '%s'%s 上的所有数据将会丢失（它们并不会被加密）！\n\n您一定要继续格式化吗？</string>
-    <string lang="zh-cn" key="NONSYS_INPLACE_ENC_CONFIRM">警告：您在加密卷完全加密前不能加载此加密卷或者访问存储于该卷上的任何文件。\n\n您确认要开始加密选择的 %s '%hs'%s 吗？</string>
+    <string lang="zh-cn" key="NONSYS_INPLACE_ENC_CONFIRM">警告：您在加密卷完全加密前不能加载此加密卷或者访问存储于该卷上的任何文件。\n\n您确认要开始加密选择的 %s '%s'%s 吗？</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="zh-cn" key="NONSYS_INPLACE_DEC_CONFIRM">警告：您在加密卷完全解密前不能加载此加密卷或者访问存储于该卷上的任何文件。\n\n您确认要开始解密选择的 %s '%s'%s 吗？</string>
     <string lang="zh-cn" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">警告：请注意如果在就地加密现有数据时突然断电，或者在 VeraCrypt 就地加密现有数据时由于软硬件故障而导致电脑死机，可能会损坏或丢失一些数据。因此，在您开始加密前，请确认您已经备份了要加密的数据。\n\n您确认已经有这样的备份了吗？</string>
-    <string lang="zh-cn" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">警告：任何存在于分区 '%hs'%s（即位于系统分区后面的第一个分区）的文件将会因被擦除而丢失。（这些文件并不会被加密）！\n\n您确认要继续格式化吗？</string>
+    <string lang="zh-cn" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">警告：任何存在于分区 '%s'%s（即位于系统分区后面的第一个分区）的文件将会因被擦除而丢失。（这些文件并不会被加密）！\n\n您确认要继续格式化吗？</string>
     <string lang="zh-cn" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">警告：选定的分区包含大量的数据！！！任何存储于此分区上的文件将会被擦除（他们并不会被加密）！</string>
     <string lang="zh-cn" key="ERASE_FILES_BY_CREATING_VOLUME">通过在分区内创建 VeraCrypt 加密卷擦除该分区上的任何文件</string>
     <string lang="zh-cn" key="PASSWORD">密码</string>
-    <string lang="en" key="PIM">PIM</string>
+    <string lang="zh-cn" key="PIM">PIM</string>
     <string lang="zh-cn" key="IDD_PCDM_CHANGE_PKCS5_PRF">设置首密钥衍生算法</string>
-    <string lang="zh-cn" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">添加/移除 密钥文件..</string>
+    <string lang="zh-cn" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">添加/移除 密钥文件...</string>
     <string lang="zh-cn" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">从加密卷中移除所有密钥文件</string>
     <string lang="zh-cn" key="PASSWORD_CHANGED">密码 和/或 密钥文件已成功修改。\n\n重要：请确认您已经阅读了用户指南的'Security Requirements and Precautions'章节中的'Changing Passwords and Keyfiles'部分。</string>
-    <string lang="en" key="FAVORITE_PIM_CHANGED">This volume is registered as a System Favorite and its PIM was changed.\nDo you want VeraCrypt to automatically update the System Favorite configuration (administrator privileges required)?\n\nPlease note that if you answer no, you'll have to update the System Favorite manually.</string>
+    <string lang="zh-cn" key="FAVORITE_PIM_CHANGED">此加密卷已经修改PIM并标记成"系统收藏加密卷"。\n您希望VeryCrypt自动更新系统收藏加密卷设置么(需要管理员权限)。\n\n如果您不希望的话，请稍后手动更新设置。</string>
     <string lang="zh-cn" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">重要：如果您不销毁 VeraCrypt 应急盘，您的系统分区/驱动器仍然可以通过使用旧密码解密（通过启动 VeraCrypt 应急盘和输入旧密码）。您应当创建一个新的 VeraCrypt 应急盘，之后并销毁原来的应急盘。\n\n您希望创建一个新的 VeraCrypt 应急盘吗？</string>
     <string lang="zh-cn" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">请注意，VeraCrypt 应急盘仍然使用着早期的加密算法。如果您觉的先前的加密算法不安全，您应当创建一个新的 VeraCrypt 应急盘，之后并销毁原来的应急盘。\n\n您希望创建一个新的 VeraCrypt 应急盘吗？</string>
     <string lang="zh-cn" key="KEYFILES_NOTE">任何类型的文件（例如：.mp3、.jpg、.zip、.avi）都可以作为 VeraCrypt 的密钥文件。VeraCrypt 并不会修改密钥文件的内容。 您可以选择一个以上的密钥文件（与次序无关）。如果您添加了一个文件夹，里面的所有非隐藏文件都将作为密钥文件。点击〖添加口令牌〗来选择存储于安全口令牌或智能卡中的密钥文件（或者导入密钥文件到安全口令牌或智能卡）。</string>
     <string lang="zh-cn" key="KEYFILE_CHANGED">密钥文件已成功添加/移除。</string>
-    <string lang="zh-cn" key="KEYFILE_EXPORTED">密钥文件已导出.</string>
+    <string lang="zh-cn" key="KEYFILE_EXPORTED">密钥文件已导出。</string>
     <string lang="zh-cn" key="PKCS5_PRF_CHANGED">首密钥衍生算法已成功设置。</string>
     <string lang="zh-cn" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">请为您想要继续就地加密的非系统分区输入密码 和/或 密钥文件。\n\n\n注解：在您点击〖下一步〗之后，VeraCrypt 将尝试查找所有加密过程被中断的非系统分区（这些中断加密的分区的 VeraCrypt 头信息可以使用提供的密码 和/或 密钥文件解密）。如果发现了多个此类的分区，您需要在下个步骤里面选择他们其中的一个。</string>
     <string lang="zh-cn" key="NONSYS_INPLACE_ENC_RESUME_VOL_SELECT_HELP">请选择下面列表中的一个加密卷。此列表包含所有加密被中断的非系统加密卷，它们的头信息可以使用提供的密码 和/或 密钥文件解密。</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="zh-cn" key="NONSYS_INPLACE_DEC_PASSWORD_PAGE_HELP">请输入用于解密非系统加密卷的密码和(或)提供密钥文件。</string>
     <string lang="zh-cn" key="PASSWORD_HELP">选择一个安全的密码非常重要。您应该避免选取能够在字典中查到的简单词汇（或是2、3、4 这类字符组合）作为密码，也不应包含任何名字或生日，同时也不应该容易被猜到。安全的密码应当包含随机的大小写字母、数字、以及类似 @ ^ = $ * + 这样的特殊字符。我们推荐使用大于 20 个字符的密码（越长越好）。最大的密码长度为 64 个字符。</string>
     <string lang="zh-cn" key="PASSWORD_HIDDENVOL_HELP">请为隐藏加密卷选择一个密码。 </string>
-    <string lang="zh-cn" key="PASSWORD_HIDDEN_OS_HELP">请为隐形操作系统设置一个密码（即隐藏加密卷的密码）。</string>
+    <string lang="zh-cn" key="PASSWORD_HIDDEN_OS_HELP">请为隐形操作系统设置一个密码（即隐藏加密卷的密码）。 </string>
     <string lang="zh-cn" key="PASSWORD_HIDDEN_OS_NOTE">重要：您在本步骤中为隐形操作系统设置的密码必须绝对不同于其它的两个密码（也就是要不同于外层加密卷的密码和迷惑操作系统的密码）。</string>
     <string lang="zh-cn" key="PASSWORD_HIDDENVOL_HOST_DIRECT_HELP">请输入外层加密卷的密码（您将在该加密卷中创建隐藏加密卷）。\n\n在单击〖下一步〗后，VeraCrypt 会尝试加载此加密卷。一旦加密卷被加载，将进行簇状图扫描来确定连续的自由空间大小（如果有的话），此空间的尾部与加密卷尾部一致。该区域将提供给隐藏加密卷并因此会限制它的最大可能大小。簇状图扫描是必要的，这可以确保外层加密卷的数据不会被隐藏加密卷覆盖。</string>
     <string lang="zh-cn" key="PASSWORD_HIDDENVOL_HOST_HELP">\n请选择外层加密卷的密码。在您被攻击者强迫说出启动验证密码的情况下，这个密码可以告诉攻击者。\n\n重要：您为外层加密卷选择的密码必须不同于隐藏加密卷的密码。\n\n说明：密码的最大长度为 64 个字符。</string>
@@ -634,34 +641,34 @@
     <string lang="zh-cn" key="PASSWORD_WRONG_AUTOMOUNT">密码不正确或不是 VeraCrypt 加密卷。</string>
     <string lang="zh-cn" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">密钥 和/或 密码不正确或不是 VeraCrypt 加密卷</string>
     <string lang="zh-cn" key="PASSWORD_WRONG_CAPSLOCK_ON">\n\n警告：Caps Lock 已经开启。 这可能导致您密码输入错误。</string>
-    <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
+    <string lang="zh-cn" key="PIM_CHANGE_WARNING">记住所挂载的卷的PIM</string>
-    <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="zh-cn" key="PIM_HIDVOL_HOST_TITLE">外层卷 PIM</string>
-    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="zh-cn" key="PIM_HIDVOL_TITLE">隐藏卷 PIM</string>
-    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</string>
+    <string lang="zh-cn" key="PIM_HIDDEN_OS_TITLE">隐形操作系统 PIM</string>
-    <string lang="en" key="PIM_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = 15000 + (PIM x 1000).\n\nWhen left empty or set to 0, VeraCrypt will use a default value (485) that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 485 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 485 will lead to slower mount. A small PIM value (less than 485) will lead to a quicker mount but it can reduce security if the password is not strong enough.</string>
+    <string lang="zh-cn" key="PIM_HELP">PIM (自定迭代次数) 是一个控制头部密钥迭代次数的值，当导出头部密钥时会向这样使用:\n      迭代次数 = 15000 + (PIM x 1000) \n\n当这个值留空或设为0时，VeraCrypt会使用默认值(485)来确保安全性。\n\n当使用20位以下的密码时，为了保证维持最小的安全性，PIM的值不能小于485。\n当使用20位以上的密码时，PIM的值可以任意自定。\n\nPIM大于485可能导致加密卷的挂载速度下降。PIM小于485可能会提高挂载速度，但是如果你的密码强度不足，这会降低安全性。</string>
-    <string lang="en" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = PIM x 2048.\n\nWhen left empty or set to 0, VeraCrypt will use a default value that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 98 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 98 will lead to slower boot. A small PIM value (less than 98) will lead to a quicker boot but it can reduce security if the password is not strong enough.</string>
+    <string lang="zh-cn" key="PIM_SYSENC_HELP">PIM (自定迭代次数) 是一个控制头部密钥迭代次数的值，当导出头部密钥时会向这样使用:\n      迭代次数 = (PIM x 2048) \n\n当这个值留空或设为0时，VeraCrypt会使用默认值(98)来确保安全性。\n\n当使用20位以下的密码时，为了保证维持最小的安全性，PIM的值不能小于98。\n当使用20位以上的密码时，PIM的值可以任意自定。\n\nPIM大于98可能导致启动速度下降。PIM小于485可能会提高启动速度，但是如果你的密码强度不足，这会降低安全性。</string>
-    <string lang="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</string>
+    <string lang="zh-cn" key="PIM_SYSENC_CHANGE_WARNING">记住所启动的系统的PIM</string>
-    <string lang="en" key="PIM_LARGE_WARNING">You have chosen a PIM value that is larger than VeraCrypt default value.\nPlease note that this will lead to much slower mount/boot.</string>
+    <string lang="zh-cn" key="PIM_LARGE_WARNING">你选择了一个大于VeraCrypt默认值的PIM。\n注意这可能使挂载/启动速度下降。</string>
-    <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
+    <string lang="zh-cn" key="PIM_SMALL_WARNING">你选择了一个小于VeraCrypt默认值的PIM。注意如果你的密码强度不够强，这回事一个安全隐患。\n\n你确定你在使用一个强密码？</string>
-    <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
+    <string lang="zh-cn" key="PIM_SYSENC_TOO_BIG">对于系统加密，自定迭代倍数 (PIM) 的最大值是65535。</string>
-    <string lang="en" key="PIM_TITLE">Volume PIM</string>
+    <string lang="zh-cn" key="PIM_TITLE">卷 PIM</string>
     <string lang="zh-cn" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\n警告：在密钥文件搜索路径中存在隐藏文件。此类隐藏文件无法被用作密钥文件。如果您需要将它们当作密钥文件使用，请去除它们的“隐藏”属性（使用鼠标右键点击文件，选择〖属性〗，去除勾选“隐藏”标志再点击〖确定〗按钮）。注意：隐藏文件仅在启用相关选项后才可见（我的电脑 -&gt; 工具 -&gt; 文件夹选项 -&gt; 查看）。</string>
     <string lang="zh-cn" key="HIDDEN_VOL_PROT_PASSWORD_US_KEYB_LAYOUT">如果您试图保护包含隐形系统的隐藏加密卷，请确认输入隐藏加密卷密码时您正在使用标准的美国键盘布局。这是因为这些密码实在启动验证环境中输入的，而此时非美国键盘布局将无法使用。</string>
     <string lang="zh-cn" key="FOUND_NO_PARTITION_W_DEFERRED_INPLACE_ENC">VeraCrypt 未发现加密过程被中断的，同时头信息可以使用提供的密码 和/或 密钥文件解密的非系统分区。\n\n请确认密码 和/或 密钥文件是正确的，并且确认此 分区/卷 并未被操作系统或其它程序（也包含杀毒软件）占用。</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="zh-cn" key="SELECTED_PARTITION_ALREADY_INPLACE_ENC">所选择的设备/分区看起来已经完全加密。\n头标志 = 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="zh-cn" key="SELECTED_PARTITION_NOT_INPLACE_ENC">所选择的设备/分区看起来没使用就地加密。\n头标志 = 0x%.8X</string>
     <string lang="zh-cn" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\n注意：如果您试图加载不带有启动验证的加密系统驱动器中的分区，或者是加载没有运行的加密系统分区，您可以通过选择〖系统〗 -&gt;〖以非启动验证方式加载〗。</string>
     <string lang="zh-cn" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">在此模式下，您不能加载此驱动器上的分区（该驱动器的部分内容处于当前活动加密系统的关键范围）。\n\n要想以此模式加载此分区，您需要先启动到安装在不同驱动器上的操作系统（与该系统是否加密无关），或者是先启动一个未加密的操作系统。</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="zh-cn" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">在整个系统所在的磁盘被加密的情况下，VeraCrypt不能单独解密某个分区(你只能解密整个系统磁盘)。</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>
+    <string lang="zh-cn" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">警告:这个磁盘看起来包含VeraCrypt启动加载器，它有可能是已经加密的整个系统磁盘。如果是的话，VeraCrypt不能单独解密某个分区(你只能解密整个系统磁盘)。你可以继续，但你稍后会收到"密码错误"的消息。</string>
     <string lang="zh-cn" key="PREV">&lt; 后退(&amp;B)</string>
     <string lang="zh-cn" key="RAWDEVICES">不能列表安装在系统上的 raw 设备！</string>
-    <string lang="zh-cn" key="READONLYPROMPT">加密卷 '%hs' 存在，并且是只读的。您确定要替换它吗？</string>
+    <string lang="zh-cn" key="READONLYPROMPT">加密卷 '%s' 存在，并且是只读的。您确定要替换它吗？</string>
     <string lang="zh-cn" key="SELECT_DEST_DIR">选择目标目录</string>
     <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="zh-cn" 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="zh-cn" key="SELECTED_KEYFILE_IS_CONTAINER_FILE">当前的容器文件被选择为密钥文件，但不会使用它作为密钥文件。</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>
@@ -680,13 +687,13 @@
     <string lang="zh-cn" key="TEST_CIPHERTEXT_SIZE">您提供的测试加密文本太长或太短。</string>
     <string lang="zh-cn" key="TEST_KEY_SIZE">您提供的测试密钥太长或太短。</string>
     <string lang="zh-cn" key="TEST_PLAINTEXT_SIZE">您提供的测试明码文本太长或太短。</string>
-    <string lang="zh-cn" key="TWO_LAYER_CASCADE_HELP">在 XTS 模式的层叠操作中需要两个密码。每个块首先使用 %hs（%d 位密钥），之后使用 %hs（%d 位密钥）加密。每个密码使用其各自的密钥。所有的密钥均各自独立。</string>
+    <string lang="zh-cn" key="TWO_LAYER_CASCADE_HELP">在 XTS 模式的层叠操作中需要两个密码。每个块首先使用 %s（%d 位密钥），之后使用 %s（%d 位密钥）加密。每个密码使用其各自的密钥。所有的密钥均各自独立。</string>
-    <string lang="zh-cn" key="THREE_LAYER_CASCADE_HELP">在 XTS 模式的层叠操作中需要 3 个密码。每个块首先以 %hs（%d 位密钥）加密，然后以 %hs（%d 位密钥）加密，最后以 %hs（%d 位密钥）加密。每个密码均使用各自的密钥。所有的密钥均彼此独立。</string>
+    <string lang="zh-cn" key="THREE_LAYER_CASCADE_HELP">在 XTS 模式的层叠操作中需要 3 个密码。每个块首先以 %s（%d 位密钥）加密，然后以 %s（%d 位密钥）加密，最后以 %s（%d 位密钥）加密。每个密码均使用各自的密钥。所有的密钥均彼此独立。</string>
     <string lang="zh-cn" key="AUTORUN_MAY_NOT_ALWAYS_WORK">需要注意的是，依赖于操作系统配置，这些自动运行和自动加载功能可能仅当便携磁盘文件创建在非可擦写 CD/DVD 类介质时才能使用。同样也要注意这并不是 VeraCrypt 程序设计缺陷（而是 Windows 系统的限制）。</string>
     <string lang="zh-cn" key="TRAVELER_DISK_CREATED">VeraCrypt 便携磁盘已成功创建。\n\n注意：您必须具有系统管理员身份才能以便携模式运行 VeraCrypt。同时也要注意尽管以便携模式运行 VeraCrypt，也可能能够从注册表中被检测到曾经运行过 VeraCrypt。</string>
     <string lang="zh-cn" key="TC_TRAVELER_DISK">VeraCrypt 便携磁盘</string>
     <string lang="zh-cn" key="TWOFISH_HELP">设计者：Bruce Schneie、John Kelsey、Doug Whiting、David Wagner、Chris Hall、Niels Ferguson。发表于 1998 年。256 位密钥，128 位块，操作模式为 XTS。Twofish 为 AES 竞争算法中的一种。</string>
-    <string lang="zh-cn" key="MORE_INFO_ABOUT">关于 %hs 的更多信息（联网）</string>
+    <string lang="zh-cn" key="MORE_INFO_ABOUT">关于 %s 的更多信息（联网）</string>
     <string lang="zh-cn" key="UNKNOWN">未知</string>
     <string lang="zh-cn" key="ERR_UNKNOWN">发生未预期的或未知错误（%d）。</string>
     <string lang="zh-cn" key="UNMOUNTALL_LOCK_FAILED">一些加密卷包含的文件或文件夹 正被应用程序或系统使用。\n\n强行卸载吗？</string>
@@ -694,10 +701,10 @@
     <string lang="zh-cn" key="UNMOUNT_FAILED">卸载失败！</string>
     <string lang="zh-cn" key="UNMOUNT_LOCK_FAILED">加密卷包含的文件或文件夹 被应用程序或系统使用。\n\n强行卸载吗？</string>
     <string lang="zh-cn" key="NO_VOLUME_MOUNTED_TO_DRIVE">没有加密卷被加载到您所指定的盘符。</string>
-    <string lang="zh-cn" key="VOL_ALREADY_MOUNTED">您试图要加载的加密卷早已加载。</string>
+    <string lang="zh-cn" key="VOL_ALREADY_MOUNTED">您试图要加载的加密卷早已加载。 </string>
     <string lang="zh-cn" key="VOL_MOUNT_FAILED">试图加载加密卷时出错。</string>
     <string lang="zh-cn" key="VOL_SEEKING">在加密卷里寻址时出错。</string>
-    <string lang="zh-cn" key="VOL_SIZE_WRONG">错误：错误的加密卷大小.</string>
+    <string lang="zh-cn" key="VOL_SIZE_WRONG">错误：错误的加密卷大小。</string>
     <string lang="zh-cn" key="WARN_QUICK_FORMAT">警告：您应当只能在下面的情况下使用快速格式化：\n\n1) 设备不包含敏感数据，且您不需要隐蔽性。\n2) 设备或分区已经被完全加密过。\n\n您确认要使用快速格式化吗？</string>
     <string lang="zh-cn" key="CONFIRM_SPARSE_FILE">动态的容器是一个预先分配的 NTFS 稀疏文件，它的物理大小（实际磁盘空间占用）在有新数据添加到里面的时候才会增加。\n\n警告: 稀疏文件基础的加密卷性能比常规加密卷的性能有较大降低。稀疏文件基础的加密卷的安全性也要弱些－因为它有可能泄漏哪些加密卷扇区未被使用的情况。另外，稀疏文件基础的加密卷无法实现隐蔽性（容纳一个隐藏加密卷）。同时需要注意到是如果数据被写入到稀疏文件基础的加密卷，而此时主机文件系统剩余空间不足，加密的文件系统可能会损坏。\n\n您确认要创建稀疏文件基础的加密卷吗？</string>
     <string lang="zh-cn" key="SPARSE_FILE_SIZE_NOTE">注意，Windows 系统和 VeraCrypt 报告的动态加密卷的大小会等于它的最大尺寸。要查看当前容器的物理大小（占用的实际磁盘空间），在 Windows 资源管理器窗口右键单击容器文件，之后选择“属性”并查看“占用空间”的数值。\n\n同时也要注意，如果您把动态加密卷移动到另外容器或驱动器，容器的物理大小会变为它的最大大小。 (为避免此类情况发生，您可以在目标位置创建一个新的动态加密卷，然后把文件从老的加密卷中复制过来)</string>
@@ -754,18 +761,18 @@
     <string lang="zh-cn" key="FOR_MORE_INFO_ON_PARTITIONS">关于创建和管理分区的更多信息，请参考您的操作系统所提供的文档，或者联系您的计算机提供商以获取技术支持。</string>
     <string lang="zh-cn" key="SYSTEM_PARTITION_NOT_ACTIVE">错误：当前运行的操作系统并未安装到启动分区（第一个作用/激活的分区）。目前不支持此情况。</string>
     <string lang="zh-cn" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">您已经表明了要在加密卷里面存放大于 4GB 的文件。然而，您选择了 FAT 文件系统，此系统无法存储大于 4 GB 的文件。\n\n您确认要格式化该卷为 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="zh-cn" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">错误:不能就地解密那些用1.0b或更旧的VeraCrypt创建的非系统加密卷。\n\n提示: 但你还是可以通过把其中的文件复制(或移动)到那些没有加密的卷中来解密它们。</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="zh-cn" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">错误:不能就地解密隐藏非系统加密卷。\n\n提示: 但你还是可以通过把其中的文件复制(或移动)到那些没有加密的卷中来解密它们。</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="zh-cn" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">警告:VeraCrypt不能就地解密隐藏卷(隐藏卷会被随机数据覆盖)。\n\n请确定将要解密的卷中不含隐藏卷\n\n提示: 如果要解密的卷中有隐藏卷但你不介意失去隐藏卷中的文件，你可以继续(外层卷会安全的被解密)。</string>
-    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="zh-cn" key="VOL_CONTAINS_NO_HIDDEN_VOL">此卷中不含隐藏卷，继续操作。</string>
-    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
+    <string lang="zh-cn" key="VOL_CONTAINS_A_HIDDEN_VOL">此卷中含隐藏卷，取消操作。</string>
     <string lang="zh-cn" key="CANT_ACCESS_VOL">错误：不能访问加密卷！\n\n请确认选择的加密卷存在，并且该加密卷并未由系统或其它程序使用，同时该加密卷未被写保护，并且您具有对该加密卷的读写权限，并且确认该加密卷未被写保护。</string>
-    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
+    <string lang="zh-cn" key="CANT_GET_VOL_INFO">错误: 不能获得卷的属性。</string>
     <string lang="zh-cn" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">错误：不能访问该加密卷 和/或 获取该加密卷的信息。\n\n请确认该加密卷存在，并且未被操作系统或其它程序占用，以及您具有对该加密卷的读写权限，同时还要保证该加密卷未被写保护。</string>
     <string lang="zh-cn" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">错误：不能访问该加密卷 和/或 获取该加密卷的信息。请确认选择的加密卷存在，并且未被操作系统或其它程序占用，以及您具有对该加密卷的读写权限，同时还要保证该加密卷未被写保护。\n\n如果此问题仍然存在，遵循以下步骤可能有所帮助。</string>
     <string lang="zh-cn" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">发生了一个错误，VeraCrypt 无法加密分区。请尝试修复任何前面报告的问题之后再次尝试。如果此问题依然存在，遵循以下步骤可能有所帮助。</string>
     <string lang="zh-cn" key="INPLACE_ENC_GENERIC_ERR_RESUME">发生了一个错误，VeraCrypt 无法继续加密分区的过程。\n\n请尝试修复任何前面报告的问题之后再次尝试加密过程。注意：该加密卷在完全加密前将无法加载。</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="zh-cn" key="INPLACE_DEC_GENERIC_ERR">发生了一个错误，VeraCrypt 无法继续解密分区的过程。\n\n请尝试修复任何前面报告的问题之后再次尝试解密过程。</string>
     <string lang="zh-cn" key="CANT_DISMOUNT_OUTER_VOL">错误：不能卸载外层加密卷！\n\n如果加密卷中的文件或文件夹被程序或被 系统使用，则该加密卷不能被锁定。\n\n请关闭任何可能使用加密卷上文件或目录 的程序，然后再点击〖重试〗。</string>
     <string lang="zh-cn" key="CANT_GET_OUTER_VOL_INFO">错误：不能获取外层加密卷的信息！ 加密卷创建不能继续。</string>
     <string lang="zh-cn" key="CANT_ACCESS_OUTER_VOL">错误：不能访问外层加密卷！ 加密卷创建不能继续。</string>
@@ -812,7 +819,7 @@
     <string lang="zh-cn" key="PKCS5_ITERATIONS">PKCS-5 迭代次数</string>
     <string lang="zh-cn" key="VOLUME_CREATE_DATE">加密卷创建时间</string>
     <string lang="zh-cn" key="VOLUME_HEADER_DATE">头信息上次修改时间</string>
-    <string lang="zh-cn" key="VOLUME_HEADER_DAYS">（%I64d 天前）</string>
+    <string lang="zh-cn" key="VOLUME_HEADER_DAYS"> （%I64d 天前）</string>
     <string lang="zh-cn" key="VOLUME_FORMAT_VERSION">加密卷格式版本</string>
     <string lang="zh-cn" key="BACKUP_HEADER">内嵌的备份头信息</string>
     <string lang="zh-cn" key="VC_BOOT_LOADER_VERSION">VeraCrypt 启动管理器版本</string>
@@ -820,11 +827,11 @@
     <string lang="zh-cn" key="REMOVABLE_DISK">移动硬盘</string>
     <string lang="zh-cn" key="HARDDISK">硬盘</string>
     <string lang="zh-cn" key="UNCHANGED">不改变</string>
-    <string lang="en" key="AUTODETECTION">Autodetection</string>
+    <string lang="zh-cn" key="AUTODETECTION">自动检测</string>
     <string lang="zh-cn" key="SETUP_MODE_TITLE">向导模式</string>
     <string lang="zh-cn" key="SETUP_MODE_INFO">请选择一种安装模式，如果不确认，请使用默认模式。</string>
     <string lang="zh-cn" key="SETUP_MODE_HELP_INSTALL">如果您想安装 VeraCrypt 到当前系统，请选择此选项。</string>
-    <string lang="zh-cn" key="SETUP_MODE_HELP_UPGRADE">注意：即使在系统分区/设备已加密的情况下，或者您正在使用隐形系统的情况下，您也可以执行更新而无需解密.</string>
+    <string lang="zh-cn" key="SETUP_MODE_HELP_UPGRADE">注意：即使在系统分区/设备已加密的情况下，或者您正在使用隐形系统的情况下，您也可以执行更新而无需解密。</string>
     <string lang="zh-cn" key="SETUP_MODE_HELP_EXTRACT">如果选择该选项，所有文件都会被从安装包中释放出来，但是不会向系统中安装任何文件。如果您计划加密 Windows 系统分区或系统驱动器，请不要选择此选项。选择此选项有时会比较有用，例如，您希望以便携模式运行 VeraCrypt。VeraCrypt 不一定要必须安装到系统中。在所有文件释放后，您可以直接运行释放后的 'VeraCrypt.exe' 文件（这时 VeraCrypt 会以便携模式运行）。您也可以把释放后的文件复制到其它计算机。</string>
     <string lang="zh-cn" key="SETUP_OPTIONS_TITLE">安装选项</string>
     <string lang="zh-cn" key="SETUP_OPTIONS_INFO">这里您可以设置控制安装过程的不同选项。</string>
@@ -832,7 +839,7 @@
     <string lang="zh-cn" key="SETUP_PROGRESS_INFO">VeraCrypt 正在安装，请稍候。</string>
     <string lang="zh-cn" key="SETUP_FINISHED_TITLE_DON">VeraCrypt 已经成功安装</string>
     <string lang="zh-cn" key="SETUP_FINISHED_UPGRADE_TITLE_DON">VeraCrypt 已经成功更新</string>
-    <string lang="zh-cn" key="SETUP_FINISHED_INFO_DON">请考虑给予捐助。您可在任何时间点击〖完成〗按钮关闭安装程序。 </string>
+    <string lang="zh-cn" key="SETUP_FINISHED_INFO_DON">请考虑给予捐助。您可在任何时间点击〖完成〗按钮关闭安装程序。</string>
     <string lang="zh-cn" key="EXTRACTION_OPTIONS_TITLE">释放选项</string>
     <string lang="zh-cn" key="EXTRACTION_OPTIONS_INFO">您可以在这里设置控制释放过程的不同选项。</string>
     <string lang="zh-cn" key="EXTRACTION_PROGRESS_INFO">正在释放文件，请稍候。</string>
@@ -851,7 +858,7 @@
     <string lang="zh-cn" key="INSTALL_FAILED">安装失败。</string>
     <string lang="zh-cn" key="UNINSTALL_FAILED">卸载失败。</string>
     <string lang="zh-cn" key="DIST_PACKAGE_CORRUPTED">该安装包已经损坏。请尝试重新下载安装包（优先建议从 VeraCrypt 官方网站 https://veracrypt.codeplex.com 下载）。</string>
-    <string lang="zh-cn" key="CANNOT_WRITE_FILE_X">不能写入文件 %hs</string>
+    <string lang="zh-cn" key="CANNOT_WRITE_FILE_X">不能写入文件 %s</string>
     <string lang="zh-cn" key="EXTRACTING_VERB">正在释放</string>
     <string lang="zh-cn" key="CANNOT_READ_FROM_PACKAGE">不能从安装包中读取数据</string>
     <string lang="zh-cn" key="CANT_VERIFY_PACKAGE_INTEGRITY">不能验证安装包的完整性。</string>
@@ -861,7 +868,7 @@
     <string lang="zh-cn" key="SETUP_UPDATE_OK">VeraCrypt 已经成功更新。</string>
     <string lang="zh-cn" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt 已经更新到新版本。在您开始使用新版本前，您必须重启计算机。\n\n您希望现在就重启计算机吗？</string>
     <string lang="zh-cn" key="SYS_ENC_UPGRADE_FAILED">警告：VeraCrypt 更新失败！\n\n重要：在您关机或重新启动系统前 ，我们强烈建议您使用系统还原（〖开始〗菜单 -&gt; 所有程序 -&gt;  附件 -&gt; 系统工具 -&gt; 系统还原），以恢复系统到名为“VeraCrypt 安装”的还原点。如果系统还原不可用，您应该在关机前尝试再从新安装原始版本的 VeraCrypt。</string>
-    <string lang="zh-cn" key="UNINSTALL_OK">VeraCrypt 已成功卸载。\n\n单击〖完成〗按钮来移除 VeraCrypt 安装程序和文件夹 %hs。注意：如果该文件夹中含有非安装程序创建的文件，则该文件夹不会被移除。</string>
+    <string lang="zh-cn" key="UNINSTALL_OK">VeraCrypt 已成功卸载。\n\n单击〖完成〗按钮来移除 VeraCrypt 安装程序和文件夹 %s。注意：如果该文件夹中含有非安装程序创建的文件，则该文件夹不会被移除。</string>
     <string lang="zh-cn" key="REMOVING_REG">正在移除 VeraCrypt 注册表项目。</string>
     <string lang="zh-cn" key="ADDING_REG">正在添加注册表项目</string>
     <string lang="zh-cn" key="REMOVING_APPDATA">正在删除程序相关数据</string>
@@ -872,10 +879,10 @@
     <string lang="zh-cn" key="CREATING_SYS_RESTORE">创建系统还原点</string>
     <string lang="zh-cn" key="FAILED_SYS_RESTORE">创建系统还原点失败！</string>
     <string lang="zh-cn" key="INSTALLER_UPDATING_BOOT_LOADER">正在更新启动管理器</string>
-    <string lang="zh-cn" key="INSTALL_OF_FAILED">安装 '%hs' 失败。 %hs 您想要继续安装吗？</string>
+    <string lang="zh-cn" key="INSTALL_OF_FAILED">安装 '%s' 失败。 %s 您想要继续安装吗？</string>
-    <string lang="zh-cn" key="UNINSTALL_OF_FAILED">卸载 '%hs' 失败。 %hs 您想要继续卸载吗？</string>
+    <string lang="zh-cn" key="UNINSTALL_OF_FAILED">卸载 '%s' 失败。 %s 您想要继续卸载吗？</string>
     <string lang="zh-cn" key="INSTALL_COMPLETED">安装完毕。</string>
-    <string lang="zh-cn" key="CANT_CREATE_FOLDER">无法创建文件夹 '%hs' </string>
+    <string lang="zh-cn" key="CANT_CREATE_FOLDER">无法创建文件夹 '%s'</string>
     <string lang="zh-cn" key="CLOSE_TC_FIRST">不能卸载 VeraCrypt 设备驱动。\n\n请首先关闭所有打开的 VeraCrypt 窗口。如果这样仍然不起作用，请重启计算机然后再试一次。</string>
     <string lang="zh-cn" key="DISMOUNT_ALL_FIRST">在安装或者卸载 VeraCrypt 之前必须先要卸载所有的 VeraCrypt 加密卷。</string>
     <string lang="zh-cn" key="UNINSTALL_OLD_VERSION_FIRST">当前系统已经安装了老版本的 VeraCrypt。在安装新版本前需要卸载旧版本的 VeraCrypt。\n\n在您关闭此对话框之后，将会加载旧版本的卸载程序。在卸载的过程中将不会执行任何加密分区的解密操作。在卸载旧版本的 VeraCrypt 之后，请再次运行新版 VeraCrypt 安装程序。</string>
@@ -928,23 +935,23 @@
     <string lang="zh-cn" key="FAVORITE_LABEL_DEVICE_PATH_ERR">下面显示的设备既不是分区也不是动态加密卷。因此，不会赋予它们磁盘盘符。</string>
     <string lang="zh-cn" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">请设置下面显示的分区的类型为 Windows 系统所能够识别的类型(使用 Windows 'diskpart' 工具的 SETID 命令)。之后从收藏中移除该分区并随后再次添加它。这可以使 VeraCrypt 能够赋予盘符给这个分区。</string>
     <string lang="zh-cn" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">由于 Windows 系统的限制，在网络上共享的远程文件系统上的加密容器不能被加载为系统收藏加密卷（然而，它可以在用户登录时被加载为普通的收藏加密卷）。</string>
-    <string lang="zh-cn" key="ENTER_PASSWORD_FOR">为 %hs 输入密码</string>
+    <string lang="zh-cn" key="ENTER_PASSWORD_FOR">为 %s 输入密码</string>
     <string lang="zh-cn" key="ENTER_PASSWORD_FOR_LABEL">为 '%s' 输入密码</string>
     <string lang="zh-cn" key="ENTER_NORMAL_VOL_PASSWORD">输入常规外层加密卷的密码</string>
     <string lang="zh-cn" key="ENTER_HIDDEN_VOL_PASSWORD">输入隐藏加密卷的密码</string>
     <string lang="zh-cn" key="ENTER_HEADER_BACKUP_PASSWORD">输入存储在备份文件中的加密卷头的密码</string>
     <string lang="zh-cn" key="KEYFILE_CREATED">密钥文件已成功创建。</string>
-    <string lang="en" key="KEYFILE_INCORRECT_NUMBER">The number of keyfiles you supplied is invalid.</string>
+    <string lang="zh-cn" key="KEYFILE_INCORRECT_NUMBER">你提供的密钥文件数量无效。</string>
-    <string lang="en" key="KEYFILE_INCORRECT_SIZE">The keyfile size must be comprized between 64 and 1048576 bytes.</string>
+    <string lang="zh-cn" key="KEYFILE_INCORRECT_SIZE">密钥文件的大小必须介于64字节至1048576字节之间。</string>
-    <string lang="en" key="KEYFILE_EMPTY_BASE_NAME">Please enter a name for the keyfile(s) to be generated</string>
+    <string lang="zh-cn" key="KEYFILE_EMPTY_BASE_NAME">输入要生成的密钥文件的文件名</string>
-    <string lang="en" key="KEYFILE_INVALID_BASE_NAME">The base name of the keyfile(s) is invalid</string>
+    <string lang="zh-cn" key="KEYFILE_INVALID_BASE_NAME">输入的密钥文件基底文件名无效</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="zh-cn" key="KEYFILE_ALREADY_EXISTS">密钥文件 '%s' 已存在。\n你希望覆盖它吗？选择"不"会停止生成过程...</string>
     <string lang="zh-cn" key="HEADER_DAMAGED_AUTO_USED_HEADER_BAK">警告：加密卷头信息已经损坏！VeraCrypt 将自动使用内嵌在加密卷中的头信息备份。\n\n您应当通过选择〖工具〗-&gt;〖恢复加密卷头信息〗来修复头信息。</string>
     <string lang="zh-cn" key="VOL_HEADER_BACKED_UP">加密卷头信息备份已经成功创建。\n\n重要：使用恢复功能恢复时也会恢复当前加密卷的密码。另外，如果创建加密卷的时候使用了密钥文件，恢复后也需要同样的密钥文件来打开加密卷。\n\n警告：该加密卷头信息备份只能用在这个提供备份的加密卷上。如果您把该头信息备份恢复到其它加密卷，您可能能够打开加密卷，但是您将不能解密存储于加密卷的任何数据（这是因为您已经改变了加密卷的主密钥）。</string>
     <string lang="zh-cn" key="VOL_HEADER_RESTORED">加密卷头信息备份已经成功恢复。\n\n重要：请注意旧密码也同样被恢复了。另外，备份时如果需要密钥文件来加载加密卷，恢复后也需要同样的密钥文件。</string>
     <string lang="zh-cn" key="EXTERNAL_VOL_HEADER_BAK_FIRST_INFO">安全起见，您需要输入正确的加密卷密码（和/或 提供正确的密钥文件）。\n\n注意：如果该加密卷中包含隐藏加密卷，您需要先输入正确的外层加密卷的密码（和/或 正确的密钥文件）。之后，如果选择老备份隐藏加密卷的头信息，您需要输入正确的隐藏加密卷密码（和/或 提供正确的密钥文件）。</string>
-    <string lang="zh-cn" key="CONFIRM_VOL_HEADER_BAK">您确认要创建加密卷 %hs 的头信息的备份吗？\n\n在您点击〖是〗后，将会弹出备份的头信息文件的文件名提示对话框。\n\n注意：常规加密卷和隐藏加密卷头信息均将使用新的元素加密并存储到备份文件中。如果加密卷中没有隐藏加密卷，在备份文件中为隐藏加密卷保留的区域将会使用随机数据填充（以保持隐蔽性）。您需要输入创建头信息备份时的正确的密码（和/或 提供正确的密钥文件）。密码或密钥文件会自动确定要恢复的加密卷头信息类型，即常规的或是隐藏的（VeraCrypt 通过尝试和错误来侦测类型），尽管有时在加密卷里面并没有隐藏加密卷（为保留隐蔽性）。当从备份文件中恢复一个加密卷的头信息时，可以选择恢复哪个头信息（例如，隐藏解密卷或是标准加密卷）</string>
+    <string lang="zh-cn" key="CONFIRM_VOL_HEADER_BAK">您确认要创建加密卷 %s 的头信息的备份吗？\n\n在您点击〖是〗后，将会弹出备份的头信息文件的文件名提示对话框。\n\n注意：常规加密卷和隐藏加密卷头信息均将使用新的元素加密并存储到备份文件中。如果加密卷中没有隐藏加密卷，在备份文件中为隐藏加密卷保留的区域将会使用随机数据填充（以保持隐蔽性）。您需要输入创建头信息备份时的正确的密码（和/或 提供正确的密钥文件）。密码或密钥文件会自动确定要恢复的加密卷头信息类型，即常规的或是隐藏的（VeraCrypt 通过尝试和错误来侦测类型），尽管有时在加密卷里面并没有隐藏加密卷（为保留隐蔽性）。当从备份文件中恢复一个加密卷的头信息时，可以选择恢复哪个头信息（例如，隐藏解密卷或是标准加密卷）</string>
-    <string lang="zh-cn" key="CONFIRM_VOL_HEADER_RESTORE">您确认要恢复加密卷 %hs 的头信息吗？\n\n警告：恢复加密卷头信息也会恢复在创建备份时 有效的密码。另外，如果在备份时需要使用密钥文件加载加密卷，那么在头信息恢复后，仍然需要同样的密钥文件。\n\n在您点击〖是〗后，您将选择头信息备份文件。</string>
+    <string lang="zh-cn" key="CONFIRM_VOL_HEADER_RESTORE">您确认要恢复加密卷 %s 的头信息吗？\n\n警告：恢复加密卷头信息也会恢复在创建备份时 有效的密码。另外，如果在备份时需要使用密钥文件加载加密卷，那么在头信息恢复后，仍然需要同样的密钥文件。\n\n在您点击〖是〗后，您将选择头信息备份文件。</string>
     <string lang="zh-cn" key="DOES_VOLUME_CONTAIN_HIDDEN">此加密卷包含隐藏加密卷吗？</string>
     <string lang="zh-cn" key="VOLUME_CONTAINS_HIDDEN">此加密卷包含隐藏加密卷</string>
     <string lang="zh-cn" key="VOLUME_DOES_NOT_CONTAIN_HIDDEN">此加密卷不包含隐藏加密卷</string>
@@ -955,12 +962,14 @@
     <string lang="zh-cn" key="VOLUME_HAS_NO_BACKUP_HEADER">加密卷中没有内嵌的备份头信息（注意，仅在 VeraCrypt 6.0 和以后的版本才包含内嵌的头信息）。</string>
     <string lang="zh-cn" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">您正在尝试备份系统分区/设备的头信息，该功能不被允许。对于系统分区/设备头信息的备份/恢复 只能通过使用 VeraCrypt 应急盘来进行。\n\n您希望创建 VeraCrypt 应急盘吗？</string>
     <string lang="zh-cn" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">您正在尝试恢复系统分区/设备的头信息，但是您选择的是系统分区/设备。该功能不被允许。 对于系统分区/设备头信息的备份/恢复 只能通过使用 VeraCrypt 应急盘来进行。\n\n您希望创建 VeraCrypt 应急盘吗？</string>
-    <string lang="zh-cn" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">在点击〖确定〗按钮后，您将会设置新的 VeraCrypt 应急盘  ISO 镜像文件的名称和存放位置。</string>
+    <string lang="zh-cn" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">在点击〖确定〗按钮后，您将会设置新的 VeraCrypt 应急盘  镜像文件的名称和存放位置。</string>
-    <string lang="zh-cn" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">应急盘  ISO 镜像文件已经创建并存储为文件： %hs\n\n现在您需要把应急盘刻录到 CD 或 DVD。\n\n重要：文件必须以 ISO 镜像文件方式刻录到 CD/DVD（不要刻录为单个的数据文件）。要获取更多的关于如何刻录 ISO 文件的信息，请参考您的 CD/DVD 刻录软件的说明书。\n\n请您在刻录应急盘之后，选择〖系统〗 -&gt; 〖验证应急盘〗来验证应急盘是否已经成功刻录。</string>
+    <string lang="zh-cn" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">应急盘  ISO 镜像文件已经创建并存储为文件： %s\n\n现在您需要把应急盘刻录到 CD 或 DVD。\n\n重要：文件必须以 ISO 镜像文件方式刻录到 CD/DVD（不要刻录为单个的数据文件）。要获取更多的关于如何刻录 ISO 文件的信息，请参考您的 CD/DVD 刻录软件的说明书。\n\n请您在刻录应急盘之后，选择〖系统〗 -&gt; 〖验证应急盘〗来验证应急盘是否已经成功刻录。</string>
-    <string lang="zh-cn" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">应急盘  ISO 镜像文件已经创建并存储为文件： %hs\n\n现在您需要把应急盘刻录到 CD 或 DVD。\n\n您想要启动 Windows 自带的磁盘镜像刻录功能吗？\n\n注意，请您在刻录应急盘之后，选择〖系统〗 -&gt; 〖验证应急盘〗来验证应急盘是否已经成功刻录。</string>
+    <string lang="zh-cn" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">应急盘  ISO 镜像文件已经创建并存储为文件： %s\n\n现在您需要把应急盘刻录到 CD 或 DVD。\n\n您想要启动 Windows 自带的磁盘镜像刻录功能吗？\n\n注意，请您在刻录应急盘之后，选择〖系统〗 -&gt; 〖验证应急盘〗来验证应急盘是否已经成功刻录。</string>
     <string lang="zh-cn" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">请插入 VeraCrypt 应急盘到 CD/DVD 光驱并点〖确定〗按钮开始验证。</string>
     <string lang="zh-cn" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">VeraCrypt 应急盘已经被成功验证。</string>
     <string lang="zh-cn" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">应急盘验证失败。\n\n如果您已经刻录了应急盘，请弹出后重新插入应急盘到 CD/DVD，之后再试一次。如果仍然无效，请尝试使用其它 CD/DVD 刻录软件或刻录盘。\n\n如果您尝试验证一个为不同的主密钥、密码、元素等创建的 VeraCrypt 应急盘，请注意这样的应急盘会无法通过验证。要创建一个新的和当前配置完全兼容的应急盘，请选择〖系统〗 -&gt; 〖创建应急盘〗。</string>
+    <string lang="zh-cn" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">VeraCrypt 应急盘 镜像已经被成功验证。</string>
+    <string lang="zh-cn" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">应急盘 镜像文件验证失败。\n\n请注意，如果你尝试验证一个与当前系统盘主密钥、密码或盐值等不同的情况下创建的应急盘，此操作将提示失败。要创建一个与当前配置相符的应急盘镜像，请选择 "系统" > "创建应急盘" 。</string>
     <string lang="zh-cn" key="ERROR_CREATING_RESCUE_DISK">创建 VeraCrypt 应急盘时失败。</string>
     <string lang="zh-cn" key="CANNOT_CREATE_RESCUE_DISK_ON_HIDDEN_OS">VeraCrypt 应急盘在隐形操作系统运行时无法创建。\n\n要创建 VeraCrypt 应急盘，请启动到迷惑操作系统之后选择〖系统〗 -&gt; 〖创建应急盘〗。</string>
     <string lang="zh-cn" key="RESCUE_DISK_CHECK_FAILED">不能确定应急盘是否刻录成功。\n\n如果您已经刻录了应急盘，请弹出后重新插入应急盘到 CD/DVD，之后再尝试验证一次。如果仍然无效，请尝试使用其它 %s 。\n\n如果您还没有创建应急盘，请首先创建一个，然后再点〖下一步〗按钮。\n\n如果您尝试验证一个运行加密盘创建向导以前创建的应急盘，则这样的应急盘是无法用于当前系统的，这是因为它是使用了不同的主密钥创建的。您需要刻录和创建一个新的应急盘。</string>
@@ -1037,7 +1046,7 @@
     <string lang="zh-cn" key="CONFIRM_EXIT_UNIVERSAL">退出吗？</string>
     <string lang="zh-cn" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt 没有足够信息确定是否要加密还是解密。</string>
     <string lang="zh-cn" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt 无足够的信息来确定加解密状态。\n\n注意：如果您在启动验证环境解密系统分区/驱动器，您可能需要点击 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' &gt; 'Resume Interrupted Process'.\n3) Select 'Decrypt'.</string>
+    <string lang="zh-cn" key="NONSYS_INPLACE_ENC_REVERSE_INFO">注意:当你在就地加密非系统卷时持续遇到错误时，直到你完全解密此卷(例如执行"继续被中断的过程")前都无法挂载这个卷(也不能访问卷中的数据)。n\n如果要这样做:\n1)退出这个向导。\n2) 从 VeraCrypt 主窗口的菜单中选择"加密卷" -&gt; "继续被中断的过程"。\n3) 选择 '解密'。</string>
     <string lang="zh-cn" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">您想要中断和推迟对分区/驱动器的加密吗？\n\n注意：要记住这个加密卷在完全加密前是不能被加载的。您可以继续加密过程，加密则会在中断的地方继续。要达到这点，例如，可以从 VeraCrypt 主窗口的菜单中选择〖加密卷〗 -&gt; 〖继续被中断的过程〗。</string>
     <string lang="zh-cn" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">您想要中断和推迟对系统分区/驱动器的加密吗？\n\n注意：您以后也可以从中断位置恢复加密进程。操作如下：在 VeraCrypt 界面中选择〖系统〗 -&gt; 〖继续被中断的过程〗。如果您想永久中止或回滚加密进程，请选择〖系统〗 -&gt; 〖永久解密系统分区/驱动器〗。</string>
     <string lang="zh-cn" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">您想要中断和推迟对系统分区/驱动器的加密吗？\n\n注意：您以后也可以从中断位置恢复加密进程。操作如下：在 VeraCrypt 界面中选择〖系统〗 -&gt; 〖继续被中断的过程〗。如果您想回滚解密进程（和开始加密），选择〖系统〗 -&gt; 〖加密系统分区/驱动器〗。</string>
@@ -1047,12 +1056,11 @@
     <string lang="zh-cn" key="FAILED_TO_START_WIPING">错误：启动擦除过程时失败。</string>
     <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' &gt; 'Resume Interrupted Process'.</string>
+    <string lang="zh-cn" key="NO_SYS_ENC_PROCESS_TO_RESUME">没有要恢复的系统分区加密/解密进程。\n\n提示: 要恢复非系统分区加密/解密进程，选择"加密卷" -&gt; "继续被中断的过程"。</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>
+    <string lang="zh-cn" key="CHECKING_FS">正在检测加载为 %s 的 VeraCrypt 加密卷的文件系统...</string>
-    <string lang="zh-cn" key="REPAIRING_FS">正在试图修复加载为 %hs 的 VeraCrypt 加密卷的文件系统...</string>
+    <string lang="zh-cn" key="REPAIRING_FS">正在试图修复加载为 %s 的 VeraCrypt 加密卷的文件系统...</string>
-    <string lang="zh-cn" key="WARN_CBC_MODE">警告：该加密卷以 CBC 模式加密。由于安全原因，CBC 模式自从 VeraCrypt 4.1 以后已不再推荐。\n\n我们强烈建议您把原来的数据移动到使用此版本 VeraCrypt 创建的加密卷里面。在执行此操作后，您应当安全的擦除或销毁早期的加密盘。要获取更多信息，请参考软件文档中的版本历史或者 VeraCrypt 4.1 或以后版本的发布说明。</string>
     <string lang="zh-cn" key="WARN_64_BIT_BLOCK_CIPHER">警告：该加密卷使用了已废弃的加密算法。\n\n所有 64-位块加密算法（Blowfish，CAST-128，和 Triple DES）已经逐渐不再被使用了。该加密卷在以后版本的 VeraCrypt 可能会被打开。然而以后则不会针对这些废弃算法采取一些改善措施。我们推荐您创建一个使用 128-位块加密算法的 Veracrypt 加密卷（如：AES，Serpent，Twofish，等等）并把使用旧算法的加密卷里面的文件移动到新的加密卷里面去。</string>
     <string lang="zh-cn" key="SYS_AUTOMOUNT_DISABLED">您的系统未被配置为自动加载新加密卷。 因此也不可能加载设备类的加密卷。自动卸载 可以在执行下列命令后重启系统来启用。\n\n\nmountvol.exe /E</string>
     <string lang="zh-cn" key="SYS_ASSIGN_DRIVE_LETTER">请在继续前为该设备/分区分配一个盘符（〖控制面板〗 -&gt; 〖系统和维护〗 -&gt; 〖管理工具〗 - 〖创建和格式化分区〗）。\n\n这些是操作系统所要求的。</string>
@@ -1069,15 +1077,15 @@
     <string lang="zh-cn" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt 不再支持对未安装 SP 补丁的 Windows Vista 系统的系统分区/设备的加密。在升级 VeraCrypt 之前，请安装 Vista 的 Service Pack 1 或更高补丁版本。</string>
     <string lang="zh-cn" key="FEATURE_REQUIRES_INSTALLATION">错误：此功能要求 VeraCrypt 必须安装于当前系统（您正在以便携模式运行 VeraCrypt）。\n\n请安装 VeraCrypt 之后再试一次。</string>
     <string lang="zh-cn" key="WINDOWS_NOT_ON_BOOT_DRIVE_ERROR">警告：Windows 看起来并未安装在它所启动的驱动器上。此功能目前尚不支持。\n\n尽在您确认 Windows 的确安装在它所启动的驱动器上时，您才应当继续。\n\n您确认要继续吗？</string>
-    <string lang="zh-cn" key="GPT_BOOT_DRIVE_UNSUPPORTED">您的系统驱动器具有 GUID 分区表（GPT）。当前只支持具有 MBR 的分区表。</string>
+    <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</string>
     <string lang="zh-cn" key="TC_BOOT_LOADER_ALREADY_INSTALLED">警告：VeraCrypt 启动管理器已经安装到了您的系统驱动器上了！\n\n这可能在您的计算机上已经加密了另外一个系统。\n\n警告：继续加密当前运行的系统可能会导致其它系统无法启动或导致数据无法访问。\n\n您确定要继续吗？</string>
     <string lang="zh-cn" key="SYS_LOADER_RESTORE_FAILED">恢复原来的系统启动管理器时失败。\n\n请使用您的 VeraCrypt 应急盘（'Repair Options' &gt; 'Restore original system loader'）或者 Windows 安装盘来清除 VeraCrypt 启动管理器。</string>
     <string lang="zh-cn" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">原来的系统引导器没有保存到应急盘上（可能原因：备份文件丢失）。</string>
     <string lang="zh-cn" key="ERROR_MBR_PROTECTED">写入 MBR 扇区时失败。\n\n您的 BIOS 可能设置为保护了 MBR 扇区或一些还原软件也会保护 MBR。请确认没有安装保护 MBR 的还原软件和检查您的 BIOS 设置（启动计算机后按 F2，Delete，或 Esc）中的 MBR/反病毒保护。</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 reinstall VeraCrypt and to take measures to avoid access to this machine by untrusted entities.</string>
+    <string lang="zh-cn" key="BOOT_LOADER_FINGERPRINT_CHECK_FAILED">警告: 验证VeraCrypt 启动管理器的指纹失败!\n你的磁盘可能已被攻击者篡改("Evil Maid" 攻击)。\n\n如果你使用急救盘恢复了VeraCrypt 启动管理器或者使用了一个不同版本的VeraCrypt，也可能出现此错误消息。\n\n建议你立即更新密码并还原成原来的VeraCrypt 启动管理器。推荐重新安装VeraCrypt并采取措施阻止非信任的用户访问设备。</string>
     <string lang="zh-cn" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">所要求版本的 VeraCrypt 启动管理器当前没有安装。这可能导致某些设置无法保存。</string>
     <string lang="zh-cn" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">提示：在某些环境，您可能希望避免外人（攻击者）在您启动计算机时看到您使用 VeraCrypt 加密了系统。上面的选项允许您自定义 VeraCrypt 启动管理器屏幕比避免此类事情发生。如果您启用了第一个选项，在启动验证屏幕不会显示任何文本（即时输入错误密码也不会提示）。在输入密码的时候计算机看起来就像被冻结的一样。此外，也可以显示自定义的信息来误导攻击者。例如，例如“Missing operating system”之类的英文信息（这个信息在 Windows 启动管理器未发现启动分区的时候显示）。然而，必须要提醒的是，如果攻击者分析硬盘的内容，他仍然可以发现硬盘上存在 VeraCrypt 启动管理器。</string>
-    <string lang="zh-cn" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">警告：请记住，如果您启用此选项，VeraCrypt 启动管理器不会显示任何文本（即便是输错密码也不会显示任何文本）。计算机在够输入密码的时候计算机看起来就像被冻结（没有响应）一样（光标不会移动并且在按下按键的时候也不会显示掩码）。\n\n您确认要启用此选项吗？ </string>
+    <string lang="zh-cn" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">警告：请记住，如果您启用此选项，VeraCrypt 启动管理器不会显示任何文本（即便是输错密码也不会显示任何文本）。计算机在够输入密码的时候计算机看起来就像被冻结（没有响应）一样（光标不会移动并且在按下按键的时候也不会显示掩码）。\n\n您确认要启用此选项吗？</string>
     <string lang="zh-cn" key="SYS_PARTITION_OR_DRIVE_APPEARS_FULLY_ENCRYPTED">您的系统分区/驱动器看起来已经完全加密了。</string>
     <string lang="zh-cn" key="SYSENC_UNSUPPORTED_FOR_DYNAMIC_DISK">VeraCrypt 不支持加密已经转换为动态磁盘的系统驱动器。</string>
     <string lang="zh-cn" key="WDE_UNSUPPORTED_FOR_EXTENDED_PARTITIONS">该系统驱动器包含扩展（逻辑）分区。\n\n 您只能在 Windows Vista 或以后版本中加密包含扩展（逻辑）分区的整个系统驱动器。而在 Windows XP 系统中，您只可以加密仅含有一个主分区的整个系统驱动器。\n\n请注意：您仍然可以加密系统分区，来取代加密整个驱动器（并且，有别于加密整个驱动器，您可以在驱动器上的任何非系统分区创建分区类型的 VeraCrypt 加密卷）。</string>
@@ -1093,13 +1101,13 @@
     <string lang="zh-cn" key="DECOY_OS_REINSTALL_WARNING">警告：在隐形系统创建过程中，您将会被要求全新安装当前运行的操作系统（以便安全创建迷惑系统）。\n\n说明：当前运行的操作系统和该系统分区的全部内容将会被复制到隐藏加密卷（以便创建隐形系统）。\n\n\n您确认您将使用 Windows 安装介质安装此系统吗（或使用服务分区）？</string>
     <string lang="zh-cn" key="DECOY_OS_REQUIREMENTS">安全起见，如果当前运行的操作系统需要激活，则必须在继续进行克隆前激活。注意到隐形操作系统将通过复制当前操作系统的内容到隐藏加密卷来得以创建（因此如果当前操作系统未激活，则隐形操作系统也处于未激活状态）。更多信息，请参考《VeraCrypt User's Guide》的 "Security Precautions Pertaining to Hidden Volumes" 章节。\n\n重要：在继续进行前，确认您已经阅读了《VeraCrypt User's Guide》的 "Security Precautions Pertaining to Hidden Volumes" 章节。\n\n\n当前运行的操作系统满足上面的条件吗？</string>
     <string lang="zh-cn" key="CONFIRM_HIDDEN_OS_EXTRA_BOOT_PARTITION">您的系统使用了一个额外的启动分区。VeraCrypt 不支持使用额外启动分区的隐形系统的休眠（迷惑系统完全可以休眠）。\n\n请注意，启动分区应当被迷惑系统和隐形系统所共同使用。因此，为了防止数据泄露和由于休眠所导致的问题，VeraCrypt 只能阻止隐形系统写入数据到共用的启动分区和阻止隐形系统使用休眠。\n\n\n您确认要继续吗？如果选择〖否〗，则会显示移除额外启动分区的提示信息。</string>
-    <string lang="zh-cn" key="EXTRA_BOOT_PARTITION_REMOVAL_INSTRUCTIONS">\n在安装 Windows 之前可以移除额外的启动分区。想要如此，请遵循以下步骤（译者注：这些步骤没有在XP安装光盘看到，请读者自悟吧，抱歉）：\n\n1）启动您的 Windows 安装光盘。\n\n2）在 Windows 安装屏幕，选择 '现在安装' -&gt; '自定义（高级）'.\n\n3）点击 '驱动器 选项'。\n\n4）选择主系统分区并选择删除这个分区，之后再确认删除（安装盘删除分区的时候会多次确认）。\n\n5）选择 '系统保留' 分区，选择 '扩展'，并增加它的大小直到可以安装系统为止。\n\n6）选择 '应用' 和确认。\n\n7）安装 Windows 到 '系统保留' 分区。\n\n\n如果攻击者询问您移除额外启动分区的原因，您可以回答是因为您不希望数据泄露到未加密的启动分区。\n\n注意：您可以通过点击下面的“打印”按钮打印这些文本。如果您打印了这些文本，强烈建议您在移除额外启动分区后销毁这些纸张（否则，如果这些纸张被发现，可能暗示着存在隐形系统）。</string>
+    <string lang="zh-cn" key="EXTRA_BOOT_PARTITION_REMOVAL_INSTRUCTIONS">\n在安装 Windows 之前可以移除额外的启动分区。想要如此，请遵循以下步骤（译者注：这些步骤没有在XP安装光盘看到，请读者自悟吧，抱歉）：\n\n1）启动您的 Windows 安装光盘。\n\n2）在 Windows 安装屏幕，选择 '现在安装' -&gt; '自定义（高级）'。\n\n3）点击 '驱动器 选项'。\n\n4）选择主系统分区并选择删除这个分区，之后再确认删除（安装盘删除分区的时候会多次确认）。\n\n5）选择 '系统保留' 分区，选择 '扩展'，并增加它的大小直到可以安装系统为止。\n\n6）选择 '应用' 和确认。\n\n7）安装 Windows 到 '系统保留' 分区。\n\n\n如果攻击者询问您移除额外启动分区的原因，您可以回答是因为您不希望数据泄露到未加密的启动分区。\n\n注意：您可以通过点击下面的“打印”按钮打印这些文本。如果您打印了这些文本，强烈建议您在移除额外启动分区后销毁这些纸张（否则，如果这些纸张被发现，可能暗示着存在隐形系统）。</string>
     <string lang="zh-cn" key="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">警告：在系统分区和其后的第一个分区之间存在未分配空间。在您创建隐形操作系统之后，您必须不能在此未分配空间上创建任何新的分区，否则，隐形操作系统将无法启动（直到删除了这个新创建的分区）。</string>
     <string lang="zh-cn" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">此算法当前不支持系统加密。</string>
-    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="zh-cn" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">当使用TrueCrypt模式时不能使用这个算法。</string>
-    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="zh-cn" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">当使用TrueCrypt模式时不能使用PIM 。</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="zh-cn" key="PIM_REQUIRE_LONG_PASSWORD">要使用这个PIM数值，你的密码必须大于20个字符。\n如果密码小于20个字符，只能使用485以上的PIM。</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="BOOT_PIM_REQUIRE_LONG_PASSWORD">要使用这个PIM数值，你的启动验证密码必须大于20个字符。\n如果密码小于20个字符，只能使用98以上的PIM。</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>
@@ -1108,8 +1116,8 @@
     <string lang="zh-cn" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">说明：在 Windows 启动前的启动验证里需要输入密码，此时非美国标准键盘布局不可用。因此，密码必须使用标准的美国键盘布局输入。然而，这不需要您必须使用真实的美国键盘。VeraCrypt 在您没有美国键盘的情况下也能够自动的保证您能够安全的输入密码（现在和启动验证环境）。</string>
     <string lang="zh-cn" key="RESCUE_DISK_INFO">在您加密系统分区/驱动器前，您必须创建一个 VeraCrypt 应急盘，用途如下：\n\n- 如果 VeraCrypt 启动管理器、主密钥、或其它关键数据损坏了，可以使用应急盘修复它们（当然您必须输入正确的密码）。\n\n- 如果 Windows 系统损坏了并且无法启动，您可以在 Windows 启动前使用应急盘永久解密这个分区/驱动器。\n\n- 应急盘包含第一个柱面当前内容的备份（通常包含系统引导器或者启动管理器），在必要的时候您可以恢复它们。\n\nVeraCrypt 应急盘 ISO 映像文件将会在下面指定位置创建。</string>
     <string lang="zh-cn" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">在您点击确定后，微软的 Windows 磁盘映像刻录器将会被启动。请使用它刻录 VeraCrypt 应急盘映像文件到 CD 或 DVD 中。\n\n在操作完这些之后，请返回到 VeraCrypt 加密卷创建向导并遵循向导的指令。</string>
-    <string lang="zh-cn" key="RESCUE_DISK_BURN_INFO">应急盘  ISO 镜像文件已经创建并存储为文件： %hs\n\n现在您需要把应急盘刻录到 CD 或 DVD。\n\n在刻录应急盘后，点击〖下一步〗按钮验证应急盘已经成功刻录。\n\n%ls在刻录完应急盘之后，请点击〖下一步〗按钮验证应急盘是否被成功刻录。</string>
+    <string lang="zh-cn" key="RESCUE_DISK_BURN_INFO">应急盘  ISO 镜像文件已经创建并存储为文件： %s\n\n现在您需要把应急盘刻录到 CD 或 DVD。\n\n在刻录应急盘后，点击〖下一步〗按钮验证应急盘已经成功刻录。\n\n%ls在刻录完应急盘之后，请点击〖下一步〗按钮验证应急盘是否被成功刻录。</string>
-    <string lang="zh-cn" key="RESCUE_DISK_BURN_INFO_NO_CHECK">应急盘映像文件已经被创建并且存储为文件： %hs\n\n现在您应当刻录该应急盘到 CD/DVD 中去或者移动该 ISO 文件到一个安全的位置以备以后使用。\n\n%ls点击〖下一步〗继续。</string>
+    <string lang="zh-cn" key="RESCUE_DISK_BURN_INFO_NO_CHECK">应急盘映像文件已经被创建并且存储为文件： %s\n\n现在您应当刻录该应急盘到 CD/DVD 中去或者移动该 ISO 文件到一个安全的位置以备以后使用。\n\n%ls点击〖下一步〗继续。</string>
     <string lang="zh-cn" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">重要：请注意，映像文件必须以 ISO 磁盘映像文件的方式刻录到 CD/DVD 中去（不能刻录为单个的数据文件）。要获取更多的关于如何刻录 ISO 文件的信息，请参考您的 CD/DVD 刻录软件的说明书。如果您还没有刻录 ISO 镜像文件的光盘刻录软件，请点下面链接下载这样的免费刻录软件。\n\n</string>
     <string lang="zh-cn" key="LAUNCH_WIN_ISOBURN">启动微软 Windows 磁盘映像刻录器</string>
     <string lang="zh-cn" key="RESCUE_DISK_BURN_NO_CHECK_WARN">警告：如果您已经创建了 VeraCrypt 应急盘，它将不能再用于系统分区/驱动器，这是因为您每次加密系统分区/驱动器时都会使用不同的主密钥，尽管您使用的是同样的密码，您也必须创建一个新的 VeraCrypt 应急盘。</string>
@@ -1140,12 +1148,12 @@
     <string lang="zh-cn" key="SYSENC_MULTI_BOOT_SYS_EQ_BOOT_HELP">当前运行的操作系统安装到了引导驱动器上了吗？\n\n说明：有时 Windows 可能并未安装到 Windows 启动管理器（活动分区）分区上。如果属于这种情况，请选择〖否〗。</string>
     <string lang="zh-cn" key="SYS_PARTITION_MUST_BE_ON_BOOT_DRIVE">VeraCrypt 当前不支持加密安装到非活动分区上的系统。</string>
     <string lang="zh-cn" key="SYSENC_MULTI_BOOT_NBR_SYS_DRIVES_TITLE">系统驱动器数目</string>
-    <string lang="zh-cn" key="SYSENC_MULTI_BOOT_NBR_SYS_DRIVES_HELP">有多少个驱动器含有操作系统？\n\n说明：例如，您在主驱动器上安装了任意系统（例如. Windows，Mac OS X，Linux，等等），在第二个驱动器上安装了其它的操作系统，这时就选择“2 个或多个”。</string>
+    <string lang="zh-cn" key="SYSENC_MULTI_BOOT_NBR_SYS_DRIVES_HELP">有多少个驱动器含有操作系统？\n\n说明：例如，您在主驱动器上安装了任意系统（例如：Windows，Mac OS X，Linux，等等），在第二个驱动器上安装了其它的操作系统，这时就选择“2 个或多个”。</string>
     <string lang="zh-cn" key="WDE_UNSUPPORTED_FOR_MULTIPLE_SYSTEMS_ON_ONE_DRIVE">VeraCrypt 目前不支持对包含多个操作系统的整个硬盘驱动器的加密。\n\n可能的解决方法：\n\n- 您可以后退并选择只加密单系统分区加密其中的一个系统（与选择加密整个系统驱动器相反）。\n\n- 或者，您也可以把要加密的驱动器中的其它系统迁移到其它的驱动器，而只在其中保留一个系统。</string>
     <string lang="zh-cn" key="SYSENC_MULTI_BOOT_ADJACENT_SYS_TITLE">单驱动器中包含多个系统</string>
-    <string lang="zh-cn" key="SYSENC_MULTI_BOOT_ADJACENT_SYS_HELP">在当前运行的系统所安装的驱动器中，是否包含其它任何操作系统？\n\n说明：例如当前运行的操作系统安装在驱动器 #0，该驱动器包含几个分区，其中一个分区安装了 Windows 系统，而另一个分区安装了其它任何操作系统（例如. Windows，Mac OS X，Linux，等等.），请选择〖是〗。</string>
+    <string lang="zh-cn" key="SYSENC_MULTI_BOOT_ADJACENT_SYS_HELP">在当前运行的系统所安装的驱动器中，是否包含其它任何操作系统？\n\n说明：例如当前运行的操作系统安装在驱动器 #0，该驱动器包含几个分区，其中一个分区安装了 Windows 系统，而另一个分区安装了其它任何操作系统（例如：Windows，Mac OS X，Linux，等等），请选择〖是〗。</string>
     <string lang="zh-cn" key="SYSENC_MULTI_BOOT_NONWIN_BOOT_LOADER_TITLE">非 Windows 启动管理器</string>
-    <string lang="zh-cn" key="SYSENC_MULTI_BOOT_NONWIN_BOOT_LOADER_HELP">是否安装了一个非 Windows 启动管理器（或启动管理器）到 MBR 中了吗?\n\n说明：例如，可启动的驱动器的第一个柱面包含 GRUB、LILO、XOSL，或其它非 Windows 启动管理器（或启动管理器），则选择“是”。</string>
+    <string lang="zh-cn" key="SYSENC_MULTI_BOOT_NONWIN_BOOT_LOADER_HELP">是否安装了一个非 Windows 启动管理器（或启动管理器）到 MBR 中了吗？\n\n说明：例如，可启动的驱动器的第一个柱面包含 GRUB、LILO、XOSL，或其它非 Windows 启动管理器（或启动管理器），则选择“是”。</string>
     <string lang="zh-cn" key="SYSENC_MULTI_BOOT_OUTCOME_TITLE">多重启动</string>
     <string lang="zh-cn" key="CUSTOM_BOOT_MANAGERS_IN_MBR_UNSUPPORTED">VeraCrypt 目前不支持在 MBR 中安装的非 Windows 多重启动管理器。\n\n可能的解决办法：\n\n- 如果您使用了一个启动管理器来启动 Windows 或 Linux，把启动管理器（典型的，例如 GRUB）从 MBR 中迁移到分区上。之后再次启动向导和加密系统分区/设备。说明：VeraCrypt 启动管理器将会成为主启动管理器，并且会允许您把原来的启动管理器（例如 GRUB）作为第二启动管理器（通过在 VeraCrypt 启动管理器屏幕按下 ESC 按键），因此您仍然可以启动 Linux。</string>
     <string lang="zh-cn" key="WINDOWS_BOOT_LOADER_HINTS">如果当前运行的系统安装在活动分区上，随后，在您加密了该分区后，尽管您想要启动其它未加密的系统，您仍然要输入正确的密码（因为它们都会共享同一个加密的 Windows 启动管理器）。\n\n相反的，如果当前运行的系统并没有安装到 Windows 的启动分区（或者如果其它系统并未使用 Windows 启动管理器），随后，在您加密了该分区后，您在启动其它未加密的系统时不需要输入正确的密码 -- 您只需按 ESC 按键来启动未加密的系统（如果存在多个未加密的系统，您也同样需要在 VeraCrypt 的启动管理器中选择要启动的系统）。\n\n说明：通常情况下，最早安装的那个系统一般都会安装到启动分区。</string>
@@ -1163,7 +1171,7 @@
     <string lang="zh-cn" key="SYS_ENCRYPTION_SPAN_WHOLE_SYS_DRIVE_HELP">如果您想加密操作系统安装和启动的分区，请选择此项。除了 VeraCrypt 启动管理器存放的第一个柱面之外，包括所有分区的整个硬盘驱动器将会被加密。任何要访问该驱动器上系统或文件的人都需要每次在系统启动前输入正确的密码。如果 Windows 并未安装到第二块或外部驱动器上并且没有从这些驱动器上启动，此选项不能用于加密第二块或外部驱动器。</string>
     <string lang="zh-cn" key="COLLECTING_RANDOM_DATA_TITLE">正在搜集随机数据</string>
     <string lang="zh-cn" key="KEYS_GEN_TITLE">密钥已生成</string>
-    <string lang="zh-cn" key="CD_BURNER_NOT_PRESENT">VeraCrypt 未在系统上发现刻录机。VeraCrypt 需要 CD/DVD 刻录机来刻录一张可启动的 VeraCrypt 应急盘，应急盘包含密钥、VeraCrypt 启动管理器、原始启动管理器等信息的备份。\n\n我们强烈建议您刻录一张 VeraCrypt 应急盘。.</string>
+    <string lang="zh-cn" key="CD_BURNER_NOT_PRESENT">VeraCrypt 未在系统上发现刻录机。VeraCrypt 需要 CD/DVD 刻录机来刻录一张可启动的 VeraCrypt 应急盘，应急盘包含密钥、VeraCrypt 启动管理器、原始启动管理器等信息的备份。\n\n我们强烈建议您刻录一张 VeraCrypt 应急盘。</string>
     <string lang="zh-cn" key="CD_BURNER_NOT_PRESENT_WILL_STORE_ISO">我没有 CD/DVD 刻录机，但是我想在可移动驱动器上存放应急盘 ISO 映像文件（例如，USB 闪存）。</string>
     <string lang="zh-cn" key="CD_BURNER_NOT_PRESENT_WILL_CONNECT_LATER">我将会在以后添加 CD/DVD 刻录机到电脑上。现在终止创建过程。</string>
     <string lang="zh-cn" key="CD_BURNER_NOT_PRESENT_CONNECTED_NOW">现在 CD/DVD 刻录机已经连接到电脑上了。继续并且刻录应急盘。</string>
@@ -1184,7 +1192,7 @@
     <string lang="zh-cn" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">预测试已经成功完成。\n\n警告：请注意，加密时如果遇到突然断电、或者加密时由于软硬件故障而导致的电脑死机，可能会损坏或丢失一些数据。因此，在您开始加密前，请确认您已经备份了要加密的数据。如果您还没有备份，请现在就备份这些数据（您可以点击〖推迟〗，备份文件，之后在以后的任何时候再运行 VeraCrypt，并选择〖系统〗-&gt;〖继续被中断的进程〗来启动加密）。\n\n当一切准备就绪时，点击〖加密〗开始执行加密过程。</string>
     <string lang="zh-cn" key="SYSENC_ENCRYPTION_PAGE_INFO">您可以在任何时候点击〖暂停〗或者〖推迟〗以中断加解密进程、退出向导、重启或关闭计算机，并在以后继续中断的进程，继续时将会从中断位置开始。为防止系统或程序读写系统盘盘造成性能变差，VeraCrypt 会自动等待数据读写完毕后（参考上面的状态）自动继续加解密。</string>
     <string lang="zh-cn" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\n您可以在加密过程的任何时候点击〖暂停〗或者〖推迟〗，来中断加密的过程，退出向导，重启计算机，并在此后继续该过程，继续的时候将会从上次中断之处开始。注意：此加密卷在完全加密之前无法被加载。</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="zh-cn" key="NONSYS_INPLACE_DEC_DECRYPTION_PAGE_INFO">\n\n您可以在解密过程的任何时候点击〖暂停〗或者〖推迟〗，来中断解密的过程，退出向导，重启计算机，并在此后继续该过程，继续的时候将会从上次中断之处开始。注意：此加密卷在完全解密之前无法被挂载。</string>
     <string lang="zh-cn" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">隐形系统已启动</string>
     <string lang="zh-cn" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">原始系统</string>
     <string lang="zh-cn" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows 会在系统分区创建（通常情况下，您并不知道或者同意）不同的日志文件、临时文件等等。同时也会在系统分区存储内存中的内容到休眠文件或虚拟内存页面文件。因此，如果攻击者分析原始系统（即隐形系统所克隆的系统来源）所在分区的文件，他可能会发现，例如，您使用过 VeraCrypt 向导的隐形系统创建模式（因此可能暗示计算机中存在隐形系统。\n\n要预防此类问题，在后面步骤中，VeraCrypt 将会安全擦除原始系统所在分区的所有内容。在此之后，为了达到隐蔽性，您需要在此分区上安装新的操作系统并使用 VeraCrypt 加密它（即成为所谓的迷惑系统）。因此您将会创建完成这个迷惑系统并且整个隐形系统的创建过程也会相应的完成。</string>
@@ -1241,8 +1249,8 @@
     <string lang="zh-cn" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">您已经选择了系统分区/驱动器（或启动分区），但是您选择的向导模式只适用于非系统驱动器。\n\n您希望设置启动验证（意味着每次启动 Windows 前，都需要您输入密码）和加密系统分区或驱动器吗？</string>
     <string lang="zh-cn" key="CONFIRM_DECRYPT_SYS_DEVICE">您确认要永久解密系统分区/驱动器吗？</string>
     <string lang="zh-cn" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">警告：如果您永久解密系统分区或驱动器，数据将会恢复为未加密状态。\n\n您确认要永久解密系统分区或驱动器吗？</string>
-    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="zh-cn" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">你确定要永久解密这个加密卷吗？</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="zh-cn" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">注意: 如果你永久解密一个卷，未加密的数据会写入到磁盘上。\n\n你确定要永久解密这个加密卷吗？</string>
     <string lang="zh-cn" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">警告：如果您使用一种级联算法加密操作系统，您可能会遇到以下问题：\n\n1）VeraCrypt 启动管理器体积偏大，因此驱动器的第一个柱面可能无法容纳 VeraCrypt 启动管理器的备份。因此，当其损坏的时候（这个可能会经常发生，例如，在某些程序的有设计缺陷的反隐私操作情况下），您将需要使用 VeraCrypt 应急盘启动和修复 VeraCrypt 启动管理器。\n\n2）在一些计算机上，导致休眠时间过长。\n\n这些潜在的问题可以通过选择一种非级联算法（例如 AES）来预防。\n\n您真的要坚持继续使用级联算法吗？</string>
     <string lang="zh-cn" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">如果您遇到任何前面描述的问题，请解密该分区/驱动器（如果已加密）并使用一种非级联算法加密（例如 AES）。</string>
     <string lang="zh-cn" key="UPDATE_TC_IN_DECOY_OS_FIRST">警告：安全考虑，在更新隐形系统中的 VeraCrypt 之前，您应当先更新迷惑系统中的 VeraCrypt。\n\n可以这样实现：启动到迷惑系统，运行 VeraCrypt 安装程序。之后启动到隐形系统和运行 VeraCrypt 安装程序。\n\n注意：迷惑系统和隐形系统共用一个启动管理器。如果你仅在隐形系统升级 VeraCrypt，迷惑系统的 VeraCrypt 驱动版本则与 VeraCrypt 启动管理器的版本不同，亦可能暗示在电脑上存在隐形系统。\n\n\n您确认要继续吗？</string>
@@ -1258,7 +1266,7 @@
     <string lang="zh-cn" key="ENABLE_BAD_SECTOR_ZEROING">错误：磁盘上一个或多个扇区的内容无法读取（可能由于物理因素影响）。\n\n这些扇区能够重新读取之前，就地加密的过程将无法继续。VeraCrypt 能够尝试向其中写入 0 来使这些扇区可读（之后这些 0 填充的区块将会被加密）。然而，请注意存储于这些不可读扇区的数据将会丢失。如果您想要避免数据丢失，您可以使用适当的第三方软件恢复这些损坏数据的某些部分。\n\n注意：在有物理损坏扇区的情况下（不同于简单的数据损坏和校验错误），当有数据试图向这些损坏扇区写入数据时，大多数存储设备都会在内部为这些要写入的数据重新分配扇区（因此当前损坏扇区上的现有数据可能在启动器上仍然保持未加密状态）。\n\n您希望 VeraCrypt 为这些不可读扇区填充 0 吗？</string>
     <string lang="zh-cn" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">错误：磁盘上一个或多个扇区的内容无法读取（可能由于物理因素影响）。\n\n为了能够继续加密，VeraCrypt 不得不放弃这些不可读扇区（扇区内容会被伪随机数据填充）。请注意，在继续进行之前，您可以尝试使用适当的第三方软件恢复任何损坏数据的一部分。\n\n您希望 VeraCrypt 废弃不可读扇区中的数据吗？</string>
     <string lang="zh-cn" key="ZEROED_BAD_SECTOR_COUNT">说明：VeraCrypt 已经把 %I64d 的不可读扇区（%s）的当前内容全部替换为加密的全部为 0 的纯文本块。</string>
-    <string lang="en" key="SKIPPED_BAD_SECTOR_COUNT">Note: VeraCrypt has replaced the content of %I64d unreadable sectors (%s) with pseudorandom data.</string>
+    <string lang="zh-cn" key="SKIPPED_BAD_SECTOR_COUNT">说明：VeraCrypt 已经把 %I64d 的不可读扇区（%s）的当前内容全部替换为随机数据纯文本块。</string>
     <string lang="zh-cn" key="ENTER_TOKEN_PASSWORD">输入口令牌 '%s' 的密码/PIN:</string>
     <string lang="zh-cn" key="PKCS11_LIB_LOCATION_HELP">为允许 VeraCrypt 访问安全口令牌或智能卡，您首先需要为口令牌或智能卡安装一种 PKCS #11 运行库，这些运行库可能已经随设备提供，或者可以从供应商网站或其它第三方网站上下载。\n\n在您安装了运行库后，您可以通过单击〖选择运行库〗手动选择，或者通过单击〖自动检测运行库〗来让 VeraCrypt 发现和选择（仅会搜索 Windows 系统目录，比较耗费时间）。</string>
     <string lang="zh-cn" key="SELECT_PKCS11_MODULE_HELP">说明：对于安装到您计算机上的 PKCS #11 运行库以及安全口令牌或智能卡的文件名和位置，请参考口令牌、智能卡的文档，或者参考第三方软件。\n\n单击〖确定〗按钮选择路径和文件名。</string>
@@ -1303,7 +1311,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="UNSUPPORTED_TRUECRYPT_FORMAT">不能在VeraCrypt使用这个用TrueCrypt%x.%x创建的加密卷，VeraCrypt只支持TrueCrypt6.x/7.x创建的加密卷。</string>
     <string lang="zh-cn" key="TEST">测试</string>
     <string lang="zh-cn" key="KEYFILE">密钥文件</string>
     <string lang="zh-cn" key="VKEY_08">Backspace</string>
@@ -1372,6 +1380,39 @@
     <string lang="zh-cn" key="TB_PER_SEC">TB/s</string>
     <string lang="zh-cn" key="PB_PER_SEC">PB/s</string>
     <string lang="zh-cn" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="zh-cn" key="PASSWORD_UTF8_TOO_LONG">键入的密码过长：在UTF-8下已超过64字节。</string>
+    <string lang="zh-cn" key="PASSWORD_UTF8_INVALID">键入的密码中包含无法转换为UTF-8编码的Unicode字符。</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="zh-cn" key="ERR_EXFAT_INVALID_VOLUME_SIZE">输入的加密卷的大小不兼容所选择的exFAT文件系统。</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.zh-hk.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="zh-hk" name="繁體中文" en-name="Chinese (Hong Kong)" version="0.1.0" translators="PUN Chi Ho" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="zh-hk" key="IDC_BROWSE">流覽(&amp;W)...</control>
     <control lang="zh-hk" key="IDC_DESKTOP_ICON">在桌面添加 VeraCrypt 圖示(&amp;D)</control>
     <control lang="en" key="IDC_DONATE">Donate now...</control>
-    <control lang="zh-hk" key="IDC_FILE_TYPE">關聯 .tc 文件到 VeraCrypt(&amp;E) </control>
+    <control lang="zh-hk" key="IDC_FILE_TYPE">關聯 .hc 文件到 VeraCrypt(&amp;E) </control>
     <control lang="zh-hk" key="IDC_OPEN_CONTAINING_FOLDER">完成後打開目標位置(&amp;O)</control>
     <control lang="zh-hk" key="IDC_PROG_GROUP">創建 VeraCrypt 的開始菜單項(&amp;S)</control>
     <control lang="zh-hk" key="IDC_SYSTEM_RESTORE">創建系統還原點(&amp;R)</control>
@@ -37,6 +37,7 @@
     <control lang="zh-hk" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">下載 CD/DVD 刻錄軟體（聯網）</control>
     <control lang="zh-hk" key="IDC_FILE_CONTAINER">創建檔型加密卷</control>
     <control lang="zh-hk" key="IDC_GB">GB(&amp;G)</control>
+    <control lang="zh-hk" key="IDC_TB">TB(&amp;T)</control>
     <control lang="zh-hk" key="IDC_HIDDEN_SYSENC_INFO_LINK">更多資訊（聯網）</control>
     <control lang="zh-hk" key="IDC_HIDDEN_VOL">隱藏的 VeraCrypt 加密卷(&amp;D) </control>
     <control lang="zh-hk" key="IDC_HIDDEN_VOL_HELP">關於隱藏加密卷的更多資訊（聯網）</control>
@@ -44,6 +45,7 @@
     <control lang="zh-hk" key="IDC_HIDVOL_WIZ_MODE_FULL">常規模式</control>
     <control lang="zh-hk" key="IDC_KB">KB(&amp;K)</control>
     <control lang="zh-hk" key="IDC_KEYFILES_ENABLE">使用密鑰檔(&amp;S)</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="zh-hk" key="IDC_KEY_FILES">密鑰文件(&amp;K)..</control>
     <control lang="zh-hk" key="IDC_LINK_HASH_INFO">關於混雜演算法的更多資訊（聯網）</control>
@@ -58,7 +60,8 @@
     <control lang="zh-hk" key="IDC_NO_HISTORY">從不保留歷史記錄(&amp;S)</control>
     <control lang="zh-hk" key="IDC_OPEN_OUTER_VOLUME">打開外層加密卷</control>
     <control lang="zh-hk" key="IDC_PAUSE">暫停(&amp;P)</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="zh-hk" key="IDC_QUICKFORMAT">快速格式化</control>
     <control lang="zh-hk" key="IDC_SHOW_PASSWORD">顯示密碼(&amp;D)</control>
     <control lang="zh-hk" key="IDC_SHOW_PASSWORD_SINGLE">顯示密碼(&amp;D)</control>
@@ -118,6 +121,7 @@
     <control lang="zh-hk" key="IDC_CREATE">創建</control>
     <control lang="zh-hk" key="IDC_CREATE_VOLUME">創建加密卷(&amp;C)</control>
     <control lang="zh-hk" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">在啟動驗證螢幕不顯示任何文本（僅顯示下面自定義的資訊）(&amp;S)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="zh-hk" key="IDC_ENABLE_HARDWARE_ENCRYPTION">使用處理器指令加速 AES 加解密（如果功能可用）</control>
     <control lang="zh-hk" key="IDC_ENABLE_KEYFILES">使用密鑰檔</control>
     <control lang="zh-hk" key="IDC_ENABLE_NEW_KEYFILES">使用密鑰檔</control>
@@ -132,6 +136,7 @@
     <control lang="zh-hk" key="IDC_FAVORITE_MOVE_UP">上移(&amp;U)</control>
     <control lang="zh-hk" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">當成功載入選定加密卷後，為其打開資源管理器視窗(&amp;E)</control>
     <control lang="zh-hk" key="IDC_FAVORITE_REMOVE">移除(&amp;R)</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="zh-hk" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">全局設置</control>
     <control lang="en" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Display balloon tooltip after successful hot-key dismount</control>
     <control lang="en" key="IDC_HK_DISMOUNT_PLAY_SOUND">Play system notification sound after successful hot-key dismount</control>
@@ -256,6 +261,7 @@
     <control lang="zh-hk" key="IDM_UNMOUNTALL">卸載全部載入的加密卷</control>
     <control lang="zh-hk" key="IDM_UNMOUNT_VOLUME">卸載所選加密卷</control>
     <control lang="zh-hk" key="IDM_VERIFY_RESCUE_DISK">驗證應急盤</control>
+    <control lang="en" key="IDM_VERIFY_RESCUE_DISK_ISO">Verify Rescue Disk Image</control>
     <control lang="zh-hk" key="IDM_VERSION_HISTORY">版本歷史（聯網）</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="zh-hk" key="IDM_VOLUME_PROPERTIES">加密卷屬性</control>
@@ -365,7 +371,7 @@
     <control lang="zh-hk" key="IDT_SECURITY_TOKEN">安全口權杖：</control>
     <control lang="zh-hk" key="IDT_SORT_METHOD">排序方式：</control>
     <control lang="zh-hk" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">請耐心等待，此過程可能需要較長時間...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="zh-hk" key="IDT_TEST_BLOCK_NUMBER">塊數值：</control>
     <control lang="zh-hk" key="IDT_TEST_CIPHERTEXT">加密文本（十六進位）</control>
     <control lang="zh-hk" key="IDT_TEST_DATA_UNIT_NUMBER">資料單元數值（64-位元十六進位，資料單元大小為 512 位元組）</control>
@@ -410,13 +416,13 @@
     <string lang="zh-hk" key="CIPHER_TITLE">加密選項</string>
     <string lang="zh-hk" key="CLEAN_WINMRU_FAILED">警告：清除上次選擇的加密卷或密鑰檔路徑失敗（由檔選擇器記憶）！</string>
     <string lang="zh-hk" key="COMPRESSION_NOT_SUPPORTED">錯誤：此加密卷在 NTFS 格式分區上壓縮過。VeraCrypt 不支持壓縮過的加密卷（這是因為壓縮過的加密資料會低效和存在資料冗餘）。\n\n請使用以下步驟取消壓縮： 1）在Windows資源管理器中右鍵單擊加密卷（不是在 VeraCrypt 視窗中）。 2）選擇“屬性”。 3）在“屬性”對話方塊，單擊“高級”。 4）在“高級屬性”對話方塊，禁用“壓縮內容以節省磁碟空間”並點擊“確定”。 5）返回到“屬性”對話方塊，點“確定”。</string>
-    <string lang="zh-hk" key="CREATE_FAILED">創建加密卷  %hs 失敗</string>
+    <string lang="zh-hk" key="CREATE_FAILED">創建加密卷  %s 失敗</string>
-    <string lang="zh-hk" key="DEVICE_FREE_BYTES">%hs 的大小為 %.2f 位元組</string>
+    <string lang="zh-hk" key="DEVICE_FREE_BYTES">%s 的大小為 %.2f 位元組</string>
-    <string lang="zh-hk" key="DEVICE_FREE_KB">%hs 的大小為 %.2f KB</string>
+    <string lang="zh-hk" key="DEVICE_FREE_KB">%s 的大小為 %.2f KB</string>
-    <string lang="zh-hk" key="DEVICE_FREE_MB">%hs 的大小為 %.2f MB</string>
+    <string lang="zh-hk" key="DEVICE_FREE_MB">%s 的大小為 %.2f MB</string>
-    <string lang="zh-hk" key="DEVICE_FREE_GB">%hs 的大小為 %.2f GB</string>
+    <string lang="zh-hk" key="DEVICE_FREE_GB">%s 的大小為 %.2f GB</string>
-    <string lang="zh-hk" key="DEVICE_FREE_TB">%hs 的大小為 %.2f TB</string>
+    <string lang="zh-hk" key="DEVICE_FREE_TB">%s 的大小為 %.2f TB</string>
-    <string lang="zh-hk" key="DEVICE_FREE_PB">%hs 的大小為 %.2f PB</string>
+    <string lang="zh-hk" key="DEVICE_FREE_PB">%s 的大小為 %.2f PB</string>
     <string lang="zh-hk" key="DEVICE_IN_USE_FORMAT">警告：設備/分區正在被系統或應用程式佔用。格式化該設備/分區它可能導致資料丟失或系統不穩定。\n\n繼續進行格式化嗎？</string>
     <string lang="zh-hk" key="DEVICE_IN_USE_INPLACE_ENC">警告：該分區正在被作業系統或應用程式使用。您應當關閉任何可能佔用此分區的程式（包括反病毒軟體）。\n\n確認繼續嗎？</string>
     <string lang="zh-hk" key="FORMAT_CANT_DISMOUNT_FILESYS">錯誤：該設備/分區包含不能被卸載的檔系統。此檔系統可能被作業系統使用。格式化此設備/分區很可能會導致資料損壞或者是系統不穩定。\n\n要解決此問題，我們推薦您首先刪除該分區之後在不格式化的情況下重新創建這個分區。要達成此目的，請遵照下麵步驟： 1）在 '開始' 菜單右鍵單擊 '電腦'（或者 '我的電腦'）圖示，之後選擇 '管理'，顯示 '電腦管理' 視窗。 2）在 '電腦管理' 視窗，選擇 '磁片管理'。 3）右鍵單擊要加密的分區，你可以選擇 '刪除分區' 或者是 '刪除卷'，或者是 '刪除邏輯驅動器'。 4）如果 Windows 提示重啟電腦，點 '是' 重啟。之後在第 5 個步驟中重複第 1 和第 2 步。 5）右鍵單擊未分配/自由空間並選擇 '新建分區'，或者 '新的卷'，或者 '新邏輯驅動器'。 6）在 '新分區嚮導' 或者 '新建卷嚮導' 視窗中，在帶有 '格式化分區' 標題的對話方塊中，選擇 '不格式化此分區' 或者是 '不格式化此卷'。在同樣的嚮導裏面，點 '下一步' 之後點 '完成' 按鈕。 7）注意：您現在在 Veracrypt 中選擇的設備路徑可能是錯誤的，因此，退出並重新啟動 VeraCrypt 加密卷創建嚮導（如果正在運行）。 8）嘗試重新加密該設備/分區。\n\n如果 VeraCrypt 仍然會加密失敗，您可以考慮創建檔類型的加密卷。</string>
@@ -435,15 +441,15 @@
     <string lang="zh-hk" key="INPLACE_ENC_INVALID_PATH">錯誤：VeraCrypt 只能就地加密分區、動態卷，或者整個系統啟動器。請確認指定的路徑有效。</string>
     <string lang="zh-hk" key="CANNOT_RESIZE_FILESYS">錯誤：不能壓縮檔系統（檔系統需要壓縮來為加密卷頭資訊以及備份頭資訊獲取空間）。\n\n可能原因及解決：\n\n- 該卷上無足夠的剩餘空間。請確認沒有其他程式正在寫入此檔系統。\n\n- 損壞的檔系統。嘗試檢查和修復錯誤（在 '我的電腦' 裏右鍵單擊相應的驅動器盤符，之後選擇 屬性 &gt; 工具 &gt; '開始檢查'，確認已經選擇了選項 '自動修復檔系統錯誤'，之後單擊 '開始' 按鈕）。\n\n如果以上方法都不起作用，請遵循以下步驟。</string>
     <string lang="zh-hk" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">錯誤：剩餘空間不足，因此檔系統不能被壓縮（檔系統需要壓縮來為加密卷頭資訊以及備份頭資訊獲取空間）。\n\n請刪除任何多餘檔並清空回收站以便釋放 256KB 的空間之後再嘗試。注意由於 Windows 的問題，Windows 資源管理器報告的自由空間數量在作業系統重新啟動前可能是不正確的。如果重啟系統後並無幫助，檔系統可能已經損壞了。嘗試檢查和修復錯誤（在 '我的電腦' 裏右鍵單擊相應的驅動器盤符，之後選擇 屬性 &gt; 工具 &gt; '開始檢查'，確認已經選擇了選項 '自動修復檔系統錯誤'，之後單擊 '開始' 按鈕）。\n\n如果以上方法都不起作用，請遵循以下步驟。</string>
-    <string lang="zh-hk" key="DISK_FREE_BYTES">驅動器 %hs 上的自由空間為 %.2f 位元組。</string>
+    <string lang="zh-hk" key="DISK_FREE_BYTES">驅動器 %s 上的自由空間為 %.2f 位元組。</string>
-    <string lang="zh-hk" key="DISK_FREE_KB">驅動器 %hs 的自由空間大小為 %.2f KB</string>
+    <string lang="zh-hk" key="DISK_FREE_KB">驅動器 %s 的自由空間大小為 %.2f KB</string>
-    <string lang="zh-hk" key="DISK_FREE_MB">驅動器 %hs 的自由空間大小為 %.2f MB</string>
+    <string lang="zh-hk" key="DISK_FREE_MB">驅動器 %s 的自由空間大小為 %.2f MB</string>
-    <string lang="zh-hk" key="DISK_FREE_GB">驅動器 %hs 的自由空間大小為 %.2f GB</string>
+    <string lang="zh-hk" key="DISK_FREE_GB">驅動器 %s 的自由空間大小為 %.2f GB</string>
-    <string lang="zh-hk" key="DISK_FREE_TB">驅動器 %hs 的自由空間大小為 %.2f TB</string>
+    <string lang="zh-hk" key="DISK_FREE_TB">驅動器 %s 的自由空間大小為 %.2f TB</string>
-    <string lang="zh-hk" key="DISK_FREE_PB">驅動器 %hs 的自由空間大小為 %.2f PB</string>
+    <string lang="zh-hk" key="DISK_FREE_PB">驅動器 %s 的自由空間大小為 %.2f PB</string>
     <string lang="zh-hk" key="DRIVELETTERS">無法得到可用的驅動器盤符。</string>
     <string lang="zh-hk" key="DRIVER_NOT_FOUND">錯誤：未發現 VeraCrypt 驅動程式！\n\n請複製“veracrypt.sys”和“veracrypt-x64.sys”文件到 VeraCrypt.exe 程式所在的目錄。</string>
-    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall; on Windows XP, select 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
+    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' > Computer > 'Uninstall or change a program' > VeraCrypt > Uninstall; on Windows XP, select 'Start Menu' > Settings > 'Control Panel' > 'Add Or Remove Programs' > VeraCrypt > Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
     <string lang="zh-hk" key="ERR_CIPHER_INIT_FAILURE">錯誤：密碼初始化失敗。</string>
     <string lang="zh-hk" key="ERR_CIPHER_INIT_WEAK_KEY">錯誤：檢測到弱強度密鑰！ 密鑰將被廢棄。請重試。</string>
     <string lang="zh-hk" key="EXCEPTION_REPORT">發生了關鍵性錯誤，VeraCrypt 必須被終止。如果該錯誤是 VeraCrypt 的缺陷導致的，我們可能會修正它。要協助我們完善軟體，您可以把 Veracrypt 自動生成的錯誤報告發送給我們，報告包括下面內容：\n\n- 程式版本\n- 作業系統版本\n- CPU類型\n- VeraCrypt 元件名稱\n- VeraCrypt 執行程式的校驗值\n- 對話方塊視窗的符號標記\n- 錯誤分類\n- 錯誤位址資訊\n- VeraCrypt 調用堆疊\n\n如果您選擇“是”，下面的 URL 網址（包含錯誤報告）將會在您的默認流覽器中打開。\n\n%hs\n\n您希望發送給我們上述錯誤報告嗎？</string>
@@ -560,7 +566,8 @@
     <string lang="zh-hk" key="MAX_HIDVOL_SIZE_BYTES">該卷能創建的最大隱藏加密卷大小為 %.2f 位元組。</string>
     <string lang="zh-hk" key="MAX_HIDVOL_SIZE_KB">該卷能創建的最大隱藏加密卷大小為 %.2f KB。</string>
     <string lang="zh-hk" key="MAX_HIDVOL_SIZE_MB">該卷能創建的最大隱藏加密卷大小為 %.2f MB。</string>
-    <string lang="zh-hk" key="MAX_HIDVOL_SIZE_GB">該卷能創建的最大隱藏加密卷大小為 %.2f GB.</string>
+    <string lang="zh-hk" key="MAX_HIDVOL_SIZE_GB">該卷能創建的最大隱藏加密卷大小為 %.2f GB。</string>
+    <string lang="zh-hk" key="MAX_HIDVOL_SIZE_TB">該卷能創建的最大隱藏加密卷大小為 %.2f TB。</string>
     <string lang="zh-hk" key="MOUNTED_NOPWCHANGE">當此加密卷被載入時，加密卷密碼/密鑰檔無法被更改。 請首先卸載此加密卷。</string>
     <string lang="zh-hk" key="MOUNTED_NO_PKCS5_PRF_CHANGE">當加密卷被載入時不能修改首密鑰衍生演算法。 請首先卸載加密卷。</string>
     <string lang="zh-hk" key="MOUNT_BUTTON">載入(&amp;M)</string>
@@ -591,12 +598,12 @@
     <string lang="zh-hk" key="SELECT_PKCS11_MODULE">選擇 PKCS #11 運行庫</string>
     <string lang="zh-hk" key="OUTOFMEMORY">記憶體不足</string>
     <string lang="zh-hk" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">重要：我們強烈建議非熟練用戶在選定的分區/設備裏面建立檔類型的加密卷，而不是嘗試加密整個分區/驅動器。\n\n例如，當您創建一個 VeraCrypt 檔類型加密卷時（相對於加密整個分區/驅動器），則不存在毀壞大量的檔的風險。請注意，一個 VeraCrypt 的檔類型加密卷（儘管其包含虛擬的加密磁片）事實上就象任意一個普通的檔一樣。如若獲取更多資訊，請參考VeraCrypt User Guide中的 Beginner's Tutorial 章節。\n\n您確認要加密整個設備/分區嗎？</string>
-    <string lang="zh-hk" key="OVERWRITEPROMPT">警告：加密卷 '%hs' 已存在！\n\n重要：VeraCrypt 並不會加密這個檔，而是會刪除這個檔。 您確定要刪除這個檔並用一個新的 VeraCrypt 加密卷來替換它嗎？</string>
+    <string lang="zh-hk" key="OVERWRITEPROMPT">警告：加密卷 '%s' 已存在！\n\n重要：VeraCrypt 並不會加密這個檔，而是會刪除這個檔。 您確定要刪除這個檔並用一個新的 VeraCrypt 加密卷來替換它嗎？</string>
-    <string lang="zh-hk" key="OVERWRITEPROMPT_DEVICE">務必小心：當前存儲在選擇的 %s '%hs'%s 上的所有資料將會丟失（它們並不會被加密）！\n\n您一定要繼續格式化嗎？</string>
+    <string lang="zh-hk" key="OVERWRITEPROMPT_DEVICE">務必小心：當前存儲在選擇的 %s '%s'%s 上的所有資料將會丟失（它們並不會被加密）！\n\n您一定要繼續格式化嗎？</string>
-    <string lang="zh-hk" key="NONSYS_INPLACE_ENC_CONFIRM">警告：您在加密卷完全加密前不能載入此加密卷或者訪問存儲於該卷上的任何檔。\n\n您確認要開始加密選擇的 %s '%hs'%s 嗎？</string>
+    <string lang="zh-hk" key="NONSYS_INPLACE_ENC_CONFIRM">警告：您在加密卷完全加密前不能載入此加密卷或者訪問存儲於該卷上的任何檔。\n\n您確認要開始加密選擇的 %s '%s'%s 嗎？</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="zh-hk" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">警告：請注意如果在就地加密現有資料時突然斷電，或者在 VeraCrypt 就地加密現有資料時由於軟硬體故障而導致系統當機，有些資料可能會損壞或丟失。因此，在您開始加密前，請確認您已經備份了要加密的資料。\n\n您確認已經有這樣的備份了嗎？</string>
-    <string lang="zh-hk" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">小心：任何存在於分區 '%hs'%s（即位於系統分區後面的第一個分區）的檔將會因被擦除而丟失。（這些檔並不會被加密）！\n\n您確認要繼續格式化嗎？</string>
+    <string lang="zh-hk" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">小心：任何存在於分區 '%s'%s（即位於系統分區後面的第一個分區）的檔將會因被擦除而丟失。（這些檔並不會被加密）！\n\n您確認要繼續格式化嗎？</string>
     <string lang="zh-hk" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">警告：選定的分區包含大量的資料！！！任何存儲於此分區上的檔將會被擦除（他們並不會被加密）！</string>
     <string lang="zh-hk" key="ERASE_FILES_BY_CREATING_VOLUME">通過在分區內創建 VeraCrypt 加密卷擦除該分區上的任何文件</string>
     <string lang="zh-hk" key="PASSWORD">密碼</string>
@@ -645,7 +652,7 @@
     <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
     <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
     <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 &gt; Organize &gt; 'Folder and search options' &gt; View).</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="zh-hk" key="HIDDEN_VOL_PROT_PASSWORD_US_KEYB_LAYOUT">如果您試圖保護包含隱形系統的隱藏加密卷，請確認輸入隱藏加密卷密碼時您正在使用標準的美國鍵盤佈局。這是因為這些密碼實在啟動驗證環境中輸入的，而此時非美國鍵盤佈局將無法使用。</string>
     <string lang="zh-hk" key="FOUND_NO_PARTITION_W_DEFERRED_INPLACE_ENC">VeraCrypt 未發現加密過程被中斷的，同時頭資訊可以使用提供的密碼 和/或 密鑰檔解密的非系統分區。\n\n請確認密碼 和/或 密鑰檔是正確的，並且確認此 分區/卷 並未被作業系統或其他程式（也包含殺毒軟體）佔用。</string>
     <string lang="en" key="SELECTED_PARTITION_ALREADY_INPLACE_ENC">The selected partition/device is already fully encrypted.\nHeader Flags = 0x%.8X</string>
@@ -656,7 +663,7 @@
     <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>
     <string lang="zh-hk" key="PREV">&lt; 後退(&amp;B)</string>
     <string lang="zh-hk" key="RAWDEVICES">不能列表安裝在系統上的 raw 設備！</string>
-    <string lang="zh-hk" key="READONLYPROMPT">加密卷 '%hs' 存在，並且是唯讀的。您確定要替換它嗎？</string>
+    <string lang="zh-hk" key="READONLYPROMPT">加密卷 '%s' 存在，並且是唯讀的。您確定要替換它嗎？</string>
     <string lang="zh-hk" key="SELECT_DEST_DIR">選擇目標目錄</string>
     <string lang="zh-hk" key="SELECT_KEYFILE">選擇密鑰檔</string>
     <string lang="zh-hk" key="SELECT_KEYFILE_PATH">選擇密鑰檔的搜索路徑。警告：注意，記憶的只是路徑，而不會記憶檔案名！</string>
@@ -680,13 +687,13 @@
     <string lang="zh-hk" key="TEST_CIPHERTEXT_SIZE">您提供的測試加密文本太長或太短。</string>
     <string lang="zh-hk" key="TEST_KEY_SIZE">您提供的測試密鑰太長或太短。</string>
     <string lang="zh-hk" key="TEST_PLAINTEXT_SIZE">您提供的測試明碼文本太長或太短。</string>
-    <string lang="zh-hk" key="TWO_LAYER_CASCADE_HELP">在 XTS 模式的層疊操作中需要兩個密碼。每個塊首先使用 %hs（%d 位密鑰），之後使用 %hs（%d 位密鑰加密。每個密碼使用其各自的密鑰。所有的密鑰均各自獨立。</string>
+    <string lang="zh-hk" key="TWO_LAYER_CASCADE_HELP">在 XTS 模式的層疊操作中需要兩個密碼。每個塊首先使用 %s（%d 位密鑰），之後使用 %s（%d 位密鑰加密。每個密碼使用其各自的密鑰。所有的密鑰均各自獨立。</string>
-    <string lang="zh-hk" key="THREE_LAYER_CASCADE_HELP">在 XTS 模式的層疊操作中需要 3 個密碼。每個塊首先以 %hs（%d 位密鑰）加密，然後以 %hs（%d 位密鑰）加密，最後以 %hs（%d 位密鑰）加密。每個密碼均使用各自的密鑰。所有的密鑰均彼此獨立。</string>
+    <string lang="zh-hk" key="THREE_LAYER_CASCADE_HELP">在 XTS 模式的層疊操作中需要 3 個密碼。每個塊首先以 %s（%d 位密鑰）加密，然後以 %s（%d 位密鑰）加密，最後以 %s（%d 位密鑰）加密。每個密碼均使用各自的密鑰。所有的密鑰均彼此獨立。</string>
     <string lang="zh-hk" key="AUTORUN_MAY_NOT_ALWAYS_WORK">需要注意的是，依賴於作業系統配置，這些自動運行和自動載入功能可能僅當便攜磁片檔創建在非可讀寫 CD/DVD 類介質時才能使用。同樣也要注意這並不是 VeraCrypt 程式設計缺陷（而是 Windows 系統的限制）。</string>
     <string lang="zh-hk" key="TRAVELER_DISK_CREATED">VeraCrypt 便攜磁片已被成功創建。\n\n注意：您必須具有系統管理員身份才能以便攜模式運行 VeraCrypt。同時也要注意儘管以便攜模式運行 VeraCrypt，也可能能夠從註冊表中被檢測到曾經運行過 VeraCrypt。</string>
     <string lang="zh-hk" key="TC_TRAVELER_DISK">VeraCrypt 便攜磁片</string>
     <string lang="zh-hk" key="TWOFISH_HELP">設計者：Bruce Schneie、John Kelsey、Doug Whiting、David Wagner、Chris Hall、Niels Ferguson。發表於 1998 年。256 位密鑰，128 位元塊，操作模式為 XTS。Twofish 為 AES 競爭演算法中的一種。</string>
-    <string lang="zh-hk" key="MORE_INFO_ABOUT">關於 %hs 的更多資訊（聯網）</string>
+    <string lang="zh-hk" key="MORE_INFO_ABOUT">關於 %s 的更多資訊（聯網）</string>
     <string lang="zh-hk" key="UNKNOWN">未知</string>
     <string lang="zh-hk" key="ERR_UNKNOWN">發生未預期的或未知錯誤（%d）。</string>
     <string lang="zh-hk" key="UNMOUNTALL_LOCK_FAILED">一些加密卷包含的檔或檔夾 正被應用程式或系統使用。\n\n強行卸載嗎？</string>
@@ -851,7 +858,7 @@
     <string lang="zh-hk" key="INSTALL_FAILED">安裝失敗。</string>
     <string lang="zh-hk" key="UNINSTALL_FAILED">卸載失敗。</string>
     <string lang="zh-hk" key="DIST_PACKAGE_CORRUPTED">該安裝包已經損壞。請嘗試重新下載安裝包（優先建議從 VeraCrypt 官方網站 https://veracrypt.codeplex.com 下載）。</string>
-    <string lang="zh-hk" key="CANNOT_WRITE_FILE_X">不能寫入檔 %hs</string>
+    <string lang="zh-hk" key="CANNOT_WRITE_FILE_X">不能寫入檔 %s</string>
     <string lang="zh-hk" key="EXTRACTING_VERB">正在釋放</string>
     <string lang="zh-hk" key="CANNOT_READ_FROM_PACKAGE">不能從安裝包中讀取資料</string>
     <string lang="zh-hk" key="CANT_VERIFY_PACKAGE_INTEGRITY">不能驗證安裝包的完整性。</string>
@@ -860,8 +867,8 @@
     <string lang="zh-hk" key="INSTALL_OK">VeraCrypt 已成功安裝。</string>
     <string lang="zh-hk" key="SETUP_UPDATE_OK">VeraCrypt 已經成功更新。</string>
     <string lang="en" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt has been successfully upgraded. However, before you can start using it, the computer must be restarted.\n\nDo you want to restart it now?</string>
-    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
+    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu > All programs > Accessories > System Tools > System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
-    <string lang="zh-hk" key="UNINSTALL_OK">VeraCrypt 已成功卸載。\n\n單擊 '完成' 按鈕來移除 VeraCrypt 安裝程式和檔夾 %hs。注意：如果該檔夾中含有非安裝程式創建的檔，則該檔夾不會被移除。</string>
+    <string lang="zh-hk" key="UNINSTALL_OK">VeraCrypt 已成功卸載。\n\n單擊 '完成' 按鈕來移除 VeraCrypt 安裝程式和檔夾 %s。注意：如果該檔夾中含有非安裝程式創建的檔，則該檔夾不會被移除。</string>
     <string lang="zh-hk" key="REMOVING_REG">正在移除 VeraCrypt 註冊表專案。</string>
     <string lang="zh-hk" key="ADDING_REG">正在添加註冊表專案</string>
     <string lang="zh-hk" key="REMOVING_APPDATA">正在刪除程式相關資料</string>
@@ -872,10 +879,10 @@
     <string lang="zh-hk" key="CREATING_SYS_RESTORE">創建系統還原點</string>
     <string lang="zh-hk" key="FAILED_SYS_RESTORE">創建系統還原點失敗！</string>
     <string lang="zh-hk" key="INSTALLER_UPDATING_BOOT_LOADER">正在更新啟動管理器</string>
-    <string lang="zh-hk" key="INSTALL_OF_FAILED">安裝 '%hs' 失敗。 %hs 您想要繼續安裝嗎？</string>
+    <string lang="zh-hk" key="INSTALL_OF_FAILED">安裝 '%s' 失敗。 %s 您想要繼續安裝嗎？</string>
-    <string lang="zh-hk" key="UNINSTALL_OF_FAILED">卸載 '%hs' 失敗。 %hs 您想要繼續卸載嗎？</string>
+    <string lang="zh-hk" key="UNINSTALL_OF_FAILED">卸載 '%s' 失敗。 %s 您想要繼續卸載嗎？</string>
     <string lang="zh-hk" key="INSTALL_COMPLETED">安裝完畢。</string>
-    <string lang="zh-hk" key="CANT_CREATE_FOLDER">檔夾 '%hs' 不能被創建</string>
+    <string lang="zh-hk" key="CANT_CREATE_FOLDER">檔夾 '%s' 不能被創建</string>
     <string lang="zh-hk" key="CLOSE_TC_FIRST">不能卸載 VeraCrypt 設備驅動。\n\n請首先關閉所有打開的 VeraCrypt 視窗。如果這樣仍然不起作用，請重啟電腦然後再試一次。</string>
     <string lang="zh-hk" key="DISMOUNT_ALL_FIRST">在安裝或者卸載 VeraCrypt 之前必須先要卸載所有的 VeraCrypt 加密卷。</string>
     <string lang="zh-hk" key="UNINSTALL_OLD_VERSION_FIRST">當前系統已經安裝了一份不同版本的 VeraCrypt。在安裝新版本前需要卸載舊版本的 VeraCrypt。\n\n在您關閉此對話方塊之後，將會載入舊版本的卸載程式。在卸載的過程中將不會執行任何加密分區的解密操作。在卸載舊版本的 VeraCrypt 之後，請再次運行新版 VeraCrypt 的安裝程式。</string>
@@ -928,7 +935,7 @@
     <string lang="zh-hk" key="FAVORITE_LABEL_DEVICE_PATH_ERR">下面顯示的設備既不是分區也不是動態卷。因此，不會賦予它們標籤。</string>
     <string lang="zh-hk" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">請設置下面顯示的分區的類型為 Windows 系統所能夠識別的類型(使用Windows 'diskpart' 工具的 SETID 命令)。之後從收藏中移除該分區並隨後再次添加它。這可以使 VeraCrypt 能夠賦予盤符給這個分區。</string>
     <string lang="zh-hk" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">由於 Windows 系統的限制，在網路上共用的遠端檔系統上的加密容器不能被載入為系統收藏加密卷（然而，它可以在用戶登錄時被載入為普通的收藏加密卷）。</string>
-    <string lang="zh-hk" key="ENTER_PASSWORD_FOR">為 %hs 輸入密碼</string>
+    <string lang="zh-hk" key="ENTER_PASSWORD_FOR">為 %s 輸入密碼</string>
     <string lang="zh-hk" key="ENTER_PASSWORD_FOR_LABEL">為 '%s' 輸入密碼</string>
     <string lang="zh-hk" key="ENTER_NORMAL_VOL_PASSWORD">輸入常規外層加密卷的密碼</string>
     <string lang="zh-hk" key="ENTER_HIDDEN_VOL_PASSWORD">輸入隱藏加密卷的密碼</string>
@@ -943,8 +950,8 @@
     <string lang="zh-hk" key="VOL_HEADER_BACKED_UP">加密卷頭資訊備份已經成功創建。\n\n重要：使用恢復功能恢復時也會恢復當前加密卷的密碼。另外，如果創建加密卷的時候使用了密鑰檔，恢復後也需要同樣的密鑰檔來打開加密卷。\n\n警告：該加密卷頭資訊備份只能用在這個提供備份的加密卷上。如果你把該頭資訊備份恢復到其他加密卷，您可能能夠打開加密卷，但是您將不能解密存儲於加密卷的任何資料（這是因為您已經改變了加密卷的主密鑰）。</string>
     <string lang="zh-hk" key="VOL_HEADER_RESTORED">加密卷頭資訊備份已經成功恢復。\n\n重要：請注意舊密碼也同樣被恢復了。另外，備份時如果需要密鑰檔來載入加密卷，恢復後也需要同樣的密鑰檔。</string>
     <string lang="zh-hk" key="EXTERNAL_VOL_HEADER_BAK_FIRST_INFO">安全起見，您需要輸入正確的加密卷密碼（和/或 提供正確的密鑰檔）。\n\n注意：如果該卷中包含隱藏加密卷，您需要先輸入正確的外層加密卷的密碼（和/或 正確的密鑰檔）。之後，如果您選擇老備份隱藏加密卷的頭資訊，您您需要輸入正確的隱藏加密卷密碼（和/或 提供正確的密鑰檔）。</string>
-    <string lang="zh-hk" key="CONFIRM_VOL_HEADER_BAK">您確認要創建加密卷 %hs 的頭資訊的備份嗎？\n\n在您點擊“是”後，將會彈出備份的頭資訊檔的檔案名提示對話方塊。\n\n注意：常規加密卷和隱藏加密卷頭資訊均將使用新的元素加密並存儲到備份檔案中。如果卷中沒有隱藏加密卷，在備份檔案中為隱藏加密卷保留的區域將會使用亂數據填充（以保持隱蔽性）。您需要輸入創建頭資訊備份時的正確的密碼（和/或 提供正確的密鑰檔）。密碼或密鑰檔會自動確定要恢復的加密卷頭資訊類型，即常規的或是隱藏的（VeraCrypt 通過嘗試和錯誤來偵測類型），儘管有時在加密卷裏面並沒有隱藏加密卷（為保留隱蔽性）。當從備份檔案中恢復一個加密卷的頭資訊時，可以選擇恢復哪個頭資訊（例如，隱藏卷或是標準卷）</string>
+    <string lang="zh-hk" key="CONFIRM_VOL_HEADER_BAK">您確認要創建加密卷 %s 的頭資訊的備份嗎？\n\n在您點擊“是”後，將會彈出備份的頭資訊檔的檔案名提示對話方塊。\n\n注意：常規加密卷和隱藏加密卷頭資訊均將使用新的元素加密並存儲到備份檔案中。如果卷中沒有隱藏加密卷，在備份檔案中為隱藏加密卷保留的區域將會使用亂數據填充（以保持隱蔽性）。您需要輸入創建頭資訊備份時的正確的密碼（和/或 提供正確的密鑰檔）。密碼或密鑰檔會自動確定要恢復的加密卷頭資訊類型，即常規的或是隱藏的（VeraCrypt 通過嘗試和錯誤來偵測類型），儘管有時在加密卷裏面並沒有隱藏加密卷（為保留隱蔽性）。當從備份檔案中恢復一個加密卷的頭資訊時，可以選擇恢復哪個頭資訊（例如，隱藏卷或是標準卷）</string>
-    <string lang="zh-hk" key="CONFIRM_VOL_HEADER_RESTORE">您確認要恢復加密卷 %hs 的頭資訊嗎？\n\n警告：恢復加密卷頭資訊也會恢復在創建備份時 有效的密碼。另外，如果在備份時需要使用密鑰檔載入加密卷，那麼在頭資訊恢復後，仍然需要同樣的密鑰檔。\n\n在您點擊“是”後，您將選擇頭資訊備份檔案。</string>
+    <string lang="zh-hk" key="CONFIRM_VOL_HEADER_RESTORE">您確認要恢復加密卷 %s 的頭資訊嗎？\n\n警告：恢復加密卷頭資訊也會恢復在創建備份時 有效的密碼。另外，如果在備份時需要使用密鑰檔載入加密卷，那麼在頭資訊恢復後，仍然需要同樣的密鑰檔。\n\n在您點擊“是”後，您將選擇頭資訊備份檔案。</string>
     <string lang="zh-hk" key="DOES_VOLUME_CONTAIN_HIDDEN">此加密卷包含隱藏加密卷嗎？</string>
     <string lang="zh-hk" key="VOLUME_CONTAINS_HIDDEN">此加密卷包含隱藏加密卷</string>
     <string lang="zh-hk" key="VOLUME_DOES_NOT_CONTAIN_HIDDEN">此加密卷不包含隱藏加密卷</string>
@@ -955,12 +962,14 @@
     <string lang="zh-hk" key="VOLUME_HAS_NO_BACKUP_HEADER">加密卷中沒有內嵌的備份頭資訊（注意，僅在 VeraCrypt 6.0 和以後的版本才包含內嵌的頭資訊）。</string>
     <string lang="zh-hk" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">您正在嘗試備份系統分區/設備的頭資訊，該功能不被允許。對於系統分區/設備頭資訊的備份/恢復 只能通過使用 VeraCrypt 應急盤來進行。\n\n您希望創建 VeraCrypt 應急盤嗎？</string>
     <string lang="zh-hk" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">您正在嘗試恢復系統分區/設備的頭資訊，但是您選擇的是系統分區/設備。該功能不被允許。 對於系統分區/設備頭資訊的備份/恢復 只能通過使用 VeraCrypt 應急盤來進行。\n\n您希望創建 VeraCrypt 應急盤嗎？</string>
-    <string lang="zh-hk" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">在點擊“確定”按鈕後，您將會設置新的 VeraCrypt 應急盤  ISO 鏡像檔的名稱和存放位置。</string>
+    <string lang="zh-hk" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">在點擊“確定”按鈕後，您將會設置新的 VeraCrypt 應急盤  鏡像檔的名稱和存放位置。</string>
-    <string lang="zh-hk" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">應急盤  ISO 鏡像檔已經創建並存儲為檔： %hs\n\n現在您需要把應急盤刻錄到 CD 或 DVD。\n\n重要：檔必須以 ISO 鏡像檔方式刻錄到 CD/DVD（不要刻錄為單個的資料檔案）。要獲取更多的關於如何刻錄 ISO 檔的資訊，請參考您的 CD/DVD 刻錄軟體的說明書。\n\n請您在刻錄應急盤之後，選擇 '系統' &gt; '驗證應急盤' 來驗證應急盤是否已經成功刻錄。</string>
+    <string lang="zh-hk" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">應急盤  ISO 鏡像檔已經創建並存儲為檔： %s\n\n現在您需要把應急盤刻錄到 CD 或 DVD。\n\n重要：檔必須以 ISO 鏡像檔方式刻錄到 CD/DVD（不要刻錄為單個的資料檔案）。要獲取更多的關於如何刻錄 ISO 檔的資訊，請參考您的 CD/DVD 刻錄軟體的說明書。\n\n請您在刻錄應急盤之後，選擇 '系統' &gt; '驗證應急盤' 來驗證應急盤是否已經成功刻錄。</string>
-    <string lang="zh-hk" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">應急盤  ISO 鏡像檔已經創建並存儲為檔： %hs\n\n現在您需要把應急盤刻錄到 CD 或 DVD。\n\n您想要啟動 Windows 自帶的磁片鏡像刻錄功能嗎？\n\n注意，請您在刻錄應急盤之後，選擇 '系統' &gt; '驗證應急盤' 來驗證應急盤是否已經成功刻錄。</string>
+    <string lang="zh-hk" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">應急盤  ISO 鏡像檔已經創建並存儲為檔： %s\n\n現在您需要把應急盤刻錄到 CD 或 DVD。\n\n您想要啟動 Windows 自帶的磁片鏡像刻錄功能嗎？\n\n注意，請您在刻錄應急盤之後，選擇 '系統' &gt; '驗證應急盤' 來驗證應急盤是否已經成功刻錄。</string>
     <string lang="zh-hk" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">請插入 VeraCrypt 應急盤到 CD/DVD 光碟機並點“確定”按鈕開始驗證。</string>
     <string lang="zh-hk" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">VeraCrypt 應急盤已經被成功驗證。</string>
     <string lang="zh-hk" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">應急盤驗證失敗。\n\n如果您已經刻錄了應急盤，請彈出後重新插入應急盤到 CD/DVD，之後再試一次。如果仍然無效，請嘗試使用其他 CD/DVD 刻錄軟體或刻錄盤。\n\n如果您嘗試驗證一個為不同的主密鑰、密碼、元素等創建的 VeraCrypt 應急盤，請注意這樣的應急盤會無法通過驗證。要創建一個新的和當前配置完全相容的應急盤，請選擇 '系統' &gt; '創建應急盤'。</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk image fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
     <string lang="zh-hk" key="ERROR_CREATING_RESCUE_DISK">創建 VeraCrypt 應急盤時失敗。</string>
     <string lang="zh-hk" key="CANNOT_CREATE_RESCUE_DISK_ON_HIDDEN_OS">VeraCrypt 應急盤在隱形作業系統運行時無法創建。\n\n要創建 VeraCrypt 應急盤，請啟動到迷惑作業系統之後選擇 '系統' &gt; '創建應急盤'。</string>
     <string lang="zh-hk" key="RESCUE_DISK_CHECK_FAILED">不能確定應急盤是否刻錄成功。\n\n如果您已經刻錄了應急盤，請彈出後重新插入應急盤到 CD/DVD，之後再嘗試驗證一次。如果仍然無效，請嘗試使用其他 %s 。\n\n如果您還沒有創建應急盤，請首先創建一個，然後再點 '下一步' 按鈕。\n\n如果您嘗試驗證一個運行加密盤創建嚮導以前創建的應急盤，則這樣的應急盤是無法用於當前系統的，這是因為它是使用了不同的主密鑰創建的。您需要刻錄和創建一個新的應急盤。</string>
@@ -1050,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="zh-hk" key="CHECKING_FS">正在檢測載入為 %s 的 VeraCrypt 加密卷的檔系統...</string>
-    <string lang="zh-hk" key="REPAIRING_FS">正在試圖修復載入為 %hs 的 VeraCrypt 加密卷的檔系統...</string>
+    <string lang="zh-hk" key="REPAIRING_FS">正在試圖修復載入為 %s 的 VeraCrypt 加密卷的檔系統...</string>
-    <string lang="zh-hk" key="WARN_CBC_MODE">警告：該加密卷以 CBC 模式加密。由於安全原因，CBC 模式自從 VeraCrypt 4.1 以後已不再推薦。\n\n我們強烈建議您把原來的資料移動到使用此版本 VeraCrypt 創建的加密卷裏面。在執行此操作後，您應當安全的擦除或銷毀早期的加密盤。要獲取更多資訊，請參考軟體文檔中的版本歷史或者 VeraCrypt 4.1 或以後版本的發佈說明。</string>
     <string lang="zh-hk" key="WARN_64_BIT_BLOCK_CIPHER">警告：該加密卷使用了已被廢棄的加密演算法。\n\n所有 64-位元塊加密演算法（Blowfish，CAST-128，和 Triple DES）已經逐漸不再被使用了。該加密卷在以後版本的 VeraCrypt 可能會被打開。然而以後則不會針對這些廢棄演算法採取一些改善措施。我們推薦您創建一個使用 128-位元塊加密演算法的 Veracrypt 加密卷（如：AES，Serpent，Twofish，等等）並把使用舊演算法的加密卷裏面的檔移動到新的加密卷裏面去。</string>
     <string lang="zh-hk" key="SYS_AUTOMOUNT_DISABLED">您的系統未被配置為自動載入新加密卷。 因此也不可能載入設備類的加密卷。自動卸載 可以在執行下列命令後重啟系統來啟用。\n\n\nmountvol.exe /E</string>
     <string lang="zh-hk" key="SYS_ASSIGN_DRIVE_LETTER">請在繼續前為該設備/分區分配一個盤符（'控制面板' &gt; '系統和維護' &gt; '管理工具' - '創建和格式化分區'）。\n\n這些是作業系統所要求的。</string>
@@ -1069,7 +1077,7 @@
     <string lang="zh-hk" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt 不再支援對未安裝 SP 補丁的 Windows Vista 系統的系統分區/設備的加密。在升級 VeraCrypt 之前，請安裝 Vista 的 Service Pack 1 或更高補丁版本。</string>
     <string lang="zh-hk" key="FEATURE_REQUIRES_INSTALLATION">錯誤：此功能要求 VeraCrypt 必須安裝於當前系統（您正在以便攜模式運行 VeraCrypt）。\n\n請安裝 VeraCrypt 之後再試一次。</string>
     <string lang="zh-hk" key="WINDOWS_NOT_ON_BOOT_DRIVE_ERROR">警告：Windows 看起來並未安裝在它所啟動的驅動器上。此功能目前尚不支援。\n\n盡在您確認 Windows 的確安裝在它所啟動的驅動器上時，您才應當繼續。\n\n您確認要繼續嗎？</string>
-    <string lang="zh-hk" key="GPT_BOOT_DRIVE_UNSUPPORTED">您的系統驅動器具有 GUID 分區表（GPT）。當前只支持具有 MBR 的分區表。</string>
+    <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</string>
     <string lang="zh-hk" key="TC_BOOT_LOADER_ALREADY_INSTALLED">小心：VeraCrypt 啟動管理器已經安裝到了您的系統驅動器上了！\n\n這可能在您的電腦上已經加密了另外一個系統。\n\n警告：繼續加密當前運行的系統可能會導致其他系統無法啟動或導致資料無法訪問。\n\n您確定要繼續嗎？</string>
     <string lang="zh-hk" key="SYS_LOADER_RESTORE_FAILED">恢復原來的系統啟動管理器時失敗。\n\n請使用您的 VeraCrypt 應急盤（'Repair Options' &gt; 'Restore original system loader'）或者 Windows 安裝盤來清除 VeraCrypt 啟動管理器。</string>
     <string lang="zh-hk" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">原來的系統引導器沒有保存到應急盤上（可能原因：備份檔案丟失）。</string>
@@ -1108,8 +1116,8 @@
     <string lang="zh-hk" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">說明：在 Windows 啟動前的啟動驗證裏需要輸入密碼，此時非美國標準鍵盤佈局不可用。因此，密碼必須使用標準的美國鍵盤佈局輸入。然而，這不需要您必須使用真實的美國鍵盤。VeraCrypt 在您沒有美國鍵盤的情況下也能夠自動的保證您能夠安全的輸入密碼（現在和啟動驗證環境）。</string>
     <string lang="zh-hk" key="RESCUE_DISK_INFO">在您加密系統分區/驅動器前，您必須創建一個 VeraCrypt 應急盤，用途如下：\n\n- 如果 VeraCrypt 啟動管理器、主密鑰、或其他關鍵資料損壞了，可以使用應急盤修復它們（當然你必須輸入正確的密碼）。\n\n- 如果 Windows 系統損壞了並且無法啟動，你可以在 Windows 啟動前使用應急盤永久解密這個分區/驅動器。\n\n- 應急盤包含第一個柱面當前內容的備份（通常包含系統引導器或者啟動管理器），在必要的時候你可以恢復它們。\n\nVeraCrypt 應急盤 ISO 映射檔將會在下面指定位置創建。</string>
     <string lang="zh-hk" key="RESCUE_DISK_WIN_ISOBURN_PRELAUNCH_NOTE">在您點擊確定後，微軟的 Windows 磁片映射刻錄器將會被啟動。請使用它刻錄 VeraCrypt 應急盤映射檔到 CD 或 DVD 中。\n\n在操作完這些之後，請返回到 VeraCrypt 加密卷創建嚮導並遵循嚮導的指令。</string>
-    <string lang="zh-hk" key="RESCUE_DISK_BURN_INFO">應急盤  ISO 鏡像檔已經創建並存儲為檔： %hs\n\n現在您需要把應急盤刻錄到 CD 或 DVD。\n\n在刻錄應急盤後，點擊 '下一步' 按鈕驗證應急盤已經成功刻錄。\n\n%ls在刻錄完應急盤之後，請點擊 "下一步" 按鈕驗證應急盤是否被成功刻錄。</string>
+    <string lang="zh-hk" key="RESCUE_DISK_BURN_INFO">應急盤  ISO 鏡像檔已經創建並存儲為檔： %s\n\n現在您需要把應急盤刻錄到 CD 或 DVD。\n\n在刻錄應急盤後，點擊 '下一步' 按鈕驗證應急盤已經成功刻錄。\n\n%ls在刻錄完應急盤之後，請點擊 "下一步" 按鈕驗證應急盤是否被成功刻錄。</string>
-    <string lang="zh-hk" key="RESCUE_DISK_BURN_INFO_NO_CHECK">應急盤映射檔已經被創建並且存儲為檔： %hs\n\n現在您應當刻錄該應急盤到 CD/DVD 中去或者移動該 ISO 檔到一個安全的位置以備以後使用。\n\n%ls點擊 '下一步' 繼續。</string>
+    <string lang="zh-hk" key="RESCUE_DISK_BURN_INFO_NO_CHECK">應急盤映射檔已經被創建並且存儲為檔： %s\n\n現在您應當刻錄該應急盤到 CD/DVD 中去或者移動該 ISO 檔到一個安全的位置以備以後使用。\n\n%ls點擊 '下一步' 繼續。</string>
     <string lang="zh-hk" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">重要：請注意，映射檔必須以 ISO 磁片映射檔的方式刻錄到 CD/DVD 中去（不能刻錄為單個的資料檔案）。要獲取更多的關於如何刻錄 ISO 檔的資訊，請參考您的 CD/DVD 刻錄軟體的說明書。如果您還沒有刻錄 ISO 鏡像檔的光碟刻錄軟體，請點下面鏈結下載這樣的免費刻錄軟體。\n\n</string>
     <string lang="zh-hk" key="LAUNCH_WIN_ISOBURN">啟動微軟 Windows 磁片映射刻錄器</string>
     <string lang="zh-hk" key="RESCUE_DISK_BURN_NO_CHECK_WARN">警告：如果您已經創建了 VeraCrypt 應急盤，它將不能再用於系統分區/驅動器，這是因為您每次加密系統分區/驅動器時都會使用不同的主密鑰，儘管您使用的是同樣的密碼，您也必須創建一個新的 VeraCrypt 應急盤。</string>
@@ -1372,6 +1380,39 @@
     <string lang="zh-hk" key="TB_PER_SEC">TB/s</string>
     <string lang="zh-hk" key="PB_PER_SEC">PB/s</string>
     <string lang="zh-hk" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

Translations/Language.zh-tw.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.14">
+  <localization prog-version="1.18">
     <!-- Languages -->
     <language langid="zh-tw" name="繁體中文" en-name="Chinese (Taiwan)" version="0.1.0" translators="Barney Li, Simon Ma, ChangMing Hsu" />
     <!-- Fonts -->
@@ -14,7 +14,7 @@
     <control lang="zh-tw" key="IDC_BROWSE">瀏覽(&amp;B)...</control>
     <control lang="zh-tw" key="IDC_DESKTOP_ICON">在桌面新增 VeraCrypt 圖示(&amp;D)</control>
     <control lang="en" key="IDC_DONATE">Donate now...</control>
-    <control lang="zh-tw" key="IDC_FILE_TYPE">副檔名 '.tc' 的檔案關聯到 VeraCrypt(&amp;E)</control>
+    <control lang="zh-tw" key="IDC_FILE_TYPE">副檔名 '.hc' 的檔案關聯到 VeraCrypt(&amp;E)</control>
     <control lang="zh-tw" key="IDC_OPEN_CONTAINING_FOLDER">完成後開啟目標資料夾(&amp;O)</control>
     <control lang="zh-tw" key="IDC_PROG_GROUP">建立 VeraCrypt 的開始功能表項目(&amp;S)</control>
     <control lang="zh-tw" key="IDC_SYSTEM_RESTORE">建立系統還原點(&amp;R)</control>
@@ -37,6 +37,7 @@
     <control lang="zh-tw" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">下載 CD/DVD 燒錄軟體</control>
     <control lang="en" key="IDC_FILE_CONTAINER">Create an encrypted file container</control>
     <control lang="en" key="IDC_GB">&amp;GB</control>
+    <control lang="en" key="IDC_TB">&amp;TB</control>
     <control lang="en" key="IDC_HIDDEN_SYSENC_INFO_LINK">More information</control>
     <control lang="zh-tw" key="IDC_HIDDEN_VOL">建立隱藏的 VeraCrypt 加密區(&amp;D) </control>
     <control lang="zh-tw" key="IDC_HIDDEN_VOL_HELP">更多隱藏加密區的訊息</control>
@@ -44,6 +45,7 @@
     <control lang="zh-tw" key="IDC_HIDVOL_WIZ_MODE_FULL">正常模式</control>
     <control lang="zh-tw" key="IDC_KB">KB(&amp;K)</control>
     <control lang="zh-tw" key="IDC_KEYFILES_ENABLE">使用金鑰檔(&amp;S)</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="zh-tw" key="IDC_KEY_FILES">金鑰檔案(&amp;K)...</control>
     <control lang="zh-tw" key="IDC_LINK_HASH_INFO">關於雜湊演算法的更多資訊</control>
@@ -58,7 +60,8 @@
     <control lang="zh-tw" key="IDC_NO_HISTORY">不保留歷史記錄(&amp;S)</control>
     <control lang="zh-tw" key="IDC_OPEN_OUTER_VOLUME">打開外層加密區</control>
     <control lang="zh-tw" key="IDC_PAUSE">暫停(&amp;P)</control>
-    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</control>
+    <control lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</control>
     <control lang="zh-tw" key="IDC_QUICKFORMAT">快速格式化</control>
     <control lang="zh-tw" key="IDC_SHOW_PASSWORD">顯示密碼(&amp;D)</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Display password</control>
@@ -89,6 +92,8 @@
     <control lang="zh-tw" key="IDT_PARTIAL_POOL_CONTENTS">目前集區內容(部分)</control>
     <control lang="en" key="IDT_PASS">Pass</control>
     <control lang="zh-tw" key="IDT_PASSWORD">密碼：</control>
+    <control lang="en" key="IDT_PIM">Volume PIM:</control>
+    <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
     <control lang="zh-tw" key="IDT_PROGRESS">進度：</control>
     <control lang="zh-tw" key="IDT_RANDOM_POOL">隨機集區： </control>
     <control lang="zh-tw" key="IDT_SINGLE_BOOT">如果只在這台電腦上裝了一個作業系統的請選擇此項(即使該系統可能有多個使用者)。</control>
@@ -116,6 +121,7 @@
     <control lang="zh-tw" key="IDC_CREATE">建立</control>
     <control lang="zh-tw" key="IDC_CREATE_VOLUME">建立加密區(&amp;C)</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <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="zh-tw" key="IDC_ENABLE_KEYFILES">使用金鑰檔</control>
     <control lang="zh-tw" key="IDC_ENABLE_NEW_KEYFILES">使用金鑰檔</control>
@@ -130,6 +136,7 @@
     <control lang="en" key="IDC_FAVORITE_MOVE_UP">Move &amp;Up</control>
     <control lang="en" key="IDC_FAVORITE_OPEN_EXPLORER_WIN_ON_MOUNT">Open &amp;Explorer window for selected volume when successfully mounted</control>
     <control lang="en" key="IDC_FAVORITE_REMOVE">&amp;Remove</control>
+    <control lang="en" key="IDC_FAVORITE_USE_LABEL_IN_EXPLORER">Use favorite label as Explorer drive label</control>
     <control lang="en" key="IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX">Global Settings</control>
     <control lang="en" key="IDC_HK_DISMOUNT_BALLOON_TOOLTIP">Display balloon tooltip after successful hot-key dismount</control>
     <control lang="en" key="IDC_HK_DISMOUNT_PLAY_SOUND">Play system notification sound after successful hot-key dismount</control>
@@ -187,7 +194,7 @@
     <control lang="zh-tw" key="IDD_MOUNT_DLG">VeraCrypt</control>
     <control lang="zh-tw" key="IDD_PASSWORDCHANGE_DLG">修改密碼和金鑰檔</control>
     <control lang="zh-tw" key="IDD_PASSWORD_DLG">輸入 VeraCrypt 加密區密碼</control>
-    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance Options</control>
+    <control lang="en" key="IDD_PERFORMANCE_SETTINGS">VeraCrypt - Performance and Driver Options</control>
     <control lang="zh-tw" key="IDD_PREFERENCES_DLG">VeraCrypt - 偏好設定</control>
     <control lang="en" key="IDD_SYSENC_SETTINGS">VeraCrypt - System Encryption Settings</control>
     <control lang="en" key="IDD_TOKEN_PREFERENCES">VeraCrypt - Security Token Preferences</control>
@@ -233,7 +240,7 @@
     <control lang="zh-tw" key="IDM_ONLINE_TUTORIAL">新手上路(線上)</control>
     <control lang="en" key="IDM_ORGANIZE_FAVORITES">Organize Favorite Volumes...</control>
     <control lang="en" key="IDM_ORGANIZE_SYSTEM_FAVORITES">Organize System Favorite Volumes...</control>
-    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance...</control>
+    <control lang="en" key="IDM_PERFORMANCE_SETTINGS">Performance/Driver Configuration</control>
     <control lang="zh-tw" key="IDM_PERMANENTLY_DECRYPT_SYS">永久解密系統分割區/磁碟機...</control>
     <control lang="zh-tw" key="IDM_PREFERENCES">偏好設定...</control>
     <control lang="zh-tw" key="IDM_REFRESH_DRIVE_LETTERS">重新整理磁碟機代號</control>
@@ -254,6 +261,7 @@
     <control lang="zh-tw" key="IDM_UNMOUNTALL">卸載全部掛載的加密區</control>
     <control lang="zh-tw" key="IDM_UNMOUNT_VOLUME">卸載選擇的加密區</control>
     <control lang="zh-tw" key="IDM_VERIFY_RESCUE_DISK">驗證救援磁碟</control>
+    <control lang="en" key="IDM_VERIFY_RESCUE_DISK_ISO">Verify Rescue Disk Image</control>
     <control lang="zh-tw" key="IDM_VERSION_HISTORY">版本歷史(線上)</control>
     <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="zh-tw" key="IDM_VOLUME_PROPERTIES">加密區內容</control>
@@ -363,7 +371,7 @@
     <control lang="en" key="IDT_SECURITY_TOKEN">Security token:</control>
     <control lang="zh-tw" key="IDT_SORT_METHOD">排序方式：</control>
     <control lang="en" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Please wait. This process may take a long time...</control>
-    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.</control>
+    <control lang="en" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.</control>
     <control lang="zh-tw" key="IDT_TEST_BLOCK_NUMBER">區塊數值：</control>
     <control lang="zh-tw" key="IDT_TEST_CIPHERTEXT">密文(十六進位)</control>
     <control lang="zh-tw" key="IDT_TEST_DATA_UNIT_NUMBER">資料單位數值(64 位元十六進位，資料單位大小是 512 位元組)</control>
@@ -408,13 +416,13 @@
     <string lang="zh-tw" key="CIPHER_TITLE">加密選項</string>
     <string lang="zh-tw" key="CLEAN_WINMRU_FAILED">警告：清除上次選擇的加密區或金鑰檔路徑失敗(檔案選擇器記憶)！</string>
     <string lang="zh-tw" key="COMPRESSION_NOT_SUPPORTED">錯誤：此容器已被檔案系統壓縮過的。VeraCrypt 不支援壓縮過的容器(要注意這是因為壓縮過的加密資料是低效能和資料冗長的)。\n\n請使用以下步驟取消壓縮： 1) 在 Windows 檔案總管中的容器上按右鍵(不是在 VeraCrypt 視窗中)。 2) 選擇 "內容"。 3) 在 "內容" 對話方塊，點 "進階"。 4) 在 "進階內容" 對話方塊，停用 "壓縮磁碟機來節省磁碟空間" 並選取 "確定"。 5) 回到 "內容" 對話方塊，點 "確定"。</string>
-    <string lang="zh-tw" key="CREATE_FAILED">建立加密區 %hs 失敗</string>
+    <string lang="zh-tw" key="CREATE_FAILED">建立加密區 %s 失敗</string>
-    <string lang="zh-tw" key="DEVICE_FREE_BYTES">%hs 的大小為 %.2f 位元組</string>
+    <string lang="zh-tw" key="DEVICE_FREE_BYTES">%s 的大小為 %.2f 位元組</string>
-    <string lang="zh-tw" key="DEVICE_FREE_KB">%hs 的大小為 %.2f KB</string>
+    <string lang="zh-tw" key="DEVICE_FREE_KB">%s 的大小為 %.2f KB</string>
-    <string lang="zh-tw" key="DEVICE_FREE_MB">%hs 的大小為 %.2f MB</string>
+    <string lang="zh-tw" key="DEVICE_FREE_MB">%s 的大小為 %.2f MB</string>
-    <string lang="en" key="DEVICE_FREE_GB">Size of %hs is %.2f GB</string>
+    <string lang="en" key="DEVICE_FREE_GB">Size of %s is %.2f GB</string>
-    <string lang="en" key="DEVICE_FREE_TB">Size of %hs is %.2f TB</string>
+    <string lang="en" key="DEVICE_FREE_TB">Size of %s is %.2f TB</string>
-    <string lang="en" key="DEVICE_FREE_PB">Size of %hs is %.2f PB</string>
+    <string lang="en" key="DEVICE_FREE_PB">Size of %s is %.2f PB</string>
     <string lang="zh-tw" key="DEVICE_IN_USE_FORMAT">警告：磁碟機/磁碟分割區正被系統或應用程式使用。格式化該磁碟機/磁碟分割區可能導致資料遺失或系統不穩定。\n\n繼續進行格式化嗎？</string>
     <string lang="en" key="DEVICE_IN_USE_INPLACE_ENC">Warning: The partition is in use by the operating system or applications. You should close any applications that might be using the partition (including antivirus software).\n\nContinue?</string>
     <string lang="zh-tw" key="FORMAT_CANT_DISMOUNT_FILESYS">錯誤：該磁碟機/磁碟分割區包含不能被卸載的檔案系統。此檔案系統可能被作業系統所使用。格式化此磁碟機/磁碟分割區很可能會導致資料損壞或者是系統不穩定。\n\n要解決此問題，我們建議您先刪除該磁碟分割區之後在不格式化的情況下重新建立這個磁碟分割區。要達成此目的，請遵照下面步驟： 1) 在 "我的電腦" 的圖示上按右鍵，然後選擇 "管理"，顯示 "電腦管理" 視窗。 2) 在 "電腦管理" 視窗，選擇 "磁碟管理"。 3) 右鍵單點要加密的磁碟分割區，您可以選擇 "刪除磁碟分割"，"刪除磁區" 或者是 "刪除邏輯磁碟"。 4) 如果 Windows 提示要重新啟動，點 "是" 重新啟動。然後在第 5 個步驟中重複第 1 和第 2 步。 5) 右鍵單點未分配/可用空間並選擇 "新建磁碟分割"，"新建磁區" 或者 "新建邏輯磁碟"。 6) 在 "新建磁碟分割精靈" 或者 "新建磁區精靈" 視窗中，在 "格式化磁碟分割區" 標題的對話方塊中，選擇 "不格式化此磁碟分割區" 或者是 "不格式化此磁區"。在此精靈裡面，點 "下一步" 然後點 "完成"。 7) 要注意您現在在 VeraCrypt 中選擇的磁碟機路徑可能是錯誤的，因此，退出並重新啟動 VeraCrypt 加密區建立精靈(如果正在執行)。 8) 嘗試重新加密該設備/磁碟分割區。\n\n如果 VeraCrypt 仍然顯示加密失敗，您可以考慮建立檔案類型的容器。</string>
@@ -433,15 +441,15 @@
     <string lang="en" key="INPLACE_ENC_INVALID_PATH">Error: VeraCrypt can in-place encrypt only a partition, a dynamic volume, or an entire system drive. Please make sure the specified path is valid.</string>
     <string lang="en" key="CANNOT_RESIZE_FILESYS">Error: Cannot shrink the filesystem (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPossible causes and solutions:\n\n- Not enough free space on the volume. Please make sure no other application is writing to the filesystem.\n\n- Corrupted file system. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
     <string lang="en" key="NOT_ENOUGH_FREE_FILESYS_SPACE_FOR_SHRINK">Error: There is not enough free space on the volume and so the filesystem cannot be shrunk (the filesystem needs to be shrunk to make space for the volume header and backup header).\n\nPlease delete any redundant files and empty the Recycle Bin so as to free at least 256 KB of space and then try again. Note that due to a Windows issue, the amount of free space reported by the Windows Explorer may be incorrect until the operating system is restarted. If restarting the system does not help, the file system may be corrupted. Try to check it and fix any errors (right-click the corresponding drive letter in the 'Computer' list, then select Properties &gt; Tools &gt; 'Check Now', make sure the option 'Automatically fix file system errors' is enabled and click Start).\n\nIf the above steps do not help, please follow the below steps.</string>
-    <string lang="zh-tw" key="DISK_FREE_BYTES">磁碟機 %hs 上的可用空間為 %.2f 位元組。</string>
+    <string lang="zh-tw" key="DISK_FREE_BYTES">磁碟機 %s 上的可用空間為 %.2f 位元組。</string>
-    <string lang="en" key="DISK_FREE_KB">Free space on drive %hs is %.2f KB</string>
+    <string lang="en" key="DISK_FREE_KB">Free space on drive %s is %.2f KB</string>
-    <string lang="en" key="DISK_FREE_MB">Free space on drive %hs is %.2f MB</string>
+    <string lang="en" key="DISK_FREE_MB">Free space on drive %s is %.2f MB</string>
-    <string lang="en" key="DISK_FREE_GB">Free space on drive %hs is %.2f GB</string>
+    <string lang="en" key="DISK_FREE_GB">Free space on drive %s is %.2f GB</string>
-    <string lang="en" key="DISK_FREE_TB">Free space on drive %hs is %.2f TB</string>
+    <string lang="en" key="DISK_FREE_TB">Free space on drive %s is %.2f TB</string>
-    <string lang="en" key="DISK_FREE_PB">Free space on drive %hs is %.2f PB</string>
+    <string lang="en" key="DISK_FREE_PB">Free space on drive %s is %.2f PB</string>
     <string lang="zh-tw" key="DRIVELETTERS">無法得到可用的磁碟機代號。</string>
     <string lang="zh-tw" key="DRIVER_NOT_FOUND">錯誤：找不到 VeraCrypt 磁碟機。\n\n請將檔案 "veracrypt.sys" 和 "veracrypt-x64.sys" 複製到 VeraCrypt 主應用程式(VeraCrypt.exe)所在的目錄。</string>
-    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' &gt; Computer &gt; 'Uninstall or change a program' &gt; VeraCrypt &gt; Uninstall; on Windows XP, select 'Start Menu' &gt; Settings &gt; 'Control Panel' &gt; 'Add Or Remove Programs' &gt; VeraCrypt &gt; Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
+    <string lang="en" key="DRIVER_VERSION">Error: An incompatible version of the VeraCrypt driver is currently running.\n\nIf you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already installed, you must uninstall it first (or upgrade it using the VeraCrypt installer). To uninstall it, follow these steps: On Windows Vista or later, select 'Start Menu' > Computer > 'Uninstall or change a program' > VeraCrypt > Uninstall; on Windows XP, select 'Start Menu' > Settings > 'Control Panel' > 'Add Or Remove Programs' > VeraCrypt > Remove.\n\nSimilarly, if you are trying to run VeraCrypt in portable mode (i.e. without installing it) and a different version of VeraCrypt is already running in portable mode, you must restart the system first and then run only this new version.</string>
     <string lang="zh-tw" key="ERR_CIPHER_INIT_FAILURE">錯誤：加密初始化失敗。</string>
     <string lang="zh-tw" key="ERR_CIPHER_INIT_WEAK_KEY">錯誤：檢測到弱強度金鑰！金鑰將被廢棄。請重試。</string>
     <string lang="en" key="EXCEPTION_REPORT">A critical error has occurred and VeraCrypt must be terminated. If this is caused by a bug in VeraCrypt, we would like to fix it. To help us, you can send us an automatically generated error report containing the following items:\n\n- Program version\n- Operating system version\n- Type of CPU\n- VeraCrypt component name\n- Checksum of VeraCrypt executable\n- Symbolic name of dialog window\n- Error category\n- Error address\n- VeraCrypt call stack\n\nIf you select 'Yes', the following URL (which contains the entire error report) will be opened in your default Internet browser.\n\n%hs\n\nDo you want to send us the above error report?</string>
@@ -495,7 +503,7 @@
     <string lang="en" key="WIPE_FINISHED">The content of the partition/device has been successfully erased.</string>
     <string lang="en" key="WIPE_FINISHED_DECOY_SYSTEM_PARTITION">The content of the partition where the original system (of which the hidden system is a clone) resided has been successfully erased.</string>
     <string lang="en" key="DECOY_OS_VERSION_WARNING">Please make sure the version of Windows you are going to install (on the wiped partition) is the same as the version of Windows you are currently running. This is required due to the fact that both systems will share a common boot partition.</string>
-    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' &gt; 'Add Mounted Volume to System Favorites').</string>
+    <string lang="en" key="SYSTEM_ENCRYPTION_FINISHED">The system partition/drive has been successfully encrypted.\n\nNote: If there are non-system VeraCrypt volumes that you need to have mounted automatically every time Windows starts, you can set it up by mounting each of them and selecting 'Favorites' > 'Add Mounted Volume to System Favorites').</string>
     <string lang="zh-tw" key="SYSTEM_DECRYPTION_FINISHED">該系統割分割區/磁碟機已經被成功解密。</string>
     <string lang="zh-tw" key="FORMAT_FINISHED_HELP">\n\nVeraCrypt 加密區已建立並準備就緒。要建立另外的 VeraCrypt 加密區，請點 '下一步'，否則請點 '結束'。</string>
     <string lang="en" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nThe hidden VeraCrypt volume has been successfully created (the hidden operating system will reside within this hidden volume).\n\nClick Next to continue.</string>
@@ -522,7 +530,7 @@
     <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 password for this outer volume, and the existence of the hidden volume (and of the hidden operating system) will remain secret.\n\nIMPORTANT: The files you copy to the outer volume should not occupy more than %s. Otherwise, there may not be enough free space on the outer volume for the hidden volume (and you will not be able to continue). After you finish copying, click Next (do not dismount the volume).</string>
     <string lang="zh-tw" key="HIDVOL_HOST_FILLING_HELP">外層加密區已成功建立並作為 %hc: 磁碟機掛載。對這個加密區，現在您應複製一些您不是真正要隱藏的看似敏感的檔案。這是讓那些強迫您洩漏密碼的人能看到的檔。您將僅對這個外層加密區洩漏密碼，而不要洩漏給他們隱藏加密區的密碼。您真正要保護的檔將被儲存在稍後建立的隱藏加密區裡。當您完成複製後，請點 '下一步'，而且不要卸載此加密區。\n\n注意：點 '下一步' 後，將進行叢集圖掃描來確定連續的可用空間大小，此可用空間的結尾與加密區結尾一致。該空間將提供用來建立隱藏加密區同時也是隱藏加密區的最大容量。叢集圖掃描能夠保證外層加密區中的資料不會被隱藏加密區複寫。</string>
     <string lang="zh-tw" key="HIDVOL_HOST_FILLING_TITLE">外層加密區內容</string>
-    <string lang="zh-tw" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\n在下一步您將要為外層加密區(在其內將建立隱藏加密區)調整其選項。 </string>
+    <string lang="zh-tw" key="HIDVOL_HOST_PRE_CIPHER_HELP">\n\n在下一步您將要為外層加密區(在其內將建立隱藏加密區)調整其選項。</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>
     <string lang="zh-tw" key="HIDVOL_HOST_PRE_CIPHER_TITLE">外層加密區</string>
     <string lang="en" key="HIDDEN_OS_PRE_CIPHER_HELP">In the following steps, you will set the options and password for the hidden volume, which will contain the hidden operating system.\n\nRemark: The cluster bitmap of the outer volume has been scanned in order to determine the size of uninterrupted area of free space whose end is aligned with the end of the outer volume. This area will accommodate the hidden volume, so it limits its maximum possible size. The maximum possible size of the hidden volume has been determined and confirmed to be greater than the size of the system partition (which is required, because the entire content of the system partition will need to be copied to the hidden volume). This ensures that no data currently stored on the outer volume will be overwritten by data written to the area of the hidden volume.</string>
@@ -559,6 +567,7 @@
     <string lang="zh-tw" key="MAX_HIDVOL_SIZE_KB">該區能建立的最大隱藏加密區大小為 %.2f KB。</string>
     <string lang="zh-tw" key="MAX_HIDVOL_SIZE_MB">該區能建立的最大隱藏加密區大小為 %.2f MB。</string>
     <string lang="en" key="MAX_HIDVOL_SIZE_GB">Maximum possible hidden volume size for this volume is %.2f GB.</string>
+    <string lang="en" key="MAX_HIDVOL_SIZE_TB">Maximum possible hidden volume size for this volume is %.2f TB.</string>
     <string lang="zh-tw" key="MOUNTED_NOPWCHANGE">當此加密區被掛載時，加密區密碼/金鑰檔無法被更改。請先卸載此加密區。</string>
     <string lang="zh-tw" key="MOUNTED_NO_PKCS5_PRF_CHANGE">當加密區被掛載時無法修改首金鑰推導演算法。請先卸載加密區。</string>
     <string lang="zh-tw" key="MOUNT_BUTTON">掛載(&amp;M)</string>
@@ -589,12 +598,12 @@
     <string lang="en" key="SELECT_PKCS11_MODULE">Select PKCS #11 Library</string>
     <string lang="zh-tw" key="OUTOFMEMORY">記憶體不足</string>
     <string lang="en" key="FORMAT_DEVICE_FOR_ADVANCED_ONLY">IMPORTANT: We strongly recommend that inexperienced users create a VeraCrypt file container on the selected device/partition, instead of attempting to encrypt the entire device/partition.\n\nWhen you create a VeraCrypt file container (as opposed to encrypting a device or partition) there is, for example, no risk of destroying a large number of files. Note that a VeraCrypt file container (even though it contains a virtual encrypted disk) is actually just like any normal file. For more information, see the chapter Beginner's Tutorial in the VeraCrypt User Guide.\n\nAre you sure you want to encrypt the entire device/partition?</string>
-    <string lang="zh-tw" key="OVERWRITEPROMPT">警告：加密區 '%hs' 已存在！\n\n重要：VeraCrypt 並不會加密這個檔案，而是會刪除這個檔案。您確定要刪除這個檔案並用一個新的 VeraCrypt 容器來取代它嗎？</string>
+    <string lang="zh-tw" key="OVERWRITEPROMPT">警告：加密區 '%s' 已存在！\n\n重要：VeraCrypt 並不會加密這個檔案，而是會刪除這個檔案。您確定要刪除這個檔案並用一個新的 VeraCrypt 容器來取代它嗎？</string>
-    <string lang="zh-tw" key="OVERWRITEPROMPT_DEVICE">小心：目前儲存在 %s '%hs'%s 上的所有資料將會被刪除且遺失(它們將不會被加密)！\n\n您確定要繼續格式化嗎？</string>
+    <string lang="zh-tw" key="OVERWRITEPROMPT_DEVICE">小心：目前儲存在 %s '%s'%s 上的所有資料將會被刪除且遺失(它們將不會被加密)！\n\n您確定要繼續格式化嗎？</string>
-    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully encrypted.\n\nAre you sure you want to start encrypting the selected %s '%s'%s?</string>
-    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%hs'%s?</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_CONFIRM">WARNING: You will not be able to mount the volume or access any files stored on it until it has been fully decrypted.\n\nAre you sure you want to start decrypting the selected %s '%s'%s?</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting/decrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting/decrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting/decrypting, please make sure that you have backup copies of the files you want to encrypt/decrypt.\n\nDo you have such a backup?</string>
-    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%hs'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
+    <string lang="en" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">CAUTION: ANY FILES CURRENTLY STORED ON THE PARTITION '%s'%s (I.E. ON THE FIRST PARTITION BEHIND THE SYSTEM PARTITION) WILL BE ERASED AND LOST (THEY WILL NOT BE ENCRYPTED)!\n\nAre you sure you want to proceed with format?</string>
     <string lang="en" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">WARNING: THE SELECTED PARTITION CONTAINS A LARGE AMOUNT OF DATA! Any files stored on the partition will be erased and lost (they will NOT be encrypted)!</string>
     <string lang="en" key="ERASE_FILES_BY_CREATING_VOLUME">Erase any files stored on the partition by creating a VeraCrypt volume within it</string>
     <string lang="zh-tw" key="PASSWORD">密碼</string>
@@ -643,7 +652,7 @@
     <string lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</string>
     <string lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</string>
     <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 &gt; Organize &gt; 'Folder and search options' &gt; View).</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="SELECTED_PARTITION_ALREADY_INPLACE_ENC">The selected partition/device is already fully encrypted.\nHeader Flags = 0x%.8X</string>
@@ -654,7 +663,7 @@
     <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>
     <string lang="zh-tw" key="PREV">&lt; 上一步(&amp;B)</string>
     <string lang="zh-tw" key="RAWDEVICES">無法列出安裝在系統上的原生裝置！</string>
-    <string lang="zh-tw" key="READONLYPROMPT">加密區 "%hs" 存在，而且是唯讀的。您確定要取代它嗎？</string>
+    <string lang="zh-tw" key="READONLYPROMPT">加密區 "%s" 存在，而且是唯讀的。您確定要取代它嗎？</string>
     <string lang="zh-tw" key="SELECT_DEST_DIR">選擇目標目錄</string>
     <string lang="zh-tw" key="SELECT_KEYFILE">選擇金鑰檔</string>
     <string lang="zh-tw" key="SELECT_KEYFILE_PATH">選擇金鑰檔的搜索路徑。警告：要注意記憶的只是路徑，而不會記憶檔案名！</string>
@@ -678,13 +687,13 @@
     <string lang="zh-tw" key="TEST_CIPHERTEXT_SIZE">您提供的測試加密文本太長或太短。</string>
     <string lang="zh-tw" key="TEST_KEY_SIZE">您提供的測試金鑰太長或太短。</string>
     <string lang="zh-tw" key="TEST_PLAINTEXT_SIZE">您提供的測試明碼文本太長或太短。</string>
-    <string lang="zh-tw" key="TWO_LAYER_CASCADE_HELP">在 XTS 模式的串聯操作中需要兩個加密。每個區塊首先使用 %hs (%d 位元金鑰)加密然後使用 %hs (%d 位元金鑰)加密。每個加密使用其各自的金鑰。所有的金鑰各自獨立。</string>
+    <string lang="zh-tw" key="TWO_LAYER_CASCADE_HELP">在 XTS 模式的串聯操作中需要兩個加密。每個區塊首先使用 %s (%d 位元金鑰)加密然後使用 %s (%d 位元金鑰)加密。每個加密使用其各自的金鑰。所有的金鑰各自獨立。</string>
-    <string lang="zh-tw" key="THREE_LAYER_CASCADE_HELP">在 XTS 模式的串聯操作中需要三個加密。每個區塊首先以 %hs (%d 位元金鑰)加密，然後以 %hs (%d 位元金鑰)加密，最後以 %hs (%d 位金鑰)加密。每個加密均使用其各自的金鑰。所有的金鑰均各自獨立。</string>
+    <string lang="zh-tw" key="THREE_LAYER_CASCADE_HELP">在 XTS 模式的串聯操作中需要三個加密。每個區塊首先以 %s (%d 位元金鑰)加密，然後以 %s (%d 位元金鑰)加密，最後以 %s (%d 位金鑰)加密。每個加密均使用其各自的金鑰。所有的金鑰均各自獨立。</string>
     <string lang="en" key="AUTORUN_MAY_NOT_ALWAYS_WORK">Note that, depending on the operating system configuration, these auto-run and auto-mount features may work only when the traveler disk files are created on a non-writable CD/DVD-like medium. Also note that this is not a bug in VeraCrypt (it is a limitation of Windows).</string>
     <string lang="en" key="TRAVELER_DISK_CREATED">VeraCrypt traveler disk has been successfully created.\n\nNote that you need administrator privileges to run VeraCrypt in portable mode. Also note that, after examining the registry file, it may be possible to tell that VeraCrypt was run on a Windows system even if it is run in portable mode.</string>
     <string lang="zh-tw" key="TC_TRAVELER_DISK">VeraCrypt 攜帶版磁碟</string>
     <string lang="zh-tw" key="TWOFISH_HELP">設計者為 Bruce Schneie、John Kelsey、Doug Whiting、David Wagner、Chris Hall、和 Niels Ferguson。發表於 1998 年。256 位元金鑰，128 位元區塊。操作模式為 XTS。Twofish 為與 AES 候選演算法中的一種。</string>
-    <string lang="zh-tw" key="MORE_INFO_ABOUT">關於 %hs 的更多訊息</string>
+    <string lang="zh-tw" key="MORE_INFO_ABOUT">關於 %s 的更多訊息</string>
     <string lang="zh-tw" key="UNKNOWN">未知</string>
     <string lang="en" key="ERR_UNKNOWN">An unspecified or unknown error occurred (%d).</string>
     <string lang="zh-tw" key="UNMOUNTALL_LOCK_FAILED">一些加密區包含的檔案或資料夾 正被應用程式或系統使用。\n\n強制卸載嗎？</string>
@@ -704,7 +713,7 @@
     <string lang="zh-tw" key="WRONG_VOL_TYPE">VeraCrypt 無法修改外層加密區的密碼。</string>
     <string lang="zh-tw" key="SELECT_FREE_DRIVE">請從列表中選擇一個未被使用的磁碟機代號。</string>
     <string lang="zh-tw" key="SELECT_A_MOUNTED_VOLUME">請在磁碟機列表中選擇一個已掛載的加密區。</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="zh-tw" key="CANT_CREATE_AUTORUN">錯誤：無法建立 autorun.inf</string>
     <string lang="zh-tw" key="ERR_PROCESS_KEYFILE">處理金鑰檔時出錯！</string>
     <string lang="zh-tw" key="ERR_PROCESS_KEYFILE_PATH">處理金鑰檔路徑時出錯！</string>
@@ -849,7 +858,7 @@
     <string lang="zh-tw" key="INSTALL_FAILED">安裝失敗。</string>
     <string lang="zh-tw" key="UNINSTALL_FAILED">移除失敗。</string>
     <string lang="zh-tw" key="DIST_PACKAGE_CORRUPTED">這發行包裝檔已經損壞。請試著再下載一次(最好從 VeraCrypt 官方網站 https://veracrypt.codeplex.com 下載)。</string>
-    <string lang="zh-tw" key="CANNOT_WRITE_FILE_X">不能寫入檔案 %hs</string>
+    <string lang="zh-tw" key="CANNOT_WRITE_FILE_X">不能寫入檔案 %s</string>
     <string lang="zh-tw" key="EXTRACTING_VERB">正在解壓縮</string>
     <string lang="zh-tw" key="CANNOT_READ_FROM_PACKAGE">不能從包裝檔中讀取資料</string>
     <string lang="zh-tw" key="CANT_VERIFY_PACKAGE_INTEGRITY">不能驗證發行包裝檔的完整性。</string>
@@ -858,8 +867,8 @@
     <string lang="zh-tw" key="INSTALL_OK">VeraCrypt 已成功安裝。</string>
     <string lang="en" key="SETUP_UPDATE_OK">VeraCrypt has been successfully updated.</string>
     <string lang="en" key="UPGRADE_OK_REBOOT_REQUIRED">VeraCrypt has been successfully upgraded. However, before you can start using it, the computer must be restarted.\n\nDo you want to restart it now?</string>
-    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu &gt; All programs &gt; Accessories &gt; System Tools &gt; System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
+    <string lang="en" key="SYS_ENC_UPGRADE_FAILED">Failed to upgrade VeraCrypt!\n\nIMPORTANT: Before you shut down or restart the system, we strongly recommend that you use System Restore (Windows Start menu > All programs > Accessories > System Tools > System Restore) to restore your system to the restore point named 'VeraCrypt installation'. If System Restore is not available, you should try installing the original or the new version of VeraCrypt again before you shut down or restart the system.</string>
-    <string lang="zh-tw" key="UNINSTALL_OK">VeraCrypt 已成功移除。\n\n點 "完成" 來移除 VeraCrypt 安裝程式和資料夾 %hs。要注意如果該資料夾中含有非安裝程式建立的檔案，則該資料夾不會被移除。</string>
+    <string lang="zh-tw" key="UNINSTALL_OK">VeraCrypt 已成功移除。\n\n點 "完成" 來移除 VeraCrypt 安裝程式和資料夾 %s。要注意如果該資料夾中含有非安裝程式建立的檔案，則該資料夾不會被移除。</string>
     <string lang="zh-tw" key="REMOVING_REG">正在移除 VeraCrypt 登錄檔項目。</string>
     <string lang="zh-tw" key="ADDING_REG">正在新增登錄檔項目</string>
     <string lang="zh-tw" key="REMOVING_APPDATA">正在刪除程式相關資料</string>
@@ -870,10 +879,10 @@
     <string lang="zh-tw" key="CREATING_SYS_RESTORE">建立系統還原點</string>
     <string lang="zh-tw" key="FAILED_SYS_RESTORE">建立系統還原點失敗！</string>
     <string lang="en" key="INSTALLER_UPDATING_BOOT_LOADER">Updating boot loader</string>
-    <string lang="zh-tw" key="INSTALL_OF_FAILED">"%hs" 的安裝已失敗。 %hs 您想要繼續安裝嗎？</string>
+    <string lang="zh-tw" key="INSTALL_OF_FAILED">"%s" 的安裝已失敗。 %s 您想要繼續安裝嗎？</string>
-    <string lang="zh-tw" key="UNINSTALL_OF_FAILED">"%hs" 的移除已失敗。 %hs 您想要繼續移除嗎？</string>
+    <string lang="zh-tw" key="UNINSTALL_OF_FAILED">"%s" 的移除已失敗。 %s 您想要繼續移除嗎？</string>
     <string lang="zh-tw" key="INSTALL_COMPLETED">安裝完成。</string>
-    <string lang="zh-tw" key="CANT_CREATE_FOLDER">資料夾 "%hs" 無法被建立</string>
+    <string lang="zh-tw" key="CANT_CREATE_FOLDER">資料夾 "%s" 無法被建立</string>
     <string lang="zh-tw" key="CLOSE_TC_FIRST">無法卸載 VeraCrypt 裝置驅動程式。\n\n請先關閉所有使用中的 VeraCrypt 視窗。如果這樣仍然沒有作用，請重新啟動電腦然後再試一次。</string>
     <string lang="zh-tw" key="DISMOUNT_ALL_FIRST">在安裝或者移除 VeraCrypt 之前必須先要卸載所有的 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>
@@ -919,14 +928,14 @@
     <string lang="en" key="SYS_FAVORITE_VOLUMES_SAVED">System favorite volumes saved.\n\nTo enable mounting of system favorite volumes when the system starts, please select 'Settings' &gt; 'System Favorite Volumes' &gt; 'Mount system favorite volumes when Windows starts'.</string>
     <string lang="en" key="FAVORITE_ADD_DRIVE_DEV_WARNING">The volume you are adding to favorites is neither a partition nor a dynamic volume. Therefore, VeraCrypt will be unable to mount this favorite volume if the device number changes.</string>
     <string lang="en" key="FAVORITE_ADD_PARTITION_TYPE_WARNING">The volume you are adding to favorites is a partition not recognized by Windows.\n\nVeraCrypt will be unable to mount this favorite volume if the device number changes. Please set the type of the partition to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then add the partition to favorites again.</string>
-    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings &gt; Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
+    <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_BACKGROUND_TASK_ERR">VeraCrypt Background Task is disabled or it is configured to exit when there are no mounted volumes (or VeraCrypt is running in portable mode). This may prevent your favorite volumes from being automatically mounted when devices hosting them get connected.\n\nNote: To enable the VeraCrypt Background Task, select Settings > Preferences and check the 'Enabled' checkbox in the section 'VeraCrypt Background Task'.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_NETWORK_PATH_ERR">A container stored in a remote filesystem shared over a network cannot be automatically mounted when its host device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, the volume hosted on the device cannot be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_ARRIVAL_MOUNT_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable the volume hosted on the device to be automatically mounted when the device gets connected.</string>
     <string lang="en" key="FAVORITE_LABEL_DEVICE_PATH_ERR">The device displayed below is neither a partition nor a dynamic volume. Therefore, no label can be assigned to it.</string>
     <string lang="en" key="FAVORITE_LABEL_PARTITION_TYPE_ERR">Please set the type of the partition displayed below to a type recognized by Windows (use the SETID command of the Windows 'diskpart' tool). Then remove the partition from favorites and add it again. This will enable VeraCrypt to assign a label to the partition.</string>
     <string lang="en" key="SYSTEM_FAVORITE_NETWORK_PATH_ERR">Due to a Windows limitation, a container stored in a remote filesystem shared over a network cannot be mounted as a system favorite volume (however, it can be mounted as a non-system favorite volume when a user logs on).</string>
-    <string lang="zh-tw" key="ENTER_PASSWORD_FOR">為 %hs 輸入密碼</string>
+    <string lang="zh-tw" key="ENTER_PASSWORD_FOR">為 %s 輸入密碼</string>
     <string lang="en" key="ENTER_PASSWORD_FOR_LABEL">Enter password for '%s'</string>
     <string lang="en" key="ENTER_NORMAL_VOL_PASSWORD">Enter password for the normal/outer volume</string>
     <string lang="en" key="ENTER_HIDDEN_VOL_PASSWORD">Enter password for the hidden volume</string>
@@ -941,8 +950,8 @@
     <string lang="zh-tw" key="VOL_HEADER_BACKED_UP">加密區標頭資訊備份已經成功建立。\n\n重要：使用復原功能復原時也會復原目前加密區的密碼。此外，如果建立加密區的時候使用了金鑰檔，復原後也需要同樣的金鑰檔來打開加密區。\n\n警告：該加密區標頭資訊備份只能用在這個提供備份的加密區上。如果您把該標頭資訊備份復原到其他加密區，您可能能夠打開加密區，但是您將無法解密儲存在加密區的任何資料(這是因為您已經改變了加密區的主金鑰)。</string>
     <string lang="zh-tw" key="VOL_HEADER_RESTORED">加密區標頭資訊備份已經成功復原。\n\n重要：請注意舊密碼也同樣被復原了。此外，備份時如果需要金鑰檔來掛載加密區，復原後也需要同樣的金鑰檔。</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) for the hidden volume.</string>
-    <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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</string>
+    <string lang="en" key="CONFIRM_VOL_HEADER_BAK">Are you sure you want to create volume header backup for %s?\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 deniability). When restoring a volume header from the backup file, you will need to enter the correct password (and/or to supply the correct keyfiles) that was/were valid when the volume header backup was created. The password (and/or keyfiles) will also automatically determine the type of the volume header to restore, i.e. standard or hidden (note that VeraCrypt determines the type through the process of trial and error).</string>
-    <string lang="zh-tw" key="CONFIRM_VOL_HEADER_RESTORE">您確定要復原加密區 %hs 的標頭資訊嗎？\n\n警告：復原加密區標頭資訊也會復原在建立備份時有效的密碼。此外，如果在備份時需要使用金鑰檔掛載加密區，那麼在標頭資訊復原後，仍然需要同樣的金鑰檔。\n\n在您選取 '是' 之後，您將會選擇標頭資訊備份檔案。</string>
+    <string lang="zh-tw" key="CONFIRM_VOL_HEADER_RESTORE">您確定要復原加密區 %s 的標頭資訊嗎？\n\n警告：復原加密區標頭資訊也會復原在建立備份時有效的密碼。此外，如果在備份時需要使用金鑰檔掛載加密區，那麼在標頭資訊復原後，仍然需要同樣的金鑰檔。\n\n在您選取 '是' 之後，您將會選擇標頭資訊備份檔案。</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>
@@ -953,12 +962,14 @@
     <string lang="en" key="VOLUME_HAS_NO_BACKUP_HEADER">There is no backup header embedded in this volume (note that only volumes created by VeraCrypt 6.0 or later contain embedded backup headers).</string>
     <string lang="zh-tw" key="BACKUP_HEADER_NOT_FOR_SYS_DEVICE">您正在嘗試備份系統分割區/磁碟機的標頭訊息。這是不被允許的。對於系統分割區/磁碟機標頭訊息的備份/恢復操作只能經由使用 VeraCrypt 救援磁碟來進行。\n\n您希望建立 VeraCrypt 救援磁碟嗎？</string>
     <string lang="zh-tw" key="RESTORE_HEADER_NOT_FOR_SYS_DEVICE">您正在嘗試恢復虛擬 VeraCrypt 加密區的標頭訊息但是您選擇的是系統分割區/磁碟機。這是不被允許的。 對於系統分割區/磁碟機標頭訊息的備份/恢復只能經由使用 VeraCrypt 救援磁碟來進行。\n\n您希望建立 VeraCrypt 救援磁碟嗎？</string>
-    <string lang="zh-tw" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">在點 '確定' 後，您將會選擇新的 VeraCrypt 救援磁碟 ISO 影像檔案的檔案名稱和您要存放位置。</string>
+    <string lang="zh-tw" key="RESCUE_DISK_NON_WIZARD_CREATION_SELECT_PATH">在點 '確定' 後，您將會選擇新的 VeraCrypt 救援磁碟 影像檔案的檔案名稱和您要存放位置。</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_BURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nIMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software.\n\nAfter you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
-    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%hs\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
+    <string lang="en" key="RESCUE_DISK_NON_WIZARD_CREATION_WIN_ISOBURN">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to burn the Rescue Disk image to a CD or DVD.\n\nDo you want to launch the Microsoft Windows Disc Image Burner now?\n\nNote: After you burn the Rescue Disk, select 'System' &gt; 'Verify Rescue Disk' to verify that it has been correctly burned.</string>
     <string lang="zh-tw" key="RESCUE_DISK_NON_WIZARD_CHECK_INSERT">請插入 VeraCrypt 救援磁碟到 CD/DVD 光碟機並點選 '確定' 開始驗證。</string>
     <string lang="zh-tw" key="RESCUE_DISK_NON_WIZARD_CHECK_PASSED">VeraCrypt 救援磁碟已經被成功驗證。</string>
     <string lang="zh-tw" key="RESCUE_DISK_NON_WIZARD_CHECK_FAILED">無法驗證救援磁碟已被正確燒錄。\n\n如果您已經燒錄了救援磁碟，請退出後重新插入 CD/DVD；然後再試一次。如果沒有用，請嘗試使用其他 CD/DVD 燒錄軟體或光碟片。\n\n如果您嘗試驗證一個為不同的主金鑰、密碼、salt 值、等建立的 VeraCrypt 救援磁碟，請注意這樣的救援磁碟永遠無法通過驗證。要建立一個新的和目前組態完全相容的救援磁碟，請選擇 "系統" &gt; "建立救援磁碟"。</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_PASSED">The VeraCrypt Rescue Disk image has been successfully verified.</string>
+    <string lang="en" key="RESCUE_DISK_ISO_IMAGE_CHECK_FAILED">The Rescue Disk image verification failed.\n\nIf you attempted to verify a VeraCrypt Rescue Disk image created for a different master key, password, salt, etc., please note that such Rescue Disk image will always fail this verification. To create a new Rescue Disk image fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
     <string lang="zh-tw" key="ERROR_CREATING_RESCUE_DISK">建立 VeraCrypt 救援磁碟時失敗。</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' &gt; '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 be used, because it was created for a different master key. You need to burn the newly generated Rescue Disk.</string>
@@ -987,8 +998,8 @@
     <string lang="en" key="DRIVE_LETTER_ITEM">Drive Letter:   </string>
     <string lang="zh-tw" key="UNSUPPORTED_CHARS_IN_PWD">錯誤：密碼必須只包含 ASCII 字元。\n\n密碼中的非 ASCII 字元可能會導致當作業系統組態改變時加密區無法掛載。\n\n允許使用以下字元：\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4  5 6 7 8 9 : ; &lt; = &gt; ? @ 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="zh-tw" key="UNSUPPORTED_CHARS_IN_PWD_RECOM">警告：密碼中包含非 ASCII 字元。可能會導致當作業系統組態改變時加密區無法掛載。\n\n您應該使用 ASCII 字元取代密碼中的非 ASCII 字元。如要這樣做，請選取 "加密區" -&gt; "修改加密區密碼"\n\n以下字元為 ASCII 字元：\n\n  ! " # $ % &amp; ' ( ) * + , - . / 0 1 2 3 4  5 6 7 8 9 : ; &lt; = &gt; ? @ 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="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 change it (e.g., to '.tc').\n\nAre you sure you want to use the problematic file extension?</string>
+    <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 change it (e.g., to '.hc').\n\nAre you sure you want to use the problematic file extension?</string>
-    <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 container or change it (e.g., to '.tc') after you dismount the volume.</string>
+    <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 container or change it (e.g., to '.hc') after you dismount the volume.</string>
     <string lang="zh-tw" key="HOMEPAGE">首頁(線上)</string>
     <string lang="zh-tw" key="LARGE_IDE_WARNING_XP">警告：看起來您還沒有安裝任何 Windows 作業系統的修正檔案。您不應該向未安裝 SP1 或更新的修正檔案的 Windows XP 系統中大於 128 GB 的 IDE 硬碟寫入資料！如果這樣做了，磁碟上的資料(不論是否為 VeraCrypt 加密區)可能會損壞。要注意這是 Windows 作業系統的限制，而不是 VeraCrypt 的錯誤。</string>
     <string lang="zh-tw" key="LARGE_IDE_WARNING_2K">警告：看起來您的 Windows 2000 系統還未安裝 SP3 或更新的修正檔案。您不應該向這個系統中大於 128 GB 的 IDE 硬碟寫入資料！如果這樣做了，磁碟上的資料(不論是否為 VeraCrypt 加密區)可能會損壞。要注意這是 Windows 作業系統的限制，而不是 VeraCrypt 的錯誤。\n\n注意：您也需在註冊表裡啟用 48-位元 LBA 支援；更多資訊，請參考 http：//support.microsoft.com/kb/305098/EN-US</string>
@@ -1048,9 +1059,8 @@
     <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' &gt; 'Resume Interrupted Process'.</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>
+    <string lang="zh-tw" key="CHECKING_FS">正在檢測掛載為 %s 的 VeraCrypt 加密區的檔案系統...</string>
-    <string lang="zh-tw" key="REPAIRING_FS">正在試圖修正掛載為 %hs 的 VeraCrypt 加密區的檔案系統...</string>
+    <string lang="zh-tw" key="REPAIRING_FS">正在試圖修正掛載為 %s 的 VeraCrypt 加密區的檔案系統...</string>
-    <string lang="zh-tw" key="WARN_CBC_MODE">警告：這個加密區是加密成 CBC 模式。因為安全性的問題，CBC 模式自從 VeraCrypt 4.1 版已經廢棄。\n\n我們強烈建議您將資料從這個 VeraCrypt 加密區移到這版 VeraCrypt 製成的新加密區。完成之後，您應該安全的消除或毀滅舊的加密區。要取得更多資訊，請參考文件裏的版本歷史或 VeraCrypt 4.1 或更新版的發行說明。</string>
     <string lang="zh-tw" key="WARN_64_BIT_BLOCK_CIPHER">警告：該加密區使用了被保留的加密演算法。\n\n所有 64 位元區塊加密演算法(Blowfish，CAST-128 和 Triple DES)已經逐漸不再被使用了。雖然該加密區在以後版本的 VeraCrypt 可能會被掛載。然而以後不會針對這些被保留演算法採取一些改善措施。我們建議您建立一個使用 128 位元區塊加密演算法的 Veracrypt 加密區(如：AES，Serpent，Twofish，等等)並把使用舊演算法的加密區裡面的檔案移動到新的加密區裡面去。</string>
     <string lang="zh-tw" key="SYS_AUTOMOUNT_DISABLED">您的系統未被設置為自動掛載新加密區。因此也不可能掛載磁碟機類型的加密區。自動卸載可以在執行下列命令後重啟系統來啟用。\n\n\nmountvol.exe /E</string>
     <string lang="zh-tw" key="SYS_ASSIGN_DRIVE_LETTER">請在繼續前為該磁碟機/磁碟分割區指定一個代號("控制台" &gt; "系統和維護" &gt; "管理工具" - "建立和格式化磁碟分割區")。\n\n要注意這些是作業系統所需要的。</string>
@@ -1067,7 +1077,7 @@
     <string lang="en" key="SYS_ENCRYPTION_UPGRADE_UNSUPPORTED_ON_VISTA_SP0">VeraCrypt no longer supports encryption of the system partition/drive on Windows Vista with no Service Pack installed. Before upgrading VeraCrypt, please install Service Pack 1 or higher for Windows Vista.</string>
     <string lang="en" key="FEATURE_REQUIRES_INSTALLATION">Error: This feature requires VeraCrypt to be installed on the system (you are running VeraCrypt in portable mode).\n\nPlease install VeraCrypt and then try again.</string>
     <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="zh-tw" key="GPT_BOOT_DRIVE_UNSUPPORTED">您的系統磁碟機具有 GUID 磁碟分割表(GPT)。目前，只支援有 MBR 的磁碟分割表。</string>
+    <string lang="en" key="GPT_BOOT_DRIVE_UNSUPPORTED">You are running a 32-bit Windows and your system drive has a GUID partition table (GPT). Currently, only Windows 64-bit is supported for GPT system encryption.</string>
     <string lang="zh-tw" key="TC_BOOT_LOADER_ALREADY_INSTALLED">小心：VeraCrypt 開機管理程式已經安裝到了您的系統磁碟機上！\n\n這可能在您的電腦上已經加密了另外一個系統。\n\n警告：繼續加密目前執行的系統可能會導致其他系統不可能啟動或導致資料無法存取。\n\n您確定要繼續嗎？</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' &gt; 'Restore original system loader') or Windows installation medium to replace the VeraCrypt Boot Loader with the Windows system loader.</string>
     <string lang="zh-tw" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">原來的系統開機管理程式將不會保存到救援磁碟上(可能原因：備份檔案遺失)</string>
@@ -1091,7 +1101,7 @@
     <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 medium (or using a service partition)?</string>
     <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 Hidden Volumes" in the VeraCrypt User's Guide.\n\nImportant: Before proceeding, please make sure you have read the section "Security Requirements and Precautions Pertaining to Hidden Volumes" in the VeraCrypt User's Guide.\n\n\nDoes the currently running operating system meet the above condition?</string>
     <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 from writing to the shared boot partition and from hibernating.\n\n\nDo you want to continue? If you select 'No', instructions for removing the extra boot partition will be displayed.</string>
-    <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' &gt; '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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
+    <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 so that the operating system can be installed to it.\n\n6) Click 'Apply' and 'OK'.\n\n7) Install Windows on the 'System Reserved' partition.\n\n\nShould an attacker ask why you removed the extra boot partition, you can answer that you wanted to prevent any possible data leaks to the unencrypted boot partition.\n\nNote: You can print this text by clicking the 'Print' button below. If you save a copy of this text or print it (strongly recommended, unless your printer stores copies of documents it prints on its internal drive), you should destroy any copies of it after removing the extra boot partition (otherwise, if such a copy was found, it might indicate that there is a hidden operating system on this computer).</string>
     <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="zh-tw" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">此演算法目前不支援系統加密。</string>
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
@@ -1106,8 +1116,8 @@
     <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 (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 starts.\n\n- The VRD will contain a backup of the present content of the first drive track (which typically contains a system loader or boot manager) and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ISO image will be created in the location specified below.</string>
     <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">The Rescue Disk image has been created and stored in this file:\n%s\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>
+    <string lang="en" key="RESCUE_DISK_BURN_INFO_NO_CHECK">The Rescue Disk image has been created and stored in this file:\n%s\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>
     <string lang="en" key="RESCUE_DISK_BURN_INFO_NONWIN_ISO_BURNER">IMPORTANT: Note that the file must be written to the CD/DVD as an ISO disk image (not as an individual file). For information on how to do so, please refer to the documentation of your CD/DVD recording software. If you do not have any CD/DVD recording software that can write the ISO disk image to a CD/DVD, click the link below to download such free software.\n\n</string>
     <string lang="en" key="LAUNCH_WIN_ISOBURN">Launch Microsoft Windows Disc Image Burner</string>
     <string lang="en" key="RESCUE_DISK_BURN_NO_CHECK_WARN">WARNING: If you already created a VeraCrypt Rescue Disk in the past, it cannot be reused for this system partition/drive because it was created for a different master key! Every time you encrypt a system partition/drive, you must create a new VeraCrypt Rescue Disk for it even if you use the same password.</string>
@@ -1245,7 +1255,7 @@
     <string lang="zh-tw" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">如果您遭遇任何前面描述的問題，先解密該分割區/磁碟機(如果它已經加密)並試著使用一種非串聯加密演算法對它再次加密(例如 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 system (but not on the decoy system), the decoy system would contain a VeraCrypt driver and VeraCrypt applications whose version numbers are different from the version number of the VeraCrypt Boot Loader. Such a discrepancy might indicate that there is a hidden operating system on this computer.\n\n\nDo you want to continue?</string>
     <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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' &gt; '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 loader will be updated too).\n\nIf you booted from the VeraCrypt Rescue Disk, you should update it ('System' > 'Create Rescue Disk').</string>
     <string lang="zh-tw" key="BOOT_LOADER_UPGRADE_OK">VeraCrypt 開機管理程式已經更新。\n\n強烈建議您建立一片新的 VeraCrypt 救援磁碟(那將包含新版的 VeraCrypt 開機管理程式)經由選擇 "系統" &gt; "建立救援磁碟" 在您重新啟動電腦之後。</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' &gt; 'Create Rescue Disk'.</string>
     <string lang="zh-tw" key="BOOT_LOADER_UPGRADE_FAILED">更新 VeraCrypt 開機管理程式失敗。</string>
@@ -1270,7 +1280,7 @@
     <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' &gt; '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>
@@ -1295,8 +1305,8 @@
     <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 system.</string>
     <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' &gt; 'Performance' and enable 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' &gt; 'Performance' and disable 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>
@@ -1370,6 +1380,39 @@
     <string lang="zh-tw" key="TB_PER_SEC">TB/s</string>
     <string lang="zh-tw" key="PB_PER_SEC">PB/s</string>
     <string lang="en" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</string>
+    <control lang="en" key="IDC_BOOT_LOADER_CACHE_PIM">Include &amp;PIM when caching pre-boot authentication password</control>
+    <control lang="en" key="IDC_PREF_CACHE_PIM">Include PIM when caching a password</control>
+    <control lang="en" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Make disconnected network drives available for mounting</control>
+    <string lang="en" key="PASSWORD_UTF8_TOO_LONG">The entered password is too long: its UTF-8 representation exceeds 64 bytes.</string>
+    <string lang="en" key="PASSWORD_UTF8_INVALID">The entered password contains Unicode characters that couldn't be converted to UTF-8 representation.</string>
+    <string lang="en" key="INIT_DLL">Error: Failed to load a system library.</string>
+    <string lang="en" key="ERR_EXFAT_INVALID_VOLUME_SIZE">The volume file size specified in the command line is incompatible with selected exFAT filesystem.</string>
+    <control lang="en" key="IDT_ENTROPY_BAR">Randomness Collected From Mouse Movements</control>
+    <control lang="en" key="IDT_VOLUME_ID">Volume ID:</control>
+    <string lang="en" key="VOLUME_ID">Volume ID</string>
+    <control lang="en" key="IDC_FAVORITE_USE_VOLUME_ID">Use Volume ID to mount favorite</control>
+    <string lang="en" key="VOLUME_ID_INVALID">The Volume ID value is invalid</string>
+    <string lang="en" key="VOLUME_ID_NOT_FOUND">No Volume with the specified ID was found on the system</string>
+    <string lang="en" key="IDPM_COPY_VALUE_TO_CLIPBOARD">Copy Value to Clipboard...</string>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
+    <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
+    <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
+    <control lang="en" key="IDC_HIDE_WAITING_DIALOG">Don't show wait message dialog when performing operations</control>
+    <control lang="en" key="IDC_DISABLE_BOOT_LOADER_HASH_PROMPT">Do not request Hash algorithm in the pre-boot authentication screen</control>
+    <string lang="en" key="GOST89_HELP">The GOST block cipher, defined in the standard GOST 28147-89 under name Magma, is a Soviet and Russian government standard symmetric key block cipher.\n\nDeveloped in the 1970s, the standard had been marked "Top Secret" and then downgraded to "Secret" in 1990. It was a Soviet alternative to the United States standard algorithm, DES.</string>
+    <string lang="en" key="KUZNYECHIK_HELP">Kuznyechik is a block cipher first published in 2015 and defined in the National Standard of the Russian Federation GOST R 34.12-2015 and also in RFC 7801. 256-bit key, 128-bit block. Mode of operation is XTS.</string>
+    <string lang="en" key="CAMELLIA_HELP">Jointly developed by Mitsubishi Electric and NTT of Japan. First published on 2000. 256-bit key, 128-bit block. Mode of operation is XTS. It has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.</string>
+    <string lang="en" key="TIME">Time</string>
+    <string lang="en" key="ITERATIONS">Iterations</string>
+    <string lang="en" key="PRE-BOOT">Pre-Boot</string>
+    <string lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, 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 before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</string>
+    <string lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted 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 be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP 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 a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</string>
+    <string lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CREATION">The Rescue Disk image has been created and stored in this file:\n%s\n\nNow you need to extract the Rescue Disk image to a USB stick that is formatted as FAT/FAT32.\n\nIMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\nAfter you create the Rescue Disk, select 'System' > 'Verify Rescue Disk' to verify that it has been correctly created.</string>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">

src/Boot/EFI/Readme.txt

@@ -0,0 +1,35 @@
+The source code for VeraCrypt EFI bootloader files is available at: https://github.com/veracrypt/VeraCrypt-DCS
+Use tag "VeraCrypt_1.18" to extract the sources that were used when building VeraCrypt 1.18.
+
+VeraCrypt-DCS uses EDK II as its UEFI development environement.
+
+VeraCrypt-DCS is licensed under LGPL: https://github.com/veracrypt/VeraCrypt-DCS/blob/master/LICENSE
+
+Here the steps to build VeraCrypt-DCS (Visual Studio 2010 SP1 should be installed)
+  * Clone EDK: git clone https://github.com/tianocore/tianocore.github.io.git edk2
+  * Switch to UDK2015 branche: git checkout UDK2015
+  * Clone VeraCrypt-DCS as DcsPkg inside edk2 folder: git clone https://github.com/veracrypt/VeraCrypt-DCS.git DcsPkg 
+  * Switch to VeraCrypt_1.18 branche: git checkout VeraCrypt_1.18
+  * Setup EDK by typing edksetup.bat at the root of folder edk2
+  * change directoty to DcsPkg and then type setenv.bat.
+  * change directory to DcsPkg\Library\VeraCryptLib and then type mklinks_src.bat: you will be asked to provide the path to VeraCrypt src folder.
+  * change directory to DcsPkg and then type dcs_bld.bat X64Rel
+  * After the build is finished, EFI bootloader files will be present at edk2\Build\DcsPkg\RELEASE_VS2010x86\X64
+  
+Secure Boot:
+In order to allow VeraCrypt EFI bootloader to run when EFI Secure Boot is enabled, VeraCrypt EFI bootloader files are signed
+using a custom key whose public part can be loader into Secure Boot to allow the verification of VeraCrypt EFI files.
+
+below are instruction to update Secure Boot configuration:
+1. Enter BIOS configuration
+2. Switch Secure boot to setup mode (or custom mode). It deletes PK (platform certificate) and allows to load DCS platform key.
+3. Boot Windows
+4. execute from admin command prompt
+   powershell -File sb_set_siglists.ps1
+It sets in PK (platform key) - DCS_platform
+It sets in KEK (key exchange key) - DCS_key_exchange
+It sets in db - DCS_sign MicWinProPCA2011_2011-10-19 MicCorUEFCA2011_2011-06-27 
+
+All DCS modules are protected by DCS_sign. 
+All Windows modules are protected by MicWinProPCA2011_2011-10-19
+All SHIM(linux) modules are protected by MicCorUEFCA2011_2011-06-27 

src/Boot/EFI/certs/Readme.txt

@@ -0,0 +1,3 @@
+Apart from DCS certificates, there are two public DB entries - one for Windows and one for the UEFI Certificate Authority (CA).
+Windows DB: http://www.microsoft.com/pkiops/certs/MicWinProPCA2011_2011-10-19.crt
+UEFI DB: http://www.microsoft.com/pkiops/certs/MicCorUEFCA2011_2011-06-27.crt 

src/Boot/EFI/sb_set_siglists.ps1

@@ -0,0 +1,22 @@
+Set-ExecutionPolicy Bypass -Force
+Import-Module secureboot
+
+Set-SecureBootUEFI -Name PK -Time 2015-09-11 -Content $null
+Set-SecureBootUEFI -Name KEK -Time 2015-09-11 -Content $null
+Set-SecureBootUEFI -Name db -Time 2015-09-11 -Content $null
+Set-SecureBootUEFI -Name dbx -Time 2015-09-11 -Content $null
+
+Write-Host "Setting self-signed PK..."
+Set-SecureBootUEFI -Time 2016-08-08T00:00:00Z -ContentFilePath siglists\DCS_platform_SigList.bin -SignedFilePath siglists\DCS_platform_SigList_Serialization.bin.p7 -Name PK
+
+Write-Host "Setting PK-signed KEK..."
+Set-SecureBootUEFI -Time 2016-08-08T00:00:00Z -ContentFilePath siglists\DCS_key_exchange_SigList.bin -SignedFilePath siglists\DCS_key_exchange_SigList_Serialization.bin.p7 -Name KEK
+
+Write-Host "Setting KEK-signed DCS cert in db..."
+Set-SecureBootUEFI -Time 2016-08-08T00:00:00Z -ContentFilePath siglists\DCS_sign_SigList.bin -SignedFilePath siglists\DCS_sign_SigList_Serialization.bin.p7 -Name db
+
+Write-Host "Setting KEK-signed MS cert in db..."
+Set-SecureBootUEFI -Time 2016-08-08T00:00:00Z -ContentFilePath siglists\MicWinProPCA2011_2011-10-19_SigList.bin -SignedFilePath siglists\MicWinProPCA2011_2011-10-19_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true
+
+Write-Host "Setting KEK-signed MS UEFI cert in db..."
+Set-SecureBootUEFI -Time 2016-08-08T00:00:00Z -ContentFilePath siglists\MicCorUEFCA2011_2011-06-27_SigList.bin -SignedFilePath siglists\MicCorUEFCA2011_2011-06-27_SigList_Serialization.bin.p7 -Name db -AppendWrite:$true

src/Boot/Windows/Bios.h

@@ -4,7 +4,7 @@
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.

src/Boot/Windows/Boot.vcproj

@@ -24,9 +24,9 @@
 			>
 			<Tool
 				Name="VCNMakeTool"
-				BuildCommandLine="md Release 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1&#x0D;&#x0A;&#x0D;&#x0A;md Release_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;md Release_AES 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES&#x0D;&#x0A;&#x0D;&#x0A;md Release_AES_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;md Release_Serpent 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT&#x0D;&#x0A;&#x0D;&#x0A;md Release_Serpent_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;md Release_Twofish 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH&#x0D;&#x0A;&#x0D;&#x0A;md Release_Twofish_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;md Rescue 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 RESCUE_DISK=1&#x0D;&#x0A;&#x0D;&#x0A;md Rescue_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 RESCUE_DISK=1 SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;md Rescue_AES 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES RESCUE_DISK=1&#x0D;&#x0A;&#x0D;&#x0A;md Rescue_AES_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES RESCUE_DISK=1 SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;md Rescue_Serpent 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT RESCUE_DISK=1&#x0D;&#x0A;&#x0D;&#x0A;md Rescue_Serpent_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT RESCUE_DISK=1 SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;md Rescue_Twofish 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH RESCUE_DISK=1&#x0D;&#x0A;&#x0D;&#x0A;md Rescue_Twofish_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH RESCUE_DISK=1 SINGLE_PRF=SHA2"
+				BuildCommandLine="md Release 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1&#x0D;&#x0A;&#x0D;&#x0A;md Release_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;md Release_AES 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES&#x0D;&#x0A;&#x0D;&#x0A;md Release_AES_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;md Release_Serpent 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT&#x0D;&#x0A;&#x0D;&#x0A;md Release_Serpent_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;md Release_Twofish 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH&#x0D;&#x0A;&#x0D;&#x0A;md Release_Twofish_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;md Release_Camellia 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA&#x0D;&#x0A;&#x0D;&#x0A;md Release_Camellia_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;md Rescue 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 RESCUE_DISK=1&#x0D;&#x0A;&#x0D;&#x0A;md Rescue_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 RESCUE_DISK=1 SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;md Rescue_AES 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES RESCUE_DISK=1&#x0D;&#x0A;&#x0D;&#x0A;md Rescue_AES_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES RESCUE_DISK=1 SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;md Rescue_Serpent 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT RESCUE_DISK=1&#x0D;&#x0A;&#x0D;&#x0A;md Rescue_Serpent_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT RESCUE_DISK=1 SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;md Rescue_Twofish 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH RESCUE_DISK=1&#x0D;&#x0A;&#x0D;&#x0A;md Rescue_Twofish_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH RESCUE_DISK=1 SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;md Rescue_Camellia 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA RESCUE_DISK=1&#x0D;&#x0A;&#x0D;&#x0A;md Rescue_Camellia_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA RESCUE_DISK=1 SINGLE_PRF=SHA2"
-				ReBuildCommandLine="del /q /s Release &gt;NUL:&#x0D;&#x0A;md Release 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Release_SHA2 &gt;NUL:&#x0D;&#x0A;md Release_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Release_AES &gt;NUL:&#x0D;&#x0A;md Release_AES 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Release_AES_SHA2 &gt;NUL:&#x0D;&#x0A;md Release_AES_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Release_Serpent &gt;NUL:&#x0D;&#x0A;md Release_Serpent 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Release_Serpent_SHA2 &gt;NUL:&#x0D;&#x0A;md Release_Serpent_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Release_Twofish &gt;NUL:&#x0D;&#x0A;md Release_Twofish 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Release_Twofish_SHA2 &gt;NUL:&#x0D;&#x0A;md Release_Twofish_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Rescue &gt;NUL:&#x0D;&#x0A;md Rescue 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 RESCUE_DISK=1&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Rescue_SHA2 &gt;NUL:&#x0D;&#x0A;md Rescue_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 RESCUE_DISK=1 SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Rescue_AES &gt;NUL:&#x0D;&#x0A;md Rescue_AES 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES RESCUE_DISK=1&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Rescue_AES_SHA2 &gt;NUL:&#x0D;&#x0A;md Rescue_AES_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES RESCUE_DISK=1 SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Rescue_Serpent &gt;NUL:&#x0D;&#x0A;md Rescue_Serpent 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT RESCUE_DISK=1&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Rescue_Serpent_SHA2 &gt;NUL:&#x0D;&#x0A;md Rescue_Serpent_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT RESCUE_DISK=1 SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Rescue_Twofish &gt;NUL:&#x0D;&#x0A;md Rescue_Twofish 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH RESCUE_DISK=1&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Rescue_Twofish_SHA2 &gt;NUL:&#x0D;&#x0A;md Rescue_Twofish_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH RESCUE_DISK=1 SINGLE_PRF=SHA2"
+				ReBuildCommandLine="del /q /s Release &gt;NUL:&#x0D;&#x0A;md Release 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Release_SHA2 &gt;NUL:&#x0D;&#x0A;md Release_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Release_AES &gt;NUL:&#x0D;&#x0A;md Release_AES 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Release_AES_SHA2 &gt;NUL:&#x0D;&#x0A;md Release_AES_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Release_Serpent &gt;NUL:&#x0D;&#x0A;md Release_Serpent 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Release_Serpent_SHA2 &gt;NUL:&#x0D;&#x0A;md Release_Serpent_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Release_Twofish &gt;NUL:&#x0D;&#x0A;md Release_Twofish 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Release_Twofish_SHA2 &gt;NUL:&#x0D;&#x0A;md Release_Twofish_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Release_Camellia &gt;NUL:&#x0D;&#x0A;md Release_Camellia 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Release_Camellia_SHA2 &gt;NUL:&#x0D;&#x0A;md Release_Camellia_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Rescue &gt;NUL:&#x0D;&#x0A;md Rescue 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 RESCUE_DISK=1&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Rescue_SHA2 &gt;NUL:&#x0D;&#x0A;md Rescue_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 RESCUE_DISK=1 SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Rescue_AES &gt;NUL:&#x0D;&#x0A;md Rescue_AES 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES RESCUE_DISK=1&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Rescue_AES_SHA2 &gt;NUL:&#x0D;&#x0A;md Rescue_AES_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES RESCUE_DISK=1 SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Rescue_Serpent &gt;NUL:&#x0D;&#x0A;md Rescue_Serpent 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT RESCUE_DISK=1&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Rescue_Serpent_SHA2 &gt;NUL:&#x0D;&#x0A;md Rescue_Serpent_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT RESCUE_DISK=1 SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Rescue_Twofish &gt;NUL:&#x0D;&#x0A;md Rescue_Twofish 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH RESCUE_DISK=1&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Rescue_Twofish_SHA2 &gt;NUL:&#x0D;&#x0A;md Rescue_Twofish_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH RESCUE_DISK=1 SINGLE_PRF=SHA2&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Rescue_Camellia &gt;NUL:&#x0D;&#x0A;md Rescue_Camellia 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA RESCUE_DISK=1&#x0D;&#x0A;&#x0D;&#x0A;del /q /s Rescue_Camellia_SHA2 &gt;NUL:&#x0D;&#x0A;md Rescue_Camellia_SHA2 2&gt;NUL:&#x0D;&#x0A;nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA RESCUE_DISK=1 SINGLE_PRF=SHA2"
-				CleanCommandLine="del /q /s Release Release_AES Release_Serpent Release_Twofish Rescue Rescue_AES Rescue_Serpent Rescue_Twofish &gt;NUL:&#x0D;&#x0A;del /q /s Release_SHA2 Release_AES_SHA2 Release_Serpent_SHA2 Release_Twofish_SHA2 Rescue_SHA2 Rescue_AES_SHA2 Rescue_Serpent_SHA2 Rescue_Twofish_SHA2 &gt;NUL:&#x0D;&#x0A;"
+				CleanCommandLine="del /q /s Release Release_AES Release_Serpent Release_Twofish Release_Camellia Rescue Rescue_AES Rescue_Serpent Rescue_Twofish Rescue_Camellia &gt;NUL:&#x0D;&#x0A;del /q /s Release_SHA2 Release_AES_SHA2 Release_Serpent_SHA2 Release_Twofish_SHA2 Release_Camellia_SHA2 Rescue_SHA2 Rescue_AES_SHA2 Rescue_Serpent_SHA2 Rescue_Twofish_SHA2 Rescue_Camellia_SHA2 &gt;NUL:&#x0D;&#x0A;"
 				Output="Release\BootLoader.com"
 				PreprocessorDefinitions="WIN32;NDEBUG"
 				IncludeSearchPath="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)\Common&quot;;&quot;$(SolutionDir)\Crypto&quot;;&quot;$(MSVC16_ROOT)\Include&quot;"
@@ -156,6 +156,10 @@
 					RelativePath="..\..\Crypto\AesSmall_x86.asm"
 					>
 				</File>
+				<File
+					RelativePath="..\..\Crypto\CamelliaSmall.c"
+					>
+				</File>
 				<File
 					RelativePath="..\..\Crypto\Rmd160.c"
 					>

src/Boot/Windows/Boot.vcxproj

@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Release Loader|Win32">
+      <Configuration>Release Loader</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{8B7F059F-E4C7-4E11-88F5-EE8B8433072E}</ProjectGuid>
+    <RootNamespace>Boot</RootNamespace>
+    <Keyword>MakeFileProj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Loader|Win32'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Loader|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">md Release 2&gt;NUL:
+nmake.exe /nologo RELEASE=1
+
+md Release_SHA2 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_PRF=SHA2
+
+md Release_AES 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES
+
+md Release_AES_SHA2 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES SINGLE_PRF=SHA2
+
+md Release_Serpent 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT
+
+md Release_Serpent_SHA2 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT SINGLE_PRF=SHA2
+
+md Release_Twofish 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH
+
+md Release_Twofish_SHA2 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH SINGLE_PRF=SHA2
+
+md Release_Camellia 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA
+
+md Release_Camellia_SHA2 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA SINGLE_PRF=SHA2
+
+md Rescue 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 RESCUE_DISK=1
+
+md Rescue_SHA2 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 RESCUE_DISK=1 SINGLE_PRF=SHA2
+
+md Rescue_AES 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES RESCUE_DISK=1
+
+md Rescue_AES_SHA2 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES RESCUE_DISK=1 SINGLE_PRF=SHA2
+
+md Rescue_Serpent 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT RESCUE_DISK=1
+
+md Rescue_Serpent_SHA2 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT RESCUE_DISK=1 SINGLE_PRF=SHA2
+
+md Rescue_Twofish 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH RESCUE_DISK=1
+
+md Rescue_Twofish_SHA2 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH RESCUE_DISK=1 SINGLE_PRF=SHA2
+
+md Rescue_Camellia 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA RESCUE_DISK=1
+
+md Rescue_Camellia_SHA2 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA RESCUE_DISK=1 SINGLE_PRF=SHA2</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">del /q /s Release &gt;NUL:
+md Release 2&gt;NUL:
+nmake.exe /nologo RELEASE=1
+
+del /q /s Release_SHA2 &gt;NUL:
+md Release_SHA2 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_PRF=SHA2
+
+del /q /s Release_AES &gt;NUL:
+md Release_AES 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES
+
+del /q /s Release_AES_SHA2 &gt;NUL:
+md Release_AES_SHA2 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES SINGLE_PRF=SHA2
+
+del /q /s Release_Serpent &gt;NUL:
+md Release_Serpent 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT
+
+del /q /s Release_Serpent_SHA2 &gt;NUL:
+md Release_Serpent_SHA2 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT SINGLE_PRF=SHA2
+
+del /q /s Release_Twofish &gt;NUL:
+md Release_Twofish 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH
+
+del /q /s Release_Twofish_SHA2 &gt;NUL:
+md Release_Twofish_SHA2 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH SINGLE_PRF=SHA2
+
+del /q /s Release_Camellia &gt;NUL:
+md Release_Camellia 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA
+
+del /q /s Release_Camellia_SHA2 &gt;NUL:
+md Release_Camellia_SHA2 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA SINGLE_PRF=SHA2
+
+del /q /s Rescue &gt;NUL:
+md Rescue 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 RESCUE_DISK=1
+
+del /q /s Rescue_SHA2 &gt;NUL:
+md Rescue_SHA2 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 RESCUE_DISK=1 SINGLE_PRF=SHA2
+
+del /q /s Rescue_AES &gt;NUL:
+md Rescue_AES 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES RESCUE_DISK=1
+
+del /q /s Rescue_AES_SHA2 &gt;NUL:
+md Rescue_AES_SHA2 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES RESCUE_DISK=1 SINGLE_PRF=SHA2
+
+del /q /s Rescue_Serpent &gt;NUL:
+md Rescue_Serpent 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT RESCUE_DISK=1
+
+del /q /s Rescue_Serpent_SHA2 &gt;NUL:
+md Rescue_Serpent_SHA2 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT RESCUE_DISK=1 SINGLE_PRF=SHA2
+
+del /q /s Rescue_Twofish &gt;NUL:
+md Rescue_Twofish 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH RESCUE_DISK=1
+
+del /q /s Rescue_Twofish_SHA2 &gt;NUL:
+md Rescue_Twofish_SHA2 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH RESCUE_DISK=1 SINGLE_PRF=SHA2
+
+del /q /s Rescue_Camellia &gt;NUL:
+md Rescue_Camellia 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA RESCUE_DISK=1
+
+del /q /s Rescue_Camellia_SHA2 &gt;NUL:
+md Rescue_Camellia_SHA2 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA RESCUE_DISK=1 SINGLE_PRF=SHA2</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">del /q /s Release Release_AES Release_Serpent Release_Twofish Release_Camellia Rescue Rescue_AES Rescue_Serpent Rescue_Twofish Rescue_Camellia &gt;NUL:
+del /q /s Release_SHA2 Release_AES_SHA2 Release_Serpent_SHA2 Release_Twofish_SHA2 Release_Camellia_SHA2 Rescue_SHA2 Rescue_AES_SHA2 Rescue_Serpent_SHA2 Rescue_Twofish_SHA2 Rescue_Camellia_SHA2 &gt;NUL:
+</NMakeCleanCommandLine>
+    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\BootLoader.com</NMakeOutput>
+    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir);$(SolutionDir)\Common;$(SolutionDir)\Crypto;$(MSVC16_ROOT)\Include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
+    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
+    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
+    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Loader|Win32'">$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Loader|Win32'">$(Configuration)\</IntDir>
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release Loader|Win32'">md Release 2&gt;NUL:
+nmake.exe /nologo RELEASE=1
+
+md Release_AES 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES
+
+md Release_Serpent 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT
+
+md Release_Twofish 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release Loader|Win32'">del /q /s Release &gt;NUL:
+md Release 2&gt;NUL:
+nmake.exe /nologo RELEASE=1
+
+del /q /s Release_AES &gt;NUL:
+md Release_AES 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES
+
+del /q /s Release_Serpent &gt;NUL:
+md Release_Serpent 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT
+
+del /q /s Release_Twofish &gt;NUL:
+md Release_Twofish 2&gt;NUL:
+nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release Loader|Win32'">del /q /s Release Release_AES Release_Serpent Release_Twofish &gt;NUL:</NMakeCleanCommandLine>
+    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release Loader|Win32'">Release\BootLoader.com</NMakeOutput>
+    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Loader|Win32'">WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release Loader|Win32'">$(SolutionDir);$(SolutionDir)\Common;$(SolutionDir)\Crypto;$(MSVC16_ROOT)\Include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
+    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Release Loader|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
+    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Release Loader|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
+    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Loader|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="BootConfig.cpp" />
+    <ClCompile Include="BootConsoleIo.cpp" />
+    <ClCompile Include="BootDebug.cpp" />
+    <ClCompile Include="BootDiskIo.cpp" />
+    <ClCompile Include="BootEncryptedIo.cpp" />
+    <ClCompile Include="BootMain.cpp" />
+    <ClCompile Include="BootMemory.cpp" />
+    <ClCompile Include="Decompressor.c" />
+    <ClCompile Include="IntFilter.cpp" />
+    <ClCompile Include="Platform.cpp" />
+    <ClCompile Include="..\..\Common\Crc.c" />
+    <ClCompile Include="..\..\Common\Crypto.c" />
+    <ClCompile Include="..\..\Common\Endian.c" />
+    <ClCompile Include="..\..\Common\Pkcs5.c" />
+    <ClCompile Include="..\..\Common\Volumes.c" />
+    <ClCompile Include="..\..\Common\Xts.c" />
+    <ClCompile Include="..\..\Crypto\AesSmall.c" />
+    <ClCompile Include="..\..\Crypto\CamelliaSmall.c" />
+    <ClCompile Include="..\..\Crypto\Rmd160.c" />
+    <ClCompile Include="..\..\Crypto\Serpent.c" />
+    <ClCompile Include="..\..\Crypto\Sha2Small.c" />
+    <ClCompile Include="..\..\Crypto\Twofish.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="BootCrt.asm" />
+    <None Include="BootSector.asm" />
+    <None Include="..\..\Crypto\Aes_hw_cpu.asm" />
+    <None Include="..\..\Crypto\AesSmall_x86.asm" />
+    <None Include="Makefile" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Bios.h" />
+    <ClInclude Include="BootCommon.h" />
+    <ClInclude Include="BootConfig.h" />
+    <ClInclude Include="BootConsoleIo.h" />
+    <ClInclude Include="BootDebug.h" />
+    <ClInclude Include="BootDefs.h" />
+    <ClInclude Include="BootDiskIo.h" />
+    <ClInclude Include="BootEncryptedIo.h" />
+    <ClInclude Include="BootMain.h" />
+    <ClInclude Include="BootMemory.h" />
+    <ClInclude Include="BootStrings.h" />
+    <ClInclude Include="IntFilter.h" />
+    <ClInclude Include="Platform.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

src/Boot/Windows/Boot.vcxproj.filters

@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Common">
+      <UniqueIdentifier>{851ac58e-36e0-4dfa-a208-6da2330f5959}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Crypto">
+      <UniqueIdentifier>{76da5bdb-fe11-430a-8667-2fe7f9ac3667}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Build Files">
+      <UniqueIdentifier>{732efef1-4474-4845-aa74-17b852cc0f2e}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="BootConfig.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="BootConsoleIo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="BootDebug.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="BootDiskIo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="BootEncryptedIo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="BootMain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="BootMemory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Decompressor.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="IntFilter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Platform.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\Crc.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\Crypto.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\Endian.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\Pkcs5.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\Volumes.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\Xts.c">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Crypto\AesSmall.c">
+      <Filter>Source Files\Crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Crypto\CamelliaSmall.c">
+      <Filter>Source Files\Crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Crypto\Rmd160.c">
+      <Filter>Source Files\Crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Crypto\Serpent.c">
+      <Filter>Source Files\Crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Crypto\Sha2Small.c">
+      <Filter>Source Files\Crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Crypto\Twofish.c">
+      <Filter>Source Files\Crypto</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="BootCrt.asm">
+      <Filter>Source Files</Filter>
+    </None>
+    <None Include="BootSector.asm">
+      <Filter>Source Files</Filter>
+    </None>
+    <None Include="..\..\Crypto\Aes_hw_cpu.asm">
+      <Filter>Source Files\Crypto</Filter>
+    </None>
+    <None Include="..\..\Crypto\AesSmall_x86.asm">
+      <Filter>Source Files\Crypto</Filter>
+    </None>
+    <None Include="Makefile">
+      <Filter>Build Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Bios.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="BootCommon.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="BootConfig.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="BootConsoleIo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="BootDebug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="BootDefs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="BootDiskIo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="BootEncryptedIo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="BootMain.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="BootMemory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="BootStrings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="IntFilter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Platform.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>

src/Boot/Windows/Boot.vcxproj.user

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>

src/Boot/Windows/BootCommon.h

@@ -4,7 +4,7 @@
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file) 
- and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.
@@ -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 0x0113
+#define TC_RESCUE_DISK_UPGRADE_NOTICE_MAX_VERSION 0x0117
 
 #define TC_BOOT_LOADER_AREA_SIZE (TC_BOOT_LOADER_AREA_SECTOR_COUNT * TC_SECTOR_SIZE_BIOS)
 
@@ -78,5 +78,137 @@ typedef struct
 #define TC_SET_BOOT_ARGUMENTS_SIGNATURE(SG) do { SG[0]  = 'T';   SG[1]  = 'R';   SG[2]  = 'U';   SG[3]  = 'E';   SG[4]  = 0x11;   SG[5]  = 0x23;   SG[6]  = 0x45;   SG[7]  = 0x66; } while (FALSE)
 #define TC_IS_BOOT_ARGUMENTS_SIGNATURE(SG)      (SG[0] == 'T' && SG[1] == 'R' && SG[2] == 'U' && SG[3] == 'E' && SG[4] == 0x11 && SG[5] == 0x23 && SG[6] == 0x45 && SG[7] == 0x66)
 
+#if defined(_MSC_VER) && !defined(TC_WINDOWS_BOOT)
+
+#define DCS_DISK_ENTRY_LIST_HEADER_SIGN      SIGNATURE_64 ('D','C','S','D','E','L','S','T')
+
+#define DE_IDX_CRYPTOHEADER  0
+#define DE_IDX_LIST          1
+#define DE_IDX_DISKID        2
+#define DE_IDX_MAINGPTHDR    3
+#define DE_IDX_MAINGPTENTRYS 4
+#define DE_IDX_ALTGPTHDR     5
+#define DE_IDX_ALTGPTENTRYS  6
+#define DE_IDX_EXEC          7
+#define DE_IDX_PWDCACHE      8
+#define DE_IDX_RND           9
+#define DE_IDX_TOTAL         10
+static_assert(DE_IDX_TOTAL <= 15, "DE_IDX_TOTAL too big");
+
+enum DcsDiskEntryTypes {
+	DE_Unused = 0,
+	DE_Sectors,
+	DE_List,
+	DE_DISKID,
+	DE_ExecParams,
+	DE_PwdCache,
+	DE_Rnd
+};
+
+#pragma pack(1)
+typedef struct _SECREGION_BOOT_PARAMS {
+	uint64               Ptr;
+	uint32               Size;
+	uint32               Crc;
+} SECREGION_BOOT_PARAMS;
+
+typedef struct {
+	uint32  Data1;
+	uint16  Data2;
+	uint16  Data3;
+	byte    Data4[8];
+} DCS_GUID;
+
+// DE types
+typedef struct _DCS_DISK_ENTRY_SECTORS {
+	uint32      Type;
+	uint32      Offset; // Offset in memory
+	uint64      Reserved;
+	uint64      Start;  // Start on disk (byte)
+	uint64      Length; // length on disk (byte)
+} DCS_DISK_ENTRY_SECTORS;
+static_assert(sizeof(DCS_DISK_ENTRY_SECTORS) ==	32, "Wrong size DCS_DISK_ENTRY_SECTORS");
+
+typedef struct _DCS_DISK_ENTRY_PARAMS {
+	uint32      Type;
+	uint32      Offset;
+	uint64      Reserved[2];
+	uint64      Length;           // size of data
+} DCS_DISK_ENTRY_PARAMS;
+static_assert(sizeof(DCS_DISK_ENTRY_PARAMS) == 32, "Wrong size DCS_DISK_ENTRY_PARAMS");
+
+typedef struct _DCS_DISK_ENTRY_DISKID {
+	uint32      Type;
+	uint32      MbrID;
+	uint64      ReservedDiskId;
+	DCS_GUID    GptID;
+} DCS_DISK_ENTRY_DISKID;
+static_assert(sizeof(DCS_DISK_ENTRY_DISKID) == 32, "Wrong size DCS_DISK_ENTRY_DISKID");
+
+#pragma warning(disable:4201)
+typedef struct _DCS_DISK_ENTRY {
+	union {
+		struct {
+			uint32      Type;
+			uint32      Offset;
+			byte        reserved[16];
+			uint64      Length;           // size of structure at Offset
+		};
+		DCS_DISK_ENTRY_SECTORS Sectors;
+		DCS_DISK_ENTRY_DISKID  DiskId;
+		DCS_DISK_ENTRY_PARAMS  Prm;
+	};
+} DCS_DISK_ENTRY;
+#pragma warning(default:4201)
+static_assert(sizeof(DCS_DISK_ENTRY) == 32, "Wrong size DCS_DISK_ENTRY");
+
+// Static compile time checks field offsets
+#ifndef FIELD_OFFSET
+#define FIELD_OFFSET(t, f) ((UINTN)(&((t*)0)->f))
+#endif
+static_assert(FIELD_OFFSET(DCS_DISK_ENTRY, Type)   == FIELD_OFFSET(DCS_DISK_ENTRY_SECTORS, Type), "Wrong Type offset");
+static_assert(FIELD_OFFSET(DCS_DISK_ENTRY, Type)   == FIELD_OFFSET(DCS_DISK_ENTRY_DISKID,  Type), "Wrong Type offset");
+static_assert(FIELD_OFFSET(DCS_DISK_ENTRY, Type)   == FIELD_OFFSET(DCS_DISK_ENTRY_PARAMS,  Type), "Wrong Type offset");
+static_assert(FIELD_OFFSET(DCS_DISK_ENTRY, Length) == FIELD_OFFSET(DCS_DISK_ENTRY_SECTORS, Length), "Wrong Length offset");
+static_assert(FIELD_OFFSET(DCS_DISK_ENTRY, Length) == FIELD_OFFSET(DCS_DISK_ENTRY_PARAMS,  Length), "Wrong Length offset");
+static_assert(FIELD_OFFSET(DCS_DISK_ENTRY, Offset) == FIELD_OFFSET(DCS_DISK_ENTRY_SECTORS, Offset), "Wrong Offset offset");
+static_assert(FIELD_OFFSET(DCS_DISK_ENTRY, Offset) == FIELD_OFFSET(DCS_DISK_ENTRY_PARAMS,  Offset), "Wrong Offset offset");
+
+// DE type specific data 
+// DE List
+typedef struct _DCS_DISK_ENTRY_LIST {
+	//	EFI_TABLE_HEADER
+	uint64  Signature;
+	uint32  Revision;
+	uint32  HeaderSize;	//< The size, in bytes, of the entire table including the EFI_TABLE_HEADER.
+	uint32  CRC32;       //< The 32-bit CRC for the entire table. This value is computed by setting this field to 0, and computing the 32-bit CRC for HeaderSize bytes.
+	uint32  Reserved; 	//< Reserved field that must be set to 0.
+								//
+	uint32  Count;
+	uint32  DataSize;
+	//
+	DCS_DISK_ENTRY  DE[15];
+} DCS_DISK_ENTRY_LIST;
+static_assert(sizeof(DCS_DISK_ENTRY_LIST) == 512, "Wrong size DCS_DISK_ENTRY_LIST");
+
+typedef struct _DCS_DEP_EXEC {
+	DCS_GUID     ExecPartGuid;
+	uint16       ExecCmd[248];
+} DCS_DEP_EXEC;
+static_assert(sizeof(DCS_DEP_EXEC) == 512, "Wrong size DCS_DEP_EXEC");
+
+#define DCS_DEP_PWD_CACHE_SIGN      SIGNATURE_64 ('P','W','D','C','A','C','H','E')
+typedef struct _DCS_DEP_PWD_CACHE {
+	uint64       Sign;
+	uint32       CRC;
+	uint32       Count;
+	Password     Pwd[4];
+	int32        Pim[4];
+	byte         pad[512 - 8 - 4 - 4 - (sizeof(Password) + 4) * 4];
+} DCS_DEP_PWD_CACHE;
+static_assert(sizeof(DCS_DEP_PWD_CACHE) == 512, "Wrong size DCS_DEP_PWD_CACHE");
+#pragma pack()
+
+#endif // #if !defined(TC_WINDOWS_BOOT)
 
 #endif // TC_HEADER_Boot_BootCommon

src/Boot/Windows/BootConfig.cpp

@@ -4,7 +4,7 @@
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.
@@ -32,7 +32,7 @@ Partition EncryptedVirtualPartition;
 Partition ActivePartition;
 Partition PartitionFollowingActive;
 bool ExtraBootPartitionPresent = false;
-uint64 HiddenVolumeStartUnitNo;
+uint64 PimValueOrHiddenVolumeStartUnitNo; // reuse this variable for stored PIM value to reduce memory usage
 uint64 HiddenVolumeStartSector;
 
 #ifndef TC_WINDOWS_BOOT_RESCUE_DISK_MODE
@@ -68,6 +68,14 @@ void ReadBootSectorUserConfiguration ()
 		DisableScreenOutput();
 	}
 
+	if (userConfig & TC_BOOT_USER_CFG_FLAG_DISABLE_PIM)
+	{
+		PimValueOrHiddenVolumeStartUnitNo.LowPart = 0;
+		memcpy (&PimValueOrHiddenVolumeStartUnitNo.LowPart, SectorBuffer + TC_BOOT_SECTOR_PIM_VALUE_OFFSET, TC_BOOT_SECTOR_PIM_VALUE_SIZE);
+	}
+	else
+		PimValueOrHiddenVolumeStartUnitNo.LowPart = -1;
+
 	OuterVolumeBackupHeaderCrc = *(uint32 *) (SectorBuffer + TC_BOOT_SECTOR_OUTER_VOLUME_BAK_HEADER_CRC_OFFSET);
 
 ret:

src/Boot/Windows/BootConfig.h

@@ -4,7 +4,7 @@
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.
@@ -36,7 +36,7 @@ extern Partition EncryptedVirtualPartition;
 extern Partition ActivePartition;
 extern Partition PartitionFollowingActive;
 extern bool ExtraBootPartitionPresent;
-extern uint64 HiddenVolumeStartUnitNo;
+extern uint64 PimValueOrHiddenVolumeStartUnitNo; // reuse this variable for stored PIM value to reduce memory usage
 extern uint64 HiddenVolumeStartSector;
 
 

src/Boot/Windows/BootConsoleIo.cpp

@@ -4,7 +4,7 @@
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.

src/Boot/Windows/BootConsoleIo.h

@@ -4,7 +4,7 @@
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.

src/Boot/Windows/BootCrt.asm

@@ -4,7 +4,7 @@
 ; by the TrueCrypt License 3.0.
 ;
 ; Modifications and additions to the original source code (contained in this file)
-; and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+; and all other portions of this file are Copyright (c) 2013-2016 IDRIX
 ; and are governed by the Apache License 2.0 the full text of which is
 ; contained in the file License.txt included in VeraCrypt binary and source
 ; code distribution packages.

src/Boot/Windows/BootDebug.cpp

@@ -4,7 +4,7 @@
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.

src/Boot/Windows/BootDebug.h

@@ -4,7 +4,7 @@
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.

src/Boot/Windows/BootDefs.h

@@ -4,7 +4,7 @@
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.
@@ -14,25 +14,23 @@
 #define TC_HEADER_Boot_BootDefs
 
 // Total memory required (CODE + DATA + BSS + STACK + 0x100) in KBytes - determined from linker map.
-#ifdef TC_WINDOWS_BOOT_RESCUE_DISK_MODE
+#define TC__BOOT_MEMORY_REQUIRED	43
-	#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
 
 #	ifdef TC_WINDOWS_BOOT_AES
 #		ifdef TC_WINDOWS_BOOT_RESCUE_DISK_MODE
-#			define TC__BOOT_MEMORY_REQUIRED	30
+#			define TC__BOOT_MEMORY_REQUIRED	31
 #		else
-#			define TC__BOOT_MEMORY_REQUIRED	28
+#			define TC__BOOT_MEMORY_REQUIRED	29
 #		endif
 #	elif defined (TC_WINDOWS_BOOT_SERPENT)
-#		define TC__BOOT_MEMORY_REQUIRED		32
+#		define TC__BOOT_MEMORY_REQUIRED		33
 #	elif defined (TC_WINDOWS_BOOT_TWOFISH)
-#		define TC__BOOT_MEMORY_REQUIRED		40
+#		define TC__BOOT_MEMORY_REQUIRED		41
+#	elif defined (TC_WINDOWS_BOOT_CAMELLIA)
+#		define TC__BOOT_MEMORY_REQUIRED		31
 #	endif
 
 #if 0
@@ -74,6 +72,9 @@
 #define TC__BOOT_SECTOR_OUTER_VOLUME_BAK_HEADER_CRC_SIZE 4
 #define TC__BOOT_SECTOR_OUTER_VOLUME_BAK_HEADER_CRC_OFFSET (TC__BOOT_SECTOR_USER_MESSAGE_OFFSET - TC__BOOT_SECTOR_OUTER_VOLUME_BAK_HEADER_CRC_SIZE)
 
+#define TC__BOOT_SECTOR_PIM_VALUE_SIZE	2
+#define TC__BOOT_SECTOR_PIM_VALUE_OFFSET	(TC__BOOT_SECTOR_OUTER_VOLUME_BAK_HEADER_CRC_OFFSET - TC__BOOT_SECTOR_PIM_VALUE_SIZE)
+
 #define TC__BOOT_LOADER_DECOMPRESSOR_START_SECTOR 2
 #define TC__BOOT_LOADER_DECOMPRESSOR_SECTOR_COUNT 4
 #define TC__BOOT_LOADER_DECOMPRESSOR_MEMORY_SIZE 32768
@@ -100,6 +101,8 @@
 #define TC__BOOT_USER_CFG_FLAG_SILENT_MODE				TC_HEX (01)
 #define TC__BOOT_USER_CFG_FLAG_DISABLE_ESC				TC_HEX (02)
 #define TC__BOOT_USER_CFG_FLAG_DISABLE_HW_ENCRYPTION	TC_HEX (04)
+#define TC__BOOT_USER_CFG_FLAG_DISABLE_PIM				TC_HEX (08)
+#define TC__BOOT_USER_CFG_FLAG_STORE_HASH				TC_HEX (10)
 
 // The following items are treated as a 2-bit value (apply TC_BOOT_CFG_MASK_HIDDEN_OS_CREATION_PHASE to obtain the value)
 #define TC__HIDDEN_OS_CREATION_PHASE_NONE		0
@@ -163,6 +166,8 @@ TC_HIDDEN_OS_CREATION_PHASE_WIPED = TC__HIDDEN_OS_CREATION_PHASE_WIPED
 #define TC_BOOT_SECTOR_USER_MESSAGE_OFFSET TC__BOOT_SECTOR_USER_MESSAGE_OFFSET
 #define TC_BOOT_SECTOR_OUTER_VOLUME_BAK_HEADER_CRC_SIZE TC__BOOT_SECTOR_OUTER_VOLUME_BAK_HEADER_CRC_SIZE
 #define TC_BOOT_SECTOR_OUTER_VOLUME_BAK_HEADER_CRC_OFFSET TC__BOOT_SECTOR_OUTER_VOLUME_BAK_HEADER_CRC_OFFSET
+#define TC_BOOT_SECTOR_PIM_VALUE_SIZE TC__BOOT_SECTOR_PIM_VALUE_SIZE
+#define TC_BOOT_SECTOR_PIM_VALUE_OFFSET TC__BOOT_SECTOR_PIM_VALUE_OFFSET
 #define TC_BOOT_SECTOR_USER_MESSAGE_MAX_LENGTH TC__BOOT_SECTOR_USER_MESSAGE_MAX_LENGTH
 #define TC_BOOT_SECTOR_VERSION_OFFSET TC__BOOT_SECTOR_VERSION_OFFSET
 #define TC_BOOT_SECTOR_LOADER_LENGTH_OFFSET TC__BOOT_SECTOR_LOADER_LENGTH_OFFSET
@@ -186,6 +191,8 @@ TC_HIDDEN_OS_CREATION_PHASE_WIPED = TC__HIDDEN_OS_CREATION_PHASE_WIPED
 #define TC_BOOT_USER_CFG_FLAG_SILENT_MODE TC__BOOT_USER_CFG_FLAG_SILENT_MODE
 #define TC_BOOT_USER_CFG_FLAG_DISABLE_ESC TC__BOOT_USER_CFG_FLAG_DISABLE_ESC
 #define TC_BOOT_USER_CFG_FLAG_DISABLE_HW_ENCRYPTION TC__BOOT_USER_CFG_FLAG_DISABLE_HW_ENCRYPTION
+#define TC_BOOT_USER_CFG_FLAG_DISABLE_PIM TC__BOOT_USER_CFG_FLAG_DISABLE_PIM
+#define TC_BOOT_USER_CFG_FLAG_STORE_HASH TC__BOOT_USER_CFG_FLAG_STORE_HASH
 #define TC_HIDDEN_OS_CREATION_PHASE_NONE TC__HIDDEN_OS_CREATION_PHASE_NONE
 #define TC_HIDDEN_OS_CREATION_PHASE_CLONING TC__HIDDEN_OS_CREATION_PHASE_CLONING
 #define TC_HIDDEN_OS_CREATION_PHASE_WIPING TC__HIDDEN_OS_CREATION_PHASE_WIPING
@@ -193,4 +200,11 @@ TC_HIDDEN_OS_CREATION_PHASE_WIPED = TC__HIDDEN_OS_CREATION_PHASE_WIPED
 
 #endif // TC_ASM_PREPROCESS
 
+#define EFI_BOOTARGS_REGIONS_LOW 0x90000, 0x88000, 0x80000
+#define EFI_BOOTARGS_REGIONS_HIGH \
+0x100000, 0x200000, 0x300000, 0x400000, 0x500000, 0x600000, 0x700000, 0x800000, \
+0x900000, 0xA00000, 0xB00000, 0xC00000, 0xD00000, 0xE00000, 0xF00000, 0x1000000
+
+#define EFI_BOOTARGS_REGIONS EFI_BOOTARGS_REGIONS_LOW, EFI_BOOTARGS_REGIONS_HIGH
+
 #endif // TC_HEADER_Boot_BootDefs

src/Boot/Windows/BootDiskIo.cpp

@@ -4,7 +4,7 @@
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.

src/Boot/Windows/BootDiskIo.h

@@ -4,7 +4,7 @@
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.

src/Boot/Windows/BootEncryptedIo.cpp

@@ -4,7 +4,7 @@
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.
@@ -48,7 +48,7 @@ BiosResult ReadEncryptedSectors (uint16 destSegment, uint16 destOffset, byte dri
 	{
 		// Convert sector number to data unit number of the hidden volume
 		sector -= HiddenVolumeStartSector;
-		sector += HiddenVolumeStartUnitNo;
+		sector += PimValueOrHiddenVolumeStartUnitNo;
 	}
 
 	if (drive == EncryptedVirtualPartition.Drive)
@@ -96,7 +96,7 @@ BiosResult WriteEncryptedSectors (uint16 sourceSegment, uint16 sourceOffset, byt
 		writeOffset = HiddenVolumeStartSector;
 		writeOffset -= EncryptedVirtualPartition.StartSector;
 		dataUnitNo -= EncryptedVirtualPartition.StartSector;
-		dataUnitNo += HiddenVolumeStartUnitNo;
+		dataUnitNo += PimValueOrHiddenVolumeStartUnitNo;
 	}
 
 	while (sectorCount-- > 0)

src/Boot/Windows/BootEncryptedIo.h

@@ -4,7 +4,7 @@
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.

src/Boot/Windows/BootMain.cpp

@@ -4,7 +4,7 @@
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.
@@ -168,10 +168,23 @@ static byte AskPassword (Password &password, int& pim)
 		switch (scanCode)
 		{
 		case TC_BIOS_KEY_ENTER:
+			password.Length = pos;
+			Print ("\r");
+			if (!PreventNormalSystemBoot)
+				Print ("Enter password: ");
+			pos = 0;
+			while (pos < MAX_PASSWORD)
+			{
+				pos++;
+				if (pos < MAX_PASSWORD)
+					PrintChar ('*');
+				else
+					PrintCharAtCursor ('*');
+			}
+
 			ClearBiosKeystrokeBuffer();
 			PrintEndl();
 
-			password.Length = pos;
 			break;
 
 		case TC_BIOS_KEY_BACKSPACE:
@@ -218,6 +231,17 @@ static byte AskPassword (Password &password, int& pim)
 			PrintCharAtCursor (asciiCode);
 	}
 
+#ifndef TC_WINDOWS_BOOT_RESCUE_DISK_MODE
+	if (PimValueOrHiddenVolumeStartUnitNo.LowPart != -1)
+	{
+		pim = (int) PimValueOrHiddenVolumeStartUnitNo.LowPart;
+		// reset stored PIM value to allow requesting PIM next time in case the stored value is wrong
+		PimValueOrHiddenVolumeStartUnitNo.LowPart = -1;
+		return TC_BIOS_KEY_ENTER;
+	}
+	else
+#endif
+	{
 		pos = 0;
 		Print ("PIM: ");
 
@@ -228,6 +252,14 @@ static byte AskPassword (Password &password, int& pim)
 			switch (scanCode)
 			{
 			case TC_BIOS_KEY_ENTER:
+				Print ("\rPIM: ");
+				pos =0;
+				while (pos < MAX_PIM)
+				{
+					PrintChar ('*');
+					pos++;
+				}
+
 				ClearBiosKeystrokeBuffer();
 				PrintEndl();
 
@@ -276,6 +308,7 @@ static byte AskPassword (Password &password, int& pim)
 			else
 				PrintCharAtCursor (asciiCode);
 		}
+	}
 }
 
 
@@ -447,7 +480,7 @@ static bool MountVolume (byte drive, byte &exitKey, bool skipNormal, bool skipHi
 
 		EncryptedVirtualPartition.StartSector = BootCryptoInfo->EncryptedAreaStart >> TC_LB_SIZE_BIT_SHIFT_DIVISOR;
 
-		HiddenVolumeStartUnitNo = EncryptedVirtualPartition.StartSector;
+		PimValueOrHiddenVolumeStartUnitNo = EncryptedVirtualPartition.StartSector;
 		HiddenVolumeStartSector = PartitionFollowingActive.StartSector;
 		HiddenVolumeStartSector += EncryptedVirtualPartition.StartSector;
 
@@ -728,7 +761,7 @@ static bool CopySystemPartitionToHiddenVolume (byte drive, byte &exitKey)
 		{
 			CopyMemory (TC_BOOT_LOADER_BUFFER_SEGMENT, i * TC_LB_SIZE, SectorBuffer, TC_LB_SIZE);
 
-			uint64 s = HiddenVolumeStartUnitNo + sectorOffset + i;
+			uint64 s = PimValueOrHiddenVolumeStartUnitNo + sectorOffset + i;
 			EncryptDataUnits (SectorBuffer, &s, 1, BootCryptoInfo);
 
 			CopyMemory (SectorBuffer, TC_BOOT_LOADER_BUFFER_SEGMENT, i * TC_LB_SIZE, TC_LB_SIZE);
@@ -869,6 +902,8 @@ askBadSectorSkip:
 
 	if (headerUpdateRequired)
 	{
+		Print ("\rUpdating header...");
+
 		AcquireSectorBuffer();
 		uint64 headerSector;
 		headerSector.HighPart = 0;
@@ -906,6 +941,8 @@ askBadSectorSkip:
 
 		while (WriteSectors (SectorBuffer, drive, headerSector, 1) != BiosResultSuccess);
 		ReleaseSectorBuffer();
+
+		Print ("Done!\r\n");
 	}
 
 	if (sectorsRemaining.HighPart == 0 && sectorsRemaining.LowPart == 0)

src/Boot/Windows/BootMain.h

@@ -4,7 +4,7 @@
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.

src/Boot/Windows/BootMemory.cpp

@@ -4,7 +4,7 @@
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.

src/Boot/Windows/BootMemory.h

@@ -4,7 +4,7 @@
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.

src/Boot/Windows/BootSector.asm

@@ -4,7 +4,7 @@
 ; by the TrueCrypt License 3.0.
 ;
 ; Modifications and additions to the original source code (contained in this file)
-; and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+; and all other portions of this file are Copyright (c) 2013-2016 IDRIX
 ; and are governed by the Apache License 2.0 the full text of which is
 ; contained in the file License.txt included in VeraCrypt binary and source
 ; code distribution packages.

src/Boot/Windows/BootStrings.h

@@ -4,7 +4,7 @@
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.

src/Boot/Windows/IntFilter.cpp

@@ -4,7 +4,7 @@
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.

src/Boot/Windows/IntFilter.h

@@ -4,7 +4,7 @@
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.

src/Boot/Windows/Makefile

@@ -4,7 +4,7 @@
 # by the TrueCrypt License 3.0.
 #
 # Modifications and additions to the original source code (contained in this file)
-# and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+# and all other portions of this file are Copyright (c) 2013-2016 IDRIX
 # and are governed by the Apache License 2.0 the full text of which is
 # contained in the file License.txt included in VeraCrypt binary and source
 # code distribution packages.
@@ -104,6 +104,9 @@ OBJS = $(OBJS) $(OUTDIR)\Serpent.obj
 OBJS = $(OBJS) $(OUTDIR)\Twofish.obj
 !endif
 
+!if "$(SINGLE_CIPHER)" == "CAMELLIA"
+OBJS = $(OBJS) $(OUTDIR)\CamelliaSmall.obj
+!endif
 
 all: env $(TARGETS)
 
@@ -193,8 +196,8 @@ $(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)
+# Compress the Rescue Disk botloader for Cascades and Serpent since it is too big (size > 31232 bytes)
-!if DEFINED(RESCUE_DISK) && !DEFINED (SINGLE_CIPHER) && "$(SINGLE_PRF)" == "SHA2"
+!if DEFINED(RESCUE_DISK) && (!DEFINED (SINGLE_CIPHER) || ("$(SINGLE_CIPHER)" == "SERPENT"))
 	upx $(PROJ).$(TARGETEXT)
 !endif
 	gzip.exe -c -n --best $(PROJ).$(TARGETEXT) >$(PROJ).$(TARGETEXT).gz

src/Boot/Windows/Platform.cpp

@@ -4,7 +4,7 @@
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.

src/Boot/Windows/Platform.h

@@ -4,7 +4,7 @@
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2016 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.

src/Build/Include/Makefile.inc

@@ -4,7 +4,7 @@
 # by the TrueCrypt License 3.0.
 #
 # Modifications and additions to the original source code (contained in this file)
-# and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+# and all other portions of this file are Copyright (c) 2013-2016 IDRIX
 # and are governed by the Apache License 2.0 the full text of which is
 # contained in the file License.txt included in VeraCrypt binary and source
 # code distribution packages.