Linux: modify official build script to use different build directories for wxWidgets console and GUI builds.

This reverts commit 400fd599f812b057b0674f2ae0e0141e7c35a332.

README.md

@@ -123,6 +123,7 @@ Requirements for Building VeraCrypt for Linux and Mac OS X:
 - Apple Xcode (Mac OS X only)
 - NASM assembler 2.08 or compatible (x86/x64 architecture only)
 - pkg-config
+- 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
@@ -160,12 +161,14 @@ Instructions for Building VeraCrypt for Linux and Mac OS X:
    'Main'.
 
 By default, a universal executable supporting both graphical and text user
-interface is built. To build a console-only executable, which requires no GUI
-library, use the 'NOGUI' parameter:
+interface (through the switch --text) is built.
+On Linux, a console-only executable, which requires no GUI library, can be
+built using the 'NOGUI' parameter:
 
    $ make NOGUI=1 WXSTATIC=1 WX_ROOT=/usr/src/wxWidgets wxbuild
    $ make NOGUI=1 WXSTATIC=1
    
+On MacOSX, building a console-only executable is not supported.
 
 Mac OS X specifics:
 -----------------------------------------------------------
@@ -232,7 +235,7 @@ Copyright Information
 ---------------------
 
 This software as a whole:
-Copyright (c) 2013-2014 IDRIX. All rights reserved.
+Copyright (c) 2013-2015 IDRIX. All rights reserved.
 
 Portions of this software:
 Copyright (c) 2003-2012 TrueCrypt Developers Association. All rights reserved.

Tests/bench.bat

@@ -0,0 +1,286 @@
+@echo off
+
+setlocal
+
+call :freedrive mydriveletter && goto :cont
+echo ERROR: No free drive letter found.
+goto :exit
+:cont
+
+echo Using drive letter %mydriveletter%: for our tests
+echo.
+
+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 Mount SHA-512 container (Normal)
+"c:\Program Files\VeraCrypt\veracrypt.exe" /volume test.sha512.hc /hash sha512 /l %mydriveletter% /password test /q /silent /m ro
+
+rem Get end time:
+for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
+   set /A "end=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
+)
+
+rem Get elapsed time:
+set /A elapsed=end-start
+
+rem Show elapsed time:
+set /A hh=elapsed/(60*60*100), rest=elapsed%%(60*60*100), mm=rest/(60*100), rest%%=60*100, ss=rest/100, cc=rest%%100
+if %hh% lss 10 set hh=0%hh%
+if %mm% lss 10 set mm=0%mm%
+if %ss% lss 10 set ss=0%ss%
+if %cc% lss 10 set cc=0%cc%
+echo SHA-512 (Normal) = %hh%:%mm%:%ss%,%cc%
+
+"c:\Program Files\VeraCrypt\veracrypt.exe" /dismount %mydriveletter% /silent /q
+
+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 Mount SHA-512 container (Hidden)
+"c:\Program Files\VeraCrypt\veracrypt.exe" /volume test.sha512.hc /hash sha512 /l %mydriveletter% /password testhidden /q /silent /m ro
+
+rem Get end time:
+for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
+   set /A "end=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
+)
+
+rem Get elapsed time:
+set /A elapsed=end-start
+
+rem Show elapsed time:
+set /A hh=elapsed/(60*60*100), rest=elapsed%%(60*60*100), mm=rest/(60*100), rest%%=60*100, ss=rest/100, cc=rest%%100
+if %hh% lss 10 set hh=0%hh%
+if %mm% lss 10 set mm=0%mm%
+if %ss% lss 10 set ss=0%ss%
+if %cc% lss 10 set cc=0%cc%
+echo SHA-512 (Hidden) = %hh%:%mm%:%ss%,%cc%
+echo.
+
+"c:\Program Files\VeraCrypt\veracrypt.exe" /dismount %mydriveletter% /silent /q
+
+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 Mount Whirlpool container (Normal).
+"c:\Program Files\VeraCrypt\veracrypt.exe" /volume test.whirlpool.hc /hash whirlpool /l %mydriveletter% /password test /q /silent /m ro
+
+rem Get end time:
+for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
+   set /A "end=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
+)
+
+rem Get elapsed time:
+set /A elapsed=end-start
+
+rem Show elapsed time:
+set /A hh=elapsed/(60*60*100), rest=elapsed%%(60*60*100), mm=rest/(60*100), rest%%=60*100, ss=rest/100, cc=rest%%100
+if %hh% lss 10 set hh=0%hh%
+if %mm% lss 10 set mm=0%mm%
+if %ss% lss 10 set ss=0%ss%
+if %cc% lss 10 set cc=0%cc%
+echo Whirlpool (Normal) = %hh%:%mm%:%ss%,%cc%
+
+"c:\Program Files\VeraCrypt\veracrypt.exe" /dismount %mydriveletter% /silent /q
+
+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 Mount Whirlpool container (Hidden).
+"c:\Program Files\VeraCrypt\veracrypt.exe" /volume test.whirlpool.hc /hash whirlpool /l %mydriveletter% /password testhidden /q /silent /m ro
+
+rem Get end time:
+for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
+   set /A "end=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
+)
+
+rem Get elapsed time:
+set /A elapsed=end-start
+
+rem Show elapsed time:
+set /A hh=elapsed/(60*60*100), rest=elapsed%%(60*60*100), mm=rest/(60*100), rest%%=60*100, ss=rest/100, cc=rest%%100
+if %hh% lss 10 set hh=0%hh%
+if %mm% lss 10 set mm=0%mm%
+if %ss% lss 10 set ss=0%ss%
+if %cc% lss 10 set cc=0%cc%
+echo Whirlpool (Hidden) = %hh%:%mm%:%ss%,%cc%
+echo.
+
+"c:\Program Files\VeraCrypt\veracrypt.exe" /dismount %mydriveletter% /silent /q
+
+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 Mount SHA-256 container (Normal)
+"c:\Program Files\VeraCrypt\veracrypt.exe" /volume test.sha256.hc /hash sha256 /l %mydriveletter% /password test /q /silent /m ro
+
+rem Get end time:
+for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
+   set /A "end=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
+)
+
+rem Get elapsed time:
+set /A elapsed=end-start
+
+rem Show elapsed time:
+set /A hh=elapsed/(60*60*100), rest=elapsed%%(60*60*100), mm=rest/(60*100), rest%%=60*100, ss=rest/100, cc=rest%%100
+if %hh% lss 10 set hh=0%hh%
+if %mm% lss 10 set mm=0%mm%
+if %ss% lss 10 set ss=0%ss%
+if %cc% lss 10 set cc=0%cc%
+echo SHA-256 (Normal) = %hh%:%mm%:%ss%,%cc%
+
+"c:\Program Files\VeraCrypt\veracrypt.exe" /dismount %mydriveletter% /silent /q
+
+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 Mount SHA-256 container (Hidden)
+"c:\Program Files\VeraCrypt\veracrypt.exe" /volume test.sha256.hc /hash sha256 /l %mydriveletter% /password testhidden /q /silent /m ro
+
+rem Get end time:
+for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
+   set /A "end=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
+)
+
+rem Get elapsed time:
+set /A elapsed=end-start
+
+rem Show elapsed time:
+set /A hh=elapsed/(60*60*100), rest=elapsed%%(60*60*100), mm=rest/(60*100), rest%%=60*100, ss=rest/100, cc=rest%%100
+if %hh% lss 10 set hh=0%hh%
+if %mm% lss 10 set mm=0%mm%
+if %ss% lss 10 set ss=0%ss%
+if %cc% lss 10 set cc=0%cc%
+echo SHA-256 (Hidden) = %hh%:%mm%:%ss%,%cc%
+echo.
+
+"c:\Program Files\VeraCrypt\veracrypt.exe" /dismount %mydriveletter% /silent /q
+
+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 Mount RIPEMD-160 container (Normal)
+"c:\Program Files\VeraCrypt\veracrypt.exe" /volume test.ripemd160.hc /hash ripemd160 /l %mydriveletter% /password test /q /silent /m ro
+
+rem Get end time:
+for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
+   set /A "end=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
+)
+
+rem Get elapsed time:
+set /A elapsed=end-start
+
+rem Show elapsed time:
+set /A hh=elapsed/(60*60*100), rest=elapsed%%(60*60*100), mm=rest/(60*100), rest%%=60*100, ss=rest/100, cc=rest%%100
+if %hh% lss 10 set hh=0%hh%
+if %mm% lss 10 set mm=0%mm%
+if %ss% lss 10 set ss=0%ss%
+if %cc% lss 10 set cc=0%cc%
+echo RIPEMD-160 (Normal) = %hh%:%mm%:%ss%,%cc%
+
+"c:\Program Files\VeraCrypt\veracrypt.exe" /dismount %mydriveletter% /silent /q
+
+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 Mount RIPEMD-160 container (Hidden)
+"c:\Program Files\VeraCrypt\veracrypt.exe" /volume test.ripemd160.hc /hash ripemd160 /l %mydriveletter% /password testhidden /q /silent /m ro
+
+rem Get end time:
+for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
+   set /A "end=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
+)
+
+rem Get elapsed time:
+set /A elapsed=end-start
+
+rem Show elapsed time:
+set /A hh=elapsed/(60*60*100), rest=elapsed%%(60*60*100), mm=rest/(60*100), rest%%=60*100, ss=rest/100, cc=rest%%100
+if %hh% lss 10 set hh=0%hh%
+if %mm% lss 10 set mm=0%mm%
+if %ss% lss 10 set ss=0%ss%
+if %cc% lss 10 set cc=0%cc%
+echo RIPEMD-160 (Hidden) = %hh%:%mm%:%ss%,%cc%
+echo.
+
+"c:\Program Files\VeraCrypt\veracrypt.exe" /dismount %mydriveletter% /silent /q
+
+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
+
+rem Get end time:
+for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
+   set /A "end=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
+)
+
+rem Get elapsed time:
+set /A elapsed=end-start
+
+rem Show elapsed time:
+set /A hh=elapsed/(60*60*100), rest=elapsed%%(60*60*100), mm=rest/(60*100), rest%%=60*100, ss=rest/100, cc=rest%%100
+if %hh% lss 10 set hh=0%hh%
+if %mm% lss 10 set mm=0%mm%
+if %ss% lss 10 set ss=0%ss%
+if %cc% lss 10 set cc=0%cc%
+echo Wrong Password (PRF Auto-detection)= %hh%:%mm%:%ss%,%cc%
+echo.
+
+
+goto :exit
+
+rem Finds a free drive letter.
+rem
+rem Parameters:
+rem     %1 = Output variable name.
+rem
+rem Example:
+rem     call :freedrive mydriveletter && goto :cont
+rem     echo ERROR: No free drive letter found.
+rem     goto :EOF
+rem     :cont
+rem     echo Found drive letter: %mydriveletter%
+:freedrive
+setlocal EnableDelayedExpansion
+set exitcode=0
+set "output_var=%~1"
+for %%i in (C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z) do (
+    set "drive=%%i:"
+    rem If 'subst' fails, the drive letter is already in use.
+    rem This way we can even detect optical drives that have a drive
+    rem letter but no media in them, a case that goes undetected when
+    rem using 'if exist'.
+    subst !drive! %SystemDrive%\ >nul
+    if !errorlevel! == 0 (
+        subst !drive! /d >nul
+		set "drive=%%i"
+        goto :freedrive0
+    )
+)
+set exitcode=1
+set drive=
+:freedrive0
+endlocal & set "%output_var%=%drive%" & exit /b %exitcode%
+
+:exit

Translations/Language.ar.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="ar" name="العربية" en-name="Arabic" version="0.1.0" translators="Ahmad Gharbeia, Khaled Hosny" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <control lang="ar" key="IDC_KEY_FILES">‮الملفات ال&amp;مفاتيح…</control>
     <control lang="ar" key="IDC_LINK_HASH_INFO">‮معلومات حوْل خوازميات التلبيد </control>
     <control lang="ar" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">المزيد من المعلومات</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="ar" key="IDC_MB">‮&amp;ميجابايت</control>
     <control lang="ar" key="IDC_MORE_INFO_ON_CONTAINERS">‮مزيد من المعلومات</control>
     <control lang="ar" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">‮مزيد من المعلومات عن تعمية النظام</control>
@@ -57,6 +58,7 @@
     <control lang="ar" key="IDC_NO_HISTORY">‮لا &amp;تحفظ التأريخ أبدًا</control>
     <control lang="ar" key="IDC_OPEN_OUTER_VOLUME">‮أوصل مجلدا خارجيا</control>
     <control lang="ar" key="IDC_PAUSE">‮&amp;جمِّد</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
     <control lang="ar" key="IDC_QUICKFORMAT">‮تهيئة سريعة</control>
     <control lang="ar" key="IDC_SHOW_PASSWORD">‮أ&amp;ظهر كلمة السر</control>
     <control lang="ar" key="IDC_SHOW_PASSWORD_SINGLE">‮أ&amp;ظهر كلمة السر</control>
@@ -72,6 +74,7 @@
     <control lang="ar" key="IDT_COLLECTING_RANDOM_DATA_NOTE">‮هام: حرّك الفأرة عشوائيا بقدر الإمكان في إطار هذه النافذة، كلما طال تحريكك لها كان ذلك أفضل؛ هذا يزيد بشدة من القوة التعموية لمفاتيح التعمية. ثم انقر 'اللاحق' للمواصلة.</control>
     <control lang="ar" key="IDT_CONFIRM">‮أ&amp;كِّد:</control>
     <control lang="ar" key="IDT_DONE">‮تمّ </control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="ar" key="IDT_ENCRYPTION_ALGO">‮خوارزميّة التعمية</control>
     <control lang="ar" key="IDT_FILESYSTEM">‮نظام الملفات </control>
     <control lang="ar" key="IDT_FILE_CONTAINER">‮ينشئ قرصا افتراضيا معمى في ملف. مُحبَّذٌ للمستخدمين غير الخبراء.</control>
@@ -85,6 +88,8 @@
     <control lang="ar" key="IDT_PARTIAL_POOL_CONTENTS">‮محتويات المجمع الحالية (جزئيا)</control>
     <control lang="ar" key="IDT_PASS">‮مرّة</control>
     <control lang="ar" 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="ar" key="IDT_PROGRESS">‮الإنجاز:</control>
     <control lang="ar" key="IDT_RANDOM_POOL">‮مجمّع عشوائي: </control>
     <control lang="ar" key="IDT_SINGLE_BOOT">‮اختر هذا إن كان يوجد نظام تشغيل واحد فقط منصَّب على هذا الحاسوب (حتى لو كان له عدة مستخدمين).</control>
@@ -142,6 +147,8 @@
     <control lang="ar" key="IDC_MOUNT_OPTIONS">‮خ&amp;يارات الوصل…</control>
     <control lang="ar" key="IDC_MOUNT_READONLY">‮أوصل المجلد &amp;للقراءة فقط</control>
     <control lang="ar" key="IDC_NEW_KEYFILES">‮الملفات المفاتيح…</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="ar" key="IDC_PREF_BKG_TASK_ENABLE">‮مُفعّل</control>
     <control lang="ar" key="IDC_PREF_CACHE_PASSWORDS">‮خزّن كلمات السرّ مؤقتا في ذاكرة المُشغِّل</control>
     <control lang="ar" key="IDC_PREF_DISMOUNT_INACTIVE">‮افصل المجلد تلقائيا عندما لا تُكتب/تُقرأ بيانات منه</control>
@@ -155,6 +162,7 @@
     <control lang="ar" key="IDC_PREF_MOUNT_READONLY">‮أوصل المجلدات للقراءة فقط</control>
     <control lang="ar" key="IDC_PREF_MOUNT_REMOVABLE">‮أوصل المجلدات كوسائط قابلة للفصل</control>
     <control lang="ar" 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="en" key="IDC_PREF_USE_DIFF_TRAY_ICON_IF_VOL_MOUNTED">Use a different taskbar icon when there are mounted volumes</control>
     <control lang="ar" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">‮امحُ كلمات السر المخزّنة مؤقتا عند الفصل التلقائي</control>
     <control lang="ar" key="IDC_PREF_WIPE_CACHE_ON_EXIT">‮امحُ كلمات السر المخزّنة مؤقتا عند الخروج</control>
@@ -167,11 +175,12 @@
     <control lang="ar" key="IDC_SHOW_PASSWORD_CHPWD_ORI">‮أظهر كلمة السر</control>
     <control lang="ar" key="IDC_TRAVEL_OPEN_EXPLORER">‮افتح &amp;نافذة إكسبلورر للمجلدات الموصولة</control>
     <control lang="ar" key="IDC_TRAV_CACHE_PASSWORDS">‮خزّن كلمات السرّ &amp;مؤقتا في ذاكرة المُشغِّل</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="ar" key="IDC_UNMOUNTALL">‮ا&amp;فصل الكل</control>
     <control lang="ar" key="IDC_VOLUME_PROPERTIES">‮خ&amp;صائص المجلد…</control>
     <control lang="ar" key="IDC_VOLUME_TOOLS">‮أ&amp;دوات المجلد…</control>
     <control lang="ar" key="IDC_WIPE_CACHE">‮ا&amp;مح المخبئية</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
     <control lang="ar" key="IDD_HOTKEYS_DLG">‮تروكرِبت - أزرار الاختصار العامة للنظام</control>
     <control lang="ar" key="IDD_MOUNT_DLG">‮تروكرِبت</control>
@@ -199,8 +208,10 @@
     <control lang="ar" key="IDM_CONTACT">‮التواصل…</control>
     <control lang="ar" key="IDM_CREATE_HIDDEN_OS">‮أنشئ نظام تشغيل مخفي…</control>
     <control lang="ar" key="IDM_CREATE_RESCUE_DISK">‮أنشئ قرص إنقاذ…</control>
-    <control lang="ar" key="IDM_CREATE_VOLUME">‮أنشئ مجلدا جديدا…</control>	
+    <control lang="ar" key="IDM_CREATE_VOLUME">‮أنشئ مجلدا جديدا…</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>	
     <control lang="ar" key="IDM_DEFAULT_KEYFILES">‮الملفات المفاتيح المبدئية…</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="ar" key="IDM_ENCRYPT_SYSTEM_DEVICE">‮عمّ قسم\\سواقة النظام…</control>
     <control lang="ar" key="IDM_FAQ">‮الأسئلة المتكررة</control>
@@ -243,6 +254,7 @@
     <control lang="ar" key="IDM_UNMOUNT_VOLUME">‮افصل المجلد</control>
     <control lang="ar" key="IDM_VERIFY_RESCUE_DISK">‮اختبر قرص الإنقاذ</control>
     <control lang="ar" key="IDM_VERSION_HISTORY">‮تأريخ الإصدارات</control>
+    <control lang="en" key="IDM_VOLUME_EXPANDER">توسعة المجلد</control>
     <control lang="ar" key="IDM_VOLUME_PROPERTIES">‮خصائص المجلد</control>
     <control lang="ar" key="IDM_VOLUME_WIZARD">‮مرشد إنشاء المجلدات</control>
     <control lang="ar" key="IDM_WEBSITE">‮موقع تروكرِبت على الوب</control>
@@ -485,7 +497,11 @@
     <string lang="ar" key="FORMAT_FINISHED_HELP">\nn‮ ‮أُنشئ مجلد تروكرِبت و هو جاهز للاستخدام. إذا أردت إنشاء مجلد آخر انقر 'اللاحق' و إلا فانقر 'اخرج'.</string>
     <string lang="ar" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\nn‮ ‮مجلد تروكربت المخفي تم إنشاؤه بنجاح (سيوجد نظام التشغيل المخفي داخل هذا المجلد المخفي). ‮ ‮انقر 'اللاحق' للمواصلة.</string>
     <string lang="ar" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">‮تمت تعمية المجلد بكامله</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="ar" key="NONSYS_INPLACE_ENC_FINISHED_INFO">‮هام: لوصل مجلد تروكربت الجديد هذا و للنفاذ إلى البيانات المحفوظة فيه انقر 'أوصل النبائط تلقائيا' في نافذة تروكربت الرئيسية. بعد إدخال كلمة السر الصحيحة (و\\أو تقديم الملفات المفاتيح) فإن المجلد سيوصل بحرف السواقة الذي تختاره من القائمة في نافذة تروكربت الرئيسية (و سيكون بوسعك النفاذ إلى البيانات المعماة عبر حرف السواقة المختار). ‮ ‮تذكَّر أو اكتب الخطوات السابقة إذ أنه ينبغي اتباعها كلما أردت وصل المجلد و النفاذ إلى البيانات المحفوظة فيه. عوضا عن هذا فاختر 'اختر نبيطة' في نافذة تروكربت الرئيسية ثم اختر هذا القسم\\النبيطة و انقر 'أوصل'. ‮ ‮القسم\\المجلد تمت عمي بنجاح (و هو يحوي مجلد تروكربت معمى كامل الآن) و جاهز للاستخدام.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="ar" key="FORMAT_FINISHED_INFO">‮أُنشئ مجلد تروكرِبت بنجاح.</string>
     <string lang="ar" key="FORMAT_FINISHED_TITLE">‮أُنشئ المجلد</string>
     <string lang="ar" key="FORMAT_HELP">‮هام: حرّك الفأرة عشوائيا بقدر الإمكان في إطار هذه النافذة، كلما طال تحريكك لها كان ذلك أفضل؛ هذا يزيد بشدة من القوة التعموية لمفاتيح التعمية. ثم انقر 'هيء' لتنشئ المجلد.</string>
@@ -523,6 +539,7 @@
     <string lang="ar" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">‮طرأ عطل أثناء جلب حالة تعمية النظام.</string>
     <string lang="ar" key="INIT_SYS_ENC">‮تعذّر استبداء مكونات التطبيق لتعمية النظام.</string>
     <string lang="ar" key="INIT_RAND">‮فشل استبداء مُولِّد الأرقام العشوائيّة!</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="ar" key="INIT_REGISTER">‮تعذَّر استبداء التطبيق. فشل تسجيل فئة الحوار.</string>
     <string lang="ar" key="INIT_RICHEDIT">‮عطل: تعذَّر تحميل مكتبة التحرير الغني.</string>
     <string lang="ar" key="INTRO_TITLE">‮مرشِد تروكرِبت لإنشاء المجلدات</string>
@@ -535,6 +552,7 @@
     <string lang="ar" key="MOUNT_BUTTON">‮&amp;أوصل</string>
     <string lang="ar" key="NEW_VERSION_REQUIRED">‮مطلوب إصدارة أحدث من تروكرِبت لوصل هذا المجلد.</string>
     <string lang="ar" key="VOL_CREATION_WIZARD_NOT_FOUND">‮عُطل: تعذَّر إيجاد مساعد إنشاء المجلدات. ‮ ‮من فضلك تحقق من وجود الملف '‪VeraCrypt Format.exe‬' في ذات دليل الذي شُغَّل منه ‪VeraCrypt.exe‬. إن لم يكن موجودا فأعد تنصيب تروكرِبت أو ابحث عن '‪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="ar" key="NEXT">‮ال&amp;لاحق&gt;</string>
     <string lang="ar" key="FINALIZE">‮ا&amp;نهِ</string>
     <string lang="ar" key="INSTALL">‮&amp;نصِّب</string>
@@ -542,6 +560,7 @@
     <string lang="ar" key="NODRIVER">‮تعذّر الاتصال بمشغل تروكربت. لا يستطيع تروكربت العمل إن لم يكن المشغل عاملا. ‮ ‮رجاءً لاحظ أنه بسبب مشكلات في ويندوز فقد يلزم أن تخرج من حسابك أو تعيد تشغيل النظام ليمكن تحميل المشغّل.</string>
     <string lang="ar" key="NOFONT">‮حدث عُطل أثناء تحميل/إعداد الخطوط.</string>
     <string lang="ar" 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="ar" key="DRIVE_LETTER_UNAVAILABLE">‮حرف السواقة غير متاح.</string>
     <string lang="ar" key="NO_FILE_SELECTED">‮لم تختر ملفا!</string>
     <string lang="ar" key="NO_FREE_DRIVES">‮لا توجد أية أحرف سواقات متاحة.</string>
@@ -561,15 +580,18 @@
     <string lang="ar" key="OVERWRITEPROMPT">‮تحذير: الملف '‪%hs‬' موجود بالفعل! ‮ ‮هام: لن يعمي تروكربت الملف بل سيحذفه. أمتأكد أنك تريد حذف الملف و استبداله بحاوية تروكربت جديدة؟</string>
     <string lang="ar" key="OVERWRITEPROMPT_DEVICE">‮تنبيه: كل الملفات المخزنة حاليا على ‪%s‬ '‪%hs‬'‪%s‬ المختار ستحذف و تضيع محتوياتها (لن تتم تعميتها)! ‮ ‮أمتأكد أنك تريد مواصلة التهيئة؟</string>
     <string lang="ar" key="NONSYS_INPLACE_ENC_CONFIRM">‮تحذير: لن يكون بوسعك وصل المجلد أو النفاذ إلى الملفات المحفوظة فيه حتى تتم تعميته بكامله. ‮ ‮أمتأكد أنك تريد البدء بتعمية ‪%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 '%hs'%s?</string>
     <string lang="ar" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">‮تحذير: لاحظ أنه إن انقطعت الطاقة فجأة أثناء تعمية البيانات في موضعها، أو إن انهار نظام التشغيل بسبب علات في البرمجيات أو قصور العتاد أثناء إجراء تروكربت لتعمية البيانات في موضعها فإن بعضا من البيانات ستتلف أو تضيع. لذا فقبل أن تشرع في التعمية تثَبَّت من أن لديك نسخة احتياطية من الملفات التي تريد تعميتها. ‮ ‮هل لديك نسخة احتياطية؟</string>
     <string lang="ar" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">‮تحذير: كل الملفات المخزنة في القسم '‪%hs‬'‪%s‬ (أول قسم يلي قسم النظام) ستمحى و تفقد (لن تعمّى)! ‮ ‮أمتأكد أنك تريد الشروع في التهيئة؟</string>
     <string lang="ar" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">‮تحذير: القسم المختار يحوي قدرا كبيرا من البيانات! كل الملفات المخزنة في القسم ستمحى و تفقد (لن تعمى)!</string>
     <string lang="ar" key="ERASE_FILES_BY_CREATING_VOLUME">‮امح أية ملفات مخزنة في القسم بإنشاء مجلد تروكربت فيه</string>
     <string lang="ar" key="PASSWORD">‮كلمة السّر</string>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="ar" key="IDD_PCDM_CHANGE_PKCS5_PRF">ضبط خوارزمية اشتقاق مفتاح الترويسة</string>
     <string lang="ar" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">‮أضف/احذف الملفات المفاتيح من/إلى المجلد</string>
     <string lang="ar" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">‮احذف كل الملفات المفاتيح من المجلد</string>
-    <string lang="en" key="PASSWORD_CHANGED">Password and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</string>
+    <string lang="en" key="PASSWORD_CHANGED">Password, PIM and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</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="ar" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">‮هام: إذا لم تدمر قرص إنقاذ تروكربت فإنه يمكن تظهير قسم\\نبيطة النظام باستخدام كلمة السر العتيقة (بإقلاع قرص إنقاذ تروكربت و إدخال كلمة السر العتيقة). لذا ينبغي إنشاء قرص إنقاذ تروكربت حديث ثم إتلاف العتيق. ‮ ‮أتريد إنشاء قرص تروكربت حديث؟</string>
     <string lang="ar" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">‮لاحظ أن قرص تروكربت لازال يستخدم الخوارزمية السابقة. إن كنت تعد الخوارزمية السابقة غير آمنة فينبغي لك أن تنشئ قرص إنقاذ تروكربت جديد ثم تدمر العتيق. ‮ ‮أتريد إنشاء قرص إنقاذ تروكربت جديد؟</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,6 +600,7 @@
     <string lang="ar" key="PKCS5_PRF_CHANGED">‮تم ضبط خوارزمية اشتقاق مفتاح الترويسة بنجاح.</string>
     <string lang="ar" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">‮أدخل كلمة السر و\\أو ملفات المفاتيح للمجلد الذي لغير نظام التشغيل الذي تريد معاودة صيرورة تعميته في موضعه. ‮ ‮ملاحظة: بعد أن تنقر 'اللاحق' فإن تروكربت سيحاول إيجاد المجلدات التي لغير النظام التي قوطعت صيرورة تعميتها و التي يمكن تظهير ترويستها باستخدام كلمة السر و\\أو الملفات المفاتيح المعطاة. إن وجد أكثر من مجلد بهذه الصفة فسيكون عليك أن تختار أحدها في الخطوة التالية.</string>
     <string lang="ar" 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="ar" key="PASSWORD_HELP">‮من المهم أن تضع كلمة سر جيدة. تجنب وضع كلمة سر تحوي كلمات من المعجم (أو توافيق من كلمتين أو ثلاثة أو أربعة)، كما أنها ينبغي ألا تحوي أية أسماء أو تواريخ ميلاد؛ فيجب ألا يَسهُل تخمينها. كلمة السر الجيدة تتألف من توفيقة عشوائية من الأحرف و الأرقام و المحارف الخاصة، مثل @ ^ = $ * + إلخ. نوصي بوضع كلمة سر تتألف من أكثر من 20 خانة (كلما طالت كان أفضل). الطول الأقصى المسموح به هو 64 خانة.</string>
     <string lang="ar" key="PASSWORD_HIDDENVOL_HELP">‮اختر كلمة سر للمجلد المخفي. </string>
     <string lang="ar" key="PASSWORD_HIDDEN_OS_HELP">‮ضع كلمة سر لنظام التشغيل المخفي (أي للمجلد المخفي).</string>
@@ -597,11 +620,26 @@
     <string lang="ar" key="PASSWORD_WRONG_AUTOMOUNT">‮كلمة سر غير صحيحة أو لا يوجد مجلد تروكرِبت.</string>
     <string lang="ar" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">‮ملفات مفتاح/كلمة سر غير صحيحة أو لا يوجد مجلد تروكرِبت.</string>
     <string lang="ar" key="PASSWORD_WRONG_CAPSLOCK_ON">\nn‮ ‮تنبيه: مفتاح ‪Caps Lock‬ مفعَّل. قد يُسبب هذا أن تُدخلَ كلمة السر على نحو غير صحيح.</string>
+    <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
+    <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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_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="ar" key="FOUND_NO_PARTITION_W_DEFERRED_INPLACE_ENC">‮لم يجد تروكربت أي مجلدات لغير النظام و قد قوطعت تعميتها و أمكن تظهير ترويستها باستخدام كلمة السر و\\أو الملفات المفاتح المعطاة. ‮ ‮تحقق من أن كلمة السر و\\أو ملفات المفاتيح صحيحة و أن القسم\\المجلد ليس قيد الاستخدام من قبل النظام أو تطبيقات (بما في ذلك مضادات الفيروسات).</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="ar" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\nn‮ ‮ملاحظة: إن كنت تحاول وصل مجلد موضوع في سواقة نظام معماة دون استيثاق ما قبل الإقلاع، أو إن كنت تحاول وصل قسم النظام المعمى لنظام تشغيل غير عامل فيمكنك فعل ذلك باختيار 'نظام' &gt; 'أوصل دون استيثاق ما قبل الإقلاع'.</string>
     <string lang="ar" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">‮في هذا الطور لا يمكن وصل قسم من سواقة يكون أي جزء منها قيد تعمية النظام. ‮ ‮قبل أن يمكن وصل هذا القسم في هذا الطور ينبغي أن تقلع نظام تشغيل مُنَصَّب على سواقة أخرى (معماة أو غير معماة) أو إقلاع نظام تشغيل غير معمى.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <string lang="ar" key="PREV">‮&lt; السا&amp;بق</string>
     <string lang="ar" key="RAWDEVICES">‮تعذَّر سرد النبائط الخام المنصّبة على نظامك.</string>
     <string lang="ar" key="READONLYPROMPT">‮المجلد '‪%hs‬' موجود و مسموح فقط بالقراءة منه. أمتأكد أنك ترغب في استبداله؟</string>
@@ -701,11 +739,18 @@
     <string lang="ar" key="FOR_MORE_INFO_ON_PARTITIONS">‮لمعلومات عن كيفية إنشاء و إدارة الأقسام ارجع إلى الوثائق المرفقة بنظام التشغيل أو اتصل بفني صيانة الحواسيب الذي تتعامل معه أو ابحث في الشروح و الأدلة على الوب أو استعن بصديق ذي خبرة.</string>
     <string lang="ar" key="SYSTEM_PARTITION_NOT_ACTIVE">‮عطل: نظام التشغيل العامل حاليا ليس مُنَصَّبا في قسم الإقلاع (القسم النشط الأول)؛ و هذا غير مدعوم.</string>
     <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="ar" key="CANT_ACCESS_VOL">‮عُطل: تعذَّر النفاذ إلى للمجلد! ‮ ‮تحقق من أن المجلد المختار موجود، و أنه ليس موصولا أو يستخدمه النظام أو تطبيق ما، وأنك تملك صلاحيات القراءة\\الكتابة للمجلد، وأنه ليس محميا من الكتابة.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="ar" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">‮عطل: تعذَّر النفاذ إلى المجلد و\\أو إيجاد معلومات عنه. ‮ ‮تحقق من وجود المجلد المختار، و أنه ليس قيد الاستخدام بواسطة النزام أو تطبيقات، و أن لديك صلاحية القراءة\\الكتابة فيه، و أنه ليس محميا من الكتابة.</string>
     <string lang="ar" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">‮عطل: تعذَّر النفاذ إلى المجلد و\\أو إيجاد معلومات عنه. ‮ ‮تحقق من وجود المجلد المختار، و أنه ليس قيد الاستخدام بواسطة النزام أو تطبيقات، و أن لديك صلاحية القراءة\\الكتابة فيه، و أنه ليس محميا من الكتابة. ‮ ‮إن لم تنحل المشكلة	فقد يفيد اتباع الخطوات التالية.</string>
     <string lang="ar" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">‮منع عطلٌ تروركبت من تعمية القسم. حاول إصلاح الأعطال المقررة مسبقا ثم حاول مجدا. إن تكررت المشكلة يفيد اتِّباع الخطوات التالية.</string>
     <string lang="ar" key="INPLACE_ENC_GENERIC_ERR_RESUME">‮منع عطلُ تروكربت من معاودة صيرورة تعمية القسم. ‮ ‮حاول إصلاح المشكلات المقررة مسبقا ثم حاول مجددا معاودة الصيرورة. لاحظ أن المجلد لا يمكن وصله حتى تمام تعميته.</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="ar" key="CANT_DISMOUNT_OUTER_VOL">‮عُطل: تعذَّر فصل المجلد الخارجي! ‮ ‮لا يمكن فصل المجلد إذا حوى ملفات أو أدلة يستخدمها تطبيق أو النظام. ‮ ‮أغلق كل البرمجيات التي قد تكون مستخدمة ملفات أو أدلة على المجلد ثم انقر 'حاول مجددا'.</string>
     <string lang="ar" key="CANT_GET_OUTER_VOL_INFO">‮عطل: تعذّر جلب معلومات عن المجلد الخارجي! لا تمكن مواصلة إنشاء المجلد.</string>
     <string lang="ar" key="CANT_ACCESS_OUTER_VOL">‮عُطل: تعذَّر النفاذ للمجلد الخارجي! لا يمكن متابعة إنشاء المجلد.</string>
@@ -790,7 +835,7 @@
     <string lang="ar" key="TC_INSTALLER_IS_RUNNING">‮أداة تنصيب تروكربت عاملة حاليا في هذا النظام و تجري أو تهيئ تنصيبا أو تحديثا. قبل المواصلة انتظر حتى تتم عملها أو أغلقها. إن تعذّر إغلاقها فأعد تشغيل النظام.</string>
     <string lang="ar" key="INSTALL_FAILED">‮فشل التنصيب.</string>
     <string lang="ar" key="UNINSTALL_FAILED">‮فشلت الإزالة.</string>
-    <string lang="ar" key="DIST_PACKAGE_CORRUPTED">‮حزمة التوزيع هذه معطوبة. حاول تنزيلها مجددا (يستحسن من موقع تروكربت الرسمي في ‪www.veracrypt.org‬).</string>
+    <string lang="ar" key="DIST_PACKAGE_CORRUPTED">‮حزمة التوزيع هذه معطوبة. حاول تنزيلها مجددا (يستحسن من موقع تروكربت الرسمي في ‪https://veracrypt.codeplex.com‬).</string>
     <string lang="ar" key="CANNOT_WRITE_FILE_X">‮تعذّرت كتابة الملف ‪%hs‬</string>
     <string lang="ar" key="EXTRACTING_VERB">‮يجري الاستحراج</string>
     <string lang="ar" key="CANNOT_READ_FROM_PACKAGE">‮تعذّرت قراءة البيانات من الحزمة.</string>
@@ -977,6 +1022,7 @@
     <string lang="ar" key="CONFIRM_EXIT_UNIVERSAL">‮أخرج؟</string>
     <string lang="ar" key="CHOOSE_ENCRYPT_OR_DECRYPT">‮ليس لدى تروكربت معلومات تكفي لتحديد ما إن كان المطلوب التعمية أو التظهير.</string>
     <string lang="ar" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">‮ليس لدى تروكربت معلومات تكفي لتحديد ما إن كان المطلوب التعمية أو التظهير. ‮ ‮ملاحظة: إن ظهّرت قسم\\نبيطة النظام في بيئة ما قبل الإقلاع فإن قد تحتاج إلى إتمام الصيرورة بنقر 'ظهّر'.</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="ar" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">‮أتريد مقاطعة و تأجيل صيرورة تعمية القسم\\المجلد؟ ‮ ‮ملاحظة: راع أنه لا يمكن وصل المجلد حتى تمام تعميته. سيطون بوسعك معاودة صيرورة التعمية من حيث توقفت. يمكنك عمل ذلك باختيار 'مجلدات' &gt; 'عاود الصيرورة المقاطعة' من القائمة في نافذة تروكربت الرئيسية.</string>
     <string lang="ar" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">‮أتريد مقاطعة و تأجيل صيرورة تعمية قسم\\نبيطة النظام؟ ‮ ‮ملاحظة: سيكون بوسعك معاودة الصيرورة و ستواصل من حيث توقفت. يمكنك عمل ذلك باختيار 'نظام' &gt; 'عاود الصيرورة المقاطعة' من قائمة نافذة تروكربت الرئيسية. إن كنت تريد إنهاء أو عكس صيرورة التعمية فاختر 'نظام' &gt; 'ظهّر نهائيا قسم\\نبيطة النظام'.</string>
     <string lang="ar" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">‮أتريد مقاطعة و تأجيل صيرورة تظهير قسم\\نبيطة النظام؟ ‮ ‮ملاحظة: سيكون بوسعك معاودة الصيرورة و ستواصل من حيث توقفت. يمكنك عمل ذلك باختيار 'نظام' &gt; 'عاود الصيرورة المقاطعة' من قائمة نافذة تروكربت الرئيسية. إن كنت تريد عكس صيرورة التظهير (أي بدء التعمية) فاختر 'نظام' &gt; 'عمِّ قسم\\نبيطة النظام'.</string>
@@ -986,6 +1032,7 @@
     <string lang="ar" key="FAILED_TO_START_WIPING">‮عطل: تعذَّر بدء صيرورة المحو.</string>
     <string lang="ar" key="INCONSISTENCY_RESOLVED">‮تم حل عدم الاتساق. ‮ ‮ ‮(إن أبلغت عن علة بهذا الشأن فرجاءً ضمِّن البيانات التقنية التالية في البلاغ: ‪%hs‬)</string>
     <string lang="ar" key="UNEXPECTED_STATE">‮عطل: حالة غير متوقعة. ‮ ‮ ‮(إن أبلغت عن علة ذات علاقة بهذا فرجاء ضمِّن التقرير البيانات التقنية التالية: ‮‪%hs‬)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="ar" key="NOTHING_TO_RESUME">‮لا توجد صيرورة/مهمة لمعاودتها.</string>
     <string lang="ar" key="HIDVOL_PROT_BKG_TASK_WARNING">‮تحذير: عُطِّلت مهمة تروكرِبت الخلفية. بعد أن تغلق تروكرِبت لن تُبلغ إن أحيل دون تلف في مجلد مخفي ‮ ‮ملاحظة: يمكنك إغلاق المهمة الخلفية في أي وقت بالنقر باليمين على أيقونة تروكرِبت في اللوحة و اختيار 'اخرج'. ‮ ‮أأفعِّل مهمة تروكرِبت الخلفية؟</string>
     <string lang="ar" key="LANG_PACK_VERSION">‮إصدارة حزمة اللغة:	‪%s‬</string>
@@ -1013,6 +1060,7 @@
     <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="ar" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">‮مُحمِّل النظام الأصلي لن يُحفظ على قرص الإنقاذ (سبب محتمل: ملف محفوظة مفقود).</string>
     <string lang="ar" key="ERROR_MBR_PROTECTED">‮تعذّرت كتابة قطاع ‪MBR‬. ‮ ‮ربما كان ‪BIOS‬ مضبوطا بحيث يحمي قطاع ‪MBR‬. تَفَحَّص تضبيطات ‪BIOS‬ المتعلقة بحماية ‪MBR‬ أو مضاد الفيروسات (بضغط ‪F2‬ أو ‪delete‬ أو ‪Esc‬ بعد تشغيل الحاسوب).</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="en" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">The required version of the VeraCrypt Boot Loader is currently not installed. This may prevent some of the settings from being saved.</string>
     <string lang="ar" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">‮ملاحظة: في بعض الحالات قد ترغب في منع شخص (خصم) يراقبك و أنت تشغل الحاسوب من معرفة أنك تستخدم تروكربت. الخيارات في الأعلى تمكنك من هذا بطريق تطويع شاشة مُحمِّل إقلاع تروكربت. إن فعَّلت الخيار الأول فلن يُظهر مُحمِّل الإقلاع أية نصوص (و لا حتى عندما تدخل كلمة السر)، و سيبدو أن الحاسوب متجمد في حين سيكون بوسعك إدخال كلمة السر. إضافة إلى ذلك يمكن عرض رسالة مطوعة لتضليل الخصم؛ كرسالة خطأ زائفة مثل "لا يوجد نظام تشغيل" (و هي التي يعرضها عادة مُحمِّل إقلاع ويندوز إذا لم يجد قسم إقلاع ويندوز). لكن من المهم ملاحظة أنه إذا كان بوسع الخصم تحليل محتويات سواقة الأقراص فسيكون بوسعه معرفة أنه يحوي مُحمِّل إقلاع تروكربت.</string>
     <string lang="ar" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">‮تحذير: راع أنك إن فعَّلت هذا الخيار فإن مُحمِّل إقلاع تروكربت لن يعرض أية نصوص (و لا حتى عندما تدخل كلمة السر)، و سيبدو أن الحاسوب "متجمدا" (لا يستجيب) في حين سيمكنك إدخال كلمة السر (لن تتحرك المشيرة و لن تظهر نجمات عندما تضغط المفاتيح). ‮ ‮أمتأكد أنك تريد تفعيل هذا الخيار؟</string>
@@ -1034,8 +1082,11 @@
     <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="ar" key="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">‮تحذير: توجد مساحة غير مخصصة بين قسم النظام و القسم الذي يليه. بعد إنشاء نظام التشغيل المخفي ينبغي ألا تنشئ أية أقسام جديدة في هذه المساحة غير المخصصة و إلا فلن يمكن إقلاع نظام التشغيل (حتى تحذف تلك الأقسام المنشأة حديثا).</string>
     <string lang="ar" 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="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="ar" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">‮لا يمكن حاليا استخدام الملفات المفاتيح عند تعمية النظام.</string>
     <string lang="ar" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">تنبيه: تعذَّر على تروكربت استعادة النسق الأصلي للوحة المفاتيح مما قد يؤدي إلى أن تُدخلَ كلمة السر على نحو غير صحيح.</string>
     <string lang="ar" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">‮عطل: تعذّر ضبط هيئة لوحة المفاتيح لتروكربت إلى التوزيع القياسي للولايات المتحدة. ‮ ‮لاحظ أن كلمة السر يجب أن تدخل في بيئة ما قبل الإقلاع (قبل أن يبدأ ويندوز) حيث لا يتاح سوى لوحات مفاتيح ويندوز الولايات المتحدة. لذا يجب أن تدخل كلمة السر دوما باستخدام هيئة لوحة مفاتيح الولايات المتحدة القياسية.</string>
@@ -1120,6 +1171,7 @@
     <string lang="ar" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">‮تم الاختبار المبدئي بنجاح. ‮ ‮تحذير: لاحظ أنه إذا انقطعت الطاقة أثناء تعمية البيانات في موضعها أو إذا انهار نظام التشغيل بسبب عطل برمجي أو عتادي أثناء عمل تروكربت على تعمية بيانات في موضعها فإن بعضا من البيانات ستتلف أو تُفقد. لذا فقبل البدء بالتعمية تحقق من أن لديك نسخة احتياطية من الملفات التي ستعميها، و إذا ما كانت لديك فاتِّخذ نسخة احتياطية الآن (يمكنك نقر 'أرجئ' و نسخ الملفات ثم تشغيل تروكربت مجددا في أي وقت و اختيار 'نظام' &gt; 'عاود الصيرورة المقاطعة' لبدء التعمية). ‮ ‮عندما تكون جاهزا اضغط 'عمِّ' لبدء التعمية.</string>
     <string lang="en" key="SYSENC_ENCRYPTION_PAGE_INFO">You can click Pause or Defer anytime to interrupt the process of encryption or decryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. To prevent slowdown when the system or applications write or read data from the system drive, VeraCrypt automatically waits until the data is written or read (see Status above) and then automatically continues encrypting or decrypting.</string>
     <string lang="ar" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\nn‮ ‮يمكنك أن تضغط 'جمِّد' أو 'أرجئ' في أي وقت لمقاطعة صيرورة التعمية، ثم تصرف المرشد، ثم تعيد تشغيل الحاسوب أو تطفئه، ثم معاودة الصيرورة التي ستواصل من حيث توقفت. لاحظ أن المجلد لا يمكن وصله حتى تمام تعميته.</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="ar" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">‮اشتغل النظام المخفي</string>
     <string lang="ar" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">‮النظام الأصلي</string>
     <string lang="ar" key="SYSENC_HIDDEN_OS_WIPE_INFO">‮ينشئ ويندوز (عادة دون استشارتك) ملفات سجلات عديدة، و ملفات مؤقتة و غيرها في قسم ويندوز، كما يحفظ محتويات ذاكرة RAM عند السُبات و كذلك في ملف المبادلة الذي عادة ما يوجد في قسم النظام. لذا، إن تمكن خصم من تحليل الملفات المخزنة في القسم الذي يوجد فيه النظام ااصلي (و الذي استنسخ منه النظام المخفي) فإنه قد يعرف أنك استخدمت مرشد تروكربت في طور إنشاء نظام مخفي (و هو ما قد يدل على وجود نظام تشغيل مخفي في حاسوبك). ‮ ‮للحول دون مثل هذه الملابسات فإن تروكربت في الخطوات التالية سيمحو محوا آمنا كل محتوى القسم الذي كان يوجد فيه النظام الاصلي. بعدها، و لأجل تحقيق حجية الإنكار يتوجب ليك تثبيت نظام تشغيل جديد في القسم ثم تعميته، و بهذا يصير لديك نظام تمويه و بهذا تتم صيرورة إنشاء نظام التشغيل المخفي.</string>
@@ -1159,7 +1211,7 @@
     <string lang="ar" key="HIDDEN_OS_CREATION_PREINFO_HELP">‮في الخطوات التالية سينشئ تروكربت نظام التشغيل المخفي بنسخ محتوى قسم النظام إلى المجلد المخفي (البيانات المنسوخة ستُعمى لحظيا بمفتاح تعمية يختلف عن الذي سيستخدم لنظام التشغيل التمويهي). ‮ ‮لاحظ أن هذه الصيرورة ستجري في بيئة ما قبل الإقلاع (قبل أن يشتغل ويندوز) و أنها قد تستغرق وقتا طويلا حتى تتم؛ بضع ساعات أو حتى أياما (حسب حجم قسم النظام و قوة الحاسوب). ‮ ‮سيكون بوسعك مقاطعة الصيرورة و إطفاء الحاسوب ثم بدء نظام التشغيل و معاودة الصيرورة لاحقا. إلا أنك إذا ما قاطعت صيرورة نسخ نظام التشغيل فإنها ستبدأ من البداية عند معاودتها (لأن محتويات قسم النظام ينبغي ألا تتغير أثناء النسخ).</string>
     <string lang="ar" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">‮أتريد إلغاء صيرورة إنشاء نظام التسغيل المخفي كلية؟ ‮ ‮ملاحظة: لن يمكنك معاودة الصيرورة إن ألغيتها الآن.</string>
     <string lang="ar" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">‮أتريد إلغاء الاختبار المبدئي لتعمية النظام؟</string>
-    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="ar" key="SYS_DRIVE_NOT_ENCRYPTED">‮لا يبدو أن قسم\\سواقة النظام مُعمّاة (لا جزئيا و لا بالكامل).</string>
     <string lang="ar" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">‮قسم\\سواقة النظام مُعمّاة (جزئيا أو بالكامل). ‮ ‮ظهِّر قسم\\سواقة النظام كُليّا قبل المواصلة. لفعل هذا اختر 'نظام' &gt; 'ظهِّر نهائيا قسم\\سواقة النظام' من قائمة نافذة تروكربت الرئيسية.</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">When the system partition/drive is encrypted (partially or fully), you cannot downgrade VeraCrypt (but you can upgrade it or reinstall the same version).</string>
@@ -1176,6 +1228,8 @@
     <string lang="en" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">You have selected the system partition/drive (or the boot partition), but the wizard mode you selected is suitable only for non-system partitions/drives.\n\nDo you want to set up pre-boot authentication (which means that you will need to enter your password each time before Windows boots/starts) and encrypt the system partition/drive?</string>
     <string lang="ar" key="CONFIRM_DECRYPT_SYS_DEVICE">‮أمتأكد أنك تريد تظهير قسم\\سواقة النظام نهائيا؟</string>
     <string lang="ar" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">‮تنبيه: إن ظهَّرت قسم\\سواقة النظام نهائيا فإن بيانات غير معماة ستكتب عليها. ‮ ‮أتريد حقا تظهير قسم\\سواقة النظام نهائيا؟</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
     <string lang="en" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Warning: If you use a cascade of ciphers for system encryption, you may encounter the following issues:\n\n1) The VeraCrypt Boot Loader is larger than normal and, therefore, there is not enough space in the first drive track for a backup of the VeraCrypt Boot Loader. Hence, whenever it gets damaged (which often happens, for example, during inappropriately designed anti-piracy activation procedures of certain programs), you will need to use the VeraCrypt Rescue Disk to boot or to repair the VeraCrypt Boot Loader.\n\n2) On some computers, resuming from hibernation takes longer.\n\nThese potential issues can be prevented by choosing a non-cascade encryption algorithm (e.g. AES).\n\nAre you sure you want to use a cascade of ciphers?</string>
     <string lang="ar" 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>
@@ -1191,6 +1245,7 @@
     <string lang="en" key="ENABLE_BAD_SECTOR_ZEROING">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nThe process of in-place encryption can continue only when the sectors have been made readable again. VeraCrypt can attempt to make these sectors readable by writing zeros to the sectors (subsequently such all-zero blocks would be encrypted). However, note that any data stored in the unreadable sectors will be lost. If you want to avoid that, you can attempt to recover portions of the corrupted data using appropriate third-party tools.\n\nNote: In case of physically damaged sectors (as opposed to mere data corruption and checksum errors) most types of storage devices internally reallocate the sectors when data is attempted to be written to them (so the existing data in the damaged sectors may remain unencrypted on the drive).\n\nDo you want VeraCrypt to write zeroes to unreadable sectors?</string>
     <string lang="en" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nTo be able to proceed with decryption, VeraCrypt will have to discard the content of the unreadable sectors (the content will be replaced with pseudorandom data). Please note that, before proceeding, you can attempt to recover portions of any corrupted data using appropriate third-party tools.\n\nDo you want VeraCrypt to discard data in the unreadable sectors now?</string>
     <string lang="ar" key="ZEROED_BAD_SECTOR_COUNT">‮ملاحظة: استبدل تروركبت محتوى ‪%I64d‬ قطاعا(ت) غير مقروء(ة) (‪%s‬) بكتل من صريحة الأصفار المعماة.</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="ar" key="ENTER_TOKEN_PASSWORD">‮أدخل كلمة السر\\رقم التعريف للأمارة '‪%s‬':</string>
     <string lang="ar" key="PKCS11_LIB_LOCATION_HELP">‮لتمكين تروكربت من النفاذ إلى أمارة أمان أو بطاقة ذكية ينبغي أولا تنصيب مكتبة ‪PKCS #11‬ البرمجية الخاصة بالأمارة أو البطاقة. مثل تلك المكتبة قد تكون مضمنة مع الجهاز أو قد تكون متاحة للتنزيل من موقع الصانع على الوب أو من أطراف آخرين. ‮ ‮بعد تنصيب المكتبة يمكنك إما أن تختارها يدويا بنقر 'اختر مكتبة' أو أن تدع تروكربت ليجدها و يختارها تلقائيا بنقر 'تحسس المكتبة تلقائيا' (لن يبحث سوى في دليل نظام ويندوز).</string>
     <string lang="ar" key="SELECT_PKCS11_MODULE_HELP">‮ملاحظة: فيما يخص اسم و موضع ملف مكتبة ‪PKCS #11‬ المنصبة لأمارة الأمان أو البطاقة الذاتية التي تستخدمها ارجع للوثائق المصاحبة للأمارة أو البطاقة أو البرمجيات الخارجية. ‮ ‮انقر 'موافق' لتختار المسا رو اسم الملف.</string>

Translations/Language.be.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="be" name="Беларуская" en-name="Belarusian" version="0.1.0" translators="Aleg Azarousky" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <control lang="be" key="IDC_KEY_FILES">Файлы...</control>
     <control lang="be" key="IDC_LINK_HASH_INFO">Звесткі пра хэш-алгарытмы</control>
     <control lang="be" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Дэталёва</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="be" key="IDC_MB">&amp;Мб</control>
     <control lang="be" key="IDC_MORE_INFO_ON_CONTAINERS">Дэталёва</control>
     <control lang="be" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">Звесткі пра шыфраванне сістэмы</control>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <control lang="be" key="IDT_COLLECTING_RANDOM_DATA_NOTE">ВАЖНА: Хаатычна рухайце мышкай у гэтым акне. Чым даўжэй, тым лепш. Гэта значна павялічыць крыптатрываласць ключоў шыфравання. Затым націсніце 'Далей' для працягу.</control>
     <control lang="be" key="IDT_CONFIRM">Пацвердзіце:</control>
     <control lang="be" key="IDT_DONE">Гатова</control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="be" key="IDT_ENCRYPTION_ALGO">Алгарытм шыфравання</control>
     <control lang="be" key="IDT_FILESYSTEM">Файлавая сістэма:</control>
     <control lang="be" key="IDT_FILE_CONTAINER">Стварыць віртуальны зашыфраваны дыск усярэдзіне файла. Рэкамендуецца дасведчаным карыстачам.</control>
@@ -85,6 +88,8 @@
     <control lang="be" key="IDT_PARTIAL_POOL_CONTENTS">Бягучае змесціва пула (частка)</control>
     <control lang="en" key="IDT_PASS">Pass</control>
     <control lang="be" 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="be" key="IDT_PROGRESS">Ход працы:</control>
     <control lang="be" key="IDT_RANDOM_POOL">Выпадкова:</control>
     <control lang="be" key="IDT_SINGLE_BOOT">Абярыце гэтую наладу, калі ў ПК усталяваная толькі адна АС (нават калі яна з некалькімі карыстачамі).</control>
@@ -142,6 +147,8 @@
     <control lang="be" key="IDC_MOUNT_OPTIONS">Налады...</control>
     <control lang="be" key="IDC_MOUNT_READONLY">Мантаваць як том толькі для чытання</control>
     <control lang="be" key="IDC_NEW_KEYFILES">Ключавыя файлы...</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="be" key="IDC_PREF_BKG_TASK_ENABLE">Уключана</control>
     <control lang="be" key="IDC_PREF_CACHE_PASSWORDS">Кэшаваць паролі ў памяці прывада</control>
     <control lang="be" key="IDC_PREF_DISMOUNT_INACTIVE">Аўтаматычна размантаваць пры неактыўнасці на працягу</control>
@@ -155,6 +162,7 @@
     <control lang="be" key="IDC_PREF_MOUNT_READONLY">Мантаваць як тамы толькі для чытання</control>
     <control lang="be" key="IDC_PREF_MOUNT_REMOVABLE">Мантаваць як зменныя носьбіты</control>
     <control lang="be" 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="en" key="IDC_PREF_USE_DIFF_TRAY_ICON_IF_VOL_MOUNTED">Use a different taskbar icon when there are mounted volumes</control>
     <control lang="be" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Ачысціць кэш пароляў пры аўтаразмантаванні</control>
     <control lang="be" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Ачысціць кэш пароляў на выхадзе</control>
@@ -167,11 +175,12 @@
     <control lang="be" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Паказаць пароль</control>
     <control lang="be" key="IDC_TRAVEL_OPEN_EXPLORER">Адчыніць змантаваны том у акне Аглядальніка</control>
     <control lang="be" key="IDC_TRAV_CACHE_PASSWORDS">Кэшаваць пароль у памяці драйвера</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="be" key="IDC_UNMOUNTALL">Размантаваць усе</control>
     <control lang="be" key="IDC_VOLUME_PROPERTIES">Уласцівасці тома...</control>
     <control lang="be" key="IDC_VOLUME_TOOLS">Аперацыі...</control>
     <control lang="be" key="IDC_WIPE_CACHE">Ачысціць кэш</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
     <control lang="be" key="IDD_HOTKEYS_DLG">VeraCrypt - агульнасістэмныя хуткія клавішы</control>
     <control lang="be" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="en" key="IDM_CREATE_HIDDEN_OS">Create Hidden Operating System...</control>
     <control lang="be" key="IDM_CREATE_RESCUE_DISK">Стварыць дыск узнаўлення...</control>
     <control lang="be" key="IDM_CREATE_VOLUME">Стварыць новы том...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="be" key="IDM_DEFAULT_KEYFILES">Прадвызначаныя ключавыя файлы...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="be" key="IDM_ENCRYPT_SYSTEM_DEVICE">Зашыфраваць сістэмны падзел/дыск...</control>
     <control lang="be" key="IDM_FAQ">Пытанні і адказы</control>
@@ -243,6 +254,7 @@
     <control lang="be" key="IDM_UNMOUNT_VOLUME">Размантаваць том</control>
     <control lang="be" key="IDM_VERIFY_RESCUE_DISK">Праверыць дыск узнаўлення</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>
     <control lang="be" key="IDM_VOLUME_WIZARD">Майстар стварэння тамоў</control>
     <control lang="be" key="IDM_WEBSITE">Сайт VeraCrypt</control>
@@ -485,7 +497,11 @@
     <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>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Volume Fully Encrypted</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_INFO">IMPORTANT: TO MOUNT THIS NEWLY CREATED VERACRYPT VOLUME AND TO ACCESS DATA STORED IN IT, CLICK 'Auto-Mount Devices' IN THE MAIN VERACRYPT WINDOW. After you enter the correct password (and/or supply correct keyfiles), the volume will be mounted to the drive letter you select from the list in the main VeraCrypt window (and you will be able to access the encrypted data via the selected drive letter).\n\nPLEASE REMEMBER OR WRITE DOWN THE ABOVE STEPS. YOU MUST FOLLOW THEM WHENEVER YOU WANT TO MOUNT THE VOLUME AND ACCESS DATA STORED IN IT. Alternatively, in the main VeraCrypt window, click 'Select Device', then select this partition/volume, and click 'Mount'.\n\nThe partition/volume has been successfully encrypted (it contains a fully encrypted VeraCrypt volume now) and is ready for use.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="be" key="FORMAT_FINISHED_INFO">Том VeraCrypt паспяхова створаны.</string>
     <string lang="be" key="FORMAT_FINISHED_TITLE">Том створаны</string>
     <string lang="be" key="FORMAT_HELP">ВАЖНА: Хаатычна перасоўвайце мышку ў межах гэтага акна. Чым даўжэй, тым лепш. Гэта значна павялічыць крыптаўстойлівасць ключоў шыфравання. Затым націсніце 'Размеціць', каб стварыць том.</string>
@@ -523,6 +539,7 @@
     <string lang="be" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Памылка атрымання стану сістэмнага шыфравання.</string>
     <string lang="be" key="INIT_SYS_ENC">Немагчыма ініцыялізаваць кампаненты прыкладання для сістэмнага шыфравання.</string>
     <string lang="be" key="INIT_RAND">Памылка ініцыялізацыі генератара выпадковых лікаў.</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="be" key="INIT_REGISTER">Памылка ініцыялізацыі прыкладання. Немагчыма зарэгістраваць клас Dialog.</string>
     <string lang="en" key="INIT_RICHEDIT">Error: Failed to load the Rich Edit system library.</string>
     <string lang="be" key="INTRO_TITLE">Майстар стварэння шыфраванага тома</string>
@@ -535,6 +552,7 @@
     <string lang="be" key="MOUNT_BUTTON">Змантаваць</string>
     <string lang="be" key="NEW_VERSION_REQUIRED">Для мантавання гэтага тома патрабуецца навейшая версія VeraCrypt.</string>
     <string lang="be" 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="be" key="NEXT">Далей &gt;</string>
     <string lang="be" key="FINALIZE">&amp;Гатова</string>
     <string lang="be" key="INSTALL">Усталяваць</string>
@@ -542,6 +560,7 @@
     <string lang="be" key="NODRIVER">Не атрымалася падлучыцца да драйвера прылад VeraCrypt. Калі драйвер не запушчаны, праца VeraCrypt немагчыма.\n\nЗ-за асаблівасцяў Windows для загрузкі драйвера спачатку можа запатрабавацца завяршэнне сеансу ці перазагрузка сістэмы.</string>
     <string lang="be" key="NOFONT">Памылка загрузкі/падрыхтоўкі шрыфтоў.</string>
     <string lang="en" key="NOT_FOUND">The drive letter was not found or no drive letter was specified.</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="be" key="DRIVE_LETTER_UNAVAILABLE">Літара дыска недаступна.</string>
     <string lang="be" key="NO_FILE_SELECTED">Не абраны файл.</string>
     <string lang="be" key="NO_FREE_DRIVES">Няма даступных літар дыскаў.</string>
@@ -561,15 +580,18 @@
     <string lang="be" key="OVERWRITEPROMPT">УВАГА: Файл '%hs' ужо існуе!\n\nВАЖНА: VERACRYPT НЕ БУДЗЕ ШЫФРАВАЦЬ ГЭТЫ ФАЙЛ, ЁН ЯГО ВЫДАЛІЦЬ. Вы сапраўды жадаеце выдаліць гэты файл і замяніць яго новым кантэйнерам VeraCrypt?</string>
     <string lang="be" key="OVERWRITEPROMPT_DEVICE">АСЦЯРОЖНА: УСЕ ДАДЗЕНЫЯ, ЯКІЯ УТРЫМОЎВАЕ  %s '%hs'%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_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt.\n\nDo you have such a backup?</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_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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="be" key="IDD_PCDM_CHANGE_PKCS5_PRF">Алгарытм вылічэння ключа загалоўка</string>
     <string lang="be" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Дадаць/выдаліць ключавы файл для тома</string>
     <string lang="be" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Выдаліць усе ключавыя файлы з тома</string>
-    <string lang="en" key="PASSWORD_CHANGED">Password and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</string>
+    <string lang="en" key="PASSWORD_CHANGED">Password, PIM and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</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="en" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">IMPORTANT: If you did not destroy your VeraCrypt Rescue Disk, your system partition/drive can still be decrypted using the old password (by booting the VeraCrypt Rescue Disk and entering the old password). You should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</string>
     <string lang="be" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Звярніце ўвагу, што ваш дыск узнаўлення VeraCrypt (Rescue Disk) усё яшчэ выкарыстоўвае ранейшы алгарытм. Калі вы лічыце гэты алгарытм нядосыць надзейным, стварыце новы дыск узнаўлення VeraCrypt, пасля чаго знішчыце стары.\n\nХочаце стварыць новы дыск узнаўлення VeraCrypt?</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,7 +600,8 @@
     <string lang="be" key="PKCS5_PRF_CHANGED">Алгарытм вылічэння ключа загалоўка паспяхова ўсталяваны.</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_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="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 more than 20 characters (the longer, the better). The maximum possible length is 64 characters.</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="be" key="PASSWORD_HIDDENVOL_HELP">Абярыце пароль для ўтоенага тома. </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_HELP">Please choose a password for the hidden operating system (i.e. for the hidden volume). </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_NOTE">IMPORTANT: The password that you choose for the hidden operating system in this step must be substantially different from the other two passwords (i.e. from the password for the outer volume and from the password for the decoy operating system).</string>
@@ -597,11 +620,26 @@
     <string lang="be" key="PASSWORD_WRONG_AUTOMOUNT">Няслушны пароль, або не знойдзены том VeraCrypt.</string>
     <string lang="be" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Няслушныя ключавыя файлы/пароль, альбо не знойдзены том VeraCrypt.</string>
     <string lang="be" 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="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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_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>
+    <string lang="en" key="SELECTED_PARTITION_NOT_INPLACE_ENC">The selected partition/device is not using in-place encryption.\nHeader Flags = 0x%.8X</string>
     <string lang="en" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nNote: If you are attempting to mount a partition located on an encrypted system drive without pre-boot authentication or to mount the encrypted system partition of an operating system that is not running, you can do so by selecting 'System' &gt; 'Mount Without Pre-Boot Authentication'.</string>
     <string lang="en" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">In this mode, you cannot mount a partition located on a drive whose portion is within the key scope of active system encryption.\n\nBefore you can mount this partition in this mode, you need to either boot an operating system installed on a different drive (encrypted or unencrypted) or boot an unencrypted operating system.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <string lang="be" key="PREV">&lt; Назад</string>
     <string lang="be" key="RAWDEVICES">Немагчыма паказаць спіс усталяваных у сістэме raw-прылад.</string>
     <string lang="be" key="READONLYPROMPT">Том '%hs' існуе і прызначаны толькі для чытання. Вы сапраўды жадаеце яго замяніць?</string>
@@ -701,11 +739,18 @@
     <string lang="en" key="FOR_MORE_INFO_ON_PARTITIONS">For information on how to create and manage partitions, please refer to the documentation supplied with your operating system or contact your computer vendor's technical support team for assistance.</string>
     <string lang="en" key="SYSTEM_PARTITION_NOT_ACTIVE">Error: The currently running operating system is not installed on the boot partition (first Active partition). This is not supported.</string>
     <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="be" key="CANT_ACCESS_VOL">Памылка! Няма доступу да тома.\n\nПраверце, ці існуе гэты том, ці не змантаваны ён, ці не выкарыстоўваецца сістэмай або якой-небудзь праграмай, якой вы далі правы чытання/запісу гэтага тома, і ці не засцярожаны ён ад запісу.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Error: Cannot access the volume and/or obtain information about the volume.\n\nMake sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Error: Cannot access the volume and/or obtain information about the volume. Make sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.\n\nIf the problem persists, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">An error prevented VeraCrypt from encrypting the partition. Please try fixing any previously reported problems and then try again. If the problems persist, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_RESUME">An error prevented VeraCrypt from resuming the process of encryption of the partition.\n\nPlease try fixing any previously reported problems and then try resuming the process again. Note that the volume cannot be mounted until it has been fully encrypted.</string>
+    <string lang="en" key="INPLACE_DEC_GENERIC_ERR">An error prevented VeraCrypt from decrypting the volume. Please try fixing any previously reported problems and then try again if possible.</string>
     <string lang="be" key="CANT_DISMOUNT_OUTER_VOL">Памылка! Немагчыма размантаваць вонкавы том.\n\nТом нельга размантаваць, калі ён утрымоўвае файлы ці тэчкі, што выкарыстоўваюцца якой-небудзь праграмай ці сістэмай.\n\nЗачыніце ўсе праграмы, якія могуць выкарыстоўваць файлы і тэчкі на гэтым томе, і націсніце 'Паўтор'.</string>
     <string lang="be" key="CANT_GET_OUTER_VOL_INFO">Памылка! Немагчыма атрымаць інфармацыю пра вонкавы том. Стварэнне тома спынена.</string>
     <string lang="be" key="CANT_ACCESS_OUTER_VOL">Памылка! Няма доступу да вонкавага тома. Працяг стварэння тома немагчымы.</string>
@@ -790,7 +835,7 @@
     <string lang="en" key="TC_INSTALLER_IS_RUNNING">VeraCrypt Installer is currently running on this system and performing or preparing installation or update of VeraCrypt. Before you proceed, please wait for it to finish or close it. If you cannot close it, please restart your computer before proceeding.</string>
     <string lang="be" key="INSTALL_FAILED">Усталёўка не выкананая.</string>
     <string lang="be" key="UNINSTALL_FAILED">Выдаленне не выканана.</string>
-    <string lang="be" key="DIST_PACKAGE_CORRUPTED">Гэты дыстрыбутыўны пакет пашкоджаны. Загрузіце яго ізноў (пажадана з афіцыйнага сайта VeraCrypt - www.veracrypt.org).</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="EXTRACTING_VERB">Выманне</string>
     <string lang="be" key="CANNOT_READ_FROM_PACKAGE">Немагчыма прачытаць дадзеныя з дыстрыбутыва.</string>
@@ -977,6 +1022,7 @@
     <string lang="be" key="CONFIRM_EXIT_UNIVERSAL">Выйсці?</string>
     <string lang="en" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt does not have sufficient information to determine whether to encrypt or decrypt.</string>
     <string lang="en" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt does not have sufficient information to determine whether to encrypt or decrypt.\n\nNote: If you decrypted the system partition/drive in the pre-boot environment, you may need to finalize the process by clicking Decrypt.</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_REVERSE_INFO">Note: When you are encrypting a non-system partition/volume in place and an error persistently prevents you from finishing the process, you will not be able to mount the volume (and access data stored on it) until you entirely DECRYPT the volume (i.e. reverse the process).\n\nIf you need to do so, follow these steps:\n1) Exit this wizard.\n2) In the main VeraCrypt window, select 'Volumes' &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="be" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Жадаеце перапыніць і адкласці працэс шыфравання сістэмнага падзелу/дыска?\n\nНататка: пазней працэс можна будзе аднавіць з той кропкі, дзе ён быў прыпынены. Гэта можна зрабіць, напрыклад, абраўшы ў галоўным акне VeraCrypt меню 'Сістэма' &gt; 'Працягнуць перапынены працэс'. Калі вы жадаеце канчаткова перапыніць працэс або зусім адмовіцца ад шыфравання, абярыце 'Сістэма' &gt; 'Назаўсёды расшыфраваць сістэмны падзел/дыск'.</string>
     <string lang="be" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Жадаеце перапыніць і адкласці працэс дэшыфравання сістэмнага падзелу/дыска?\n\nНататка: пазней працэс можна будзе аднавіць з той кропкі, дзе ён быў прыпынены. Гэта можна зрабіць, напрыклад, абраўшы ў галоўным акне VeraCrypt меню 'Сістэма' &gt; 'Працягнуць перапынены працэс'. Калі вы жадаеце адмовіцца ад дэшыфравання (і пачаць шыфраванне), абярыце 'Сістэма' &gt; 'Зашыфраваць сістэмны падзел/дыск'.</string>
@@ -986,6 +1032,7 @@
     <string lang="en" key="FAILED_TO_START_WIPING">Error: Failed to start the process of wiping.</string>
     <string lang="be" key="INCONSISTENCY_RESOLVED">Неадпаведнасць ухілена.\n\n\n(Калі вы паведамляеце пра датычную гэтага памылку, дадайце да сваёй справаздачы наступную тэхнічную інфармацыю: %hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="be" key="NOTHING_TO_RESUME">Няма працэсу/задання для аднаўлення.</string>
     <string lang="be" key="HIDVOL_PROT_BKG_TASK_WARNING">УВАГА: Фонавы працэс VeraCrypt адключаны. Пры выхадзе з VeraCrypt вы не будзеце апавешчаныя аб прадухіленні пашкоджання ўтоенага тома.\n\nНататка: фонавы працэс можна закрыць у любы момант, пстрыкнуўшы правай кнопкай мышы на значку VeraCrypt у сістэмным латку і абраўшы 'Выйсці'.\n\nУключыць фонавы працэс VeraCrypt?</string>
     <string lang="be" key="LANG_PACK_VERSION">Версія моўнага модуля: %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="be" key="ERROR_MBR_PROTECTED">Памылка запісу сектара MBR.\n\nBIOS у вашым ПК можа быць наладжаная на засцярогу сектара 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="en" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">The required version of the VeraCrypt Boot Loader is currently not installed. This may prevent some of the settings from being saved.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Note: In some situations, you may wish to prevent a person (adversary) that is watching you start the computer from knowing that you use VeraCrypt. The above options allow you to do that by customizing the VeraCrypt boot loader screen. If you enable the first option, no texts will be displayed by the boot loader (not even when you enter the wrong password). The computer will appear to be "frozen" while you can type your password. In addition, a custom message can be displayed to mislead the adversary. For example, fake error messages such as "Missing operating system" (which is normally displayed by the Windows boot loader if it finds no Windows boot partition). It is, however, important to note that if the adversary can analyze the content of the hard drive, he can still find out that it contains the VeraCrypt boot loader.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">WARNING: Please keep in mind that if you enable this option, the VeraCrypt boot loader will not display any texts (not even when you enter the wrong password). The computer will appear to be "frozen" (unresponsive) while you can type your password (the cursor will NOT move and no asterisk will be displayed when you press a key).\n\nAre you sure you want to enable this option?</string>
@@ -1034,8 +1082,11 @@
     <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="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>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</string>
     <string lang="be" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Памылка! Немагчыма ўсталяваць раскладку клавіятуры для VeraCrypt у стандартную амерыканскую (US).\n\nЗвярніце ўвагу, што пароль уводзіцца ДА загрузкі Windows, калі любыя раскладкі клавіятуры, адрозныя ад амерыканскай, яшчэ недаступныя. Таму пароль заўсёды павінен уводзіцца пры стандартнай амерыканскай раскладцы.</string>
@@ -1120,6 +1171,7 @@
     <string lang="en" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">The pretest has been successfully completed.\n\nWARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt. If you do not, please back up the files now (you can click Defer, back up the files, then run VeraCrypt again anytime, and select 'System' &gt; 'Resume Interrupted Process' to start encrypting).\n\nWhen ready, click Encrypt to start encrypting.</string>
     <string lang="en" key="SYSENC_ENCRYPTION_PAGE_INFO">You can click Pause or Defer anytime to interrupt the process of encryption or decryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. To prevent slowdown when the system or applications write or read data from the system drive, VeraCrypt automatically waits until the data is written or read (see Status above) and then automatically continues encrypting or decrypting.</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nYou can click Pause or Defer anytime to interrupt the process of encryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. Note that the volume cannot be mounted until it has been fully encrypted.</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="en" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Hidden System Started</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Original System</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows creates (typically, without your knowledge or consent) various log files, temporary files, etc., on the system partition. It also saves the content of RAM to hibernation and paging files located on the system partition. Therefore, if an adversary analyzed files stored on the partition where the original system (of which the hidden system is a clone) resides, he might find out, for example, that you used the VeraCrypt wizard in the hidden-system-creation mode (which might indicate the existence of a hidden operating system on your computer).\n\nTo prevent such issues, VeraCrypt will, in the next steps, securely erase the entire content of the partition where the original system resides. Afterwards, in order to achieve plausible deniability, you will need to install a new system on the partition and encrypt it. Thus you will create the decoy system and the whole process of creation of the hidden operating system will be completed.</string>
@@ -1159,7 +1211,7 @@
     <string lang="en" key="HIDDEN_OS_CREATION_PREINFO_HELP">In the next steps, VeraCrypt will create the hidden operating system by copying the content of the system partition to the hidden volume (data being copied will be encrypted on the fly with an encryption key different from the one that will be used for the decoy operating system).\n\nPlease note that the process will be performed in the pre-boot environment (before Windows starts) and it may take a long time to complete; several hours or even several days (depending on the size of the system partition and on the performance of your computer).\n\nYou will be able to interrupt the process, shut down your computer, start the operating system and then resume the process. However, if you interrupt it, the entire process of copying the system will have to start from the beginning (because the content of the system partition must not change during cloning).</string>
     <string lang="en" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Do you want to cancel the entire process of creation of the hidden operating system?\n\nNote: You will NOT be able to resume the process if you cancel it now.</string>
     <string lang="be" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Вы жадаеце адмяніць перад-тэст шыфравання сістэмы?</string>
-    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="en" key="SYS_DRIVE_NOT_ENCRYPTED">The system partition/drive does not appear to be encrypted (neither partially nor fully).</string>
     <string lang="be" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">Сістэмны падзел/дыск зашыфраваны (часткова ці цалкам).\n\nПерш чым працягнуць, цалкам дэшыфруйце сістэмны падзел/дыск. Каб гэта зрабіць, абярыце ў галоўным акне VeraCrypt меню 'Сістэма' &gt; 'Permanently Decrypt System Partition/Drive'.</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">When the system partition/drive is encrypted (partially or fully), you cannot downgrade VeraCrypt (but you can upgrade it or reinstall the same version).</string>
@@ -1176,6 +1228,8 @@
     <string lang="en" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">You have selected the system partition/drive (or the boot partition), but the wizard mode you selected is suitable only for non-system partitions/drives.\n\nDo you want to set up pre-boot authentication (which means that you will need to enter your password each time before Windows boots/starts) and encrypt the system partition/drive?</string>
     <string lang="be" key="CONFIRM_DECRYPT_SYS_DEVICE">Вы сапраўды жадаеце назаўсёды дэшыфраваць сістэмны падзел/дыск?</string>
     <string lang="be" 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="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="en" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Warning: If you use a cascade of ciphers for system encryption, you may encounter the following issues:\n\n1) The VeraCrypt Boot Loader is larger than normal and, therefore, there is not enough space in the first drive track for a backup of the VeraCrypt Boot Loader. Hence, whenever it gets damaged (which often happens, for example, during inappropriately designed anti-piracy activation procedures of certain programs), you will need to use the VeraCrypt Rescue Disk to boot or to repair the VeraCrypt Boot Loader.\n\n2) On some computers, resuming from hibernation takes longer.\n\nThese potential issues can be prevented by choosing a non-cascade encryption algorithm (e.g. AES).\n\nAre you sure you want to use a cascade of ciphers?</string>
     <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>
@@ -1191,6 +1245,7 @@
     <string lang="en" key="ENABLE_BAD_SECTOR_ZEROING">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nThe process of in-place encryption can continue only when the sectors have been made readable again. VeraCrypt can attempt to make these sectors readable by writing zeros to the sectors (subsequently such all-zero blocks would be encrypted). However, note that any data stored in the unreadable sectors will be lost. If you want to avoid that, you can attempt to recover portions of the corrupted data using appropriate third-party tools.\n\nNote: In case of physically damaged sectors (as opposed to mere data corruption and checksum errors) most types of storage devices internally reallocate the sectors when data is attempted to be written to them (so the existing data in the damaged sectors may remain unencrypted on the drive).\n\nDo you want VeraCrypt to write zeroes to unreadable sectors?</string>
     <string lang="en" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nTo be able to proceed with decryption, VeraCrypt will have to discard the content of the unreadable sectors (the content will be replaced with pseudorandom data). Please note that, before proceeding, you can attempt to recover portions of any corrupted data using appropriate third-party tools.\n\nDo you want VeraCrypt to discard data in the unreadable sectors now?</string>
     <string lang="en" key="ZEROED_BAD_SECTOR_COUNT">Note: VeraCrypt has replaced the content of %I64d unreadable sectors (%s) with encrypted all-zero plaintext blocks.</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="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>

Translations/Language.bg.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="bg" name="Български" en-name="Bulgarian" version="0.1.0" translators="Lachezar Gorchev" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <control lang="bg" key="IDC_KEY_FILES">&amp;Ключ-файлове..</control>
     <control lang="bg" key="IDC_LINK_HASH_INFO">Информация за хеш алгоритми</control>
     <control lang="bg" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Повече информация</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="bg" key="IDC_MB">&amp;MB</control>
     <control lang="bg" key="IDC_MORE_INFO_ON_CONTAINERS">Повече информация</control>
     <control lang="bg" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">Повече информация за криптиране на системата</control>
@@ -57,6 +58,7 @@
     <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="bg" key="IDC_QUICKFORMAT">Бърз формат</control>
     <control lang="bg" key="IDC_SHOW_PASSWORD">Видима &amp;парола</control>
     <control lang="bg" key="IDC_SHOW_PASSWORD_SINGLE">Видима &amp;парола</control>
@@ -72,6 +74,7 @@
     <control lang="bg" key="IDT_COLLECTING_RANDOM_DATA_NOTE">ВАЖНО: Движете мишкта в този прозорец колкото се може по-случайно. Колкото по-дълго я движите, толкова по-добре. Това значително повишава криптографската сила на ключ-файла. След това натиснете Напред за да продължите.</control>
     <control lang="bg" key="IDT_CONFIRM">&amp;Парола пак:</control>
     <control lang="bg" key="IDT_DONE">Готов</control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="bg" key="IDT_ENCRYPTION_ALGO">Криптиращ алгоритъм</control>
     <control lang="bg" key="IDT_FILESYSTEM">ФС </control>
     <control lang="bg" key="IDT_FILE_CONTAINER">Създаване на виртуален криптиран диск във файл. Препоръчва се за начинаещи потребители.</control>
@@ -85,6 +88,8 @@
     <control lang="bg" key="IDT_PARTIAL_POOL_CONTENTS">Съдържание на текущия запас (частично)</control>
     <control lang="bg" key="IDT_PASS">Пас</control>
     <control lang="bg" 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="bg" key="IDT_PROGRESS">Прогрес:</control>
     <control lang="bg" key="IDT_RANDOM_POOL">Случайност: </control>
     <control lang="bg" key="IDT_SINGLE_BOOT">Изберете тази опция, ако на този компютър има инсталирана само една операционна система (дори тя да има много потребители).</control>
@@ -142,6 +147,8 @@
     <control lang="bg" key="IDC_MOUNT_OPTIONS">&amp;Опции...</control>
     <control lang="bg" key="IDC_MOUNT_READONLY">Монтиране като "сам&amp;о за четене"</control>
     <control lang="bg" key="IDC_NEW_KEYFILES">Ключ-файлове...</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="bg" key="IDC_PREF_BKG_TASK_ENABLE">Разрешен</control>
     <control lang="bg" key="IDC_PREF_CACHE_PASSWORDS">Кеширане на пароли в паметта</control>
     <control lang="bg" key="IDC_PREF_DISMOUNT_INACTIVE">Авто-демонтиране след като няма четене/запис в продължение на</control>
@@ -155,6 +162,7 @@
     <control lang="bg" key="IDC_PREF_MOUNT_READONLY">Монтиране като "само за четене"</control>
     <control lang="bg" key="IDC_PREF_MOUNT_REMOVABLE">Монтиране като "преносима медия"</control>
     <control lang="bg" key="IDC_PREF_OPEN_EXPLORER">Отваряне на Explorer прозорец за успешно монтиран том</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</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="bg" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Заличаване на кешираните пароли при авто-демонтиране</control>
     <control lang="bg" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Заличаване при изход</control>
@@ -167,11 +175,12 @@
     <control lang="bg" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Видима парола</control>
     <control lang="bg" key="IDC_TRAVEL_OPEN_EXPLORER">Отваряне на &amp;Explorer прозорец за монтирания том</control>
     <control lang="bg" key="IDC_TRAV_CACHE_PASSWORDS">&amp;Кеширане на паролата в паметта на драйвера</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="bg" key="IDC_UNMOUNTALL">&amp;Демонтиране - всички</control>
     <control lang="bg" key="IDC_VOLUME_PROPERTIES">&amp;Свойства на тома...</control>
     <control lang="bg" key="IDC_VOLUME_TOOLS">&amp;Инструменти за том...</control>
     <control lang="bg" key="IDC_WIPE_CACHE">&amp;Заличаване на кеша</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
     <control lang="bg" key="IDD_HOTKEYS_DLG">VeraCrypt - Системни клавиши</control>
     <control lang="bg" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="bg" key="IDM_CREATE_HIDDEN_OS">Създаване на Скрита Операционна Система...</control>
     <control lang="bg" key="IDM_CREATE_RESCUE_DISK">Създаване на Спасителен Диск...</control>
     <control lang="bg" key="IDM_CREATE_VOLUME">Създаване на нов том...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="bg" key="IDM_DEFAULT_KEYFILES">Ключ-файлове по подразбиране...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDC_DONATE">Donate now...</control>
     <control lang="bg" key="IDM_ENCRYPT_SYSTEM_DEVICE">Криптиране на системен дял/устройство...</control>
     <control lang="bg" key="IDM_FAQ">Често задавани въпроси</control>
@@ -243,6 +254,7 @@
     <control lang="bg" key="IDM_UNMOUNT_VOLUME">Демонтиране на том</control>
     <control lang="bg" key="IDM_VERIFY_RESCUE_DISK">Проверка на Спасителен Диск</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>
     <control lang="bg" key="IDM_VOLUME_WIZARD">Помощник за създаване на томове</control>
     <control lang="bg" key="IDM_WEBSITE">VeraCrypt уебстраница</control>
@@ -485,7 +497,11 @@
     <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>
     <string lang="bg" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Тома е напълно криптиран</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="bg" 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="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="bg" key="FORMAT_FINISHED_INFO">VeraCrypt тома е създаден успешно.</string>
     <string lang="bg" key="FORMAT_FINISHED_TITLE">Томът е създаден</string>
     <string lang="bg" key="FORMAT_HELP">ВАЖНО: Движете мишкта в този прозорец колкото се може по-случайно. Колкото по-дълго я движите, толкова по-добре. Това значително повишава криптографската сила на ключ-файла. След това натиснете Формат за да създадете тома.</string>
@@ -523,6 +539,7 @@
     <string lang="bg" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Грешка при опит за получаване на статуса на системното криптиране.</string>
     <string lang="bg" key="INIT_SYS_ENC">Компонентите за систено криптиране не могат да бъдат инициализирани .</string>
     <string lang="bg" key="INIT_RAND">Неуспешно инициализиране на генератора за случайни числа!</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="bg" key="INIT_REGISTER">Инициализацията на приложението е невъзможна. Деуспешно регистриране на Dialog класа.</string>
     <string lang="bg" key="INIT_RICHEDIT">Грешка: Не може да се зареди Rich Edit системната библиотека.</string>
     <string lang="bg" key="INTRO_TITLE">VeraCrypt помощник за създаване на томове</string>
@@ -535,6 +552,7 @@
     <string lang="bg" key="MOUNT_BUTTON">&amp;Монтиране</string>
     <string lang="bg" key="NEW_VERSION_REQUIRED">По-нова версия на VeraCrypt е необходима за да се монтира този том.</string>
     <string lang="bg" 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="bg" key="NEXT">&amp;Напред &gt;</string>
     <string lang="bg" key="FINALIZE">&amp;Край</string>
     <string lang="bg" key="INSTALL">&amp;Инсталация</string>
@@ -542,6 +560,7 @@
     <string lang="bg" key="NODRIVER">Връзката с VeraCrypt драйвера е невъзможна. VeraCrypt не може да работи, ако драйвера не е стартиран.</string>
     <string lang="bg" key="NOFONT">Грешка при зареждането/подготовката на шрифтове.</string>
     <string lang="bg" 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="bg" key="DRIVE_LETTER_UNAVAILABLE">Буквата за устройство не е достъпна.</string>
     <string lang="bg" key="NO_FILE_SELECTED">Няма избран файл!</string>
     <string lang="bg" key="NO_FREE_DRIVES">Няма налична буква за устройство.</string>
@@ -561,15 +580,18 @@
     <string lang="bg" key="OVERWRITEPROMPT">ВНИМАНИЕ: Файлът '%hs' вече съществува!\n\nВАЖНО: VERACRYPT НЯМА ДА КРИПТИРА ФАЙЛА, НО ЩЕ ГО ИЗТРИЕ. Сигурни ли сте, че желаете да изтриете файла и да го заместите с нов VeraCrypt контейнер?</string>
     <string lang="bg" key="OVERWRITEPROMPT_DEVICE">ВНИМАНИЕ: ВСИЧКИ ФАЙЛОВЕ, КОИТО СЕ СЪДЪРЖАТ НА %s '%hs'%s ЩЕ БЪДАТ ИЗТРИТИ И ИЗГУБЕНИ (НЯМА ДА БЪДАТ КРИПТИРАНИ)!\n\nСигурни ли сте че желаете да продължите с форматирането?</string>
     <string lang="bg" key="NONSYS_INPLACE_ENC_CONFIRM">ВНИМАНИЕ: Няма да можете да монтирате тома или да достъпите файлове съхранени в него докато не е изцяло криптиран.\n\nСигурни ли сте, че желаете да стартирате криптирането на %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 '%hs'%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_SECOND_WARNING_LOTS_OF_DATA">ВНИМАНИЕ: ИЗБРАНИЯТ ДЯЛ СЪДЪРЖА ГОЛЯМ ОБЕМ ДАННИ! Всякакви файлове съхранени на дяла ще бъдат изтрити и изгубени (няма да бъдат криптирани)!</string>
     <string lang="bg" key="ERASE_FILES_BY_CREATING_VOLUME">Изтриване на всякакви файлове съхранени на дяла чрез създаване на VeraCrypt том в него</string>
     <string lang="bg" key="PASSWORD">Парола</string>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="bg" key="IDD_PCDM_CHANGE_PKCS5_PRF">Задаване на алгоритъмът за деривация на ключа на заглавната част</string>
     <string lang="bg" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Добавяне/Премахване на ключ-файлове на том</string>
     <string lang="bg" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Премахване на всички ключ-файлове от том</string>
-    <string lang="en" key="PASSWORD_CHANGED">Password and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</string>
+    <string lang="en" key="PASSWORD_CHANGED">Password, PIM and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</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="bg" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">ВАЖНО: Ако не сте унищожили вашия VeraCrypt Спасителен Диск, вашият системен дял/устойство все още може да бъде декриптиран с помощта на старата парола (като стартирате от VeraCrypt Спасителния Диск и въведете старата парола). Би трябвало да създадете нов VeraCrypt Спасителен Диск и след това да унищожите стария.\n\nЖелаете ли да създадете нов VeraCrypt Спасителен Диск?</string>
     <string lang="bg" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Обърнете внимание на това, че вашият VeraCrypt Спасителен Диск все още използва предишният алгоритъм. Ако смятате, че предишният алгоритъм е несигурен, би трябвало да създадете нов VeraCrypt Спасителен Диск и след това да унищожите стария.\n\nЖелаете ли да създадете нов VeraCrypt Спасителен Диск?</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,6 +600,7 @@
     <string lang="bg" key="PKCS5_PRF_CHANGED">Алгоритъмът за деривация на ключа на заглавната част е зададен успешно.</string>
     <string lang="bg" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">Моля, въведете паролата и/или ключ-файла(овете) за несистемния том, за който желаете да продължите процеса на криптиране на място.\n\n\nЗабележка: След като натиснете Напред, VeraCrypt ще опита ад намери всички несистемни томове, за които има прекъснат процес на криптиране и където VeraCrypt заглавната част на тома може да бъде декриптирана с помощта на зададените парола и/или ключ-файл(ове). Ако са открити повече от един такъв том, ще трябва да изберете един от тях на следващата стъпка.</string>
     <string lang="bg" 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="bg" key="PASSWORD_HELP">Много е важно да изберете добра парола. Трябва да избягвате пароли, които се състоят от една единствена дума, която може да бъде намерена в речник (или комбинация от 2, 3, или 4 такива думи). Не трябва да съдържа имена или дати на раждане. Не трябва да бъде лесна за познаване. Добра парола е случайна комбинация от главни и малки букви, цифри, и специални символи като @ ^ = $ * + и т.н. Препоръчваме избор на парола състояща се от повече от 20 знака (колкото по-дълга, толкова по-добре). Максималната възможна дължина е 64 знака.</string>
     <string lang="bg" key="PASSWORD_HIDDENVOL_HELP">Моля, изберете парола за скрития том. </string>
     <string lang="bg" key="PASSWORD_HIDDEN_OS_HELP">Моля, изберете парола за скритата операционна система (т.е. за скрития том). </string>
@@ -597,11 +620,26 @@
     <string lang="bg" key="PASSWORD_WRONG_AUTOMOUNT">Грешна парола или не е намерен VeraCrypt том.</string>
     <string lang="bg" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Грешен ключ-файл(ове)/парола или не е намерен VeraCrypt том.</string>
     <string lang="bg" 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="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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="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>
+    <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="bg" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nЗабележка: Ако опитвате да монтирате дял разположен върху криптирано системно устройство без pre-boot автентикация или да монтирате криптирания системен дял на операционна система, която не е стартирана, можете да направите това като изберете 'Система' &gt; 'Монтиране без Pre-Boot автентикация'.</string>
     <string lang="bg" 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="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>
@@ -701,11 +739,18 @@
     <string lang="bg" key="FOR_MORE_INFO_ON_PARTITIONS">За информация как да създадете и поддържате дялове, моля, погледнете документацията на вашата операционна система или се свържете със сервиза по поддръжка към вашия компютърен доставчик.</string>
     <string lang="bg" key="SYSTEM_PARTITION_NOT_ACTIVE">Грешка: Текущо стартираната операционна система не е инсталирана на зареждащия (boot) дял (първият активен дял). Това не се поддържа.</string>
     <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="bg" key="CANT_ACCESS_VOL">Грешка: Томът не може да бъде достъпен!\n\nУбедете се, че избраният том съществува, не е монтиран или използван от системата или приложение, имате права за четене/запис за тома и, че не е защитен срещу запис.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="bg" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Грешка: Не може да се достъпи тома и/или да се получи информация за тома.\n\nУверете се, че избраният том съществува, че не се използва от системата или от приложение, че имате права за четене/запис за тома, и че тома не е защитен от запис.</string>
     <string lang="bg" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Грешка:Не може да се достъпи тома и/или да се получи информация за тома. Уверете се, че избраният том съществува, че не се използва от системата или от приложение, че имате права за четене/запис за тома, и че тома не е защитен от запис.\n\nАко проблемът не се реши, следните стъпки може да помогнат.</string>
     <string lang="bg" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">VeraCrypt не може да криптира дяла поради грешка. Моля, опитайте да разрешите всички проблеми появили се до момента и опитайте отново. Ако проблемът не се реши, следните стъпки може да помогнат.</string>
     <string lang="bg" 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="bg" key="CANT_DISMOUNT_OUTER_VOL">Грешка: Външният том не може да бъде демонтиран!\n\nТом не може да бъде демонтиран, ако съдържа файлове или директории, които се използват от приложение или от системата.\n\nМоля, затворете всяка програма, която би могла да използва файлове или директории на тома и натиснете Опитай пак.</string>
     <string lang="bg" key="CANT_GET_OUTER_VOL_INFO">Грешка: Не може да се получи информация за външния том! Създаването на том не може да продължи.</string>
     <string lang="bg" key="CANT_ACCESS_OUTER_VOL">Грешка: Външният том не може да бъде достъпен! Създаването на том не може да продължи.</string>
@@ -790,7 +835,7 @@
     <string lang="bg" key="TC_INSTALLER_IS_RUNNING">Инсталатора на VeraCrypt в момента е стартиран на тази система и подготвя или извършва инсталация или обновяване на VeraCrypt. Преди да продължите, моля изчакайте го да свърши или го затворете. Ако не можете да го затворите, моля рестартирайте вашия компютър преди да продължите.</string>
     <string lang="bg" key="INSTALL_FAILED">Инсталацията неуспешна.</string>
     <string lang="bg" key="UNINSTALL_FAILED">Деинсталация неуспешна.</string>
-    <string lang="bg" key="DIST_PACKAGE_CORRUPTED">Този пакет за дистрибуция е повреден. Моля, опитайте да го изтеглите отново (за предпочитане от официалния уебсайт на VeraCrypt - www.veracrypt.org).</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="EXTRACTING_VERB">Извличане</string>
     <string lang="bg" key="CANNOT_READ_FROM_PACKAGE">Не може да се чете от пакета.</string>
@@ -977,6 +1022,7 @@
     <string lang="bg" key="CONFIRM_EXIT_UNIVERSAL">Изход?</string>
     <string lang="bg" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt няма достатъчно информация за да реши дали да криптира или декриптира.</string>
     <string lang="bg" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt няма достатъчно информация за да реши дали да криптира или декриптира.\n\nЗабележка: Ако сте декриптирали системния дял/устройство в pre-boot средата, може да трябва да завършите процеса като изберете Декриптиране.</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="bg" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">Желаете ли да прекъснете и отложите процеса на криптиране на дяла/тома?\n\nЗабележка: Помнете, че томът не може да бъде монтиран докато не е криптиран напълно. Ще можете да продължите процеса на криптиране и той ще продължи от мястото, където е бил спрян. Можете да направите това, например като изберете 'Томове' &gt; 'Продължаване на прекъснат процес' от менюто на главния прозорец на VeraCrypt.</string>
     <string lang="bg" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Желаете ли да прекъснете и отложите процеса на криптиране на системният дял/устройство?\n\nЗабележка: Ще можете да продължите процеса и той ще продължи от точката, в която е бил прекъснат. Можете да направите това, например, като изберете 'Система' &gt; 'Продължаване на прекъснат процес' от менюто на главния прозорец на VeraCrypt. Ако желаете за постоянно да прекратите или да върнете процеса на криптиране, изберете 'Система' &gt; 'Декриптиране на системния дял/устройство за постоянно'.</string>
     <string lang="bg" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Желаете ли да прекъснете и отложите процеса на декриптиране на системният дял/устройство?\n\nЗабележка: Ще можете да продължите процеса и той ще продължи от точката, в която е бил прекъснат. Можете да направите това, например, като изберете 'Система' &gt; 'Продължаване на прекъснат процес' от менюто на главния прозорец на VeraCrypt. Ако желаете да върнете процеса на декриптиране (и да започнете да криптирате), изберете 'Система' &gt; 'Криптиране на системен дял/устройство'.</string>
@@ -986,6 +1032,7 @@
     <string lang="bg" key="FAILED_TO_START_WIPING">Грешка: Неуспешен опит за стартиране на процеса на заличаване.</string>
     <string lang="bg" key="INCONSISTENCY_RESOLVED">Проблем с неконсистентност е решен.\n\n\n(Ако докладвате бъг във връзка с това, моля включете следната техническа информация в доклада за бъга: %hs)</string>
     <string lang="bg" key="UNEXPECTED_STATE">Грешка: Неочаквано състояние.\n\n\n(Ако докладвате за проблем във връзка с това, моля включете следната техническа информация в доклада:\n%hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="bg" key="NOTHING_TO_RESUME">Няма процес/задача за продължаване.</string>
     <string lang="bg" key="HIDVOL_PROT_BKG_TASK_WARNING">ВНИМАНИЕ: Фоновият процес на VeraCrypt е забранен. След като затворите VeraCrypt, няма да има нотификация в случай, че е предовратена повреда в скрития том.\n\nЗабележка: Можете да спрете фоновата задача по всяко време като натиснете десен бутон върху VeraCrypt системната иконата и изберете 'Изход'.\n\nДа се включи ли  фоновият процес на VeraCrypt?</string>
     <string lang="bg" key="LANG_PACK_VERSION">Версия на езиковия пакет:  %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="bg" key="ERROR_MBR_PROTECTED">Неуспешен опит за запис върху MBR сектора.\n\nМоже би вашият BIOS е конфигуриран да предпазва 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="bg" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">Необходимата версия на VeraCrypt Boot Loader в момента не е инсталирана. Това може да попречи на някои от настройките да бъдат съхранени.</string>
     <string lang="bg" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Забележка: В някои случаи, може да иската да попречите на някого (неприятел) да разбере че използвате VeraCrypt, докато ви гледа когато стартирате компютъра. По-горната опция ви позволява да направите това като промените екрана на VeraCrypt зареждащата програма (boot loader). Ако разрешите първата опция, зареждащата програма няма да показва никакъв текст (дори когато въведете грешна парола). Компютърът ще изглежда като "неработещ", но в същото време можете да въведете паролата си. В допълнение на това, може да бъде показано съобщение по ваше желание с цел да заблуди неприятеля. Например, фалшиви съобщения за грешка, като "Missing operating system" ("Липсва операционна система"), което обикновено се показва от зареждащата програма (boot loader) на Windows ако не е намерен Windows зареждащ (boot) дял. Все пак е важно да се знае, че ако неприятелят може да анализира съдържанието на твърдия диск, ще открие, че съдържа VeraCrypt зареждащата програма (boot loader).</string>
     <string lang="bg" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">ВНИМАНИЕ: Моля, помнете, че ако разрешите тази опция, VeraCrypt зареждащата програма (boot loader) няма да показва никакви текстове (дори когато въведете грешна парола). Компютърът ще изглежда като "неработещ" (нереагиращ), но в същото време можете да въведете паролата си (курсора НЯМА да се движи и няма да се появяват звездички (*) когато натискате клавиши).\n\nСигурни ли сте, че желаете да разрешите тази опция?</string>
@@ -1034,8 +1082,11 @@
     <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="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>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="bg" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">За сега ключ-файлове не се поддържат за системно криптиране.</string>
     <string lang="bg" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Внимание: VeraCrypt не може да възстанови оригиналната подредба на клавиатурата. Заради това може да въведете някоя парола грешно.</string>
     <string lang="bg" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Грешка: Подредбата на клавиатурата за VeraCrypt не може да се зададе да бъде стандартна US клавиатурна подредба.\n\nЗабележете, че паролата трябва да бъде въведена в pre-boot средата (преди стартирането на Windows), където не-US Windows клавиатурни подредби не са достъпни. Поради тази причина, паролата винаги трябва да бъде въвеждана, като се използва стандартна US клавиатурна подредба.</string>
@@ -1120,6 +1171,7 @@
     <string lang="en" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">The pretest has been successfully completed.\n\nWARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt. If you do not, please back up the files now (you can click Defer, back up the files, then run VeraCrypt again anytime, and select 'System' &gt; 'Resume Interrupted Process' to start encrypting).\n\nWhen ready, click Encrypt to start encrypting.</string>
     <string lang="en" key="SYSENC_ENCRYPTION_PAGE_INFO">You can click Pause or Defer anytime to interrupt the process of encryption or decryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. To prevent slowdown when the system or applications write or read data from the system drive, VeraCrypt automatically waits until the data is written or read (see Status above) and then automatically continues encrypting or decrypting.</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nYou can click Pause or Defer anytime to interrupt the process of encryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. Note that the volume cannot be mounted until it has been fully encrypted.</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="en" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Hidden System Started</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Original System</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows creates (typically, without your knowledge or consent) various log files, temporary files, etc., on the system partition. It also saves the content of RAM to hibernation and paging files located on the system partition. Therefore, if an adversary analyzed files stored on the partition where the original system (of which the hidden system is a clone) resides, he might find out, for example, that you used the VeraCrypt wizard in the hidden-system-creation mode (which might indicate the existence of a hidden operating system on your computer).\n\nTo prevent such issues, VeraCrypt will, in the next steps, securely erase the entire content of the partition where the original system resides. Afterwards, in order to achieve plausible deniability, you will need to install a new system on the partition and encrypt it. Thus you will create the decoy system and the whole process of creation of the hidden operating system will be completed.</string>
@@ -1159,7 +1211,7 @@
     <string lang="en" key="HIDDEN_OS_CREATION_PREINFO_HELP">In the next steps, VeraCrypt will create the hidden operating system by copying the content of the system partition to the hidden volume (data being copied will be encrypted on the fly with an encryption key different from the one that will be used for the decoy operating system).\n\nPlease note that the process will be performed in the pre-boot environment (before Windows starts) and it may take a long time to complete; several hours or even several days (depending on the size of the system partition and on the performance of your computer).\n\nYou will be able to interrupt the process, shut down your computer, start the operating system and then resume the process. However, if you interrupt it, the entire process of copying the system will have to start from the beginning (because the content of the system partition must not change during cloning).</string>
     <string lang="en" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Do you want to cancel the entire process of creation of the hidden operating system?\n\nNote: You will NOT be able to resume the process if you cancel it now.</string>
     <string lang="bg" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Желаете ли да прекратите предварителният тест на системното криптиране?</string>
-    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="bg" key="SYS_DRIVE_NOT_ENCRYPTED">Изглежда, че системният дял/устройство не е криптиран (нито частично, нито изцяло).</string>
     <string lang="bg" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">Вашият системен дял/устройство е криптиран (частично или изцяло).\n\nМоля, декриптирайте вашият системен дял/устройство изцяло преди да продължите. За да направите това, изберете 'Система' &gt; 'Декриптиране на системния дял/устройство за постоянно' от менюто на гавния процорез на VeraCrypt.</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">When the system partition/drive is encrypted (partially or fully), you cannot downgrade VeraCrypt (but you can upgrade it or reinstall the same version).</string>
@@ -1176,6 +1228,8 @@
     <string lang="en" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">You have selected the system partition/drive (or the boot partition), but the wizard mode you selected is suitable only for non-system partitions/drives.\n\nDo you want to set up pre-boot authentication (which means that you will need to enter your password each time before Windows boots/starts) and encrypt the system partition/drive?</string>
     <string lang="bg" key="CONFIRM_DECRYPT_SYS_DEVICE">Сигурни ли сте, че желаете да декриптирате системният дял/устройство за постоянно?</string>
     <string lang="bg" 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="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="en" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Warning: If you use a cascade of ciphers for system encryption, you may encounter the following issues:\n\n1) The VeraCrypt Boot Loader is larger than normal and, therefore, there is not enough space in the first drive track for a backup of the VeraCrypt Boot Loader. Hence, whenever it gets damaged (which often happens, for example, during inappropriately designed anti-piracy activation procedures of certain programs), you will need to use the VeraCrypt Rescue Disk to boot or to repair the VeraCrypt Boot Loader.\n\n2) On some computers, resuming from hibernation takes longer.\n\nThese potential issues can be prevented by choosing a non-cascade encryption algorithm (e.g. AES).\n\nAre you sure you want to use a cascade of ciphers?</string>
     <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>
@@ -1191,6 +1245,7 @@
     <string lang="en" key="ENABLE_BAD_SECTOR_ZEROING">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nThe process of in-place encryption can continue only when the sectors have been made readable again. VeraCrypt can attempt to make these sectors readable by writing zeros to the sectors (subsequently such all-zero blocks would be encrypted). However, note that any data stored in the unreadable sectors will be lost. If you want to avoid that, you can attempt to recover portions of the corrupted data using appropriate third-party tools.\n\nNote: In case of physically damaged sectors (as opposed to mere data corruption and checksum errors) most types of storage devices internally reallocate the sectors when data is attempted to be written to them (so the existing data in the damaged sectors may remain unencrypted on the drive).\n\nDo you want VeraCrypt to write zeroes to unreadable sectors?</string>
     <string lang="en" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nTo be able to proceed with decryption, VeraCrypt will have to discard the content of the unreadable sectors (the content will be replaced with pseudorandom data). Please note that, before proceeding, you can attempt to recover portions of any corrupted data using appropriate third-party tools.\n\nDo you want VeraCrypt to discard data in the unreadable sectors now?</string>
     <string lang="en" key="ZEROED_BAD_SECTOR_COUNT">Note: VeraCrypt has replaced the content of %I64d unreadable sectors (%s) with encrypted all-zero plaintext blocks.</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="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>

Translations/Language.ca.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="ca" name="Català" en-name="Catalan" version="0.1.0" translators="CESICAT, Centre de Seguretat de la Informació de Catalunya" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <control lang="ca" key="IDC_KEY_FILES">Fitxers de &amp;claus...</control>
     <control lang="ca" key="IDC_LINK_HASH_INFO">Més informació</control>
     <control lang="ca" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Més informació</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="ca" key="IDC_MB">&amp;MB</control>
     <control lang="ca" key="IDC_MORE_INFO_ON_CONTAINERS">Més informació</control>
     <control lang="ca" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">Més informació sobre els algorismes de xifrat</control>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <control lang="ca" key="IDT_COLLECTING_RANDOM_DATA_NOTE">IMPORTANT: Mogui el seu ratolí tant aleatòriament com pugui en aquesta finestra. Com més el mogui, millor. Això incrementarà significativament la força de les claus de xifrat. Després faci clic a Següent per continuar.</control>
     <control lang="ca" key="IDT_CONFIRM">&amp;Confirmar:</control>
     <control lang="ca" key="IDT_DONE">Fet</control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="ca" key="IDT_ENCRYPTION_ALGO">Algorisme de xifrat</control>
     <control lang="ca" key="IDT_FILESYSTEM">Sistema de fitxers </control>
     <control lang="ca" key="IDT_FILE_CONTAINER">Crea un disc virtual xifrat dins d'un fitxer. Recomanat per a usuaris inexperts.</control>
@@ -85,6 +88,8 @@
     <control lang="ca" key="IDT_PARTIAL_POOL_CONTENTS">Contingut (parcial) actual</control>
     <control lang="ca" key="IDT_PASS">Passat</control>
     <control lang="ca" key="IDT_PASSWORD">Contrasenya:</control>
+    <control lang="en" key="IDT_PIM">Volume PIM:</control>
+    <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
     <control lang="ca" key="IDT_PROGRESS">Progrés:</control>
     <control lang="ca" key="IDT_RANDOM_POOL">Contingut aleatòri: </control>
     <control lang="ca" key="IDT_SINGLE_BOOT">Seleccioni aquesta opció si nomhés hi ha un sistema operatiu instal·lat en aquest ordinador (encara que tingui més d'un usuari).</control>
@@ -142,6 +147,8 @@
     <control lang="ca" key="IDC_MOUNT_OPTIONS">Opci&amp;ons...</control>
     <control lang="ca" key="IDC_MOUNT_READONLY">Muntar el volum en mode &amp;només lectura</control>
     <control lang="ca" key="IDC_NEW_KEYFILES">Seleccionar...</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="ca" key="IDC_PREF_BKG_TASK_ENABLE">Activat</control>
     <control lang="ca" key="IDC_PREF_CACHE_PASSWORDS">Guardar contrasenyes al controlador</control>
     <control lang="ca" key="IDC_PREF_DISMOUNT_INACTIVE">Desmuntar el volum automàticament quan no s'hi llegeixi/escrigui durant</control>
@@ -155,6 +162,7 @@
     <control lang="ca" key="IDC_PREF_MOUNT_READONLY">Muntar els volums en mode només lectura</control>
     <control lang="ca" key="IDC_PREF_MOUNT_REMOVABLE">Muntar els volums com a mitjans extraïbles</control>
     <control lang="ca" key="IDC_PREF_OPEN_EXPLORER">Obrir una finestra pels volums muntats satisfactòriament</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</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="ca" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Oblidar les contrasenyes guardades quan es desmunti automàticament</control>
     <control lang="ca" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Oblidar les contrasenyes guardades al sortir</control>
@@ -167,11 +175,12 @@
     <control lang="ca" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Veure contrasenya</control>
     <control lang="ca" key="IDC_TRAVEL_OPEN_EXPLORER">Obrir una finestra de l'&amp;exporador pel volum muntat</control>
     <control lang="ca" key="IDC_TRAV_CACHE_PASSWORDS">Guardar contrassenyes a la memòria del controlador</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="ca" key="IDC_UNMOUNTALL">&amp;Desmuntar-ho tot</control>
     <control lang="ca" key="IDC_VOLUME_PROPERTIES">Propietats del &amp;volum...</control>
     <control lang="ca" key="IDC_VOLUME_TOOLS">&amp;Eines de volum...</control>
     <control lang="ca" key="IDC_WIPE_CACHE">&amp;Buidar la memòria cau</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="ca" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Volums favorits</control>
     <control lang="ca" key="IDD_HOTKEYS_DLG">VeraCrypt - Dreceres de teclat</control>
     <control lang="ca" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="ca" key="IDM_CREATE_HIDDEN_OS">Crear un sistema operatiu ocult...</control>
     <control lang="ca" key="IDM_CREATE_RESCUE_DISK">Crear un disc de recuperació...</control>
     <control lang="ca" key="IDM_CREATE_VOLUME">Crear un volum nou...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="ca" key="IDM_DEFAULT_KEYFILES">Fitxers de claus per defecte...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="ca" key="IDM_ENCRYPT_SYSTEM_DEVICE">Xifrar la partició/unitat del sistema...</control>
     <control lang="ca" key="IDM_FAQ">Preguntes més freqüents</control>
@@ -243,6 +254,7 @@
     <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="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>
     <control lang="ca" key="IDM_VOLUME_WIZARD">Assistent de creació de volums</control>
     <control lang="ca" key="IDM_WEBSITE">Lloc web de VeraCrypt</control>
@@ -369,7 +381,7 @@
     <string lang="ca" key="ACCESS_DENIED">Error: S'ha denegat l'accés.\n\nLa partició a la que s'intenta accedir té una mida de 0 sectors o és la unitat d'arranc.</string>
     <string lang="ca" key="ADMINISTRATOR">Administrador</string>
     <string lang="ca" key="ADMIN_PRIVILEGES_DRIVER">Per carregar el controlador VeraCrypt és necessari que entri al sistema amb un compte amb privilegis d'administrador.</string>
-    <string lang="ca" key="ADMIN_PRIVILEGES_WARN_DEVICES">Si us plau, tingui en compte que per xifrar/donar format a una partició/unitat és necessari que s'utilitzi un compte d'usuari amb privilegis d'administrador.\n\nAixò no s'aplica als volums de dispositiu.</string>
+    <string lang="ca" key="ADMIN_PRIVILEGES_WARN_DEVICES">Si us plau, tingui en compte que per xifrar/desxifrar/donar format a una partició/unitat és necessari que s'utilitzi un compte d'usuari amb privilegis d'administrador.\n\nAixò no s'aplica als volums de dispositiu.</string>
     <string lang="ca" key="ADMIN_PRIVILEGES_WARN_HIDVOL">Per a crear un volum ocult és necessàri utilitzar un compte d'usuari amb privilegis d'administrador.\n\nVol continuar?</string>
     <string lang="ca" key="ADMIN_PRIVILEGES_WARN_NTFS">Tingui en compte que per donar format NTFS a un volum és necessàri utilitzar un compte d'usuari amb privilegis d'administrador.\n\nSense privilegis d'administrador pot donar format FAT al volum.</string>
     <string lang="ca" key="AES_HELP">Un xifrat aprovat pel FIPS (el 1998 amb el nom de Rijndael) que està autoritzat pels departaments i les agències del govern dels EUA per protegir informació classificada fins al nivell de Top Secret. Clau de 256 bits, bloc de 128 bits, 14 rondes (AES-256). Treballa en mode XTS.</string>
@@ -485,7 +497,11 @@
     <string lang="ca" key="FORMAT_FINISHED_HELP">\n\nS'ha creat el volum i ja es pot utilitzar. Si vol crear un altre volum, faci clic a 'Següent'. Si no, faci clic a 'Sortir'.</string>
     <string lang="ca" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nEl volum ocult s'ha creat amb èxit (el sistema operatiu ocult residirà dins aquest volum ocult).\n\nFaci clic a 'Següent' per continuar.</string>
     <string lang="ca" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Volum completament xifrat</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="ca" key="NONSYS_INPLACE_ENC_FINISHED_INFO">IMPORTANT: PER MUNTAR AQUEST VOLUM ACABAT DE CREAR I ACCEDIR A LES DADES QUE CONTÉ, FACI CLIC A '' A LA FINESTRA PRINCIPAL DEL VERACRYPT. Després d'introduïr la contrassenya correcte (i/o proporcionar els fitxers de claus correctes) el volum es muntarà a la lletra d'unitat que s'hagi seleccionat de la llista de la finestra principal del VeraCrypt (i serà possible accedir a les dades xifrades a través de la lletra d'unitat).\n\nSI US PLAU, RECORDI O ANOTI AQUESTS PASSOS. HAURÀ DE SEGUIR-LOS CADA COP QUE VULGUI MUNTAR EL VOLUM O ACCEDIR A LES DADES QUE CONTÉ. D'altra banda, també pot accedir a 'Triar dispositiu' des de la finestra principal del programa i després seleccionar la partició/volum i fer clic a 'Muntar'.\n\nLa partició/unitat s'ha xifrat amb èxit (ara conté un volum VeraCrypt completament xifrat) i està a punt per utilitzar-se.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="ca" key="FORMAT_FINISHED_INFO">S'ha creat el volum VeraCrypt amb èxit.</string>
     <string lang="ca" key="FORMAT_FINISHED_TITLE">S'ha creat el volum</string>
     <string lang="ca" key="FORMAT_HELP">IMPORTANT: Mogui el seu ratolí tant aleatòriament com pugui en aquesta finestra. Com més el mogui, millor. Això incrementarà significativament la força de les claus de xifrat. Després faci clic a Formatar per continuar.</string>
@@ -523,6 +539,7 @@
     <string lang="ca" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">S'ha produït un error quan s'intentava obtenir l'estat de xifratge del sistema.</string>
     <string lang="ca" key="INIT_SYS_ENC">No s'han pogut inicialitzar els components de l'aplicació per xifrar el sistema.</string>
     <string lang="ca" key="INIT_RAND">No s'ha pogut inicialitzar el generador de números aleatòris!</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="ca" key="INIT_REGISTER">No es pot inicialitzar l'aplicació. No es pot registrar la classe Dialog.</string>
     <string lang="ca" key="INIT_RICHEDIT">Error: no s'ha pogut carregar la biblioteca d'edició enriquida del sistema.</string>
     <string lang="ca" key="INTRO_TITLE">Assistent de creació de volums</string>
@@ -535,6 +552,7 @@
     <string lang="ca" key="MOUNT_BUTTON">&amp;Muntar</string>
     <string lang="ca" key="NEW_VERSION_REQUIRED">És necessària una versió més nova del VeraCrypt per muntar aquest volum.</string>
     <string lang="ca" key="VOL_CREATION_WIZARD_NOT_FOUND">Error: No es troba l'assistent de creació de volums.\n\nSi us plau, asseguri's que el fitxer 'VeraCrypt Format.exe' és al directori des d'ón s'ha executat el 'VeraCrypt.exe'. Si no hi és, si us plau reinstal·li el TrueCrpyt o localitzi el fitxer 'VeraCrypt Format.exe' al seu disc i executi'l.</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="ca" key="NEXT">&amp;Següent &gt;</string>
     <string lang="ca" key="FINALIZE">&amp;Acabar</string>
     <string lang="ca" key="INSTALL">&amp;Instal·lar</string>
@@ -542,6 +560,7 @@
     <string lang="ca" key="NODRIVER">No s'ha pogut connectar amb el controlador de dispositius del VeraCrypt. El VeraCrypt no pot funcionar sense el controlador de dispositius.\n\nTingui en compte que, degut a un problema del Windows, pot ser necessari tancar la sessió o reiniciar el sistema perquè es pugui carregar el controlador de dispositius.</string>
     <string lang="ca" key="NOFONT">S'ha produït un error quan es carregaven/preparaven les fonts.</string>
     <string lang="ca" key="NOT_FOUND">No s'ha trobat la lletra d'unitat especificada o bé no se n'ha especificat cap.</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="ca" key="DRIVE_LETTER_UNAVAILABLE">Lletra d'unitat no disponible.</string>
     <string lang="ca" key="NO_FILE_SELECTED">No s'ha seleccionat cap fitxer!</string>
     <string lang="ca" key="NO_FREE_DRIVES">No hi ha lletres d'unitat disponibles.</string>
@@ -561,15 +580,18 @@
     <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_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="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="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="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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="ca" key="IDD_PCDM_CHANGE_PKCS5_PRF">Establir l'algorisme de derivació de la clau de la capçalera</string>
     <string lang="ca" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Afegir/Eliminar fitxers de claus a/d'un volum</string>
     <string lang="ca" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Eliminar tots els fitxers de claus d'un volum</string>
-    <string lang="ca" key="PASSWORD_CHANGED">La contrasenya i/o els fitxers de claus s'han canviat amb èxit.\n\nIMPORTANT: Si us plau, assegureu-vos d'haver llegit 'Canviar contrasenyes i fitxers de claus' al capítol 'Requisits de seguretat i precaucions' de la guia d'usuari del VeraCrypt.</string>
+    <string lang="ca" key="PASSWORD_CHANGED">La contrasenya, PIM i/o els fitxers de claus s'han canviat amb èxit.\n\nIMPORTANT: Si us plau, assegureu-vos d'haver llegit 'Canviar contrasenyes i fitxers de claus' al capítol 'Requisits de seguretat i precaucions' de la guia d'usuari del VeraCrypt.</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="ca" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">IMPORTANT: Si no ha destruït el disc de recuperació del VeraCrypt, la seva partició/unitat de sistema es podrà desxifrar utilitzant la contrasenya antiga (introduïnt el disc de ercuperació antic i la contrasenya antiga). Hauria de crear un nou disc de recuperació i destruïr l'antic.\n\nVol crear un nou disc de recuperació?</string>
     <string lang="ca" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Tingui en compte que el seu disc de recuperació encara utilitza l'algorisme anterior. Si considera que l'algorisme anterior és insegur, hauria de crear un nou disc de recuperació i destruïr l'antic.\n\nVol crear un nou disc de recuperació?</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,6 +600,7 @@
     <string lang="ca" key="PKCS5_PRF_CHANGED">S'ha establert l'algorisme de derivació de la clau de capçalera.</string>
     <string lang="ca" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">Si us plau, introdueixi la contrasenya i/o el(s) fitxer(s) de claus pel volum del que vol continuar el procés de xifrat in-situ.\n\nObservació: Quan faci clic a 'Següent' el VeraCrypt provarà de buscar tots els volums que no siguin de sistema que hagin interromput el procés de xifrat i que es puguin desxifrar amb les dades proporcionades. Si hi ha més d'un volum que cumpleix aquests requisits haurà de seleccionar-ne un al següent pas.</string>
     <string lang="ca" key="NONSYS_INPLACE_ENC_RESUME_VOL_SELECT_HELP">Si us plau, seleccioni un volum de la llista. La llista conté tots els volums accessibles que han interromput el procés de xifrat i capçalera dels quals pot ser desxifrada utilitzant la contrasenya i/o els fitxers de claus que s'han proporcionat.</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="ca" key="PASSWORD_HELP">És molt important triar una bona contrasenya. Hauria d'evitat escollir-ne una que només contingui una paraula que es pot trobar a un diccionari (o una combinació de 2, 3 o 4 d'aquestes paraules). No hauria de contenir noms o dates de naixement. Ha de ser dificil d'endevinar. Una bona contrasenya és una combinació aleatòria de lletres majúscules i minúscules, números i caràcters especials, com ara @, ^, =, $, *, +, etc. Recomenem escollir una contrasenya de més de 20 caràcters (com més llarga, millor). La mida màxima de la contrasenya és de 64 caràcters.</string>
     <string lang="ca" key="PASSWORD_HIDDENVOL_HELP">Esculli la contrasenya del volum ocult. </string>
     <string lang="ca" key="PASSWORD_HIDDEN_OS_HELP">Esculli la contrasenya del sistema operatiu ocult (o sigui, pel volum ocult). </string>
@@ -597,11 +620,26 @@
     <string lang="ca" key="PASSWORD_WRONG_AUTOMOUNT">La contrassenya és incorrecte o no és un volum VeraCrypt.</string>
     <string lang="ca" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">El(s) fitxer(s) de claus i/o la contrassenya són incorrectes, o no és un volum VeraCrypt.</string>
     <string lang="ca" key="PASSWORD_WRONG_CAPSLOCK_ON">ATENCIÓ: Hi ha el bloqueig de majúscules activat. Això pot fer que introdueixi la contressenya incorrectament.</string>
+    <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
+    <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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="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>
+    <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="ca" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nNota: Si està intentant muntar una partició dins d'una unitat de sistema xifrada sense l'autenticació de prearrencada o muntar una partició de sistema xifrrada d'un sistema operatiu que no s'està executant, pot fer-ho a través de 'Sistema' &gt; 'Muntar sense l'autenticació prearrencada'.</string>
     <string lang="ca" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">En aquesta modalitat, no pot muntar una partició allotjada a un dispositiu que és dins de l'àmbit de la clau del sistema xifrat actual.\n\nAbans de muntar la partició en aquesta modalitat, ha d'arrencar un sistema operatiu en una altre unitat (xifrat o no) o arrencar un sistema operatiu no xifrat.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <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>
@@ -701,11 +739,18 @@
     <string lang="ca" key="FOR_MORE_INFO_ON_PARTITIONS">Per trobar informació sobre la creació i administració de particions consulti la documentació del seu sistema operatiu o contacti amb l'equip de suport del proveïdor de l'ordinador per demanar assistència.</string>
     <string lang="ca" key="SYSTEM_PARTITION_NOT_ACTIVE">Error: El sistema operatiu actual no està instal·lat a la partició d'arranc (la primera partició activa). Això no està suportat.</string>
     <string lang="ca" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">Ha indicat que té intenció de guardar fitxers més grans de 4 GB dins el volum. Tot i això, ha escollit el sistema de fitxers FAT, que no permet emmagatzemar fitxers més grans de 4 GB.\n\nSegur que vol donar un format FAT al volum?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="ca" key="CANT_ACCESS_VOL">Error: No s'ha pogut accedir al volum!\n\nAsseguri's que el volum seleccionat existeix, que no està muntat ni sent utilitzat pel sistema o alguna aplicació, que té permisos de lectura i escriptura sobre el volum i que no està protegit contra escriptura.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="ca" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Error: No s'ha pogut accedir al volum ni/o obtenir informació sobre el volum.\n\nAsseguri's que el volum seleccionat existeix, que no està muntat ni sent utilitzat pel sistema o alguna aplicació, que té permisos de lectura i escriptura sobre el volum i que no està protegit contra escriptura.</string>
     <string lang="ca" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Error: No s'ha pogut accedir al volum!\n\nAsseguri's que el volum seleccionat existeix, que no està muntat ni sent utilitzat pel sistema o alguna aplicació, que té permisos de lectura i escriptura sobre el volum i que no està protegit contra escriptura.\n\nSi el problema persisteix, pot ser d'ajuda seguir els passos següents.</string>
     <string lang="ca" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">Un error ha evitat que el VeraCrypt xifri la partició. Si us plau, intenti arreglar qualsevol problema notificat anteriorment i torni-ho a provar. Si el problema persisteix, pot ser d'ajuda seguir els passos següents.</string>
     <string lang="ca" key="INPLACE_ENC_GENERIC_ERR_RESUME">Un error ha evitat que el VeraCrypt recuperi el procés de xifrat de la partició. Si us plau, intenti arreglar qualsevol problema notificat anteriorment i torni-ho a provar. Recordi que no es pot muntar un volum fins que no està completament xifrat.</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="ca" key="CANT_DISMOUNT_OUTER_VOL">Error: No s'ha pogut desmuntar el volum ocult!\n\nEl volum no es pot desmuntar si conté fitxers o directoris que estiguin sent utilitzats pel sistema o una aplicació.\n\nSi us plau tenqui tots els programes que puguin estar utilitzant els fitxers o directoris del volum i torni-ho a provar.</string>
     <string lang="ca" key="CANT_GET_OUTER_VOL_INFO">Error: No s'ha pogut obtenir informació sobre el volum exterior!\nLa creació del volum no pot continuar.</string>
     <string lang="ca" key="CANT_ACCESS_OUTER_VOL">Error: No s'ha pogut accedir al volum exterior! La creació del volum no pot continuar.</string>
@@ -790,7 +835,7 @@
     <string lang="ca" key="TC_INSTALLER_IS_RUNNING">L'instal·lador del VeraCrypt està realitzant una instal·lació o actualització del programa. Abans de continuar, si us plau esperi que acabi o tenqui'l. Si no el pot tancar, reinicii l'ordinador abans de continuar.</string>
     <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 www.veracrypt.org).</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="EXTRACTING_VERB">Extraient</string>
     <string lang="ca" key="CANNOT_READ_FROM_PACKAGE">No s'han pogut llegir dades del paquet.</string>
@@ -977,6 +1022,7 @@
     <string lang="ca" key="CONFIRM_EXIT_UNIVERSAL">Sortir?</string>
     <string lang="ca" key="CHOOSE_ENCRYPT_OR_DECRYPT">El VeraCrypt no té prou informació per saber si ha de xifrar o desxifrar.</string>
     <string lang="ca" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">El VeraCrypt no té prou informació per saber si ha de xifrar o desxifrar.\n\nNota: Si ha desxifrat la partició/unitat de sistema a l'entorn de prearrencada, és possible que hagi de finalitzar el procés fent clic a 'Desxifrar'.</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="ca" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">Vol interrompre i posposar el procés de xifrat de la partició/volum?\n\nNota: Tercordi que el volum no es pot muntar fins que s'hagi xifrat completament. Podrà reprendre el procés de xifrat i continuarà des del punt on s'ha aturat. Pot fer-ho, per exemple, seleccionant 'Volums' &gt; 'Continuar una tasca interrompuda' al menú principal de la finestra del VeraCrypt.</string>
     <string lang="ca" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Vol interrompre i posposar el procés de xifrat de la partició/volum de sistema?\n\nNota: Recordi que el volum no es pot muntar fins que s'hagi xifrat completament. Podrà reprendre el procés de xifrat i continuarà des del punt on s'ha aturat. Pot fer-ho, per exemple, seleccionant 'Sistema' &gt; 'Continuar una tasca interrompuda' al menú principal de la finestra del VeraCrypt. Si vol revertir o evitar el procés de xifrat, seleccioni 'Sistema' &gt; 'Desxifrar la partició/unitat del sistema permanentment'.</string>
     <string lang="ca" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Vol interrompre i posposar el procés de desxifrat de la partició/volum de sistema?\n\nNota: Recordi que el volum no es pot muntar fins que s'hagi xifrat completament. Podrà reprendre el procés i continuarà des del punt on s'ha aturat. Pot fer-ho, per exemple, seleccionant 'Sistema' &gt; 'Continuar una tasca interrompuda' al menú principal de la finestra del VeraCrypt. Si vol revertir el procés de desxifrat (i començar el de xifrat) seleccioni 'Sistema' &gt; 'Xifrar la partició/unitat del sistema'.</string>
@@ -986,6 +1032,7 @@
     <string lang="ca" key="FAILED_TO_START_WIPING">Error: no s'ha pogut engegar el procés de neteja.</string>
     <string lang="ca" key="INCONSISTENCY_RESOLVED">S'ha resolt la inconsistència.\n\n\n(Si reporta un error relacionat amb això, si us plau inclogui la següent informació tècnica:\n%hs)</string>
     <string lang="ca" key="UNEXPECTED_STATE">Estat inesperat.\n\n\n(Si reporta un error relacionat amb això, si us plau inclogui la següent informació tècnica:\n%hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="ca" key="NOTHING_TO_RESUME">No hi ha cap procés o tasca per continuar.</string>
     <string lang="ca" key="HIDVOL_PROT_BKG_TASK_WARNING">ATENCIÓ: La tasca en segon pla del VeraCrypt està desactivada. Després de sortir del VeraCrypt, no rebrà notificacions si s'evita el dany a un volum ocult.\n\nNota: Es pot aturar la tasca en segon pla del VeraCrypt fent clic amb el botó dret a l'icona a la safata i seleccionant 'Sortir'.\n\nVol activar la tasca en segon pla del VeraCrypt?</string>
     <string lang="ca" key="LANG_PACK_VERSION">Versió del paquet d'idioma:  %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="ca" key="ERROR_MBR_PROTECTED">No s'ha pogut escriure al sector MBR.\n\nPotser la seva BIOS està configurada per protegir el sector MBR. Comprovi la configuració de la BIOS (premi F2, Esc o Suprimir quan s'engegui l'ordinador) per si té protecció pel sector 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="ca" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">No està instal·lada la versió requerida del gestor d'arranc VeraCrypt. Això pot evitar que es guardin algunes configuracions.</string>
     <string lang="ca" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Nota: En algunes situacions, potser voldrà evitar que una altre persona (un adversari) que l'estigui mirant s'adoni que està utilitzant el VeraCrypt. Aquestes opcions li permetran fer-ho personalitzant la pantalla del gestor d'arranc. Si activa la primera opció, no es mostarà cap text al gestor d'arranc (encara que introdueixi una contrassenya equivocada). L'ordinador semblarà 'congelat' mentre no introdueixi la seva contrasenya. A part d'això, es pot mostrar un missatge personalitzat per confondre l'adversari. Per exemple, un fals missatge d'error com ara "Missing operating system" (que normalment mostra el gestor d'arranc del Windows si no troba la partició d'arranc del Windows). És important remarcar que si l'adversari pot analitzar el contingut del disc dur, encara podrà saber que conté el gestor d'arranc del VeraCrypt.</string>
     <string lang="ca" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">ATENCIÓ: Si us plau, recordi que si activa aquesta opció, el gestor d'arrancada no mostrarà cap text (encara que introdueixi una contrassenya errònia). L'ordinador semblarà "congelat" (sense donar resposta) mentre no escrigui la contrasenya (el cursor NO es mourà i no es mostraran asteriscos quan es premin tecles).\n\nSegur que vol habilitar aquesta opció?</string>
@@ -1034,8 +1082,11 @@
     <string lang="ca" key="EXTRA_BOOT_PARTITION_REMOVAL_INSTRUCTIONS">La partició d'arranc extra es pot eliminar abans d'instal·lar el Windows. Per a fer-ho, segueixi aquests passos:\n\n1) Arrenqui el disc d'instal·ació de Windwows.\n\n2) A la pantalla d'instal·lació faci clic a 'Install now' &gt; 'Custom (advanced)'.\n\n3) Faci clic a 'Drive Options'.\n\n seleccioni la partició de sistema principal i elimini-la.\n\n5) seleccioni la partició reservada pel sistema i faci clic a 'Extend' per incrementar l'espai on es pot instal·lar wl Windows.\n\n6) Faci clic a 'Apply' i a 'OK'.\n\n7) Instal·li el Windows a la partició reservada.\n\n\nLi podrien preguntar perquè ha esborrat la partició d'arranc extra. Pot respondre que volia evitar qualsevol fuga de dades cap a la partició d'arranc sense xifrar.\n\nNota: Pot imprimir aquest text fent clic a 'Imprimir'. Si guarda alguna còpia d'aquest text o l'imprimeix (molt recomanat a no ser que la seva impressora guardi copies dels documents que imprimeix en una unitat interna), hauria de destruïr totes les còpies després d'esborrar la partició d'arranc extra.</string>
     <string lang="ca" key="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">ATENCIÓ: Hi ha espai no assignat entre la partició del sistema i la primera partició després d'ella. Després de crear el sistema operatiu ocult, no podrà crear cap nova partició en aquest espai. Si ho fa, el sistema operatiu ocult no es podrà engegar (fins que esborri aquestes noves particions).</string>
     <string lang="ca" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Aquest algorisme de xifrat no està suportat per al xifrat del sistema</string>
-	<string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="ca" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Els fitxers de claus no estan suportats per al xifrat del sistema.</string>
     <string lang="ca" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">ATENCIÓ: El VeraCrypt no ha pogut restaurar la disposició de teclat orignal. Això pot provocar que introdueixi la contrasenya incorrectament.</string>
     <string lang="ca" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Error: No s'ha pogut establir la disposició de teclat estàndard als EUA pel VeraCrypt.\n\nTingui en compte que la contrasenya s'haurà d'esciure a l'entorn de prearrencada (abans que arrenqui el windows) on no hi haurà altres disposicions de teclat disponibles. Per tant, la contrasenya s'ha d'escriure sempre amb la disposició de teclat estàndard als EUA.</string>
@@ -1120,6 +1171,7 @@
     <string lang="ca" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">S'ha completat la prova prèvia amb èxit.\n\nATENCIÓ: 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. Si no en té; si us plau faci'n una ara (pot fer clic a 'Ajornar', fer la còpia de seguretat i després executar el VeraCrypt altre vegada i seleccionar 'Sistema' &gt; 'Continuar una tasca interrompuda' i començar a xifrar).\n\nQuan estigui llest, faci clic a 'Xifrar' per començar.</string>
     <string lang="ca" key="SYSENC_ENCRYPTION_PAGE_INFO">Pot fer clic a 'Pausar' o 'Ajornar' en qualsevol moment per interrompre el procés de xifrat o desxifrat, sortir de l'assistent, reiniciar o apagar l'ordinador i després reprendre el procés, que continuarà des del punt on s'ha aturat. Per evitar la desacceleració quan el sistema o les aplicacions llegeixen o escriuen dades des del disc de sistema, el VeraCrypt espera fins que s'ha acabat de llegir o escriure, moment en el qual segueix xifrant o desxifrant.</string>
     <string lang="ca" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nPot fer clic a 'Pausar' o 'Ajornar' en qualsevol moment per interrompre el procés de xifrat o desxifrat, sortir de l'assistent, reiniciar o apagar l'ordinador i després reprendre el procés, que continuarà des del punt on s'ha aturat. Tingui en compte que no es podrà muntar el volum fins que no estigui completament xifrat.</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="ca" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">S'ha iniciat el sistema ocult</string>
     <string lang="ca" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Sistema original</string>
     <string lang="ca" key="SYSENC_HIDDEN_OS_WIPE_INFO">El Windows crea (normalment sense avís ni consentiment) diversos fitxers de registre, temporals, etc. a la partició de sistema. També guarda contingut de la RAm per hivernar i fitxers de paginació a la partició de sistema. Per tant, si un adversari analitza els fitxers emmagatzemats a la partició on hi ha el sistema operatiu original (del qual el sistema ocult és un clon) podria saber, per exemple, que s'ha utilitzat l'assistent del VeraCrypt per a fer un sistema operatiu ocult (cosa que pot indiciar l'existència d'un sistema operatiu ocult dins el sistema).\n\nPer evitar aquests problemes, durant els passos següents, el VeraCrypt esborrarà de forma segura tot el contingut de la partició on hi ha el sistema operatiu original. Després d'això, per a mantenir la credibilitat, hauria d'instal·lar un nou sistema a la partició i xifar-lo. Així es crearà un sistema esquer i es completarà el procés de creació del sistema operatiu ocult.</string>
@@ -1159,7 +1211,7 @@
     <string lang="ca" key="HIDDEN_OS_CREATION_PREINFO_HELP">Als passos següents, el VeraCrypt crearà un sistema operatiu ocult copiant el contingut de la partició de sistema al volum ocult (les dades copiades es xifraran al vol amb una clau de xifrat diferent a la que s'utilitza pel sistema operatiu esquer).\n\nAquest procés es durà a terme a l'entorn de prearrencada (abans d'iniciar el Windows) i pot trigar força estona a acabar-se; diverses hores o dies (depenent de la mida de la partició de sistema i del rendiment de l'ordinador).\n\nPorà interrompre el procés, apagar l'ordinador, engegar el sistema operatiu i després continuar el procés. No obstant, si l'interromp, el procés de copiar el sistema haurà de tornar a començar des del principi (ja que el contingut de la partició de sistema no haurien de canviar durant la còpia).</string>
     <string lang="ca" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Vol cancel·lar el procés de creació d'un sistema operatiu ocult?\n\nNota: No podrà continuar aquest procés si el cancel·la ara.</string>
     <string lang="ca" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Vol cancelar la prova prèvia de xifrat del sistema?</string>
-    <string lang="ca" key="BOOT_PRETEST_FAILED_RETRY">Ha fallat la prova prèvia de xifrat del sistema. Vol tornar-ho a provar?\n\nSi selecciona 'No', es desinstal·larà el component d'autenticació prearrencada.\n\nNots.\n\n- Si el gestor d'arranc del VeraCrypt no li demana la contrasenya abans d'engegar el Windows és possible que el seu sistema operatiu no engegui des del disc dur on es troba instal·lat. Això no està suportat.\n\n- Si utilitza un algorisme de xifrat que no sigui AES i la prova prèvia falla (i ha introduït la contrasenya) pot ser degut a un controlador defectuós. Seleccioni 'No' i provi de tornar a xifrar la partició/unitat una altre vegada, però utilitzant l'algorisme de xifrat AES (que necessita menys memòria).\n\n- Per a més possibles causes i solucions, vegi: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="ca" key="BOOT_PRETEST_FAILED_RETRY">Ha fallat la prova prèvia de xifrat del sistema. Vol tornar-ho a provar?\n\nSi selecciona 'No', es desinstal·larà el component d'autenticació prearrencada.\n\nNots.\n\n- Si el gestor d'arranc del VeraCrypt no li demana la contrasenya abans d'engegar el Windows és possible que el seu sistema operatiu no engegui des del disc dur on es troba instal·lat. Això no està suportat.\n\n- Si utilitza un algorisme de xifrat que no sigui AES i la prova prèvia falla (i ha introduït la contrasenya) pot ser degut a un controlador defectuós. Seleccioni 'No' i provi de tornar a xifrar la partició/unitat una altre vegada, però utilitzant l'algorisme de xifrat AES (que necessita menys memòria).\n\n- Per a més possibles causes i solucions, vegi: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="ca" key="SYS_DRIVE_NOT_ENCRYPTED">La partició/unitat de sistema sembla no estar xifrada (ni parcial ni completament).</string>
     <string lang="ca" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">La partició/unitat de sistema està xifrada (parcial o completament).\n\nSi us plau, desxifri completament la partició/unitat abans de continuar. Per a fer-ho, seleccioni 'Sistema' &gt; 'Desxifrar la partició/unitat del sistema permenentment'.</string>
     <string lang="ca" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">Quan la partició/unitat de sistema està xifrada (parcial o completament) no és possible baixar la versió del VeraCrypt (però es pot actualitzar o reinstal·lar la mateixa versió).</string>
@@ -1176,6 +1228,8 @@
     <string lang="ca" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">Ha seleccionat la partició/unitat de sistema (o la partició d'arranc) però en aquest punt l'assisten només pot seleccionar particions/unitats que no siguin de sistema\n\nVol configurar la contrasenya de prearrancada el que significa que haurà d'entrar la contrasenya cada vegada abans d'iniciar el Windows) i xifrar la partició/unitat de sistema?</string>
     <string lang="ca" key="CONFIRM_DECRYPT_SYS_DEVICE">Està segur que vol desxifrar de forma permanent la partició/unitat del sistema?</string>
     <string lang="ca" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">ATENCIÓ: Si desxifra de forma permanent la unitat/partició de sistema, s'hi escriuran dades sense xifrar.\n\nSegur que vol desxifrar permenentment la unitat/partició de sistema?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
     <string lang="ca" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">ATENCIÓ: Si utilitza xifrats en cascada per xifrar el sistema es pot trobar amb els següents problemes:\n\n1) El gestor d'arranc del TrueCrypr és més gran del normal i, per tant, no hi ha prou espai a la primera pista de la unitat per la còpia del gestor d'arranc. Per tant, cada cop que es malmeti (cosa que passa sovint, per exemple, durant el procés antipirateria d'alguns programes mal dissenyats), haurà d'utilitzar el disc de recuperació per arrencar o reparar el gestor d'arranc.\n\n2) En alguns ordinadors, engegar després de la hivernació triga molt de temps.\n\nAquests problemes potencials poden evitarse seleccionant un algorisme de xifrat que no sigui en cascada (per exemple, l'AES).\n\nSegur que vol fer servir un xifrat en cascada</string>
     <string lang="ca" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">Si es troba amb algun dels problemes descrits anteriorment, desxifri la partició/unitat (si està xifrada) i provi de xifrar-la un altre cop fent servir un algorisme de xifrat que no sigui en cascada (per exemple, 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>
@@ -1191,6 +1245,7 @@
     <string lang="ca" key="ENABLE_BAD_SECTOR_ZEROING">Error: No es pot llegir el contingut d'un o més sectors del disc (probablement per un defecte físic al disc).\n\nEl procés de xifrat in-situ pot continuar només quan els sectors tornin a ser llegibles. El VeraCrypt pot intentar fer aquests sectors llegibles escribint-hi zeros. No obstant, tingui en compte que es perdran totes les dades que hi haguessin als sectors il·legibles. Per evitar això, pot provar de recuperar les porcions corruptes fent servir les eines de tercers adecuades.\n\nNota: En cas de sectors malmesos físicament (en comptes de simplement dades corrputes i errors de comprovació) la majoria de tipus de dispositius d'emmagatzematge reubiquen internament el contingut que s'hi inenta escriure (i per tant les dades que hi ha als sectors malmesos poden restar sense xifrar).\n\nVol que el VeraCrypt ompli de zeros els sectors il·legibles?</string>
     <string lang="ca" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Error: No es pot llegir el contingut d'un o més sectors del disc (probablement per un defecte físic al disc).\n\nPer poder seguir amb el procés de desxifrat, el VeraCrypt haurà de descartar el contingut dels sector il·legibles (el contingut es canviarà per dades pseudoaleatòries). Després de fer això podrà intentar recuperar porcions de qualsevol dada corrupta utilitzat el programari de tercers apropiat.\n\nVol que el VeraCrypt descarti les dades dels sectors il·legibles?</string>
     <string lang="ca" key="ZEROED_BAD_SECTOR_COUNT">Nota: El VeraCrypt ha substituït el contingut de %I64d sector(s) (%s) amb blocs de zeros xifrats.</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="ca" key="ENTER_TOKEN_PASSWORD">Introdueixi la contrasenya/PIN pel testimoni '%s':</string>
     <string lang="ca" key="PKCS11_LIB_LOCATION_HELP">Per tal que el VeraCrypt pugui accedir a un testimoni de seguretat o a una targeta intel·ligent és necessàri instal·lar una biblioteca PKCS #11 per a aquests dispositius. Aquesta biblioteca pot ser subministrada amb el dispositiu o pot estar disponible per a descarregar del lloc web del proveïdor o de tercers.\n\nDesprés d'instal·lar la bilioteca, pot seleccionar-la manualment fent clic a 'Buscar biblioteca' o pot deixar que el VeraCrypt la busqui i seleccioni automàticament fent clic a 'Detectar automàticament' (només es buscarà al directòri de sistema de windows).</string>
     <string lang="ca" key="SELECT_PKCS11_MODULE_HELP">Nota: Per saber el nom de fitxer i la ubicació de la bilioteca PKCS #11 pel seu testimoni de seguretat o targeta intel·ligent vegeu la documentació proporcionada amb el testimoni, targeta o programari de tercers.</string>

Translations/Language.cs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="cs" name="Čeština" en-name="Czech" version="1.0.0" translators="Vítek Moser" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <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>
     <control lang="cs" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Více informací</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="cs" key="IDC_MB">&amp;MB</control>
     <control lang="cs" key="IDC_MORE_INFO_ON_CONTAINERS">Více informací</control>
     <control lang="cs" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">Více informací o zašifrování systému</control>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <control lang="cs" key="IDT_COLLECTING_RANDOM_DATA_NOTE">DŮLEŽITÉ: Pohybujte s myší v tomto okně co nejnáhodněji. Čím déle s ní budete hýbat, tím lépe. Kryptografická síla šifrovacích klíčů se tím výrazně zvýší. Pro pokračování klikněte na Další.</control>
     <control lang="cs" key="IDT_CONFIRM">&amp;Potvrdit:</control>
     <control lang="cs" key="IDT_DONE">Hotovo</control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="cs" key="IDT_ENCRYPTION_ALGO">Šifrovací algoritmus</control>
     <control lang="cs" key="IDT_FILESYSTEM">Systém souborů</control>
     <control lang="cs" key="IDT_FILE_CONTAINER">Vytvoří virtuální zašifrovaný disk uvnitř souboru. Doporučené pro nezkušené uživatele.</control>
@@ -85,6 +88,8 @@
     <control lang="cs" key="IDT_PARTIAL_POOL_CONTENTS">Momentálně generovaný obsah (částečný)</control>
     <control lang="cs" key="IDT_PASS">Schváleno</control>
     <control lang="cs" key="IDT_PASSWORD">Heslo:</control>
+    <control lang="en" key="IDT_PIM">Volume PIM:</control>
+    <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
     <control lang="cs" key="IDT_PROGRESS">Průběh:</control>
     <control lang="cs" key="IDT_RANDOM_POOL">Náhodný výběr:</control>
     <control lang="cs" key="IDT_SINGLE_BOOT">Vyberte tuto volbu, pokud je na tomto počítači nainstalován pouze jeden operační systém (i v případě, že má více uživatelů).</control>
@@ -142,6 +147,8 @@
     <control lang="cs" key="IDC_MOUNT_OPTIONS">Volby připojení</control>
     <control lang="cs" key="IDC_MOUNT_READONLY">Připojit svazek jen &amp;pro čtení</control>
     <control lang="cs" key="IDC_NEW_KEYFILES">Soubor. klíče…</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="cs" key="IDC_PREF_BKG_TASK_ENABLE">Povoleno</control>
     <control lang="cs" key="IDC_PREF_CACHE_PASSWORDS">Ukládat hesla do paměti ovladače</control>
     <control lang="cs" key="IDC_PREF_DISMOUNT_INACTIVE">Autom. odpojit svazek pokud z/do něj nebylo čteno/zapisováno</control>
@@ -155,6 +162,7 @@
     <control lang="cs" key="IDC_PREF_MOUNT_READONLY">Připojit svazky jen pro čtení</control>
     <control lang="cs" key="IDC_PREF_MOUNT_REMOVABLE">Připojit svazky jako výměnná média</control>
     <control lang="cs" key="IDC_PREF_OPEN_EXPLORER">Otevřít okno Průzkumníka pro úspěšně připojený svazek</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</control>
     <control lang="cs" key="IDC_PREF_USE_DIFF_TRAY_ICON_IF_VOL_MOUNTED">Použít jinou ikonu na hlavním panelu, pokud jsou k dispozici připojené svazky</control>
     <control lang="cs" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Odstranit hesla z mezipaměti a automaticky odpojit</control>
     <control lang="cs" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Odstranit hesla z mezipaměti při ukončení</control>
@@ -167,11 +175,12 @@
     <control lang="cs" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Zobrazit heslo</control>
     <control lang="cs" key="IDC_TRAVEL_OPEN_EXPLORER">Otevřít okno &amp;Průzkumníka pro připojený svazek</control>
     <control lang="cs" key="IDC_TRAV_CACHE_PASSWORDS">&amp;Ukládat hesla do mezipaměti</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="cs" key="IDC_UNMOUNTALL">O&amp;dpojit vše</control>
     <control lang="cs" key="IDC_VOLUME_PROPERTIES">Vlastnos&amp;ti svazku…</control>
     <control lang="cs" key="IDC_VOLUME_TOOLS">&amp;Nástroje svazku…</control>
     <control lang="cs" key="IDC_WIPE_CACHE">Vyčistit &amp;mezipaměť</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="cs" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Oblíbené svazky</control>
     <control lang="cs" key="IDD_HOTKEYS_DLG">VeraCrypt - Systémové klávesové zkratky</control>
     <control lang="cs" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="cs" key="IDM_CREATE_HIDDEN_OS">Vytvořit skrytý operační systém...</control>
     <control lang="cs" key="IDM_CREATE_RESCUE_DISK">Vytvořit záchranný disk…</control>
     <control lang="cs" key="IDM_CREATE_VOLUME">Vytvořit nový svazek…</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="cs" key="IDM_DEFAULT_KEYFILES">Výchozí souborové klíče…</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="cs" key="IDM_DONATE">Podpořte nás...</control>
     <control lang="cs" key="IDM_ENCRYPT_SYSTEM_DEVICE">Zašifrovat systémový oddíl/disk…</control>
     <control lang="cs" key="IDM_FAQ">Často kladené dotazy</control>
@@ -243,6 +254,7 @@
     <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="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>
     <control lang="cs" key="IDM_VOLUME_WIZARD">Průvodce vytvořením svazku</control>
     <control lang="cs" key="IDM_WEBSITE">Domovská stránka VeraCrypt</control>
@@ -485,7 +497,11 @@
     <string lang="cs" key="FORMAT_FINISHED_HELP">\n\nVeraCrypt svazek byl vytvořen a je připraven k použití. Pokud chcete vytvořit další svazek VeraCrypt, klikněte Další. Jinak klikněte Konec.</string>
     <string lang="cs" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nSkrytý svazek VeraCrypt byl úspěšně vytvořen (skrytý operační systém bude umístěn v tomto skrytém svazku).\n\nKlikněte na Další pro pokračování.</string>
     <string lang="cs" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Svazek plně zašifrován</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="cs" key="NONSYS_INPLACE_ENC_FINISHED_INFO">DŮLEŽITÉ: PRO PŘIPOJENÍ TOHOTO NOVĚ VYTVOŘENÉHO SVAZKU VERACRYPT A PRO PŘÍSTUP K DATŮM NA NĚM, KLIKNĚTE NA 'Autom. připojit zařízení' V HLAVNÍM OKNĚ VERACRYPT. Jakmile zadáte správné heslo (a/nebo přiložíte správný souborový klíč/e), svazek bude připojen k písmenu jednotky, které jste vybrali v seznamu v hlavním okně VeraCryptu (a budete moci přistupovat k zašifrovaným datům přes toto vybrané písmeno jednotky).\n\nZAPAMATUJTE SI PROSÍM, NEBO ZAPIŠTE, VÝŠE UVEDENÉ KROKY. TĚMITO KROKY SE MUSÍTE ŘÍDIT KDYKOLIV, KDYŽ BUDETE CHTÍT SVAZEK PŘIPOJIT A PŘISTUPOVAT K DATŮM NA NĚM. Případně můžete v hlavním okně VeraCryptu kliknout na 'Vybrat zařízení', pak vybrat tento oddíl/svazek a kliknout na 'Připojit'.\n\nOddíl/svazek byl úspěšně zašifrován (obsahuje nyní úplně zašifrovaný svazek VeraCrypt) a je připraven k použití.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="cs" key="FORMAT_FINISHED_INFO">Svazek VeraCrypt byl úspěšně vytvořen.</string>
     <string lang="cs" key="FORMAT_FINISHED_TITLE">Svazek byl vytvořen</string>
     <string lang="cs" key="FORMAT_HELP">DŮLEŽITÉ: Pohybujte s myší v tomto okně co nejnáhodněji. Čím déle s ní budete hýbat, tím lépe. Kryptografická síla šifrovacích klíčů se tak výrazně zvýší. Pak klikněte Formátovat pro vytvoření svazku.</string>
@@ -523,6 +539,7 @@
     <string lang="cs" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Nastala chyba při získávání informací o stavu zašifrovaného systému.</string>
     <string lang="cs" key="INIT_SYS_ENC">Nelze inicializovat aplikační komponenty pro systémové šifrování.</string>
     <string lang="cs" key="INIT_RAND">Selhala inicializace generátoru náhodných čísel!</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="cs" key="INIT_REGISTER">Aplikace nemohla být inicializována. Selhala registrace Dialogové třídy.</string>
     <string lang="cs" key="INIT_RICHEDIT">Chyba: Systémová knihovna Rich Edit nemohla být načtena.</string>
     <string lang="cs" key="INTRO_TITLE">Průvodce vytvořením svazku VeraCrypt</string>
@@ -535,6 +552,7 @@
     <string lang="cs" key="MOUNT_BUTTON">&amp;Připojit</string>
     <string lang="cs" key="NEW_VERSION_REQUIRED">Pro připojení tohoto oddílu je potřeba novější verze programu VeraCrypt.</string>
     <string lang="cs" key="VOL_CREATION_WIZARD_NOT_FOUND">Chyba: Průvodce vytvořením svazku nebyl nalezen.\n\nUjistěte se prosím, že  soubor 'VeraCrypt Format.exe' je ve složce, ze které byl 'VeraCrypt.exe' spuštěn. Pokud není, přeinstalujte prosím VeraCrypt nebo najděte 'VeraCrypt Format.exe' na vašem disku a spusťte jej.</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="cs" key="NEXT">&amp;Další &gt;</string>
     <string lang="cs" key="FINALIZE">&amp;Dokončit</string>
     <string lang="cs" key="INSTALL">&amp;Instalovat</string>
@@ -542,6 +560,7 @@
     <string lang="cs" key="NODRIVER">Nelze připojit k ovladači zařízení VeraCrypt. VeraCrypt nemůže pracovat, pokud ovladač zařízení neběží.\n\nKvůli architektuře Windows bude pravděpodobně nutné se odhlásit nebo restartovat systém, aby mohl být ovladač zařízení načten.</string>
     <string lang="cs" key="NOFONT">Nastala chyba při nahrávání/připravování fontů.</string>
     <string lang="cs" key="NOT_FOUND">Písmeno disku nebylo nalezeno nebo nebylo specifikováno.</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="cs" key="DRIVE_LETTER_UNAVAILABLE">Písmeno jednotky není k dispozici.</string>
     <string lang="cs" key="NO_FILE_SELECTED">Nebyl vybrán žádný soubor!</string>
     <string lang="cs" key="NO_FREE_DRIVES">Žádné písmeno disku není k dispozici.</string>
@@ -561,15 +580,18 @@
     <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_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="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="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="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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="cs" key="IDD_PCDM_CHANGE_PKCS5_PRF">Zadejte hlavičku klíče derivačního algoritmu</string>
     <string lang="cs" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Přidat/Odebrat souborové klíče do/ze svazku</string>
     <string lang="cs" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Odstranit všechny souborové klíče ze svazku</string>
     <string lang="cs" key="PASSWORD_CHANGED">Heslo a souborový klíč/e byly úspěšně změněny.\n\nDŮLEŽITÉ: Ujistěte se, prosím, že jste si přečetli sekci 'Změna hesel a souborových klíčů' v kapitole  'Bezpečnostní požadavky a opatření' v uživatelské příručce VeraCryptu.</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="cs" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">DŮLEŽITÉ: Pokud jste nezničili váš Záchranný disk VeraCrypt, váš systémový oddíl/disk může být stále dešifrován použitím starého hesla (nabootováním Záchranného disku VeraCrypt a zadáním starého hesla). Měli byste vytvořit nový Záchranný disk VeraCrypt a pak zničit starý.\n\nChcete vytvořit nový Záchranný disk VeraCrypt?</string>
     <string lang="cs" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Záchranný disk VeraCrypt stále používá předchozí algoritmus. Považujete-li předchozí algoritmus za nedostatečně bezpečný, měli byste vytvořit nový záchranný disk VeraCrypt a pak starý zničit.\n\nChcete vytvořit nový Záchranný disk VeraCrypt?</string>
     <string lang="cs" key="KEYFILES_NOTE">Jakýkoliv typ souboru (například .mp3, .jpg, .zip, .avi) může být použit jako souborový klíč VeraCryptu. Vězte, že VeraCrypt nikdy nemění obsah souborového klíče. Můžete vybrat více než jen jeden souborový klíč (na pořadí nezáleží). Pokud zadáte adresář, všechny neskryté soubory nalezené uvnitř, budou použity jako souborové klíče. Klikněte na 'Přidat soubory tokenu' a vyberte souborové klíče uložené na bezpečnostních tokenech nebo smart kartách (nebo k importu souborových klíčů na bezpečnostní tokeny nebo na smart karty).</string>
@@ -578,6 +600,7 @@
     <string lang="cs" key="PKCS5_PRF_CHANGED">Klíč hlavičky derivačního algoritmu byl úspěšně zadán.</string>
     <string lang="cs" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">Zadejte prosím heslo a/nebo souborový klíč/e k nesystémovému svazku, u kterého chcete pokračovat v procesu šifrování za běhu.\n\n\nPoznámka: Až kliknete na Další, VeraCrypt se pokusí najít všechny nesystémové svazky, u kterých byl přerušen proces šifrování a u kterých může být VeraCrypt hlavička dešifrována použitím uvedeného hesla a/nebo souborového klíče/ů. Pokud bude nalezeno více než jeden svazek, budete muset v příštím kroku vybrat jeden z nich.</string>
     <string lang="cs" key="NONSYS_INPLACE_ENC_RESUME_VOL_SELECT_HELP">Vyberte, prosím, jeden svazek ze seznamu. Seznam obsahuje všechny přístupné ne-systémové svazky, kde byl přerušen proces šifrování a jejichž hlavičky mohou být dešifrovány s použitím použitého hesla a souborového klíče.</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="cs" key="PASSWORD_HELP">Je velmi důležité, abyste zadali dobré heslo. Měli byste se vyvarovat takového hesla, které obsahuje jen jedno slovo nebo může být nalezeno ve slovníku (nebo kombinace 2, 3 nebo 4 takovýchto slov). Nemělo by obsahovat žádná jména nebo data narození. Nemělo by být lehce uhodnutelné. Dobré heslo se skládá z kombinace různých velkých a malých písmen, čísel a speciálních znaků jako např. @ ^ = $ * + atd. Doporučujeme zvolit heslo skládající se z 20 znaků a více (čím delší, tím lepší). Maximální možná délka je 64 znaků.</string>
     <string lang="cs" key="PASSWORD_HIDDENVOL_HELP">Zadejte heslo pro skrytý svazek. </string>
     <string lang="cs" key="PASSWORD_HIDDEN_OS_HELP">Zadejte, prosím, heslo pro skrytý operační systém (např. pro skrytý svazek). </string>
@@ -597,11 +620,26 @@
     <string lang="cs" key="PASSWORD_WRONG_AUTOMOUNT">Špatné heslo nebo nebyl nalezen žádný svazek VeraCrypt.</string>
     <string lang="cs" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Špatný souborový klíč/heslo nebo nebyl nalezen žádný svazek VeraCrypt.</string>
     <string lang="cs" key="PASSWORD_WRONG_CAPSLOCK_ON">\n\nUpozornění: Caps Lock je zapnutý. Tím můžete špatně zadat heslo.</string>
+    <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
+    <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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="cs" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nVAROVÁNÍ: V cestě k souborovým klíčům byl nalezen skrytý soubor/y. Tyto skryté soubory nemohou být použity jako souborové klíče. Pokud je potřebujete použít jako souborové klíče, odstraňte jejich 'Skrytý' atribut (pravým tlačítkem myši na něj klikněte, vyberte 'Vlastnosti', odškrtněte 'Skrytý' a potvrďte OK). Poznámka: Skryté soubory jsou viditelné jen tehdy, pokud je daná volba zapnuta (Ovládací panely &gt; 'Možnosti složky' &gt; Zobrazit).</string>
     <string lang="cs" key="HIDDEN_VOL_PROT_PASSWORD_US_KEYB_LAYOUT">Pokud se snažíte ochránit skrytý svazek, který obsahuje skrytý systém, ujistěte se, že používáte při zadávání hesla ke skrytému svazku standardní US rozložení klávesnice. Je to nutné vzhledem k tomu, že hesla musí být zadávána v před-bootovacím prostředí (než se spustí Windows), kde nejsou ne-US rozložení klávesnice k dispozici.</string>
     <string lang="cs" key="FOUND_NO_PARTITION_W_DEFERRED_INPLACE_ENC">VeraCrypt nenašel žádný svazek, kde by bylo přerušeno nesystémové šifrování a kde by bylo možné dešifrovat hlavičku svazku s pomocí dodaného hesla a/nebo souborového klíče/ů.\n\nUjistěte se, prosím, že heslo a/nebo souborový klíč/e jsou správné a že oddíl/svazek není používán systémem nebo aplikacemi (včetně antivirového programu).</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="cs" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nPoznámka: Snažíte-li se připojit oddíl umístěný na zašifrovaném systémovém disku bez před-bootovací autentifikace nebo snažíte-li se připojit zašifrovaný systémový oddíl operačního systému, který neběží, můžete tak učinit přes 'Systém' &gt; 'Připojit bez před-bootovací autentifikace.'</string>
     <string lang="cs" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">V tomto módu nemůžete připojit oddíl umístěný na disku, jehož část je součástí aktivního systémového šifrování.\n\nNež budete moci připojit oddíl v tomto módu, musíte buď nabootovat z operačního systému nainstalovaném na odlišném disku (zašifrovaném nebo nezašifrovaném) nebo nabootovat z nezašifrovaného operačního systému.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <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>
@@ -701,11 +739,18 @@
     <string lang="cs" key="FOR_MORE_INFO_ON_PARTITIONS">Pro informace jak vytvořit a spravovat oddíly, viz dodaná dokumentace k vašemu operačnímu systému nebo kontaktujte technickou podporu prodejce vašeho počítače pro asistenci.</string>
     <string lang="cs" key="SYSTEM_PARTITION_NOT_ACTIVE">Chyba: Momentálně běžící operační systém není nainstalován na bootovacím svazku (první aktivní oddíl). To není podporováno.</string>
     <string lang="cs" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">Uvedli jste, že chcete v tomto svazku VeraCrypt ukládat soubory větší než 4 GB. Vybrali jste ale systém souborů FAT, kde soubory větší než 4 GB nemohou být uloženy.\n\nJste si jisti, že chcete svazek naformátovat na FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="cs" key="CANT_ACCESS_VOL">Chyba: Ke svazku nelze přistoupit!\n\nUjistěte se, že vybraný svazek existuje, že není připojený používaný systémem nebo aplikací, že máte práva pro čtení/zápis ke svazku a že svazek není chráněn proti zápisu.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="cs" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Chyba: Ke svazku se nelze připojit a/nebo o něm nelze zjistit informace.\n\nUjistěte se, že vámi vybraný svazek existuje, že není používán systémem nebo aplikacemi a že máte práva pro čtení/zapisování ke svazku a že není chráněn proti zápisu.</string>
     <string lang="cs" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Chyba: Ke svazku se nelze připojit a/nebo o něm nelze zjistit informace. Ujistěte se, že vámi vybraný svazek existuje, že není používán systémem nebo aplikacemi a že máte práva pro čtení/zapisování ke svazku a že není chráněn proti zápisu.\n\nPokud problém přetrvává, mohou vám pomoci kroky uvedené níže.</string>
     <string lang="cs" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">Svazek nemohl být VeraCryptem zašifrován, protože nastala nějaká chyba. Zkuste, prosím, nejdříve opravit všechny předešlé ohlášené chyby, a pak to zkuste znovu. Pokud problém přetrvává, mohou vám pomoci kroky uvedené níže.</string>
     <string lang="cs" key="INPLACE_ENC_GENERIC_ERR_RESUME">VeraCrypt nemohl pokračovat v šifrování oddílu, protože nastala nějaká chyba.\n\nZkuste, prosím, nejdříve opravit všechny předešlé ohlášené chyby, a pak zkuste v procesu pokračovat. Svazek nelze připojit, dokud nebude úplně zašifrová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="cs" key="CANT_DISMOUNT_OUTER_VOL">Chyba: Vnější svazek nelze odpojit!\n\nSvazek nemůže být odpojen, pokud obsahuje soubory nebo složky používané programem nebo systémem.\n\nZavřete prosím jakýkoliv program, který by mohl soubory nebo adresáře na svazku používat a klikněte Znovu.</string>
     <string lang="cs" key="CANT_GET_OUTER_VOL_INFO">Chyba: Nelze získat informace o vnějším svazku! Vytváření svazku nemůže pokračovat.</string>
     <string lang="cs" key="CANT_ACCESS_OUTER_VOL">Chyba: Nelze přistupovat na vnější svazek! Vytváření svazku nelze dokončit.</string>
@@ -790,7 +835,7 @@
     <string lang="cs" key="TC_INSTALLER_IS_RUNNING">Instalátor programu VeraCrypt momentálně běží na tomto systému a provádí nebo připravuje instalaci nebo update programu VeraCrypt. Než budete pokračovat, počkejte na dokončení nebo jej zavřete. Pokud ho nemůžete zavřít, restartujte prosím počítač, než budete pokračovat.</string>
     <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 www.veracrypt.org).</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="EXTRACTING_VERB">Rozbalení</string>
     <string lang="cs" key="CANNOT_READ_FROM_PACKAGE">Nelze přečíst data z balíčku.</string>
@@ -977,6 +1022,7 @@
     <string lang="cs" key="CONFIRM_EXIT_UNIVERSAL">Ukončit?</string>
     <string lang="cs" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt nemá dostatek informací, aby určil, zda má šifrovat nebo dešifrovat.</string>
     <string lang="cs" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt nemá dostatečné informace pro stanovení, zda šifrovat nebo dešifrovat.\n\nPoznámka: Pokud jste dešifrovali systémový oddíl/disk v před-bootovacím prostředí, bude možná nutné dokončit proces kliknutím na Dešifrovat.</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="cs" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">Chcete přerušit a odložit proces šifrování oddílu/svazku?\n\nPoznámka: Vězte, že svazek nemůže být připojen, dokud nebude úplně zašifrován. Proces šifrování budete moci obnovit, naváže tam, kde naposledy skončil. Můžete tak učinit přes lištu v hlavním okně VeraCryptu - 'Svazky' &gt; 'Obnovit přerušený proces'.</string>
     <string lang="cs" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Chcete přerušit a odložit proces šifrování systémového oddílu/disku?\n\nV procesu budete moci pokračovat z místa, kde byl zastaven. Můžete tak učinit kliknutím na 'Systém' &gt; 'Obnovit přerušený proces' z hlavního menu v okně programu VeraCrypt. Chcete-li trvale ukončit nebo vrátit proces šifrování, vyberte 'Systém' &gt; 'Trvale dešifrovat systémový oddíl/disk'.</string>
     <string lang="cs" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Chcete přerušit a odložit proces dešifrování systémového oddílu/disku?\n\nV procesu budete moci pokračovat z místa, kde byl zastaven. Můžete tak učinit kliknutím na 'Systém' &gt; 'Obnovit přerušený proces' z hlavního menu v okně programu VeraCrypt. Chcete-li zvrátit proces dešifrování (a začít šifrovat) vyberte 'Systém' &gt; 'Zašifrovat systémový oddíl/disk'.</string>
@@ -986,6 +1032,7 @@
     <string lang="cs" key="FAILED_TO_START_WIPING">Chyba: Nepodařilo se spustit proces čištění.</string>
     <string lang="cs" key="INCONSISTENCY_RESOLVED">Nekonzistence vyřešena.\n\n\n(Pokud chcete ohlásit chybu ve spojitosti s touto událostí, přiložte prosím tuto technickou informaci do zprávy o chybě: %hs)</string>
     <string lang="cs" key="UNEXPECTED_STATE">Chyba: Neočekávaný stav.\n\n\n(Pokud budete chtít nahlásit chybu spojenou s tímto problémem, nezapomeňte do zprávy přiložit následující technické informace:\n%hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="cs" key="NOTHING_TO_RESUME">Není žádný proces/úkol k obnovení.</string>
     <string lang="cs" key="HIDVOL_PROT_BKG_TASK_WARNING">UPOZORNĚNÍ: VeraCrypt služba na pozadí je vypnuta. Po ukončení programu VeraCrypt nebudete upozorněni, zda bylo zabráněno poškození skrytého svazku.\n\nPoznámka: Službu na pozadí můžete kdykoliv zavřít kliknutím pravého tlačítka myši na ikonu programu VeraCrypt v pravém dolním rohu a vyberte 'Konec'.\n\nPovolit VeraCrypt službu na pozadí?</string>
     <string lang="cs" key="LANG_PACK_VERSION">Verze jazykového balíčku:  %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="cs" key="ERROR_MBR_PROTECTED">Zápis do MBR sektoru selhal.\n\nVáš BIOS může mít nastavenu ochranu zápisu MBR sektoru. Zkontrolujte nastavení vašeho BIOSu (zmáčkněte klávesu F2, Delete nebo Esc po zapnutí vašeho počítače) ohledně MBR/antivirové ochrany.</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="cs" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">Požadovaná verze bootovacího zavaděče VeraCryptu není nainstalována. To může způsobit, že některé změny nebudou zapsány.</string>
     <string lang="cs" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Poznámka: V některých případech se můžete snažit skrýt před nějakou osobou (protivník) fakt, že při startu počítače používáte VeraCrypt. Volba uvedená výše vám povolí upravit bootovací obrazovku VeraCryptu. Vyberete-li první možnost, nebudou při bootování zobrazeny žádné texty (ani když zadáte špatné heslo). Počítač bude při zadávání hesla vypadat jako by zamrznul. Navíc lze zobrazit libovolný text pro zmatení protivníka. Například falešná chybová hláška jako například "Chybějící operační systém" (která se normálně zobrazuje bootovacím zavaděčem Windows, pokud nenalezne žádný oddíl s Windows). Je potřeba ale zdůraznit, že pokud dokáže protivník analyzovat obsah disku, stále může zjistit, že obsahuje bootovací zavaděč VeraCryptu.</string>
     <string lang="cs" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">VAROVÁNÍ: Mějte prosím na paměti, že pokud zapnete tuto volbu, bootovací zavaděč VeraCryptu nezobrazí žádné texty (ani když zadáte špatné heslo). Počítač bude vypadat jako kdyby "zamrzl" (nereaguje) zatímco budete psát heslo (kurzor se NEBUDE hýbat a při stisku kláves se nezobrazí žádné hvězdičky).\n\nJste si jisti, že chcete zapnout tuto volbu?</string>
@@ -1034,8 +1082,11 @@
     <string lang="cs" key="EXTRA_BOOT_PARTITION_REMOVAL_INSTRUCTIONS">\nDodatečný bootovací oddíl může být před instalací Windows odstraněn. Abyste to mohli udělat, řiďte se následujícími kroky:\n\n1) Nabootujte váš instalační disk Windows.\n\n2) Na instalační obrazovce Windows klikněte na 'Nyní nainstalovat' &gt; 'Volitelné (pokročilé)'.\n\n3) Klikněte na 'Volby disku'.\n\n4) Vyberte hlavní systémový oddíl a smažte ho kliknutím na 'Smazat' a 'OK'.\n\n5) Vyberte 'Rezervovaný systémový' oddíl, klikněte 'Rozšířit', a zvyšte jeho velikost, aby do něj mohl být nainstalován operační systém.\n\n6) Klikněte na 'Použít' a 'OK'.\n\n7) Nainstalujte Windows na 'Rezervovaný systémový' oddíl.\n\n\nPokud by se útočník ptal, proč jste odstranili dodatečný bootovací oddíl, můžete odpovědět, že jste chtěli předejít jakémukoliv možnému úniku dat do nezašifrovaného bootovacího oddílu.\n\nPoznámka: Tento text si můžete vytisknout kliknutím na tlačítko 'Tisknout' níže. Pokud si uschováte kopii tohoto textu nebo jej vytisknete (důrazně doporučujeme, pokud vaše tiskárna neukládá vytištěné dokumenty na svůj pevný disk ), měli byste zničit jakékoliv jeho kopie po odstranění dodatečného bootovacího svazku (pokud by se nalezla takováto kopie, mohla by naznačovat přítomnost skrytého svazku s operačním systémem).</string>
     <string lang="cs" key="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">Varování: Mezi systémovým oddílem a prvním oddílem za ním je nealokované místo. Po vytvoření skrytého operačního systému nesmíte vytvořit žádné nové oddíly v tomto nealokovaném prostoru. Jinak nebude možné spustit skrytý operační systém (dokud nesmažete takto nově vytvořené oddíly).</string>
     <string lang="cs" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Systémové šifrování momentálně nepodporuje tento algoritmus.</string>
-	<string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="cs" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Souborové klíče aktuálně nejsou podporovány pro šifrování systémů.</string>
     <string lang="cs" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Varování: VeraCrypt nemohl obnovit původní nastavení klávesnice. To může způsobit, že heslo bude zadáno nesprávně.</string>
     <string lang="cs" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Chyba: Nelze nastavit rozvržení klávesnice na typickou americkou klávesnici.\n\nHeslo musí být nastaveno v před-bootovacím prostředí (před startem Windows), kde nejsou ne-americké klávesnice k dispozici. Proto musí být heslo vždy nastaveno s použitím rozvržení kláves jako na americké klávesnici.</string>
@@ -1119,6 +1170,7 @@
     <string lang="cs" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">Předtest byl úspěšně dokončen.\n\nVAROVÁNÍ: Vězte, že pokud dojde během šifrování dat za běhu k výpadku proudu, nebo pokud operační systém selže kvůli softwarové chybě nebo hardwarovému selhání, část dat bude poškozena nebo ztracena. Proto než začnete zašifrovávat, ujistěte se, že máte záložní kopie souborů, které chcete zašifrovat. Pokud je nemáte, zazálohujte je nyní (můžete kliknout na Odložit, zazálohovat soubory a pak znovu kdykoliv spustit VeraCrypt. Vyberte 'Systém' &gt; 'Obnovit přerušený proces' pro spuštění šifrování).\n\nAž budete připraveni, klikněte na Zašifrovat.</string>
     <string lang="cs" key="SYSENC_ENCRYPTION_PAGE_INFO">Kdykoliv můžete kliknout na Pauzu nebo Odložit pro přerušení procesu šifrování nebo dešifrování. Můžete také opustit tohoto průvodce, restartovat nebo vypnout váš počítač a pak proces obnovit. Bude pokračovat z bodu, kde naposledy skončil. Aby nedošlo ke zpomalení, když systém nebo aplikace čtou nebo zapisují z/do systémového oddílu, VeraCrypt automaticky čeká, dokud nejsou data zapsána nebo přečtena (viz Status dole) a pak automaticky pokračuje v šifrování nebo dešifrování.</string>
     <string lang="cs" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nKdykoliv můžete kliknout na Pauzu nebo Odložit pro přerušení procesu šifrování nebo dešifrování. Můžete také opustit tohoto průvodce, restartovat nebo vypnout váš počítač a pak proces obnovit. Bude pokračovat z bodu, kde naposledy skončil. Svazek nemůže být připojen, dokud nebude úplně zašifrová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="cs" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Skrytý systém byl spuštěn</string>
     <string lang="cs" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Původní systém</string>
     <string lang="cs" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows vytváří na systémovém oddílu (většinou bez toho, aniž byste to věděli nebo odsouhlasili) různé soubory s logy, dočasné soubory apod. Také ukládá aktuální obsah RAM paměti do hibernačního a stránkovacího souboru, který je uložen na systémovém oddílu. Pokud by protivník analyzoval soubory uložené na oddílu, kde je původní systém (kde je skrytý systém klonem) uložen, mohl by například zjistit, že jste použili průvodce VeraCryptu pro vytvoření skrytého systémého svazku (což může naznačit existenci skrytého operačního systému na vašem počítači).\n\nAbyste předešli těmto problémům, VeraCrypt v příštích krocích bezpečně vymaže celý obsah oddílu, kde je uložen původní systém. A poté, aby bylo dosaženo hodnověrného popření, budete muset nainstalovat na tento oddíl nový systém a zašifrovat ho. Takto vytvoříte klamný systém a celý proces vytvoření skrytého operačního systému bude dokončen.</string>
@@ -1158,7 +1210,7 @@
     <string lang="cs" key="HIDDEN_OS_CREATION_PREINFO_HELP">V následujícím kroku vytvoří VeraCrypt skrytý operační systém tak, že zkopíruje obsah systémového oddílu do skrytého svazku (kopírovaná data budou zašifrována za běhu jiným šifrovacím klíčem, než je ten, co se používá pro klamný operační systém).\n\nProces bude proveden v před-bootovacím prostředí (než se Windows spustí) a může to trvat delší dobu; několik hodin nebo dokonce několik dní (záleží na velikosti systémového oddílu a na výkonu vašeho počítače).\n\nBudete moci proces přerušit, vypnout počítač a pak spustit operační systém a pokračovat v procesu. Pokud ho ale přerušíte, celý proces kopírování systému bude spuštěn úplně od začátku (protože obsah systémového oddílu se nesmí během klonování změnit).</string>
     <string lang="cs" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Chcete zrušit celý proces vytváření skrytého operačního systému?\n\nPoznámka: NEBUDETE moci pokračovat, pokud ho nyní zrušíte.</string>
     <string lang="cs" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Chcete zrušit před-testování šifrování systému?</string>
-    <string lang="cs" key="BOOT_PRETEST_FAILED_RETRY">Předběžná zkouška zašifrování systému selhala. Chcete to zkusit znovu?\n\nVyberete-li 'Ne', před-bootovací autentifikační komponenta bude odinstalována.\n\nPoznámka:\n\n- Pokud vás bootovací zavaděč VeraCryptu nevyzval k zadání hesla před startem Windows, je možné, že vás operační systém nebootuje z disku, na kterém je nainstalován. To není podporováno.\n\n- Pokud jste použili jiný šifrovací algoritmus než AES a předběžná zkouška selhala (a vy jste zadali heslo), může to být způsobeno nevhodně navrženým ovladačem. Vyberte 'Ne' a zkuste systémový oddíl/jednotku znovu zašifrovat, ale použijte šifrovací algoritmus AES (který má nejmenší nároky na paměť).\n\n- Pro zjištění, jaké jsou další možné příčiny a řešení, viz: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="cs" key="BOOT_PRETEST_FAILED_RETRY">Předběžná zkouška zašifrování systému selhala. Chcete to zkusit znovu?\n\nVyberete-li 'Ne', před-bootovací autentifikační komponenta bude odinstalována.\n\nPoznámka:\n\n- Pokud vás bootovací zavaděč VeraCryptu nevyzval k zadání hesla před startem Windows, je možné, že vás operační systém nebootuje z disku, na kterém je nainstalován. To není podporováno.\n\n- Pokud jste použili jiný šifrovací algoritmus než AES a předběžná zkouška selhala (a vy jste zadali heslo), může to být způsobeno nevhodně navrženým ovladačem. Vyberte 'Ne' a zkuste systémový oddíl/jednotku znovu zašifrovat, ale použijte šifrovací algoritmus AES (který má nejmenší nároky na paměť).\n\n- Pro zjištění, jaké jsou další možné příčiny a řešení, viz: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="cs" key="SYS_DRIVE_NOT_ENCRYPTED">Systémový oddíl/disk pravděpodobně není zašifrován (ani částečně ani plně).</string>
     <string lang="cs" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">Váš systémový oddíl/disk je zašifrován (částečně nebo plně).\n\nPřed pokračováním celý systémový oddíl/disk nejdříve dešifrujte. Pokud tak chcete učinit, zvolte 'Systém' &gt; 'Trvale dešifrovat systémový oddíl/disk' z menu hlavního okna programu VeraCrypt.</string>
     <string lang="cs" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">Je-li systémový oddíl/disk zašifrován (částečně nebo úplně), nemůžete snížit verzi VeraCryptu (ale můžete jej aktualizovat nebo přeinstalovat stejnou verzi).</string>
@@ -1175,6 +1227,8 @@
     <string lang="cs" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">Vybrali jste systémový oddíl/jednotku (nebo bootovací oddíl), ale průvodce, kterého jste vybrali, je vhodný pouze pro nesystémové oddíly/jednotky.\n\nChcete nastavit před-bootovací autentifikaci (což znamená, že budete muset zadávat heslo při každém startu Windows) a zašifrovat systémový oddíl/jednotku?</string>
     <string lang="cs" key="CONFIRM_DECRYPT_SYS_DEVICE">Jste si jisti, že chcete trvale dešifrovat systémový oddíl/disk?</string>
     <string lang="cs" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">VAROVÁNÍ: Pokud trvale dešifrujete systémový oddíl/disk, budou na něj zapsána nezašifrovaná data.\n\nJste si opravdu jisti, že chcete trvale dešifrovat systémový oddíl/disk?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
     <string lang="cs" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Varování: Použijete-li k zašifrování systému kaskádu šifer, můžete zaznamenat následující problémy:\n\n1) Bootovací zavaděč VeraCryptu je větší než obvykle, a proto není v prvním stopě disku dostatek místa pro zálohu bootovacího zavaděče VeraCryptu. Proto, pokud dojde k jeho poškození, (což se stává často, například při nevhodně navržené aktivaci protipirátské ochrany určitých programů), budete muset použít Záchranný disk VeraCrypt pro nabootování a opravě bootovacího zavaděče VeraCryptu.\n\n2) Na některých počítačích trvá obnovení z hibernace delší dobu.\n\nTěmto případným problémům můžete předejít, pokud vyberete nekaskádový šifrovací algoritmus (např. AES).\n\nJste si jisti, že chcete použít kaskádu šifer?</string>
     <string lang="cs" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">Zaznamenáte-li některé z popisovaných problémů, dešifrujte oddíl/disk (pokud je zašifrovaný) a pak jej zkuste zašifrovat znovu použitím ne-kaskádového šifrovacího algoritmu (např. AES).</string>
     <string lang="cs" key="UPDATE_TC_IN_DECOY_OS_FIRST">VAROVÁNÍ: Z bezpečnostních důvodů byste měli aktualizovat VeraCrypt na klamném operačním systému před jeho aktualizací na skrytém operačním systému.\n\nAbyste tak učinili, nastartujte klamný operační systém a spusťte z něj instalátor programu VeraCrypt. Poté nastartujte skrytý systém a z něj také spusťte instalátor.\n\nPoznámka: Klamný operační systém a skrytý systém sdílejí jednotný bootovací zavaděč. Pokud jste aktualizovali VeraCrypt jen na skrytém systému (ale ne na klamném systému), klamný systém bude obsahovat ovladač programu VeraCrypt a VeraCrypt aplikace, jejichž verze budou rozdílné od Bootovacího zavaděče VeraCryptu. Takovýto rozpor by mohl být signálem, že je na vašem počítači skrytý operační systém.\n\n\nChcete pokračovat? (Nedoporučeno.)</string>
@@ -1190,6 +1244,7 @@
     <string lang="cs" key="ENABLE_BAD_SECTOR_ZEROING">Chyba: Obsah jednoho nebo více sektorů na disku nemůže být přečten (pravděpodobně kvůli fyzickému poškození).\n\nProces okamžitého zašifrování může pokračovat pouze tehdy, když budou sektory opět čitelné. VeraCrypt se může pokusit změnit jejich čitelnost tím, že do nich zapíše nuly (následně všechny nulové bloky budou zašifrovány). Všechna data uložená v nečitelných sektorech tím ale budou ztracena. Pokud se tomu chcete vyhnout, můžete se pokusit opravit části poškozených dat použitím nástroje někoho jiného.\n\nPoznámka: V případě fyzického poškození sektorů (oproti obyčejnému poškození dat a chybě kontrolních součtů) se většina zařízení snaží interně přemístit tyto sektory, pokud je učiněn pokus o zápis do nich (aby existující data v poškozených sektorech zůstala nezašifrována).\n\nChcete, aby VeraCrypt zapsal nuly do nečitelných sektorů?</string>
     <string lang="cs" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Chyba: Obsah jednoho nebo více sektorů na disku nemůže být přečten (pravděpodobně kvůli fyzickému poškození).\n\nAbyste mohli pokračovat s dešifrováním, VeraCrypt bude muset zničit obsah nečitelných sektorů (obsah bude vyplněn náhodnými daty). Mějte prosím na paměti, že před pokračováním se můžete ještě pokusit opravit části poškozených dat pomocí nějakého nástroje třetí strany.\n\nChcete, aby VeraCrypt nyní zničil data v nečitelných sektorech?</string>
     <string lang="cs" key="ZEROED_BAD_SECTOR_COUNT">Poznámka: VeraCrypt nahradil obsah %I64d nečitelných sektorů (%s) šifrovanými nulovými bloky s nešifrovaným textem.</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="cs" key="ENTER_TOKEN_PASSWORD">Zadejte heslo/PIN pro token '%s':</string>
     <string lang="cs" key="PKCS11_LIB_LOCATION_HELP">Aby mohl VeraCrypt přistupovat k bezpečnostnímu tokenu nebo smart kartě, potřebujete nejdříve pro token/smart kartu vybrat softwarovou knihovnu PKCS #11. Tato knihovna může být dodávána se zařízením nebo může být k dispozici ke stažení na stránkách výrobce nebo třetí strany.\n\nJakmile knihovnu nainstalujete, můžete ji vybrat buď manuálně přes 'Vybrat knihovnu' nebo nechte VeraCrypt, ať ji nalezne sám, a to s pomocí 'Autodetekce knihovny' (bude prohledán pouze systémový adresář Windows).</string>
     <string lang="cs" key="SELECT_PKCS11_MODULE_HELP">Poznámka: Název souboru a umístění vaší nainstalované knihovny PKCS #11 k bezpečnostnímu tokenu/smart kartě naleznete v dokumentaci dodané k tokenu/smart kartě.\n\nKlikněte na 'OK' a vyberte cestu a jméno souboru.</string>

Translations/Language.da.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="da" name="Dansk" en-name="Danish" version="0.1.0" translators="Lasse Bond" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <control lang="da" key="IDC_KEY_FILES">Nøglefiler..</control>
     <control lang="da" key="IDC_LINK_HASH_INFO">Information om hakke algoritmer</control>
     <control lang="da" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Mere information</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="da" key="IDC_MB">&amp;MB</control>
     <control lang="da" key="IDC_MORE_INFO_ON_CONTAINERS">Mere information</control>
     <control lang="da" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">Mere information om system kryptering</control>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <control lang="da" key="IDT_COLLECTING_RANDOM_DATA_NOTE">VIGTIGT: Bevæg musen så tilfældigt som muligt indenfor dette vindue. Jo længere tid du bevæger den, jo bedre. Dette forhøjer den kryptografiske styrke af krypteringsnøglerne betydeligt. Klik på Næste for at fortsætte.</control>
     <control lang="da" key="IDT_CONFIRM">Godkend:</control>
     <control lang="da" key="IDT_DONE">Fuldført </control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="da" key="IDT_ENCRYPTION_ALGO">Krypterings Algoritme</control>
     <control lang="da" key="IDT_FILESYSTEM">Filsystem </control>
     <control lang="da" key="IDT_FILE_CONTAINER">Opretter en virtuel krypteret disk inden i en fil. Anbefales til uerfarne brugere.</control>
@@ -85,6 +88,8 @@
     <control lang="da" key="IDT_PARTIAL_POOL_CONTENTS">Nuværende pool indhold (partiel)</control>
     <control lang="en" key="IDT_PASS">Pass</control>
     <control lang="da" key="IDT_PASSWORD">Kodeord:</control>
+    <control lang="en" key="IDT_PIM">Volume PIM:</control>
+    <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
     <control lang="da" key="IDT_PROGRESS">Udførsel:</control>
     <control lang="da" key="IDT_RANDOM_POOL">Tilfældig Pool: </control>
     <control lang="da" key="IDT_SINGLE_BOOT">Vælg dette hvis der kun er et operativsystem installeret på denne computer (også selv om der er flere brugere).</control>
@@ -142,6 +147,8 @@
     <control lang="da" key="IDC_MOUNT_OPTIONS">Tilslutnings Va&amp;lg...</control>
     <control lang="da" key="IDC_MOUNT_READONLY">Tilslut bind som læs-&amp;kun</control>
     <control lang="da" key="IDC_NEW_KEYFILES">Nøglefiler...</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="da" key="IDC_PREF_BKG_TASK_ENABLE">Tilsluttet</control>
     <control lang="da" key="IDC_PREF_CACHE_PASSWORDS">Gem kodeord i driverhukommelse</control>
     <control lang="da" key="IDC_PREF_DISMOUNT_INACTIVE">Auto-afbryd bind efter der ikke har været læst/skrevet til det i</control>
@@ -155,6 +162,7 @@
     <control lang="da" key="IDC_PREF_MOUNT_READONLY">Tilslut bind som læs-kun</control>
     <control lang="da" key="IDC_PREF_MOUNT_REMOVABLE">Tilslut bind som flytbart medie</control>
     <control lang="da" key="IDC_PREF_OPEN_EXPLORER">Åben Explorer vindue til succesfuldt tilsluttet bind</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</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="da" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Slet kodeord i hukommelsen ved auto-afbryd</control>
     <control lang="da" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Slet kodeord i hukommelsen ved afslut</control>
@@ -167,11 +175,12 @@
     <control lang="da" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Vis kodeord</control>
     <control lang="da" key="IDC_TRAVEL_OPEN_EXPLORER">Åben &amp;Explorer vindue for tilsluttet bind</control>
     <control lang="da" key="IDC_TRAV_CACHE_PASSWORDS">&amp;Gem kodeord i driver-hukommelsen</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="da" key="IDC_UNMOUNTALL">Afb&amp;ryd Alle</control>
     <control lang="da" key="IDC_VOLUME_PROPERTIES">Bin&amp;d Egenskaber...</control>
     <control lang="da" key="IDC_VOLUME_TOOLS">Bind V&amp;ærktøjer...</control>
     <control lang="da" key="IDC_WIPE_CACHE">&amp;Slet hukommelsen</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
     <control lang="da" key="IDD_HOTKEYS_DLG">VeraCrypt - System genvejstaster</control>
     <control lang="da" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="da" key="IDM_CREATE_HIDDEN_OS">Opret Skjult Operativsystem...</control>
     <control lang="da" key="IDM_CREATE_RESCUE_DISK">Opret Nødhjælps Disk...</control>
     <control lang="da" key="IDM_CREATE_VOLUME">Opret nyt Bind...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="da" key="IDM_DEFAULT_KEYFILES">Standard nøglefiler...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="da" key="IDM_ENCRYPT_SYSTEM_DEVICE">Krypter System Partition/Drev...</control>
     <control lang="da" key="IDM_FAQ">FAQ - Ofte stillede spørgsmål</control>
@@ -243,6 +254,7 @@
     <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="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>
     <control lang="da" key="IDM_VOLUME_WIZARD">Bind Oprettelsesguide</control>
     <control lang="da" key="IDM_WEBSITE">VeraCrypt Hjemmeside</control>
@@ -485,7 +497,11 @@
     <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>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Volume Fully Encrypted</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_INFO">IMPORTANT: TO MOUNT THIS NEWLY CREATED VERACRYPT VOLUME AND TO ACCESS DATA STORED IN IT, CLICK 'Auto-Mount Devices' IN THE MAIN VERACRYPT WINDOW. After you enter the correct password (and/or supply correct keyfiles), the volume will be mounted to the drive letter you select from the list in the main VeraCrypt window (and you will be able to access the encrypted data via the selected drive letter).\n\nPLEASE REMEMBER OR WRITE DOWN THE ABOVE STEPS. YOU MUST FOLLOW THEM WHENEVER YOU WANT TO MOUNT THE VOLUME AND ACCESS DATA STORED IN IT. Alternatively, in the main VeraCrypt window, click 'Select Device', then select this partition/volume, and click 'Mount'.\n\nThe partition/volume has been successfully encrypted (it contains a fully encrypted VeraCrypt volume now) and is ready for use.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="da" key="FORMAT_FINISHED_INFO">VeraCrypt bindet er oprettet med succes.</string>
     <string lang="da" key="FORMAT_FINISHED_TITLE">Bind Oprettet</string>
     <string lang="da" key="FORMAT_HELP">VIGTIGT: Bevæg musen så tilfældigt som muligt i dette vindue. Jo længere tid du bevæger den, jo bedre. Dette forbedrer signifikant den kryptografiske styrke på nøglefilen. Klik på Formater for at oprette bindet.</string>
@@ -523,6 +539,7 @@
     <string lang="da" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">En fejl opstod under læsning af system krypterings status.</string>
     <string lang="da" key="INIT_SYS_ENC">Kan ikke initialisere applikations komponenter for system kryptering.</string>
     <string lang="da" key="INIT_RAND">Kunne ikke initialisere tilfældigheds nummergenerator!</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="da" key="INIT_REGISTER">Kunne ikke initialisere applikationen. Fejl i registrering af Dialog class.</string>
     <string lang="en" key="INIT_RICHEDIT">Error: Failed to load the Rich Edit system library.</string>
     <string lang="da" key="INTRO_TITLE">VeraCrypt Bind Oprettelsesguide</string>
@@ -535,6 +552,7 @@
     <string lang="da" key="MOUNT_BUTTON">&amp;Tilslut</string>
     <string lang="da" key="NEW_VERSION_REQUIRED">En nyere version af VeraCrypt kræves for at tilslutte dette bind.</string>
     <string lang="da" key="VOL_CREATION_WIZARD_NOT_FOUND">Fejl: Bind Oprettelsesguiden er ikke fundet.\n\nKontroller venligst at 'VeraCrypt Format.exe' er i mappen hvorfra 'VeraCrypt.exe' blev startet. Hvis den ikke er, geninstaller VeraCrypt, eller find 'VeraCrypt Format.exe' på din harddisk og start den.</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="da" key="NEXT">&amp;Næste &gt;</string>
     <string lang="da" key="FINALIZE">&amp;Afslut</string>
     <string lang="da" key="INSTALL">&amp;Installer</string>
@@ -542,6 +560,7 @@
     <string lang="da" key="NODRIVER">Ude i stand til at tilslutte VeraCrypt enhedsdriver. VeraCrypt vil ikke virke hvis enhedsdriveren ikke kører.\n\nBemærk venligst at, pga. et Windows problem, kan det være nødvendigt at logge af eller genstarte systemet førend enhedsdriveren kan lokalisere.</string>
     <string lang="da" key="NOFONT">Fejl opstået under indlæsning/forberedelse af skrifttyper.</string>
     <string lang="da" key="NOT_FOUND">Drev bogstavet blev ikke fundet eller der blev ikke angivet noget drev bogstav.</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="da" key="DRIVE_LETTER_UNAVAILABLE">Drev bogstav er ikke tilgængeligt.</string>
     <string lang="da" key="NO_FILE_SELECTED">Ingen fil valgt!</string>
     <string lang="da" key="NO_FREE_DRIVES">Ingen drev bogstaver tilgængelige.</string>
@@ -561,15 +580,18 @@
     <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_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="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_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt.\n\nDo you have such a backup?</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_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="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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="da" key="IDD_PCDM_CHANGE_PKCS5_PRF">Ændre etiketnøgle oprindelses algoritme</string>
     <string lang="da" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Tilføj/Fjern nøglefiler til/fra Bind</string>
     <string lang="da" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Fjern alle nøglefiler fra Bind</string>
-    <string lang="en" key="PASSWORD_CHANGED">Password and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</string>
+    <string lang="en" key="PASSWORD_CHANGED">Password, PIM and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</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="da" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">VIGTIGT: Hvis du ikke har destrueret din VeraCrypt Nødhjælps Disk, vil dit system partition/drev stadig kunne dekrypteres ved brug af det gamle kodeord (ved at boote på VeraCrypt Nødhjælps Disk og indtaste det gamle kodeord). Du bør oprette en ny VeraCrypt Nødhjælps Disk og så destruere den gamle.\n\nØnsker du at oprette en ny VeraCrypt Nødhjælps Disk?</string>
     <string lang="da" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Bemærk at din VeraCrypt Nødhjælps Disk stadig bruger den tidligere algoritme. Hvis du fornemmer den tidligere algoritme er usikker, bør du oprette en ny VeraCrypt Nødhjælps Disk og så destruere den gamle.\n\nØnsker du at oprette en ny VeraCrypt Nødhjælps Disk?</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,6 +600,7 @@
     <string lang="da" key="PKCS5_PRF_CHANGED">Etiketnøgle oprindelses algoritme ændret med success.</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_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_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="da" key="PASSWORD_HELP">Det er meget vigtigt at du vælger et godt kodeord. Du bør undgå at vælge et der kun indeholder et enkelt ord der kan findes i en ordbog (eller en kombination af 2, 3 eller 4 af sådanne ord). Det bør ikke indeholde nogle navne eller fødselsdatoer. Det skal ikke være nemt at gætte. Et godt kodeord er en tilfældig kombination af store og små bogstaver, tal, og specielle karakterer, så som @ ^ = $ * + osv. Vi anbefaler at du vælger et kodeord der består af mere end 20 karakterer (jo længere, jo bedre). Det maksimalt mulige længde er 64 karakterer.</string>
     <string lang="da" key="PASSWORD_HIDDENVOL_HELP">Vælg venligst et kodeord til det skjulte bind. </string>
     <string lang="da" key="PASSWORD_HIDDEN_OS_HELP">Vælg venligst et kodeord til det skjulte operativsystem (f.eks. til det skjulte bind). </string>
@@ -597,11 +620,26 @@
     <string lang="da" key="PASSWORD_WRONG_AUTOMOUNT">Ukorrekt kodeord eller intet VeraCrypt bind fundet.</string>
     <string lang="da" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Ukorrekt nøglefil(er)/kodeord eller intet VeraCrypt bind fundet.</string>
     <string lang="da" key="PASSWORD_WRONG_CAPSLOCK_ON">\n\nAdvarsel: Caps Lock er slået til. Dette kan medføre at kodeordet indtastes ukorrekt.</string>
+    <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
+    <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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_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>
+    <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="da" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nBemærk: Hvis du forsøger at tilslutte en partition placeret på et krypteret system drev uden før-boot godkendelse eller tilslutte en krypteret system partition fra et operativsystem der ikke kører, kan du gøre dette ved at vælge 'System' &gt; 'Tilslut uden før-Boot Godkendelse'.</string>
     <string lang="da" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">I denne tilstand kan du ikke tilslutte en partition placeret på et drev hvis portion er indenfor nøglens rækkevidde af aktiv system kryptering.\n\nFør du kan tilslutte denne partition i denne tilstand, er du nødt til enten at boote et operativsystem installeret på et andet drev (krypteret eller ukrypteret) eller boote på et ukrypteret operativsystem.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <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>
@@ -701,11 +739,18 @@
     <string lang="da" key="FOR_MORE_INFO_ON_PARTITIONS">For information om hvordan man opretter og administrerer partitioner, læs venligst dokumentationen som fulgte med dit operativsystem eller kontakt din computer forhandlers tekniske support for yderligere hjælp.</string>
     <string lang="da" key="SYSTEM_PARTITION_NOT_ACTIVE">Fejl: Det nuværende kørende operativsystem er ikke installeret på boot partitionen (første Aktive partition). Dette er ikke supporteret.</string>
     <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="da" key="CANT_ACCESS_VOL">Fejl: Har ikke adgang til bindet!\n\nSørg for at det valgte bind eksisterer, at det ikke er tilsluttet eller bliver brugt af systemet eller andre programmer, at du har læse/skrive rettighed til bindet, og at det ikke er skrivebeskyttet.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Error: Cannot access the volume and/or obtain information about the volume.\n\nMake sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Error: Cannot access the volume and/or obtain information about the volume. Make sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.\n\nIf the problem persists, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">An error prevented VeraCrypt from encrypting the partition. Please try fixing any previously reported problems and then try again. If the problems persist, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_RESUME">An error prevented VeraCrypt from resuming the process of encryption of the partition.\n\nPlease try fixing any previously reported problems and then try resuming the process again. Note that the volume cannot be mounted until it has been fully encrypted.</string>
+    <string lang="en" key="INPLACE_DEC_GENERIC_ERR">An error prevented VeraCrypt from decrypting the volume. Please try fixing any previously reported problems and then try again if possible.</string>
     <string lang="da" key="CANT_DISMOUNT_OUTER_VOL">Fejl: Kan ikke afbryde det ydre bind!\n\nBindet kan ikke afbrydes hvis det indeholder filer eller mapper der bliver brugt af et program eller systemet.\n\nLuk venligst alle programmer der måtte bruge filer eller mapper på bindet og klik på Prøv igen.</string>
     <string lang="da" key="CANT_GET_OUTER_VOL_INFO">Fejl: Kan ikke finde information om det ydre bind! Oprettelse af bind kan ikke fortsætte.</string>
     <string lang="da" key="CANT_ACCESS_OUTER_VOL">Fejl: Har ikke adgang til det ydre bind! Oprettelse af bind kan ikke fortsætte.</string>
@@ -790,7 +835,7 @@
     <string lang="da" key="TC_INSTALLER_IS_RUNNING">VeraCrypt Installation kører nu på dette system og udfører eller forbereder installation eller opdatering af VeraCrypt. Før du fortsætter, vent venligst til det afsluttes eller luk det. Hvis du ikke kan lukke det, genstart venligst din computer før du fortsætter.</string>
     <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å www.veracrypt.org).</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="EXTRACTING_VERB">Udpakker</string>
     <string lang="da" key="CANNOT_READ_FROM_PACKAGE">Kan ikke læse data fra pakken.</string>
@@ -977,6 +1022,7 @@
     <string lang="da" key="CONFIRM_EXIT_UNIVERSAL">Afslut?</string>
     <string lang="da" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt har ikke nok information til at afgøre om der skal krypteres eller dekrypteres.</string>
     <string lang="da" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt har ikke nok information til at afgøre om der skal krypteres eller dekrypteres.\n\nBemærk: Hvis du har dekrypteret system partition/drev i før-boot miljøet, kan det være nødvendigt at du afslutter processen ved at klikke på Dekrypter.</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="da" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Ønsker du at afbryde og udskyde processen med kryptering af system partition/drev?\n\nBemærk: Du vil være i stand til at genoptage processen og den vil fortsætte fra det sted den blev stoppet. Du kan gøre dette ved f.eks. ved at vælge 'System' &gt; 'Genoptag Afbrudt Proces' fra menulinien i hovedvinduet i VeraCrypt. Hvis du ønsker permanent at afbryde eller tilbageføre krypterings processen, vælg 'System' &gt; 'Dekrypter System Partition/Drev Permanent'.</string>
     <string lang="da" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Ønsker du at afbryde og udskyde processen med dekryptering af system partition/drev?\n\nBemærk: Du vil være i stand til at genoptage processen og den vil fortsætte fra det sted den blev stoppet. Du kan gøre dette ved f.eks. ved at vælge 'System' &gt; 'Genoptag Afbrudt Proces' fra menulinien i hovedvinduet i VeraCrypt. Hvis du ønsker at tilbageføre dekrypterings processen (og påbegynde kryptering), vælg 'System' &gt; 'Krypter System Partition/Drev'.</string>
@@ -986,6 +1032,7 @@
     <string lang="en" key="FAILED_TO_START_WIPING">Error: Failed to start the process of wiping.</string>
     <string lang="da" key="INCONSISTENCY_RESOLVED">Uoverensstemmelse løst.\n\n\n(Hvis du ønsker at rapportere en fejl i denne forbindelse, inkluder venligst følgende tekniske information i fejlrapporten: %hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="da" key="NOTHING_TO_RESUME">Der er ingen proces/opgave at genoptage.</string>
     <string lang="da" key="HIDVOL_PROT_BKG_TASK_WARNING">ADVARSEL: VeraCrypt baggrundsopgaver er slået fra. Efter du afslutter VeraCrypt, vil du ikke blive gjort opmærksom på om skade på det skjulte bind er undgået.\n\nBemærk: Du kan nårsomhelst lukke baggrundsopgaver ned ved at højreklikke på VeraCrypt ikonet i systembakken, og klikke på 'Afslut'.\n\nAktiver VeraCrypt Baggrundsopgaver?</string>
     <string lang="da" key="LANG_PACK_VERSION">Sprogpakke version:  %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="da" key="ERROR_MBR_PROTECTED">Kunne ikke skrive MBR sektor.\n\nDin BIOS er muligvis konfigureret til at beskytte MBR sektoren. Tjek din BIOS indstilling (tryk F2, Delete, eller Esc, efter du har tændt din computer) for MBR/antivirus beskyttelse.</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="en" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">The required version of the VeraCrypt Boot Loader is currently not installed. This may prevent some of the settings from being saved.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Note: In some situations, you may wish to prevent a person (adversary) that is watching you start the computer from knowing that you use VeraCrypt. The above options allow you to do that by customizing the VeraCrypt boot loader screen. If you enable the first option, no texts will be displayed by the boot loader (not even when you enter the wrong password). The computer will appear to be "frozen" while you can type your password. In addition, a custom message can be displayed to mislead the adversary. For example, fake error messages such as "Missing operating system" (which is normally displayed by the Windows boot loader if it finds no Windows boot partition). It is, however, important to note that if the adversary can analyze the content of the hard drive, he can still find out that it contains the VeraCrypt boot loader.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">WARNING: Please keep in mind that if you enable this option, the VeraCrypt boot loader will not display any texts (not even when you enter the wrong password). The computer will appear to be "frozen" (unresponsive) while you can type your password (the cursor will NOT move and no asterisk will be displayed when you press a key).\n\nAre you sure you want to enable this option?</string>
@@ -1034,8 +1082,11 @@
     <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="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>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="da" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Advarsel: VeraCrypt kunne ikke gendanne det originale keyboard layout. Dette kan medføre at du indtaster et kodeord ukorrekt.</string>
     <string lang="da" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Fejl: Kan ikke indstille keyboard layoutet for VeraCrypt til standard US keyboard layout.\n\nBemærk at kodeordet skal indtastes i før-boot miljøet (før Windows starter) hvor ikke-US Windows keyboard layouts ikke er tilgængelige. Derfor skal kodeordet altid skrives ved brug af standard US keyboard layout.</string>
@@ -1120,6 +1171,7 @@
     <string lang="en" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">The pretest has been successfully completed.\n\nWARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt. If you do not, please back up the files now (you can click Defer, back up the files, then run VeraCrypt again anytime, and select 'System' &gt; 'Resume Interrupted Process' to start encrypting).\n\nWhen ready, click Encrypt to start encrypting.</string>
     <string lang="en" key="SYSENC_ENCRYPTION_PAGE_INFO">You can click Pause or Defer anytime to interrupt the process of encryption or decryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. To prevent slowdown when the system or applications write or read data from the system drive, VeraCrypt automatically waits until the data is written or read (see Status above) and then automatically continues encrypting or decrypting.</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nYou can click Pause or Defer anytime to interrupt the process of encryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. Note that the volume cannot be mounted until it has been fully encrypted.</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="en" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Hidden System Started</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Original System</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows creates (typically, without your knowledge or consent) various log files, temporary files, etc., on the system partition. It also saves the content of RAM to hibernation and paging files located on the system partition. Therefore, if an adversary analyzed files stored on the partition where the original system (of which the hidden system is a clone) resides, he might find out, for example, that you used the VeraCrypt wizard in the hidden-system-creation mode (which might indicate the existence of a hidden operating system on your computer).\n\nTo prevent such issues, VeraCrypt will, in the next steps, securely erase the entire content of the partition where the original system resides. Afterwards, in order to achieve plausible deniability, you will need to install a new system on the partition and encrypt it. Thus you will create the decoy system and the whole process of creation of the hidden operating system will be completed.</string>
@@ -1159,7 +1211,7 @@
     <string lang="en" key="HIDDEN_OS_CREATION_PREINFO_HELP">In the next steps, VeraCrypt will create the hidden operating system by copying the content of the system partition to the hidden volume (data being copied will be encrypted on the fly with an encryption key different from the one that will be used for the decoy operating system).\n\nPlease note that the process will be performed in the pre-boot environment (before Windows starts) and it may take a long time to complete; several hours or even several days (depending on the size of the system partition and on the performance of your computer).\n\nYou will be able to interrupt the process, shut down your computer, start the operating system and then resume the process. However, if you interrupt it, the entire process of copying the system will have to start from the beginning (because the content of the system partition must not change during cloning).</string>
     <string lang="da" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Ønsker du at afbryde hele processen med at oprette det skjulte operativsystem?\n\nBemærk: Du vil IKKE være i stand til at fortsætte processen hvis du afbryder nu.</string>
     <string lang="da" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Ønsker du at afbryde system krypteringens indledende test?</string>
-    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="da" key="SYS_DRIVE_NOT_ENCRYPTED">System partition/drev ser ikke ud til at være krypteret (hverken delvist eller helt).</string>
     <string lang="da" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">Det system partition/drev er krypteret (delvist eller helt).\n\nDekrypter venligst dit system partition/drev helt før du fortsætter. For at gøre dette, vælg 'System' &gt; 'Dekrypter System Partition/Drev Permanent' fra menulinien i VeraCrypt hovedvinduet.</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">When the system partition/drive is encrypted (partially or fully), you cannot downgrade VeraCrypt (but you can upgrade it or reinstall the same version).</string>
@@ -1176,6 +1228,8 @@
     <string lang="en" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">You have selected the system partition/drive (or the boot partition), but the wizard mode you selected is suitable only for non-system partitions/drives.\n\nDo you want to set up pre-boot authentication (which means that you will need to enter your password each time before Windows boots/starts) and encrypt the system partition/drive?</string>
     <string lang="da" key="CONFIRM_DECRYPT_SYS_DEVICE">Er du sikker på du ønsker at dekryptere system partition/drev permanent?</string>
     <string lang="da" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">FORSIGTIG: Hvis du dekrypterer system partition/drev permantent, vil ukrypteret data blive skrevet der til.\n\nEr du helt sikker på du vil dekryptere system partition/drev permanent?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
     <string lang="en" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Warning: If you use a cascade of ciphers for system encryption, you may encounter the following issues:\n\n1) The VeraCrypt Boot Loader is larger than normal and, therefore, there is not enough space in the first drive track for a backup of the VeraCrypt Boot Loader. Hence, whenever it gets damaged (which often happens, for example, during inappropriately designed anti-piracy activation procedures of certain programs), you will need to use the VeraCrypt Rescue Disk to boot or to repair the VeraCrypt Boot Loader.\n\n2) On some computers, resuming from hibernation takes longer.\n\nThese potential issues can be prevented by choosing a non-cascade encryption algorithm (e.g. AES).\n\nAre you sure you want to use a cascade of ciphers?</string>
     <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>
@@ -1191,6 +1245,7 @@
     <string lang="en" key="ENABLE_BAD_SECTOR_ZEROING">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nThe process of in-place encryption can continue only when the sectors have been made readable again. VeraCrypt can attempt to make these sectors readable by writing zeros to the sectors (subsequently such all-zero blocks would be encrypted). However, note that any data stored in the unreadable sectors will be lost. If you want to avoid that, you can attempt to recover portions of the corrupted data using appropriate third-party tools.\n\nNote: In case of physically damaged sectors (as opposed to mere data corruption and checksum errors) most types of storage devices internally reallocate the sectors when data is attempted to be written to them (so the existing data in the damaged sectors may remain unencrypted on the drive).\n\nDo you want VeraCrypt to write zeroes to unreadable sectors?</string>
     <string lang="en" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nTo be able to proceed with decryption, VeraCrypt will have to discard the content of the unreadable sectors (the content will be replaced with pseudorandom data). Please note that, before proceeding, you can attempt to recover portions of any corrupted data using appropriate third-party tools.\n\nDo you want VeraCrypt to discard data in the unreadable sectors now?</string>
     <string lang="en" key="ZEROED_BAD_SECTOR_COUNT">Note: VeraCrypt has replaced the content of %I64d unreadable sectors (%s) with encrypted all-zero plaintext blocks.</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="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>

Translations/Language.el.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="el" name="Ελληνικά" en-name="Greek" version="0.1.0" translators="Βασίλης Κοσμίδης" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <control lang="el" key="IDC_KEY_FILES">Αρ&amp;χεία-κλειδιά</control>
     <control lang="el" key="IDC_LINK_HASH_INFO">Πληροφορίες για αλγόριθμους hash</control>
     <control lang="el" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Περισσότερες πληροφορίες</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="el" key="IDC_MB">&amp;MB</control>
     <control lang="el" key="IDC_MORE_INFO_ON_CONTAINERS">Περισσότερες πληροφορίες</control>
     <control lang="el" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">Περισσότερες πληροφορίες για την κρυπτογράφηση συστήματος</control>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <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_FILE_CONTAINER">Δημιουργεί έναν εικονικό κρυπτογραφημένο δίσκο μέσα σε ένα αρχείο. Συνίσταται για μη έμπειρους χρήστες.</control>
@@ -85,6 +88,8 @@
     <control lang="el" key="IDT_PARTIAL_POOL_CONTENTS">Τρέχον περιεχόμενο δεξαμενής (μερικό)</control>
     <control lang="en" key="IDT_PASS">Pass</control>
     <control lang="el" 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="el" key="IDT_PROGRESS">Πρόοδος:</control>
     <control lang="el" key="IDT_RANDOM_POOL">Δεξαμενή: </control>
     <control lang="el" key="IDT_SINGLE_BOOT">Επιλέξτε αυτή τη δυνατότητα αν έχετε εγκατεστημένο μόνο ένα λειτουργικό σύστημα (ακόμα και αν έχει πολλαπλούς χρήστες).</control>
@@ -142,6 +147,8 @@
     <control lang="el" key="IDC_MOUNT_OPTIONS">Επι&amp;λογές φόρ/σης</control>
     <control lang="el" key="IDC_MOUNT_READONLY">Φόρτωση τόμου μόνο για ανάγ&amp;νωση</control>
     <control lang="el" key="IDC_NEW_KEYFILES">Αρχεία-κλειδιά</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="el" key="IDC_PREF_BKG_TASK_ENABLE">Ενεργοποιημένο</control>
     <control lang="el" key="IDC_PREF_CACHE_PASSWORDS">Αποθ/ση κωδικών στη μνήμη του οδηγού</control>
     <control lang="el" key="IDC_PREF_DISMOUNT_INACTIVE">Όταν δε διαβάζονται/γράφονται δεδομένα σ'αυτόν για</control>
@@ -155,6 +162,7 @@
     <control lang="el" key="IDC_PREF_MOUNT_READONLY">Φόρτωση τόμων ως μόνο για ανάγνωση</control>
     <control lang="el" key="IDC_PREF_MOUNT_REMOVABLE">Φόρτωση τόμων ως αποσπώμενα μέσα</control>
     <control lang="el" key="IDC_PREF_OPEN_EXPLORER">Άνοιγμα Explorer για τους επιτυχώς φορτωμένους τόμους</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</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="el" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Διαγραφή κωδικών από τη μνήμη κατά την αυτοεκφόρτωση</control>
     <control lang="el" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Διαγρ. κωδικών από τη μνήμη κατά την έξοδο</control>
@@ -167,11 +175,12 @@
     <control lang="el" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Εμφάνιση κωδικού</control>
     <control lang="el" key="IDC_TRAVEL_OPEN_EXPLORER">Άνοιγμα &amp;Explorer για φορτωμένους τόμους</control>
     <control lang="el" key="IDC_TRAV_CACHE_PASSWORDS">&amp;Αποθήκευση κωδικών στη μνήμη του οδηγού</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="el" key="IDC_UNMOUNTALL">Εκ&amp;φόρτωση όλων</control>
     <control lang="el" key="IDC_VOLUME_PROPERTIES">&amp;Ιδιότητες τόμου...</control>
     <control lang="el" key="IDC_VOLUME_TOOLS">Εργαλεία &amp;τόμου...</control>
     <control lang="el" key="IDC_WIPE_CACHE">&amp;Διαγραφή μνήμης cache</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
     <control lang="el" key="IDD_HOTKEYS_DLG">VeraCrypt - Συντομεύσεις</control>
     <control lang="el" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="en" key="IDM_CREATE_HIDDEN_OS">Create Hidden Operating System...</control>
     <control lang="el" key="IDM_CREATE_RESCUE_DISK">Δημιουργία Δίσκου Ασφαλείας...</control>
     <control lang="el" key="IDM_CREATE_VOLUME">Δημιουργία νέου τόμου...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="el" key="IDM_DEFAULT_KEYFILES">Εξ'ορισμού αρχεία-κλειδιά...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="el" key="IDM_ENCRYPT_SYSTEM_DEVICE">Κρυπτογράφηση διαμερίσματος/οδηγού συστήματος...</control>
     <control lang="el" key="IDM_FAQ">Συχνές ερωτήσεις</control>
@@ -243,6 +254,7 @@
     <control lang="el" key="IDM_UNMOUNT_VOLUME">Εκφόρτωση τόμων</control>
     <control lang="el" key="IDM_VERIFY_RESCUE_DISK">Επαλήθευση Δίσκου Ασφαλείας</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>
     <control lang="el" key="IDM_VOLUME_WIZARD">Οδηγός δημιουργίας τόμου</control>
     <control lang="el" key="IDM_WEBSITE">Ιστοτόπος VeraCrypt</control>
@@ -485,7 +497,11 @@
     <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>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Volume Fully Encrypted</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_INFO">IMPORTANT: TO MOUNT THIS NEWLY CREATED VERACRYPT VOLUME AND TO ACCESS DATA STORED IN IT, CLICK 'Auto-Mount Devices' IN THE MAIN VERACRYPT WINDOW. After you enter the correct password (and/or supply correct keyfiles), the volume will be mounted to the drive letter you select from the list in the main VeraCrypt window (and you will be able to access the encrypted data via the selected drive letter).\n\nPLEASE REMEMBER OR WRITE DOWN THE ABOVE STEPS. YOU MUST FOLLOW THEM WHENEVER YOU WANT TO MOUNT THE VOLUME AND ACCESS DATA STORED IN IT. Alternatively, in the main VeraCrypt window, click 'Select Device', then select this partition/volume, and click 'Mount'.\n\nThe partition/volume has been successfully encrypted (it contains a fully encrypted VeraCrypt volume now) and is ready for use.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="el" key="FORMAT_FINISHED_INFO">Ο τόμος VeraCrypt δημιουργήθηκε επιτυχώς.</string>
     <string lang="el" key="FORMAT_FINISHED_TITLE">Ο τόμος δημιουργήθηκε</string>
     <string lang="el" key="FORMAT_HELP">ΣΗΜΑΝΤΙΚΟ: Κινήστε το ποντίκι όσο πιο τυχαία γίνεται μέσα σε αυτό το παράθυρο. Όσο περισσότερο, τόσο καλύτερα. Αυτό αυξάνει σημαντικά την κρυπτογραφική ικανότητα των αρχείων-κλειδιών. Στη συνέχεια πιέστε Διαμόρφωση για να δημιουργήσετε τον τόμο.</string>
@@ -523,6 +539,7 @@
     <string lang="el" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Ένα σφάλμα συνέβη κατά τη λήψη της κατάστασης κρυπτογράφησης του συστήματος.</string>
     <string lang="el" key="INIT_SYS_ENC">Αδυναμία αρχικοποίησης των στοιχείων της εφαρμογής για κρυπτογράφηση του συστήματος.</string>
     <string lang="el" key="INIT_RAND">Αποτυχία αρχικοποίησης της γεννήτριας τυχαίων αριθμών!</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="el" key="INIT_REGISTER">Αδυναμία αρχικοποίησης της εφαρμογής. Αποτυχία καταχώρησης της τάξης διαλόγου.</string>
     <string lang="en" key="INIT_RICHEDIT">Error: Failed to load the Rich Edit system library.</string>
     <string lang="el" key="INTRO_TITLE">Οδηγός δημιουργίας τόμου VeraCrypt</string>
@@ -535,6 +552,7 @@
     <string lang="el" key="MOUNT_BUTTON">&amp;Φόρτωση</string>
     <string lang="el" key="NEW_VERSION_REQUIRED">Μια νεότερη έκδοση του VeraCrypt χρειάζεται για να φορτώσετε αυτό τον τόμο.</string>
     <string lang="el" 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="el" key="NEXT">&amp;Επόμενο &gt;</string>
     <string lang="el" key="FINALIZE">&amp;Τέλος</string>
     <string lang="el" key="INSTALL">&amp;Εγκατάσταση</string>
@@ -542,6 +560,7 @@
     <string lang="el" key="NODRIVER">Αδύνατη η σύνδεση με τον οδηγό συσκευής του VeraCrypt. Το VeraCrypt δεν μπορεί να λειτουργήσει αν δεν τρέχει ο οδηγός συσκευής.\n\nΣημειώστε ότι λόγω των Windows, μπορεί να χρειαστεί να αποσυνδεθείτε ή να κάνετε επανεκκίνηση για να φορτωθεί ο οδηγός συσκευής.</string>
     <string lang="el" key="NOFONT">Σφάλμα κατά τη φόρτωση/προετοιμασία των γραμματοσειρών.</string>
     <string lang="el" 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="el" key="DRIVE_LETTER_UNAVAILABLE">Το γράμμα του οδηγού δεν είναι διαθέσιμο.</string>
     <string lang="el" key="NO_FILE_SELECTED">Δεν επιλέχθηκε αρχείο!</string>
     <string lang="el" key="NO_FREE_DRIVES">Δεν υπάρχουν διαθέσιμα γράμματα οδηγών.</string>
@@ -561,15 +580,18 @@
     <string lang="el" key="OVERWRITEPROMPT">ΠΡΟΣΟΧΗ: Το αρχείο '%hs' ήδη υπάρχει!\n\nΣΗΜΑΝΤΙΚΟ: ΤΟ VERACRYPT ΔΕ ΘΑ ΚΡΥΠΤΟΓΡΑΦΗΣΕΙ ΤΟ ΑΡΧΕΙΟ ΑΛΛΑ ΘΑ ΤΟ ΔΙΑΓΡΑΨΕΙ. Είστε σίγουρος ότι θέλετε να διαγράψετε το αρχείο και να το αντικαταστήσετε με ένα νέο αρχείο-τόμο VeraCrypt;</string>
     <string lang="el" key="OVERWRITEPROMPT_DEVICE">ΠΡΟΣΟΧΗ: ΟΛΑ ΤΑ ΑΠΟΘΗΚΕΥΜΕΝΑ ΑΡΧΕΙΑ ΣΤΟ ΕΠΙΛΕΓΜΕΝΟ %s '%hs'%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_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt.\n\nDo you have such a backup?</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_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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="el" key="IDD_PCDM_CHANGE_PKCS5_PRF">Ορισμός κλειδιού αλγορίθμου δημιουργίας header</string>
     <string lang="el" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Προσθήκη/Διαγραφή αρχείων-κλειδιών σε/από τόμους</string>
     <string lang="el" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Διαγραφή όλων των αρχείων-κλειδιών από τον τόμο</string>
-    <string lang="en" key="PASSWORD_CHANGED">Password and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</string>
+    <string lang="en" key="PASSWORD_CHANGED">Password, PIM and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</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="en" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">IMPORTANT: If you did not destroy your VeraCrypt Rescue Disk, your system partition/drive can still be decrypted using the old password (by booting the VeraCrypt Rescue Disk and entering the old password). You should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</string>
     <string lang="el" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Σημειώστε ότι ο Δίσκος Ασφαλείας VeraCrypt σας εξακολουθεί να χρησιμοποιεί τον προηγούμενο αλγόριθμο. Αν θεωρείτε τον προηγούμενο αλγόριθμο ανασφαλή, θα πρέπει να δημιουργήσετε έναν νέο Δίσκο Ασφαλείας και να καταστρέψετε τον παλιό.\n\nΘέλετε να δημιουργήσετε έναν νέο Δίσκο Ασφαλείας VeraCrypt;</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,7 +600,8 @@
     <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_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="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 more than 20 characters (the longer, the better). The maximum possible length is 64 characters.</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>
     <string lang="en" key="PASSWORD_HIDDEN_OS_HELP">Please choose a password for the hidden operating system (i.e. for the hidden volume). </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_NOTE">IMPORTANT: The password that you choose for the hidden operating system in this step must be substantially different from the other two passwords (i.e. from the password for the outer volume and from the password for the decoy operating system).</string>
@@ -597,11 +620,26 @@
     <string lang="el" key="PASSWORD_WRONG_AUTOMOUNT">Λάθος κωδικός ή δεν βρέθηκε τόμος VeraCrypt.</string>
     <string lang="el" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Λάθος αρχεία-κλειδιά και/ή κωδικός ή δεν βρέθηκε τόμος VeraCrypt.</string>
     <string lang="el" 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="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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_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>
+    <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>
     <string lang="en" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">In this mode, you cannot mount a partition located on a drive whose portion is within the key scope of active system encryption.\n\nBefore you can mount this partition in this mode, you need to either boot an operating system installed on a different drive (encrypted or unencrypted) or boot an unencrypted operating system.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <string lang="el" key="PREV">&lt; &amp;Πίσω</string>
     <string lang="el" key="RAWDEVICES">Αδυναμία παράθεσης των εγκατεστημένων στο σύστημα σας αδιαμόρφωτων συσκευών!</string>
     <string lang="el" key="READONLYPROMPT">Ο τόμος '%hs' υπάρχει και είναι μόνο για ανάγνωση. Είστε σίγουρος ότι θέλετε να τον αντικαταστήσετε;</string>
@@ -701,11 +739,18 @@
     <string lang="en" key="FOR_MORE_INFO_ON_PARTITIONS">For information on how to create and manage partitions, please refer to the documentation supplied with your operating system or contact your computer vendor's technical support team for assistance.</string>
     <string lang="en" key="SYSTEM_PARTITION_NOT_ACTIVE">Error: The currently running operating system is not installed on the boot partition (first Active partition). This is not supported.</string>
     <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="el" key="CANT_ACCESS_VOL">Σφάλμα: Αδυναμία πρόσβασης στον τόμο!\n\nΣιγουρευτείτε ότι ο επιλεγμένος τόμος υπάρχει, δεν είναι φορτωμένος ή χρησιμοποιείται από το σύστημα ή κάποια εφαρμογή, ότι έχετε δικαιώματα ανάγνωσης/εγγραφής σε αυτόν και ότι δεν έχει προστασία εγγραφής.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Error: Cannot access the volume and/or obtain information about the volume.\n\nMake sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Error: Cannot access the volume and/or obtain information about the volume. Make sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.\n\nIf the problem persists, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">An error prevented VeraCrypt from encrypting the partition. Please try fixing any previously reported problems and then try again. If the problems persist, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_RESUME">An error prevented VeraCrypt from resuming the process of encryption of the partition.\n\nPlease try fixing any previously reported problems and then try resuming the process again. Note that the volume cannot be mounted until it has been fully encrypted.</string>
+    <string lang="en" key="INPLACE_DEC_GENERIC_ERR">An error prevented VeraCrypt from decrypting the volume. Please try fixing any previously reported problems and then try again if possible.</string>
     <string lang="el" key="CANT_DISMOUNT_OUTER_VOL">Σφάλμα: Αδυναμία εκφόρτωσης του εξωτερικού τόμου!\n\nΟ τόμος δεν μπορεί να εκφορτωθεί αν περιέχει αρχεία ή φακέλους σε χρήση.\n\nΠαρακαλώ κλείστε κάθε πρόγραμμα που μπορεί να χρησιμοποιεί αρχεία ή φακέλους του τόμου και επιλέξτε "Επανάληψη".</string>
     <string lang="el" key="CANT_GET_OUTER_VOL_INFO">Σφάλμα: Αδυναμία ανάκτησης πληροφοριών για τον εξωτερικό τόμο! Η δημιουργία του τόμου δεν μπορεί να συνεχιστεί.</string>
     <string lang="el" key="CANT_ACCESS_OUTER_VOL">Σφάλμα: Αδυναμία πρόσβασης στον εξωτερικό τόμο! Η δημιουργία του τόμου δεν μπορεί να συνεχισθεί.</string>
@@ -790,7 +835,7 @@
     <string lang="en" key="TC_INSTALLER_IS_RUNNING">VeraCrypt Installer is currently running on this system and performing or preparing installation or update of VeraCrypt. Before you proceed, please wait for it to finish or close it. If you cannot close it, please restart your computer before proceeding.</string>
     <string lang="el" key="INSTALL_FAILED">Η εγκατάσταση απέτυχε.</string>
     <string lang="el" key="UNINSTALL_FAILED">Η απεγκατάσταση απέτυχε.</string>
-    <string lang="el" key="DIST_PACKAGE_CORRUPTED">Αυτό το πακέτο εγκατάστασης είναι φθαρμένο. Παρακαλώ δοκιμάστε να το κατεβάσετε ξανά (κατά προτίμηση από τον ιστοχώρο του VeraCrypt στη www.veracrypt.org).</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="EXTRACTING_VERB">Εξαγωγή</string>
     <string lang="el" key="CANNOT_READ_FROM_PACKAGE">Αδυναμία ανάγνωσης δεδομένων από το πακέτο.</string>
@@ -977,6 +1022,7 @@
     <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="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>
@@ -986,6 +1032,7 @@
     <string lang="en" key="FAILED_TO_START_WIPING">Error: Failed to start the process of wiping.</string>
     <string lang="el" key="INCONSISTENCY_RESOLVED">Ασυνέπεια αποκαταστάθηκε.\n\n\n(Αν αναφέρετε ένα σφάλμα σχετικό με αυτή, παρακαλώ συμπεριλάβετε στην αναφορά σφάλματος τις ακόλουθες τεχνικές πληροφορίες: %hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="el" key="NOTHING_TO_RESUME">Δεν υπάρχει διαδικασία/εργασία προς επαναφορά.</string>
     <string lang="el" key="HIDVOL_PROT_BKG_TASK_WARNING">ΠΡΟΣΟΧΗ: Η εργασία στο παρασκήνιο του VeraCrypt είναι απενεργοποιημένη. Αν κλείσετε το VeraCrypt δε θα ειδοποιηθήτε αν αποτραπεί ζημιά σε κρυφό τόμο.\n\nΣημείωση: Μπορείτε να κλείσετε την εργασία στο παρασκήνιο όποτε θέλετε με δεξί κλικ στο εικονίδιο του χώρου ειδοποιήσεων και επιλέγοντας "Έξοδος".\n\nΕνεργοποίηση της εργασίας στο παρασκήνιο του VeraCrypt;</string>
     <string lang="el" key="LANG_PACK_VERSION">Έκδοση αρχείου γλώσσας:  %s</string>
@@ -1013,6 +1060,7 @@
     <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="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>
     <string lang="en" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">The required version of the VeraCrypt Boot Loader is currently not installed. This may prevent some of the settings from being saved.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Note: In some situations, you may wish to prevent a person (adversary) that is watching you start the computer from knowing that you use VeraCrypt. The above options allow you to do that by customizing the VeraCrypt boot loader screen. If you enable the first option, no texts will be displayed by the boot loader (not even when you enter the wrong password). The computer will appear to be "frozen" while you can type your password. In addition, a custom message can be displayed to mislead the adversary. For example, fake error messages such as "Missing operating system" (which is normally displayed by the Windows boot loader if it finds no Windows boot partition). It is, however, important to note that if the adversary can analyze the content of the hard drive, he can still find out that it contains the VeraCrypt boot loader.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">WARNING: Please keep in mind that if you enable this option, the VeraCrypt boot loader will not display any texts (not even when you enter the wrong password). The computer will appear to be "frozen" (unresponsive) while you can type your password (the cursor will NOT move and no asterisk will be displayed when you press a key).\n\nAre you sure you want to enable this option?</string>
@@ -1034,8 +1082,11 @@
     <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="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>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="el" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Προειδοποίηση: Το VeraCrypt δεν μπόρεσε να επαναφέρει την αρχική διάταξη του πληκτρολογίου. Αυτό μπορεί να προκαλέσει εσφαλμένη εισαγωγή κωδικού.</string>
     <string lang="el" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Σφάλμα: Αδυναμία ορισμού διάταξης πληκτρολογίου για το VeraCrypt σε Η.Π.Α..\n\nΣημειώστε ότι ο κωδικός πρέπει να πληκτρολογηθεί στο περιβάλλον πριν την εκκίνηση των Windows όπου μη-Η.Π.Α. διατάξεις πληκτρολογίου δεν είναι διαθέσιμες. Γι'αυτό ο κωδικός πρέπει πάντα να πληκτρολογείται με χρήση διάταξης πληκτρολογίου Η.Π.Α.</string>
@@ -1119,6 +1170,7 @@
     <string lang="en" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">The pretest has been successfully completed.\n\nWARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt. If you do not, please back up the files now (you can click Defer, back up the files, then run VeraCrypt again anytime, and select 'System' &gt; 'Resume Interrupted Process' to start encrypting).\n\nWhen ready, click Encrypt to start encrypting.</string>
     <string lang="en" key="SYSENC_ENCRYPTION_PAGE_INFO">You can click Pause or Defer anytime to interrupt the process of encryption or decryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. To prevent slowdown when the system or applications write or read data from the system drive, VeraCrypt automatically waits until the data is written or read (see Status above) and then automatically continues encrypting or decrypting.</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nYou can click Pause or Defer anytime to interrupt the process of encryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. Note that the volume cannot be mounted until it has been fully encrypted.</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="en" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Hidden System Started</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Original System</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows creates (typically, without your knowledge or consent) various log files, temporary files, etc., on the system partition. It also saves the content of RAM to hibernation and paging files located on the system partition. Therefore, if an adversary analyzed files stored on the partition where the original system (of which the hidden system is a clone) resides, he might find out, for example, that you used the VeraCrypt wizard in the hidden-system-creation mode (which might indicate the existence of a hidden operating system on your computer).\n\nTo prevent such issues, VeraCrypt will, in the next steps, securely erase the entire content of the partition where the original system resides. Afterwards, in order to achieve plausible deniability, you will need to install a new system on the partition and encrypt it. Thus you will create the decoy system and the whole process of creation of the hidden operating system will be completed.</string>
@@ -1158,7 +1210,7 @@
     <string lang="en" key="HIDDEN_OS_CREATION_PREINFO_HELP">In the next steps, VeraCrypt will create the hidden operating system by copying the content of the system partition to the hidden volume (data being copied will be encrypted on the fly with an encryption key different from the one that will be used for the decoy operating system).\n\nPlease note that the process will be performed in the pre-boot environment (before Windows starts) and it may take a long time to complete; several hours or even several days (depending on the size of the system partition and on the performance of your computer).\n\nYou will be able to interrupt the process, shut down your computer, start the operating system and then resume the process. However, if you interrupt it, the entire process of copying the system will have to start from the beginning (because the content of the system partition must not change during cloning).</string>
     <string lang="en" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Do you want to cancel the entire process of creation of the hidden operating system?\n\nNote: You will NOT be able to resume the process if you cancel it now.</string>
     <string lang="el" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Θέλετε να ακυρώσετε τον προέλεγχο της κρυπτογράφησης συστήματος;</string>
-    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="el" key="SYS_DRIVE_NOT_ENCRYPTED">Το διαμέρισμα/οδηγός του συστήματος δε φαίνεται κρυπτογραφημένο (ούτε μερικώς ούτε ολόκληρο).</string>
     <string lang="el" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">Το διαμέρισμα/οδηγός του συστήματος είναι κρυπτογραφημένο (μερικώς ή ολόκληρο).\n\nΠαρακαλώ αποκρυπτογραφήστε το ολοκληρωτικά πριν συνεχίσετε. Για να το κάνετε αυτό, επιλέξτε 'Σύστημα' &gt; 'Μόνιμη αποκρυπτογράφηση διαμερίσματος/οδηγού συστήματος' από το μενού του κύριου παράθυρου του VeraCrypt.</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">When the system partition/drive is encrypted (partially or fully), you cannot downgrade VeraCrypt (but you can upgrade it or reinstall the same version).</string>
@@ -1175,6 +1227,8 @@
     <string lang="en" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">You have selected the system partition/drive (or the boot partition), but the wizard mode you selected is suitable only for non-system partitions/drives.\n\nDo you want to set up pre-boot authentication (which means that you will need to enter your password each time before Windows boots/starts) and encrypt the system partition/drive?</string>
     <string lang="el" key="CONFIRM_DECRYPT_SYS_DEVICE">Είστε σίγουρος ότι θέλετε να αποκρυπτογραφήσετε μόνιμα το διαμέρισμα/συσκευή του συστήματος;</string>
     <string lang="el" 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="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="en" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Warning: If you use a cascade of ciphers for system encryption, you may encounter the following issues:\n\n1) The VeraCrypt Boot Loader is larger than normal and, therefore, there is not enough space in the first drive track for a backup of the VeraCrypt Boot Loader. Hence, whenever it gets damaged (which often happens, for example, during inappropriately designed anti-piracy activation procedures of certain programs), you will need to use the VeraCrypt Rescue Disk to boot or to repair the VeraCrypt Boot Loader.\n\n2) On some computers, resuming from hibernation takes longer.\n\nThese potential issues can be prevented by choosing a non-cascade encryption algorithm (e.g. AES).\n\nAre you sure you want to use a cascade of ciphers?</string>
     <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>
@@ -1190,6 +1244,7 @@
     <string lang="en" key="ENABLE_BAD_SECTOR_ZEROING">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nThe process of in-place encryption can continue only when the sectors have been made readable again. VeraCrypt can attempt to make these sectors readable by writing zeros to the sectors (subsequently such all-zero blocks would be encrypted). However, note that any data stored in the unreadable sectors will be lost. If you want to avoid that, you can attempt to recover portions of the corrupted data using appropriate third-party tools.\n\nNote: In case of physically damaged sectors (as opposed to mere data corruption and checksum errors) most types of storage devices internally reallocate the sectors when data is attempted to be written to them (so the existing data in the damaged sectors may remain unencrypted on the drive).\n\nDo you want VeraCrypt to write zeroes to unreadable sectors?</string>
     <string lang="en" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nTo be able to proceed with decryption, VeraCrypt will have to discard the content of the unreadable sectors (the content will be replaced with pseudorandom data). Please note that, before proceeding, you can attempt to recover portions of any corrupted data using appropriate third-party tools.\n\nDo you want VeraCrypt to discard data in the unreadable sectors now?</string>
     <string lang="en" key="ZEROED_BAD_SECTOR_COUNT">Note: VeraCrypt has replaced the content of %I64d unreadable sectors (%s) with encrypted all-zero plaintext blocks.</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="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>

Translations/Language.es.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="es" name="Español" en-name="Spanish" version="1.0.0" translators="Juan Antonio Auñón Ochando" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <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>
     <control lang="es" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Más información</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="es" key="IDC_MB">&amp;MB</control>
     <control lang="es" key="IDC_MORE_INFO_ON_CONTAINERS">Más informacion</control>
     <control lang="es" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">Más información sobre cifrado del sistema</control>
@@ -57,6 +58,7 @@
     <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="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_SINGLE">&amp;Mostrar contraseña</control>
@@ -72,6 +74,7 @@
     <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="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>
     <control lang="es" key="IDT_FILE_CONTAINER">Crea un disco cifrado virtual dentro de un archivo. Recomendado para usuarios sin experiencia.</control>
@@ -85,6 +88,8 @@
     <control lang="es" key="IDT_PARTIAL_POOL_CONTENTS">Contenido actual del pool (parcial)</control>
     <control lang="es" key="IDT_PASS">Pasada</control>
     <control lang="es" key="IDT_PASSWORD">Contraseña:</control>
+    <control lang="en" key="IDT_PIM">Volume PIM:</control>
+    <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
     <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>
@@ -142,6 +147,8 @@
     <control lang="es" key="IDC_MOUNT_OPTIONS">&amp;Opciones Montaje</control>
     <control lang="es" key="IDC_MOUNT_READONLY">Montar volumen como sól&amp;o lectura</control>
     <control lang="es" key="IDC_NEW_KEYFILES">Archivos-llave</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="es" key="IDC_PREF_BKG_TASK_ENABLE">Activado</control>
     <control lang="es" key="IDC_PREF_CACHE_PASSWORDS">Guardar contraseñas en caché</control>
     <control lang="es" key="IDC_PREF_DISMOUNT_INACTIVE">Desmontar volumen autom. cuando dejen de leerse/escribirse datos</control>
@@ -155,6 +162,7 @@
     <control lang="es" key="IDC_PREF_MOUNT_READONLY">Montar volúmenes como sólo lectura</control>
     <control lang="es" key="IDC_PREF_MOUNT_REMOVABLE">Montar volúmenes como medios extraíbles</control>
     <control lang="es" key="IDC_PREF_OPEN_EXPLORER">Abrir en el &amp;explorador el volumen montado con éxito</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</control>
     <control lang="es" key="IDC_PREF_USE_DIFF_TRAY_ICON_IF_VOL_MOUNTED">Usar icono distinto en la barra de tareas si hay volúmenes montados</control>
     <control lang="es" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Eliminar contraseñas guardadas al desmontar automáticamente</control>
     <control lang="es" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Eliminar contraseñas guardadas al salir</control>
@@ -167,11 +175,12 @@
     <control lang="es" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Mostrar contraseña</control>
     <control lang="es" key="IDC_TRAVEL_OPEN_EXPLORER">Abrir en el &amp;explorador el volumen montado</control>
     <control lang="es" key="IDC_TRAV_CACHE_PASSWORDS">Guardar &amp;contraseña en caché</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="es" key="IDC_UNMOUNTALL">&amp;Desmontar Todo</control>
     <control lang="es" key="IDC_VOLUME_PROPERTIES">Propiedades del &amp;Volumen</control>
     <control lang="es" key="IDC_VOLUME_TOOLS">Herramien&amp;tas de volumen</control>
     <control lang="es" key="IDC_WIPE_CACHE">&amp;Borrar Caché</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="es" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Volúmenes favoritos</control>
     <control lang="es" key="IDD_HOTKEYS_DLG">VeraCrypt - Atajos de teclado para sistema completo</control>
     <control lang="es" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="es" key="IDM_CREATE_HIDDEN_OS">Crear Sistema Operativo Oculto</control>
     <control lang="es" key="IDM_CREATE_RESCUE_DISK">Crear Disco de Rescate</control>
     <control lang="es" key="IDM_CREATE_VOLUME">Crear Nuevo Volumen</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="es" key="IDM_DEFAULT_KEYFILES">Archivos-llave Por Defecto</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="es" key="IDM_DONATE">Donar ahora...</control>
     <control lang="es" key="IDM_ENCRYPT_SYSTEM_DEVICE">Cifrar la Partición/Unidad del Sistema</control>
     <control lang="es" key="IDM_FAQ">Preguntas Frecuentes</control>
@@ -243,6 +254,7 @@
     <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="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>
     <control lang="es" key="IDM_VOLUME_WIZARD">Asistente de Creación de Volumen</control>
     <control lang="es" key="IDM_WEBSITE">Sitio Web de VeraCrypt</control>
@@ -485,7 +497,11 @@
     <string lang="es" key="FORMAT_FINISHED_HELP">\n\nEl volumen VeraCrypt ha sido creado y está listo para usarse. Si desea crear otro volumen VeraCrypt haga click en Siguiente. Si no, haga click en Salir.</string>
     <string lang="es" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nEl volumen oculto VeraCrypt ha sido creado con éxito (el sistema operativo oculto residirá dentro de este volumen oculto).\n\nHaga click en Siguiente para continuar.</string>
     <string lang="es" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Volumen Completamente Cifrado</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="es" key="NONSYS_INPLACE_ENC_FINISHED_INFO">IMPORTANTE: PARA MONTAR EL VOLUMEN VERACRYPT RECIÉN CREADO Y ACCEDER A SUS DATOS, HAGA CLICK EN 'Montar Autom.' EN LA VENTANA PRINCIPAL DE VERACRYPT. Después de introducir la contraseña (y/o los archivos-llave), el volumen será montado en la letra de unidad seleccionada de la lista de la ventana principal (y podrá acceder a los datos cifrados a través de dicha letra).\n\nRECUERDE O APUNTE ESTAS INSTRUCCIONES. DEBERÁ SEGUIRLAS CADA VEZ QUE QUIERA MONTAR EL VOLUMEN Y ACCEDER A LOS DATOS ALMACENADOS EN ÉL. Alternativamente, en la ventana principal, haga click en 'Seleccionar Dispositivo', seleccione esta partición/volumen, y haga click en 'Montar'.\n\nLa partición/volumen ha sido cifrado correctamente (ahora contiene un volumen VeraCrypt completamente cifrado) y está listo para su uso.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="es" key="FORMAT_FINISHED_INFO">El volumen VeraCrypt ha sido creado con éxito.</string>
     <string lang="es" key="FORMAT_FINISHED_TITLE">Volumen creado</string>
     <string lang="es" key="FORMAT_HELP">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 haga click en 'Formatear' para crear el volumen.</string>
@@ -523,6 +539,7 @@
     <string lang="es" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Ha ocurrido un error al obtener el estado del cifrado del sistema.</string>
     <string lang="es" key="INIT_SYS_ENC">No se pueden inicializar componentes de la aplicación para el cifrado del sistema.</string>
     <string lang="es" key="INIT_RAND">¡Fallo al inicializar el generador de números aleatorios!</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="es" key="INIT_REGISTER">No se pudo iniciar la aplicación. Fallo al registrar la clase Dialog.</string>
     <string lang="es" key="INIT_RICHEDIT">Error: Fallo al cargar la librería de sistema Rich Edit.</string>
     <string lang="es" key="INTRO_TITLE">Asistente de Creación de Volúmenes VeraCrypt</string>
@@ -535,6 +552,7 @@
     <string lang="es" key="MOUNT_BUTTON">&amp;Montar</string>
     <string lang="es" key="NEW_VERSION_REQUIRED">Se requiere una versión más reciente de VeraCrypt para montar este volumen.</string>
     <string lang="es" key="VOL_CREATION_WIZARD_NOT_FOUND">Error: Asistente para la Creación de Volumen no encontrado.\n\nVerifique que el archivo 'VeraCrypt Format.exe' este en la misma carpeta que el archivo ' VeraCrypt.exe'. Si no es así, reinstale VeraCrypt o localice el archivo 'VeraCrypt Format.exe' en su disco y ejecútelo.</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="es" key="NEXT">&amp;Siguiente &gt;</string>
     <string lang="es" key="FINALIZE">&amp;Finalizar</string>
     <string lang="es" key="INSTALL">&amp;Instalar</string>
@@ -542,6 +560,7 @@
     <string lang="es" key="NODRIVER">No es posible conectar con el controlador de dispositivo VeraCrypt. VeraCrypt no puede funcionar si el controlador de dispositivo no está funcionando.\n\nTenga en cuenta que, debido a un problema de Windows, puede ser necesario terminar la sesión o reiniciar el sistema antes antes de que el controlador de dispositivo se pueda cargar.</string>
     <string lang="es" key="NOFONT">Ocurrió un error al cargar/preparar las fuentes.</string>
     <string lang="es" key="NOT_FOUND">No se ha encontrado la letra de unidad, o no se ha especificado ninguna.</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="es" key="DRIVE_LETTER_UNAVAILABLE">Letra de unidad no disponible.</string>
     <string lang="es" key="NO_FILE_SELECTED">¡No seleccionó ningún archivo!</string>
     <string lang="es" key="NO_FREE_DRIVES">No hay letras de unidad disponibles.</string>
@@ -561,15 +580,18 @@
     <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_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="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="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="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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="es" key="IDD_PCDM_CHANGE_PKCS5_PRF">Establecer Algoritmo de Derivación de Clave de Cabecera</string>
     <string lang="es" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Añadir/Eliminar Archivos-llave a/de un Volumen</string>
     <string lang="es" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Eliminar Todos los Archivos-llave de un Volumen</string>
-    <string lang="es" key="PASSWORD_CHANGED">Contraseña y/o archivo-llave cambiados con éxito.\n\nIMPORTANTE: Asegúrese de que ha leído la sección 'Cambiando contraseñas y archivos-llave' en el capítulo 'Precauciones y Requisitos de Seguridad' en la Guía de Usuario de VeraCrypt.</string>
+    <string lang="es" key="PASSWORD_CHANGED">Contraseña, PIM y/o archivo-llave cambiados con éxito.\n\nIMPORTANTE: Asegúrese de que ha leído la sección 'Cambiando contraseñas y archivos-llave' en el capítulo 'Precauciones y Requisitos de Seguridad' en la Guía de Usuario de VeraCrypt.</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="es" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">IMPORTANTE: Si no destruyó su Disco de Rescate VeraCrypt, su partición/unidad del sistema aún puede ser descifrada usando la contraseña antigua (arrancando el Disco de Rescate VeraCrypt e introduciendo la contraseña antigua). Debería ud. crear un nuevo Disco de Rescate VeraCrypt y destruir el antiguo.\n\n¿Desea crear un nuevo Disco de Rescate VeraCrypt?</string>
     <string lang="es" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Recuerde que el Disco de Rescate VeraCrypt aún usa el algoritmo anterior. Si considera el algoritmo anterior inseguro, debería crear un nuevo Disco de Rescate VeraCrypt y destruir el antiguo.\n\n¿Desea crear un nuevo Disco de Rescate VeraCrypt?</string>
     <string lang="es" key="KEYFILES_NOTE">Cualquier tipo de archivo (.mp3, .jpg, .zip, .avi...) puede usarse como archivo-llave. VeraCrypt nunca modifica el contenido del archivo. Puede seleccionar más de un archivo-llave (el orden no importa). Si añade una carpeta, todos los archivos no ocultos que contenga serán usados como archivos-llave. Haga click en 'Archivos Token' para seleccionar archivos-llave almacenados en token de seguridad o tarjetas inteligentes (o para importar archivos-llave a tokens o tarjetas).</string>
@@ -578,6 +600,7 @@
     <string lang="es" key="PKCS5_PRF_CHANGED">Algoritmo de derivación de clave de cabecera establecido con éxito.</string>
     <string lang="es" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">Introduzca la contraseña y/o archivos-llave para el volumen secundario donde desea continuar el proceso de cifrado sin pérdida de datos.\n\nObservación: Después de pulsar Siguiente, VeraCrypt intentará encontrar todos los volúmenes secundarios donde el proceso de cifrado haya sido interrumpido y la cabecera del volumen pueda ser descifrada usando la contraseña y/o archivos-llave suministrados. Si se encuentra más de un volumen, necesitará seleccionar uno en el siguiente paso.</string>
     <string lang="es" key="NONSYS_INPLACE_ENC_RESUME_VOL_SELECT_HELP">Seleccione uno de los volúmenes listados. La lista contiene todos los volúmenes secundarios accesibles donde el proceso de cifrado haya sido interrumpido y cuya cabecera pudo ser descifrada usando la contraseña y/o archivos-llave suministrados.</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="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>
@@ -597,11 +620,26 @@
     <string lang="es" key="PASSWORD_WRONG_AUTOMOUNT">Contraseña incorrecta o no se encontró el volumen VeraCrypt.</string>
     <string lang="es" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Contraseña y/o archivo-llave incorrectos o no se encontró el volumen VeraCrypt.</string>
     <string lang="es" key="PASSWORD_WRONG_CAPSLOCK_ON">\n\nAviso: El bloqueo de mayúsculas está activo. Esto puede causar que introduzca su contraseña incorrectamente.</string>
+    <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
+    <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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="es" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nAVISO: Se han encontrado archivos ocultos en una ruta de búsqueda de archivos-llave. Estos archivos no pueden ser usados como archivos-llave. Si necesita usarlos como archivos-llave, elimine su atributo 'Oculto' (click derecho en cada uno, seleccione 'Propiedades', desmarque 'Oculto' y pulse Aceptar). Nota: Los archivos ocultos sólo son visibles si la opción correspondiente está activada (Equipo &gt; Organizar &gt; 'Opciones de carpeta y búsqueda' &gt; Ver).</string>
     <string lang="es" key="HIDDEN_VOL_PROT_PASSWORD_US_KEYB_LAYOUT">Si está intentando proteger un volumen oculto que contiene un sistema oculto, asegúrese de estar usando la distribución de teclado EEUU estándar cuando teclee la contraseña para el volumen oculto. Esto es necesario debido a que la contraseña necesita ser escrita en el entorno de pre-arranque (antes de que Windows se inicie) en el que las distribuciones de teclado Windows distintas a la de EEUU no estarán disponibles.</string>
     <string lang="es" key="FOUND_NO_PARTITION_W_DEFERRED_INPLACE_ENC">VeraCrypt no ha encontrado ningún volumen en el que el cifrado haya sido interrumpido y la cabecera de volumen pueda ser descifrada usando la contraseña y/o archivo-llave suministrados.\n\nPor favor asegúrese de que la contraseña y/o archivo-llave son correctos y que la partición/volumen no esté siendo usada por el sistema o alguna aplicación (antivirus incluídos).</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="es" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nRecuerde: Si está intentando montar una partición ubicada en una unidad del sistema cifrada sin autenticación de pre-arranque, o montar la partición del sistema cifrada de un sistema operativo que no se está ejecutando, puede hacerlo seleccionando 'Sistema' &gt; 'Montar sin Autenticación de Pre-Arranque'.</string>
     <string lang="es" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">En este modo, no puede montar una partición ubicada en una unidad cuya parte está dentro del ámbito de la clave del cifrado del sistema activo.\n\nAntes de que pueda montar esta partición en este modo, necesita o arrancar un sistema operativo instalado en una unidad diferente (cifrado o no) o arrancar un sistema operativo no cifrado.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <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>
@@ -701,11 +739,18 @@
     <string lang="es" key="FOR_MORE_INFO_ON_PARTITIONS">Para más información sobre cómo crear y administrar particiones, remítase a la documentación proporcionada con su sistema operativo o contacte con el equipo de soporte técnico del vendedor de su ordenador para obtener asistencia.</string>
     <string lang="es" key="SYSTEM_PARTITION_NOT_ACTIVE">Error: El sistema operativo en ejecución no está instalado en la partición de arranque (la primera partición activa). Esto no está soportado.</string>
     <string lang="es" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">Ha indicado su intención de almacenar archivos mayores de 4 GB en este volumen VeraCrypt. No obstante, ha elegido el sistema de archivos FAT, en el cual no se pueden almacenar archivos mayores de 4 GB.\n\n¿Seguro que desea formatear el volumen como FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="es" key="CANT_ACCESS_VOL">Error: ¡No se puede acceder al volumen!\n\nAsegúrese de que el volumen seleccionado existe, que no está montado ni siendo usado por otra aplicación, que tiene permisos de lectura/escritura sobre el volumen, y que no está protegido contra escritura.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="es" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Error: No se puede acceder al volumen y/o obtener información sobre el volumen.\n\nAsegúrese de que el volumen seleccionado existe, que no está siendo usado por el sistema o alguna aplicación, que tiene permisos de lectura/escritura sobre el volumen, y que no está protegido contra escritura.</string>
     <string lang="es" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Error: No se puede acceder al volumen y/o obtener información sobre el mismo. Asegúrese de que el volumen seleccionado existe, de que no está siendo usado por el sistema o alguna aplicación, que tiene permisos de lectura/escritura sobre el volumen, y que no está protegido contra escritura.\n\nSi el problema continúa, podría ayudar seguir los pasos siguientes.</string>
     <string lang="es" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">Un error evitó que VeraCrypt cifrara la partición. Intente arreglar cualquier problema reportado previamente y reinténtelo. Si el problema continúa, podría ayudar seguir los siguientes pasos.</string>
     <string lang="es" key="INPLACE_ENC_GENERIC_ERR_RESUME">Un error evitó que VeraCrypt continuara el proceso de cifrado de la partición.\n\nIntente arreglar cualquier problema reportado previamente y trate de continuar el proceso de nuevo. Recuerde que el volumen no puede montarse hasta que haya sido cifrado por completo.</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="es" key="CANT_DISMOUNT_OUTER_VOL">Error: ¡No se puede desmontar el volumen externo!\n\nEl volumen no puede ser desmontado si contiene carpetas o archivos que estén siendo usados por el sistema o una aplicación.\n\nCierre los programas que puedan estar usando las carpetas o archivos del volumen y pulse Reintentar.</string>
     <string lang="es" key="CANT_GET_OUTER_VOL_INFO">Error: ¡No se puede obtener información acerca del volumen externo! La creación del volumen no puede continuar.</string>
     <string lang="es" key="CANT_ACCESS_OUTER_VOL">Error: ¡No se puede acceder al volumen externo! La creación del volumen no puede continuar.</string>
@@ -790,7 +835,7 @@
     <string lang="es" key="TC_INSTALLER_IS_RUNNING">El Instalador de VeraCrypt ya se está ejecutando en este sistema y está preparando o llevando a cabo la instalación o actualización de VeraCrypt. Antes de continuar, espere a que termine o ciérrelo. Si no puede cerrarlo, reinicie su ordenador antes de continuar.</string>
     <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 www.veracrypt.org).</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="EXTRACTING_VERB">Extrayendo</string>
     <string lang="es" key="CANNOT_READ_FROM_PACKAGE">No se puede leer información del paquete.</string>
@@ -977,6 +1022,7 @@
     <string lang="es" key="CONFIRM_EXIT_UNIVERSAL">¿Salir?</string>
     <string lang="es" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt no tiene suficiente información para determinar si cifrar o descifrar.</string>
     <string lang="es" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt no tiene suficiente información para determinar si cifrar o descifrar.\n\nNota: Si descifró la partición/unidad del sistema en el entorno de pre-arranque, puede ser necesario finalizar el proceso pulsando 'Descifrar'.</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="es" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">¿Desea interrumpir y posponer el proceso de cifrado de la partición/volumen?\n\nNota: tenga en cuenta que el volumen no puede ser montado hasta que haya sido cifrado por completo. Podrá continuar el proceso de cifrado desde el punto en que éste se detuvo. Puede hacerlo, por ejemplo, seleccionando 'Volúmenes' &gt; 'Continuar Proceso Interrumpido' desde el menú de la ventana principal de VeraCrypt.</string>
     <string lang="es" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">¿Desea interrumpir y posponer el proceso de cifrado de la partición/unidad del sistema?\n\nNota: podrá continuar el proceso desde el punto en que éste se detuvo. Puede hacerlo, por ejemplo, seleccionando 'Sistema' &gt; 'Continuar Proceso Interrumpido' desde el menú de la ventana principal de VeraCrypt. Si desea revertir o terminar permanentemente el proceso de cifrado, seleccione 'Sistema' &gt; 'Descifrar Permanentemente Partición/Unidad del Sistema'.</string>
     <string lang="es" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">¿Desea interrumpir y posponer el proceso de descifrado de la partición/unidad del sistema?\n\nNota: podrá continuar el proceso desde el punto en que éste se detuvo. Puede hacerlo, por ejemplo, seleccionando 'Sistema' &gt; 'Continuar Proceso Interrumpido' desde el menú de la ventana principal de VeraCrypt. Si desea revertir el proceso de descifrado (y empezar a cifrar) seleccione 'Sistema' &gt; 'Cifrar Partición/Unidad del Sistema'.</string>
@@ -986,6 +1032,7 @@
     <string lang="es" key="FAILED_TO_START_WIPING">Error: Ha fallado el inicio del proceso de borrado.</string>
     <string lang="es" key="INCONSISTENCY_RESOLVED">Inconsistencia resuelta.\n\n\n(Si reporta un error relacionado con esto, incluya en el reporte la siguiente información técnica:\n%hs)</string>
     <string lang="es" key="UNEXPECTED_STATE">Error: Estado inesperado.\n\n\n(Si reporta un error relacionado con esto, incluya en el reporte la siguiente información técnica:\n%hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="es" key="NOTHING_TO_RESUME">No hay ningún proceso/tarea por retomar.</string>
     <string lang="es" key="HIDVOL_PROT_BKG_TASK_WARNING">AVISO: VeraCrypt en Segundo Plano está deshabilitado. Tras cerrar VeraCrypt, no será notificado si se impiden daños en el volumen oculto.\n\nNota: Puede cerrar el Segundo Plano en cualquier momento haciendo click derecho en el icono de VeraCrypt en el área de notificación y seleccionando 'Salir'.\n\n¿Habilitar VeraCrypt en Segundo Plano?</string>
     <string lang="es" key="LANG_PACK_VERSION">Versión del paquete: %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="es" key="ERROR_MBR_PROTECTED">Fallo al escribir el sector MBR.\n\nSu BIOS puede estar configurada para proteger el sector MBR. Revise la configuración de su BIOS (pulsando F2, Delete, o Esc, despues de encender su ordenador) buscando la protección 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>
     <string lang="es" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">La versión requerida del Cargador de Arranque VeraCrypt no está instalada actualmente. Esto puede impedir que algunos ajustes se guarden.</string>
     <string lang="es" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Nota: En algunas situaciones, quizá le interese evitar que alguien (un adversario) que esté viéndole iniciar el ordenador pueda saber que usa VeraCrypt. Las siguientes opciones lo permiten pesonalizando la pantalla del cargador de arranque de VeraCrypt. Si activa la primera opción, no se mostrará ningún texto al arrancar (ni siquiera al introducir una contraseña errónea). El ordenador parecerá estar "congelado" mientras puede escribir su contraseña. Además, puede mostrarse un mensaje personalizado para confundir al adversario. Por ejemplo, falsos mensajes de error como "No se ha encontrado sistema operativo" (mensaje que muestra el cargador de arranque de Windows si no encuentra partición de arranque de Windows). No obstante, recuerde que si el adversario puede analizar el contenido del disco duro, puede darse cuenta de que contiene el cargador de arranque de VeraCrypt.</string>
     <string lang="es" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">AVISO: Tenga en cuenta que si activa esta opción, el cargador de arranque de VeraCrypt no mostrará ningún texto (ni siquiera si introduce una contraseña errónea). El ordenador parecerá "congelado" (sin responder) mientras ud. escribe su contraseña (el cursor NO se moverá ni aparecerá ningún asterisco al pulsar alguna tecla).\n\n¿Seguro que desea activar esta opción?</string>
@@ -1034,8 +1082,11 @@
     <string lang="es" key="EXTRA_BOOT_PARTITION_REMOVAL_INSTRUCTIONS">\nLa partición de arranque adicional puede ser eliminada antes de instalar Windows. Para hacerlo, siga estos pasos:\n\n1) Arranque su disco de instalación de Windows.\n\n2) En la pantalla del instalador de Windows, haga click en 'Instalar ahora' &gt; 'Personalizar (avanzada)'.\n\n3) Click en 'Opciones de Dispositivo'.\n\n4) Seleccione la partición del sistema principal y bórrela pulsando 'Eliminar' y 'Aceptar'.\n\n5) Seleccione la partición 'Reservada del Sistema', pulse 'Extender' y aumente su tamaño hasta que se pueda instalar en ella el sistema operativo.\n\n6) Click en 'Aplicar' y 'Aceptar'.\n\n7) Instale Windows en la partición 'Reservada del Sistema'.\n\n\nUn atacante podría preguntarle por qué eliminó la partición de arranque adicional, ud. puede responder que quería evitar cualquier posible filtración de datos en la partición de arranque no cifrada.\n\nNota: puede imprimir este texto pulsando el botón 'Imprimir'. Si guarda una copia de este texto o lo imprime (muy recomendable, salvo que su impresora almacene en su controlador interno copias de los documentos que imprime), debería destruir cualquier copia de este texto tras eliminar la partición de arranque adicional (de lo contrario, si una de estas copias fuera encontrada, indicaría que existe un sistema operativo oculto en este ordenador).</string>
     <string lang="es" key="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">Aviso: Hay espacio no asignado entre la partición del sistema y la primera partición tras ella. Después de crear el sistema operativo oculto, no debe crear ninguna partición nueva en ese espacio sin asignar. De lo contrario, podría ser iposible arrancar el sistema operativo oculto (hasta que elimine esas particiones nuevas).</string>
     <string lang="es" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Este algoritmo no está soportado actualmente para el cifrado del sistema.</string>
-	<string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="es" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Los archivos-llave no están soportados actualmente para el cifrado del sistema.</string>
     <string lang="es" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Aviso: VeraCrypt no pudo restaurar la disposición de teclado original. Esto puede hacer que ud. introduzca incorrectamente la contraseña.</string>
     <string lang="es" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Error: No se puede establecer la disposición del teclado para VeraCrypt al estándar de EEUU.\n\nRecuerde que la contraseña necesita ser escrita en el entorno de pre-arranque (antes de que Windows se inicie) donde no están disponibles disposiciones de teclado distintas a la de EEUU. Por tanto, la contraseña debe ser escrita siempre usando la disposición de teclado EEUU estándar.</string>
@@ -1120,6 +1171,7 @@
     <string lang="es" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">La prueba ha sido completada con éxito.\n\nAVISO: Tenga en cuenta que si el suministro de energía es interrumpido repentinamente mientras se cifran los datos existentes sin pérdida de inforación, o si el sistema operativo falla debido a un error de software o hardware mientras VeraCrypt cifra los datos, podrían corromperse o perderse porciones de los datos. Por tanto, antes de empezar a cifrar, asegúrese de que posee copias de seguridad de los archivos que desea cifrar. Si no las tiene, copie los archivos ahora (puede hacer click en Aplazar, hacer la copia, ejecutar de nuevo VeraCrypt y seleccionar 'Sistema' &gt; 'Continuar proceso interrumpido' para iniciar el cifrado).\n\nCuando esté listo, pulse Cifrar para empezar.</string>
     <string lang="es" key="SYSENC_ENCRYPTION_PAGE_INFO">Puede hace click en Pausa o en Aplazar en cualquier momento para interrumpir el proceso de cifrado o descifrado, salir de este asistente, reiniciar o apagar su ordenador, y luego continuar el proceso desde el punto en que se detuvo. Para evitar ralentizaciones cuando el sistema o alguna aplicación lea o escriba en la unidad del sistema, VeraCrypt automáticamente espera hasta que los datos sean leídos o escritos (ver Estado a continuación) y luego continúa cifrando o descifrando.</string>
     <string lang="es" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nPuede hacer click en Pausa o en Aplazar en cualquier momento para interrumpir el proceso de cifrado, salir de este asistente, reiniciar o apagar su ordenador, y luego continuar el proceso desde el punto en que se detuvo. Recuerde que el volumen no puede montarse hasta que esté cifrado por completo.</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="es" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Sistema Oculto Iniciado</string>
     <string lang="es" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Sistema Original</string>
     <string lang="es" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows crea (normalmente sin su conocimiento ni su consentimiento) varios archivos temporales, logs, etc. en la partición del sistema. También guarda el contenido de la RAM en archivos de hibernación y paginación ubicados en la partición del sistema. Por tanto, si un adversario analiza archivos almacenados en la partición donde reside el sistema original (del que es una copia el sistema oculto), podría hallar, por ejemplo, que ud. usó el asistente de VeraCrypt en modo de creación de sistema oculto (lo que podría indicar la existencia de un sistema operativo oculto en su ordenador).\n\nPara evitar estos problemas, VeraCrypt borrará el contenido entero de la partición donde reside el sistema original. Acto seguido, para lograr la negación plausible, tendrá que instalar un nuevo sistema en la partición y cifrarla. Con esto creará el sistema señuelo y el proceso de creación del sistema operativo oculto estará completo.</string>
@@ -1159,7 +1211,7 @@
     <string lang="es" key="HIDDEN_OS_CREATION_PREINFO_HELP">En los siguientes pasos, VeraCrypt creará el sistema operativo oculto copiando el contenido de la partición del sistema al volumen oculto (los datos que se copien serán cifrados al vuelo con una clave de cifrado diferente de la que se usará para el sistema operativo señuelo).\n\nTenga en cuenta que el proceso se realizará en el entorno de pre-arranque (antes del inicio de Windows) y puede tardar mucho en completarse; varias horas o incluso días (dependiendo del tamaño de la partición del sistema y del rendimiento de su ordenador).\n\nPodrá interrumpir el proceso, apagar su ordenador, iniciar el sistema operativo y luego continuar el proceso. No obstante, si lo interrumpe, el proceso de copiado tendrá que comenzar desde el principio (porque el contenido de la partición del sistema no debe cambiar durante la clonación).</string>
     <string lang="es" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">¿Desea cancelar el proceso entero de cración del sistema operativo oculto?\n\nNota: NO podrá continuar el proceso más tarde si lo cancela ahora.</string>
     <string lang="es" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">¿Desea cancelar la prueba del cifrado del sistema?</string>
-    <string lang="es" key="BOOT_PRETEST_FAILED_RETRY">Ha fallado la prueba del cifrado del sistema VeraCrypt. ¿Desea intentarlo de nuevo?\n\nSi selecciona 'No', el componente de autenticación de pre-arranque será desinstalado.\n\nNotas:\n\n- Si el Cargador de Arranque VeraCrypt no le pidió que introdujera la contraseña antes de que Windows se iniciara, es posible que su sistema operativo no arranque desde la unidad en la que está instalado. Esto no está soportado.\n\n- Si usó un algoritmo de cifrado distinto a AES y la prueba falló (e introdujo la contraseña), la causa puede ser un controlador diseñado inapropiadamente. Seleccione 'No', y trate de cifrar la partición/unidad del sistema otra vez, pero use el algoritmo de cifrado AES (que tiene los requisitos de memoria más bajos).\n\n- Para más posibles causas y soluciones, vea http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="es" key="BOOT_PRETEST_FAILED_RETRY">Ha fallado la prueba del cifrado del sistema VeraCrypt. ¿Desea intentarlo de nuevo?\n\nSi selecciona 'No', el componente de autenticación de pre-arranque será desinstalado.\n\nNotas:\n\n- Si el Cargador de Arranque VeraCrypt no le pidió que introdujera la contraseña antes de que Windows se iniciara, es posible que su sistema operativo no arranque desde la unidad en la que está instalado. Esto no está soportado.\n\n- Si usó un algoritmo de cifrado distinto a AES y la prueba falló (e introdujo la contraseña), la causa puede ser un controlador diseñado inapropiadamente. Seleccione 'No', y trate de cifrar la partición/unidad del sistema otra vez, pero use el algoritmo de cifrado AES (que tiene los requisitos de memoria más bajos).\n\n- Para más posibles causas y soluciones, vea https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="es" key="SYS_DRIVE_NOT_ENCRYPTED">La partición/unidad del sistema no parece estar cifrada (ni parcial ni completamente).</string>
     <string lang="es" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">Su partición/unidad del sistema está cifrada (parcial o completamente).\n\nDescifre por completo su partición/unidad del sistema antes de continuar. Para ello, seleccione 'Sistema' &gt; 'Descifrar Permanentemente la Partición/Unidad del Sistema' desde el menú de la ventana principal de VeraCrypt.</string>
     <string lang="es" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">Si la partición/unidad del sistema está cifrada (parcial o completamente), no puede usar una versión anterior de VeraCrypt (pero puede actualizarlo o reinstalar la misma versión).</string>
@@ -1176,6 +1228,8 @@
     <string lang="es" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">Ha seleccionado la partición/unidad del sistema (o la partición de arranque), pero el modo de asistente seleccionado es sólo para particiones/unidades secundarias.\n\n¿Desea instalar autenticación de pre-arranque (lo que significa que tendrá que introducir su contraseña antes de cada inicio de Windows) y cifrar la partición/unidad del sistema?</string>
     <string lang="es" key="CONFIRM_DECRYPT_SYS_DEVICE">¿Seguro que desea descifrar permanentemente la partición/unidad del sistema?</string>
     <string lang="es" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">CUIDADO: Si descifra permanentemente la partición/unidad del sistema, se escribirán en ella datos no cifrados.\n\n¿Seguro que desea descifrar permanentemente la partición/unidad del sistema?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
     <string lang="es" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Aviso: si usa algoritmos en cascada para el cifrado del sistema, pueden producirse estos problemas:\n\n1) Que el Cargador de Arranque VeraCrypt sea mayor de lo normal y no haya suficiente espacio en la primera pista de la unidad para hacer una copia de seguridad del Cargador. Por tanto, si resulta dañado (lo que a veces ocurre, por ejemplo, con procedimientos de activación antipiratería diseñados inapropiadamente), tendrá que usar el Disco de Rescate VeraCrypt para arrancar o reparar el Cargador de Arranque.\n\n2) Que en algunos ordenadores se tarde más en reanudar tras la hibernación.\n\nEstos problemas potenciales pueden evitarse eligiendo un algoritmo de cifrado sin cascada (como AES).\n\n¿Seguro que desea usar algoritmos en cascada?</string>
     <string lang="es" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">Si encuentra alguno de los problemas mencionados, descifre la partición/unidad (si está cifrada) y luego intente cifrarla de nuevo usando un algoritmo de cifrado sin cascada (como AES).</string>
     <string lang="es" key="UPDATE_TC_IN_DECOY_OS_FIRST">AVISO: Por razones de seguridad, debería actualizar VeraCrypt en el sistema operativo señuelo antes de actualizarlo en el sistema operativo oculto.\n\nPara hacerlo, arranque el sistema señuelo y ejecute el instalador VeraCrypt en él. Luego arranque el sistema oculto y ejecute también el instalador en él.\n\nNota: El sistema señuelo y el sistema oculto comparten un único cargador de arranque. Si actualizó VeraCrypt sólo en el sistema oculto (pero no en el señuelo), el sistema señuelo podría contener un controlador VeraCrypt y aplicaciones VeraCrypt cuya versión sea diferente a la del Cargador de Arranque VeraCrypt. Esta discrepancia podría indicar que existe un sistema operativo oculto en este ordenador.\n\n\n¿Desea continuar?</string>
@@ -1191,6 +1245,7 @@
     <string lang="es" key="ENABLE_BAD_SECTOR_ZEROING">Error: El contenido de uno o más sectores del disco no puede leerse (probablemente debido a un defecto físico).\n\nEl proceso de cifrado sin pérdida de datos puede continuar sólo cuando los sectores sean legibles de nuevo. VeraCrypt puede intentar hacer legibles esos sectores escribiendo ceros en ellos (con lo cual estos bloques de ceros serán cifrados). Sin embargo, tenga en cuenta que los datos almacenados en los sectores ilegibles se perderán. Si quiere evitarlo, puede intentar recuperar fragmentos de los datos corruptos usando herramientas de terceros.\n\nNota: En caso de sectores físicamente dañados (al contrario que con la corrupción de datos y errores de suma de verificación) la mayoría de los tipos de dispositivos de almacenamiento reasignan los sectores cuando se intenta escribir datos en ellos (así que los datos de los sectores dañados pueden permanecer sin cifrar en la unidad).\n\n¿Desea que VeraCrypt escriba ceros en los sectores ilegibles?</string>
     <string lang="es" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Error: El contenido de uno o más sectores del disco no puede leerse (probablemente debido a un defecto físico).\n\nPara proceder con el descifrado, VeraCrypt tendrá que desechar el contenido de los sectores ilegibles (su contenido será reemplazado por datos pseudoaleatorios). Recuerde que, antes de continuar, puede intentar recuperar fragmentos de los datos corruptos usando herramientas de terceros.\n\n¿Desea que VeraCrypt descarte los datos de los sectores ilegibles?</string>
     <string lang="es" key="ZEROED_BAD_SECTOR_COUNT">Nota: VeraCrypt ha reemplazado el contenido de %I64d sectores ilegibles (%s) con bloques cifrados de texto plano llenos de ceros.</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="es" key="ENTER_TOKEN_PASSWORD">Introduzca contraseña/PIN para token '%s':</string>
     <string lang="es" key="PKCS11_LIB_LOCATION_HELP">Para permitir que VeraCrypt acceda a un token de seguridad o tarjeta inteligente, necesita instalar primero una librería de software PKCS #11 para el token o la tarjeta. Esta librería puede ser suministrada con el dispositivo o puede descargarse desde la web del vendedor o de terceros.\n\nTras instalar la librería, puede seleccionarla manualmente pulsando 'Seleccionar Librería' o puede dejar que VeraCrypt la encuentre y seleccione automáticamente pulsando 'Detección Automática' (sólo se buscará en el directorio del sistema Windows).</string>
     <string lang="es" key="SELECT_PKCS11_MODULE_HELP">Nota: Para el nombre de archivo y ubicación de la librería PKCS #11 instalada para su token o tarjeta, vaya a la documentación suministrada con el token, tarjeta, o software de terceros.\n\nPulse 'Aceptar' para seleccionar la ruta y nombre de archivo.</string>

Translations/Language.et.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="et" name="Eesti" en-name="Estonian" version="0.1.0" translators="Maiko Mõtsar" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <control lang="et" key="IDC_KEY_FILES">Võtmefailid..</control>
     <control lang="et" key="IDC_LINK_HASH_INFO">Informatsioon räsi algoritmide kohta</control>
     <control lang="et" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Rohkem informatsiooni</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="et" 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>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <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="et" key="IDT_CONFIRM">Kinnita:</control>
     <control lang="et" key="IDT_DONE">Valmis </control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="et" key="IDT_ENCRYPTION_ALGO">Krüpteerimisalgoritm</control>
     <control lang="et" key="IDT_FILESYSTEM">Failisüsteem</control>
     <control lang="en" key="IDT_FILE_CONTAINER">Creates a virtual encrypted disk within a file. Recommended for inexperienced users.</control>
@@ -85,6 +88,8 @@
     <control lang="en" key="IDT_PARTIAL_POOL_CONTENTS">Current pool content (partial)</control>
     <control lang="en" key="IDT_PASS">Pass</control>
     <control lang="et" key="IDT_PASSWORD">Salasõna:</control>
+    <control lang="en" key="IDT_PIM">Volume PIM:</control>
+    <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
     <control lang="en" key="IDT_PROGRESS">Progress:</control>
     <control lang="et" key="IDT_RANDOM_POOL">Juhuslik maatriks: </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>
@@ -142,6 +147,8 @@
     <control lang="et" key="IDC_MOUNT_OPTIONS">Haakevalikud...</control>
     <control lang="et" key="IDC_MOUNT_READONLY">Haagi konteiner kirjutuskaitstuna</control>
     <control lang="et" key="IDC_NEW_KEYFILES">Võtmefailid...</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="et" key="IDC_PREF_BKG_TASK_ENABLE">Lubatud</control>
     <control lang="et" key="IDC_PREF_CACHE_PASSWORDS">Hoia salasõna tüüreli mälus</control>
     <control lang="et" key="IDC_PREF_DISMOUNT_INACTIVE">Auto-haagi lahti konteiner peale mitte kirjutamist/lugemist</control>
@@ -155,6 +162,7 @@
     <control lang="et" key="IDC_PREF_MOUNT_READONLY">Haagi konteiner kirjutuskaitstuna</control>
     <control lang="et" key="IDC_PREF_MOUNT_REMOVABLE">Haagi konteinerid kui eemaldatav meedia</control>
     <control lang="et" key="IDC_PREF_OPEN_EXPLORER">Ava edukalt haagitud konteiner Exploreris</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</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="et" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Kustuta kogutud salasõnad automaatsel lahtihaakimisel</control>
     <control lang="et" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Kustuta väljumisel kogutud salasõnad</control>
@@ -167,11 +175,12 @@
     <control lang="et" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Kuva salasõna</control>
     <control lang="et" key="IDC_TRAVEL_OPEN_EXPLORER">Ava haagitud konteiner &amp;Exploreri aknas</control>
     <control lang="et" key="IDC_TRAV_CACHE_PASSWORDS">Hoia salasõnu tüürelis vahemälus</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="et" key="IDC_UNMOUNTALL">Haagi kõik lahti</control>
     <control lang="et" key="IDC_VOLUME_PROPERTIES">Konteineri atribuudid...</control>
     <control lang="et" key="IDC_VOLUME_TOOLS">Konteineri &amp;tööriistad...</control>
     <control lang="et" key="IDC_WIPE_CACHE">Tühjenda vahemälu</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
     <control lang="et" key="IDD_HOTKEYS_DLG">VeraCrypt - Süsteemi kiirklahvid</control>
     <control lang="et" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="en" key="IDM_CREATE_HIDDEN_OS">Create Hidden Operating System...</control>
     <control lang="en" key="IDM_CREATE_RESCUE_DISK">Create Rescue Disk...</control>
     <control lang="et" key="IDM_CREATE_VOLUME">Loo uus konteiner...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="et" key="IDM_DEFAULT_KEYFILES">Vaikimisi võtmefailid...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="en" key="IDM_ENCRYPT_SYSTEM_DEVICE">Encrypt System Partition/Drive...</control>
     <control lang="et" key="IDM_FAQ">Korduma Kippuvad Küsimused</control>
@@ -243,6 +254,7 @@
     <control lang="et" key="IDM_UNMOUNT_VOLUME">Konteineri lahtihaakimine</control>
     <control lang="en" key="IDM_VERIFY_RESCUE_DISK">Verify Rescue Disk</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>
     <control lang="et" key="IDM_VOLUME_WIZARD">Konteineri loomise nõustaja</control>
     <control lang="et" key="IDM_WEBSITE">VeraCrypti kodulehekülg</control>
@@ -485,7 +497,11 @@
     <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>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Volume Fully Encrypted</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_INFO">IMPORTANT: TO MOUNT THIS NEWLY CREATED VERACRYPT VOLUME AND TO ACCESS DATA STORED IN IT, CLICK 'Auto-Mount Devices' IN THE MAIN VERACRYPT WINDOW. After you enter the correct password (and/or supply correct keyfiles), the volume will be mounted to the drive letter you select from the list in the main VeraCrypt window (and you will be able to access the encrypted data via the selected drive letter).\n\nPLEASE REMEMBER OR WRITE DOWN THE ABOVE STEPS. YOU MUST FOLLOW THEM WHENEVER YOU WANT TO MOUNT THE VOLUME AND ACCESS DATA STORED IN IT. Alternatively, in the main VeraCrypt window, click 'Select Device', then select this partition/volume, and click 'Mount'.\n\nThe partition/volume has been successfully encrypted (it contains a fully encrypted VeraCrypt volume now) and is ready for use.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="et" key="FORMAT_FINISHED_INFO">VeraCrypti konteiner on edukalt loodud.</string>
     <string lang="et" key="FORMAT_FINISHED_TITLE">Konteiner loodud</string>
     <string lang="en" key="FORMAT_HELP">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 Format to create the volume.</string>
@@ -523,6 +539,7 @@
     <string lang="en" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">An error occurred when obtaining the system encryption status.</string>
     <string lang="en" key="INIT_SYS_ENC">Cannot initialize application components for system encryption.</string>
     <string lang="et" key="INIT_RAND">Juhunumbri generaatori initsialiseerimine ebaõnnestus!</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="et" key="INIT_REGISTER">Võimetu rakendust initsialiseerima. Dialoogi klassi registreerimine ebaõnnestus.</string>
     <string lang="en" key="INIT_RICHEDIT">Error: Failed to load the Rich Edit system library.</string>
     <string lang="et" key="INTRO_TITLE">VeraCrypt konteineri loomise nõustaja</string>
@@ -535,6 +552,7 @@
     <string lang="et" key="MOUNT_BUTTON">Haagi</string>
     <string lang="et" key="NEW_VERSION_REQUIRED">Selle konteineri haakimiseks on vajalik VeraCrypti uuem versioon.</string>
     <string lang="et" key="VOL_CREATION_WIZARD_NOT_FOUND">Viga: Konteineri loomise nõustajat ei leidnud.\n\nPalun veendu, et fail 'VeraCrypt Format.exe' on kataloogis, milles on 'VeraCrypt.exe' käivitatud. Kui ei, palun taaspaigalda VeraCrypt või näita 'VeraCrypt Format.exe' asukoht kettal ja käivita see.</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="et" key="NEXT">Edasi &gt;</string>
     <string lang="et" key="FINALIZE">&amp;Lõpeta</string>
     <string lang="en" key="INSTALL">&amp;Install</string>
@@ -542,6 +560,7 @@
     <string lang="en" key="NODRIVER">Unable to connect to the VeraCrypt device driver. VeraCrypt cannot work if the device driver is not running.\n\nPlease note that, due to a Windows issue, it may be necessary to log off or restart the system before the device driver can be loaded.</string>
     <string lang="et" key="NOFONT">Ilmnes viga fontide laadimisel/ettevalmistamisel.</string>
     <string lang="en" key="NOT_FOUND">The drive letter was not found or no drive letter was specified.</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="et" key="DRIVE_LETTER_UNAVAILABLE">Draivitäht pole saadaval.</string>
     <string lang="et" key="NO_FILE_SELECTED">Ükski fail pole valitud!</string>
     <string lang="et" key="NO_FREE_DRIVES">Ühtegi draivi tähte pole saadaval.</string>
@@ -561,15 +580,18 @@
     <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_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="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_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt.\n\nDo you have such a backup?</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_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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="et" key="IDD_PCDM_CHANGE_PKCS5_PRF">Säti päise võtme derivatsiooni algoritm</string>
     <string lang="et" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Lisa/Eemalda võtmefailid konteineri(le/lt)</string>
     <string lang="et" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Eemalda kõik võtmefailid konteinerilt</string>
-    <string lang="en" key="PASSWORD_CHANGED">Password and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</string>
+    <string lang="en" key="PASSWORD_CHANGED">Password, PIM and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</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="en" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">IMPORTANT: If you did not destroy your VeraCrypt Rescue Disk, your system partition/drive can still be decrypted using the old password (by booting the VeraCrypt Rescue Disk and entering the old password). You should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</string>
     <string lang="en" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Note that your VeraCrypt Rescue Disk still uses the previous algorithm. If you consider the previous algorithm insecure, you should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,7 +600,8 @@
     <string lang="et" key="PKCS5_PRF_CHANGED">Päise võtme derivatsioonalgoritm edukalt sätitud.</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_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="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 more than 20 characters (the longer, the better). The maximum possible length is 64 characters.</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="et" key="PASSWORD_HIDDENVOL_HELP">Palun vali peidetud konteinerile salasõna. </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_HELP">Please choose a password for the hidden operating system (i.e. for the hidden volume). </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_NOTE">IMPORTANT: The password that you choose for the hidden operating system in this step must be substantially different from the other two passwords (i.e. from the password for the outer volume and from the password for the decoy operating system).</string>
@@ -597,11 +620,26 @@
     <string lang="et" key="PASSWORD_WRONG_AUTOMOUNT">Ebakorrektne salasõna või pole VeraCrypti konteinerit leitud.</string>
     <string lang="et" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Ebakorrektsed võtmefailid/salasõna või pole VeraCrypti konteinerit leitud.</string>
     <string lang="et" key="PASSWORD_WRONG_CAPSLOCK_ON">\n\nHOIATUS: Tõstuklahv on sees. See võib põhjustada salasõna ebakorrektset sisestust.</string>
+    <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
+    <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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_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>
+    <string lang="en" key="SELECTED_PARTITION_NOT_INPLACE_ENC">The selected partition/device is not using in-place encryption.\nHeader Flags = 0x%.8X</string>
     <string lang="en" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nNote: If you are attempting to mount a partition located on an encrypted system drive without pre-boot authentication or to mount the encrypted system partition of an operating system that is not running, you can do so by selecting 'System' &gt; 'Mount Without Pre-Boot Authentication'.</string>
     <string lang="en" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">In this mode, you cannot mount a partition located on a drive whose portion is within the key scope of active system encryption.\n\nBefore you can mount this partition in this mode, you need to either boot an operating system installed on a different drive (encrypted or unencrypted) or boot an unencrypted operating system.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <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>
@@ -701,11 +739,18 @@
     <string lang="en" key="FOR_MORE_INFO_ON_PARTITIONS">For information on how to create and manage partitions, please refer to the documentation supplied with your operating system or contact your computer vendor's technical support team for assistance.</string>
     <string lang="en" key="SYSTEM_PARTITION_NOT_ACTIVE">Error: The currently running operating system is not installed on the boot partition (first Active partition). This is not supported.</string>
     <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="et" key="CANT_ACCESS_VOL">VIGA: ei pääse konteinerile ligi!\n\nVeendu, et valitud konteiner eksisteerib, et see pole haagitud või kasutuses süsteemi või mõne rakenduse poolt, et sul on lugemise/kirjutamise õigused sellele konteinerile ja see pole kirjutuskaitstud.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Error: Cannot access the volume and/or obtain information about the volume.\n\nMake sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Error: Cannot access the volume and/or obtain information about the volume. Make sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.\n\nIf the problem persists, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">An error prevented VeraCrypt from encrypting the partition. Please try fixing any previously reported problems and then try again. If the problems persist, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_RESUME">An error prevented VeraCrypt from resuming the process of encryption of the partition.\n\nPlease try fixing any previously reported problems and then try resuming the process again. Note that the volume cannot be mounted until it has been fully encrypted.</string>
+    <string lang="en" key="INPLACE_DEC_GENERIC_ERR">An error prevented VeraCrypt from decrypting the volume. Please try fixing any previously reported problems and then try again if possible.</string>
     <string lang="et" key="CANT_DISMOUNT_OUTER_VOL">Viga: välise konteineri lahtihaakimine ebaõnnestus!\n\nKonteinerit ei saa lahti haakida, kui see sisaldab faile, katalooge, mis kasutuses süsteemi või mõne rakenduse poolt.\n\nPalun sulge iga programm, mis võib kasutada faile või katalooge ja kliki Proovi uuesti.</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="et" key="CANT_ACCESS_OUTER_VOL">Viga: ei pääse välisele konteinerile ligi!  Konteineri loomine katkestatud.</string>
@@ -790,7 +835,7 @@
     <string lang="en" key="TC_INSTALLER_IS_RUNNING">VeraCrypt Installer is currently running on this system and performing or preparing installation or update of VeraCrypt. Before you proceed, please wait for it to finish or close it. If you cannot close it, please restart your computer before proceeding.</string>
     <string lang="en" key="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 www.veracrypt.org).</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="EXTRACTING_VERB">Extracting</string>
     <string lang="en" key="CANNOT_READ_FROM_PACKAGE">Cannot read data from the package.</string>
@@ -977,6 +1022,7 @@
     <string lang="en" key="CONFIRM_EXIT_UNIVERSAL">Exit?</string>
     <string lang="en" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt does not have sufficient information to determine whether to encrypt or decrypt.</string>
     <string lang="en" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt does not have sufficient information to determine whether to encrypt or decrypt.\n\nNote: If you decrypted the system partition/drive in the pre-boot environment, you may need to finalize the process by clicking Decrypt.</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_REVERSE_INFO">Note: When you are encrypting a non-system partition/volume in place and an error persistently prevents you from finishing the process, you will not be able to mount the volume (and access data stored on it) until you entirely DECRYPT the volume (i.e. reverse the process).\n\nIf you need to do so, follow these steps:\n1) Exit this wizard.\n2) In the main VeraCrypt window, select 'Volumes' &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="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Do you want to interrupt and postpone the process of encryption of the system partition/drive?\n\nNote: You will be able to resume the process and it will continue from the point it was stopped. You can do so, for example, by selecting 'System' &gt; 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window. If you want to permanently terminate or reverse the encryption process, select 'System' &gt; 'Permanently Decrypt System Partition/Drive'.</string>
     <string lang="en" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Do you want to interrupt and postpone the process of decryption of the system partition/drive?\n\nNote: You will be able to resume the process and it will continue from the point it was stopped. You can do so, for example, by selecting 'System' &gt; 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window. If you want to reverse the decryption process (and start encrypting), select 'System' &gt; 'Encrypt System Partition/Drive'.</string>
@@ -986,6 +1032,7 @@
     <string lang="en" key="FAILED_TO_START_WIPING">Error: Failed to start the process of wiping.</string>
     <string lang="en" key="INCONSISTENCY_RESOLVED">Inconsistency resolved.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="en" key="NOTHING_TO_RESUME">There is no process/task to resume.</string>
     <string lang="et" key="HIDVOL_PROT_BKG_TASK_WARNING">HOIATUS: VeraCrypti taustakäsk on keelatud. Peale VeraCryptist väljumist ei teavitata sind kui peidetud konteineri vigastust on välditud.\n\nMärkus: võid taustakäsu alati välja lilitada parem-klikkides TrueCrykti süsteemisalve ikoonil ja valides 'Välju'.\n\nLuba VeraCrypti taustakäsk?</string>
     <string lang="et" key="LANG_PACK_VERSION">Keelepaki versioon:  %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="en" key="ERROR_MBR_PROTECTED">Failed to write the MBR sector.\n\nYour BIOS may be configured to protect the MBR sector. Check your BIOS settings (press F2, Delete, or Esc, after powering on your computer) for MBR/antivirus protection.</string>
+    <string lang="en" key="BOOT_LOADER_FINGERPRINT_CHECK_FAILED">WARNING: The verification of VeraCrypt bootloader fingerprint failed!\nYour disk may have been tampered with by an attacker ("Evil Maid" attack).\n\nThis warning can also be triggered if you restored VeraCrypt boot loader using an Rescue Disk generated using a different VeraCrypt version.\n\nYou are advised to change your password immediately which will also restore the correct VeraCrypt bootloader. It is recommended to reinstall VeraCrypt and to take measures to avoid access to this machine by untrusted entities.</string>
     <string lang="en" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">The required version of the VeraCrypt Boot Loader is currently not installed. This may prevent some of the settings from being saved.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Note: In some situations, you may wish to prevent a person (adversary) that is watching you start the computer from knowing that you use VeraCrypt. The above options allow you to do that by customizing the VeraCrypt boot loader screen. If you enable the first option, no texts will be displayed by the boot loader (not even when you enter the wrong password). The computer will appear to be "frozen" while you can type your password. In addition, a custom message can be displayed to mislead the adversary. For example, fake error messages such as "Missing operating system" (which is normally displayed by the Windows boot loader if it finds no Windows boot partition). It is, however, important to note that if the adversary can analyze the content of the hard drive, he can still find out that it contains the VeraCrypt boot loader.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">WARNING: Please keep in mind that if you enable this option, the VeraCrypt boot loader will not display any texts (not even when you enter the wrong password). The computer will appear to be "frozen" (unresponsive) while you can type your password (the cursor will NOT move and no asterisk will be displayed when you press a key).\n\nAre you sure you want to enable this option?</string>
@@ -1034,8 +1082,11 @@
     <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="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">Warning: There is unallocated space between the system partition and the first partition behind it. After you create the hidden operating system, you must not create any new partitions in that unallocated space. Otherwise, the hidden operating system will be impossible to boot (until you delete such newly created partitions).</string>
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">This algorithm is currently not supported for system encryption.</string>
-	<string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</string>
     <string lang="en" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Error: Cannot set the keyboard layout for VeraCrypt to the standard US keyboard layout.\n\nNote that the password needs to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout.</string>
@@ -1120,6 +1171,7 @@
     <string lang="en" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">The pretest has been successfully completed.\n\nWARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt. If you do not, please back up the files now (you can click Defer, back up the files, then run VeraCrypt again anytime, and select 'System' &gt; 'Resume Interrupted Process' to start encrypting).\n\nWhen ready, click Encrypt to start encrypting.</string>
     <string lang="en" key="SYSENC_ENCRYPTION_PAGE_INFO">You can click Pause or Defer anytime to interrupt the process of encryption or decryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. To prevent slowdown when the system or applications write or read data from the system drive, VeraCrypt automatically waits until the data is written or read (see Status above) and then automatically continues encrypting or decrypting.</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nYou can click Pause or Defer anytime to interrupt the process of encryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. Note that the volume cannot be mounted until it has been fully encrypted.</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="en" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Hidden System Started</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Original System</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows creates (typically, without your knowledge or consent) various log files, temporary files, etc., on the system partition. It also saves the content of RAM to hibernation and paging files located on the system partition. Therefore, if an adversary analyzed files stored on the partition where the original system (of which the hidden system is a clone) resides, he might find out, for example, that you used the VeraCrypt wizard in the hidden-system-creation mode (which might indicate the existence of a hidden operating system on your computer).\n\nTo prevent such issues, VeraCrypt will, in the next steps, securely erase the entire content of the partition where the original system resides. Afterwards, in order to achieve plausible deniability, you will need to install a new system on the partition and encrypt it. Thus you will create the decoy system and the whole process of creation of the hidden operating system will be completed.</string>
@@ -1159,7 +1211,7 @@
     <string lang="en" key="HIDDEN_OS_CREATION_PREINFO_HELP">In the next steps, VeraCrypt will create the hidden operating system by copying the content of the system partition to the hidden volume (data being copied will be encrypted on the fly with an encryption key different from the one that will be used for the decoy operating system).\n\nPlease note that the process will be performed in the pre-boot environment (before Windows starts) and it may take a long time to complete; several hours or even several days (depending on the size of the system partition and on the performance of your computer).\n\nYou will be able to interrupt the process, shut down your computer, start the operating system and then resume the process. However, if you interrupt it, the entire process of copying the system will have to start from the beginning (because the content of the system partition must not change during cloning).</string>
     <string lang="en" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Do you want to cancel the entire process of creation of the hidden operating system?\n\nNote: You will NOT be able to resume the process if you cancel it now.</string>
     <string lang="en" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Do you want to cancel the system encryption pretest?</string>
-    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="en" key="SYS_DRIVE_NOT_ENCRYPTED">The system partition/drive does not appear to be encrypted (neither partially nor fully).</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">Your system partition/drive is encrypted (partially or fully).\n\nPlease decrypt your system partition/drive entirely before proceeding. To do so, select 'System' &gt; 'Permanently Decrypt System Partition/Drive' from the menu bar of the main VeraCrypt window.</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">When the system partition/drive is encrypted (partially or fully), you cannot downgrade VeraCrypt (but you can upgrade it or reinstall the same version).</string>
@@ -1176,6 +1228,8 @@
     <string lang="en" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">You have selected the system partition/drive (or the boot partition), but the wizard mode you selected is suitable only for non-system partitions/drives.\n\nDo you want to set up pre-boot authentication (which means that you will need to enter your password each time before Windows boots/starts) and encrypt the system partition/drive?</string>
     <string lang="en" key="CONFIRM_DECRYPT_SYS_DEVICE">Are you sure you want to permanently decrypt the system partition/drive?</string>
     <string lang="en" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the system partition/drive, unencrypted data will be written to it.\n\nAre you really sure you want to permanently decrypt the system partition/drive?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
     <string lang="en" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Warning: If you use a cascade of ciphers for system encryption, you may encounter the following issues:\n\n1) The VeraCrypt Boot Loader is larger than normal and, therefore, there is not enough space in the first drive track for a backup of the VeraCrypt Boot Loader. Hence, whenever it gets damaged (which often happens, for example, during inappropriately designed anti-piracy activation procedures of certain programs), you will need to use the VeraCrypt Rescue Disk to boot or to repair the VeraCrypt Boot Loader.\n\n2) On some computers, resuming from hibernation takes longer.\n\nThese potential issues can be prevented by choosing a non-cascade encryption algorithm (e.g. AES).\n\nAre you sure you want to use a cascade of ciphers?</string>
     <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>
@@ -1191,6 +1245,7 @@
     <string lang="en" key="ENABLE_BAD_SECTOR_ZEROING">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nThe process of in-place encryption can continue only when the sectors have been made readable again. VeraCrypt can attempt to make these sectors readable by writing zeros to the sectors (subsequently such all-zero blocks would be encrypted). However, note that any data stored in the unreadable sectors will be lost. If you want to avoid that, you can attempt to recover portions of the corrupted data using appropriate third-party tools.\n\nNote: In case of physically damaged sectors (as opposed to mere data corruption and checksum errors) most types of storage devices internally reallocate the sectors when data is attempted to be written to them (so the existing data in the damaged sectors may remain unencrypted on the drive).\n\nDo you want VeraCrypt to write zeroes to unreadable sectors?</string>
     <string lang="en" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nTo be able to proceed with decryption, VeraCrypt will have to discard the content of the unreadable sectors (the content will be replaced with pseudorandom data). Please note that, before proceeding, you can attempt to recover portions of any corrupted data using appropriate third-party tools.\n\nDo you want VeraCrypt to discard data in the unreadable sectors now?</string>
     <string lang="en" key="ZEROED_BAD_SECTOR_COUNT">Note: VeraCrypt has replaced the content of %I64d unreadable sectors (%s) with encrypted all-zero plaintext blocks.</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="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>

Translations/Language.eu.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="eu" name="Euskara" en-name="Basque" version="1.0.0" translators="Ander Genua" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <control lang="eu" key="IDC_KEY_FILES">&amp;Gako-artxiboa..</control>
     <control lang="eu" key="IDC_LINK_HASH_INFO">Hash algoritmoei buruzko informazioa</control>
     <control lang="eu" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Informazio gehiago</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="eu" key="IDC_MB">&amp;MB</control>
     <control lang="eu" key="IDC_MORE_INFO_ON_CONTAINERS">Informazio gehiago</control>
     <control lang="eu" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">Sistemaren enkriptazioari buruzko Informazio gehiago</control>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <control lang="eu" key="IDT_COLLECTING_RANDOM_DATA_NOTE">GARRANTZITSUA: Xagua ahal duzun ausazkoen mugitu ezazu lehio honetan. Zenbat eta gehiago, hobeago. Honek zifratzeko gakoen asko indartzen du. 'Hurrengoa' botoia sakatu jarraitzeko.</control>
     <control lang="eu" key="IDT_CONFIRM">&amp;Baieztatu:</control>
     <control lang="eu" key="IDT_DONE">Eginda</control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="eu" key="IDT_ENCRYPTION_ALGO">Zifratzeko Algoritmoa</control>
     <control lang="eu" key="IDT_FILESYSTEM">Fitxategi Sistema</control>
     <control lang="eu" key="IDT_FILE_CONTAINER">Fitxategi batean zifratutako disko birtuala sortzen du. Esperientziarik gabeko erabiltzaileentzako gomendatua.</control>
@@ -85,6 +88,8 @@
     <control lang="eu" key="IDT_PARTIAL_POOL_CONTENTS">Oraingo multzoaren edukina (zatia)</control>
     <control lang="eu" key="IDT_PASS">Sartu</control>
     <control lang="eu" key="IDT_PASSWORD">Pasahitza:</control>
+    <control lang="en" key="IDT_PIM">Volume PIM:</control>
+    <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
     <control lang="eu" key="IDT_PROGRESS">Aurrerapena:</control>
     <control lang="eu" key="IDT_RANDOM_POOL">Ausazko taldea: </control>
     <control lang="eu" key="IDT_SINGLE_BOOT">Aukera hau hautatu ordenagailu honetan sistema eragile bakarra badago (erabiltzaile anitzak badauzka ere).</control>
@@ -142,6 +147,8 @@
     <control lang="eu" key="IDC_MOUNT_OPTIONS">Muntaketa &amp;aukerak...</control>
     <control lang="eu" key="IDC_MOUNT_READONLY">Bolumenak &amp;irakurtzeko bakarrik muntatu</control>
     <control lang="eu" key="IDC_NEW_KEYFILES">Gako-fitxategiak...</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="eu" key="IDC_PREF_BKG_TASK_ENABLE">Gaituta</control>
     <control lang="eu" key="IDC_PREF_CACHE_PASSWORDS">Pasahitzak gorde gailuaren memorian</control>
     <control lang="eu" key="IDC_PREF_DISMOUNT_INACTIVE">Bolumena auto-desmuntatu daturik ez bada idatzi/irakurri</control>
@@ -155,6 +162,7 @@
     <control lang="eu" key="IDC_PREF_MOUNT_READONLY">Bolumenak &amp;irakurtzeko bakarrik muntatu</control>
     <control lang="eu" key="IDC_PREF_MOUNT_REMOVABLE">Bolumenak kendu daitezkeen gailuak bezala muntatu</control>
     <control lang="eu" key="IDC_PREF_OPEN_EXPLORER">Explorer-aren lehioa ireki muntatutako bolumenentzako</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</control>
     <control lang="eu" key="IDC_PREF_USE_DIFF_TRAY_ICON_IF_VOL_MOUNTED">Ataza-barra ikono ezberdin bat erabili muntatutako bolumenak badaude</control>
     <control lang="eu" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Gordetako pasahitzak ezabatu automatikoki desmuntatzerakoan</control>
     <control lang="eu" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Gordetako pasahitzak ezabatu irtetzerakoan</control>
@@ -167,11 +175,12 @@
     <control lang="eu" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Pasahitza erakutsi</control>
     <control lang="eu" key="IDC_TRAVEL_OPEN_EXPLORER">Muntatutako Bolumenak &amp;Explorer-aren lehioak ireki</control>
     <control lang="eu" key="IDC_TRAV_CACHE_PASSWORDS">Pasahitza &amp;gorde diskaren memorian</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="eu" key="IDC_UNMOUNTALL">&amp;Guztiak desmuntatu</control>
     <control lang="eu" key="IDC_VOLUME_PROPERTIES">&amp;Bolumenaren ezaugarriak...</control>
     <control lang="eu" key="IDC_VOLUME_TOOLS">Bolumenaren &amp;Tresnak...</control>
     <control lang="eu" key="IDC_WIPE_CACHE">&amp;Memoria ezabatu</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="eu" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Gogoko Bolumenak</control>
     <control lang="eu" key="IDD_HOTKEYS_DLG">VeraCrypt - Sistema osoaren tekla bereziak</control>
     <control lang="eu" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="eu" key="IDM_CREATE_HIDDEN_OS">Ezkututako sistema eragilea sortu...</control>
     <control lang="eu" key="IDM_CREATE_RESCUE_DISK">Salbatze diska sortu...</control>
     <control lang="eu" key="IDM_CREATE_VOLUME">Bolumen berria sortu...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="eu" key="IDM_DEFAULT_KEYFILES">Lehenetsitako gako-fitxategiak...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="eu" key="IDM_DONATE">Orain eman...</control>
     <control lang="eu" key="IDM_ENCRYPT_SYSTEM_DEVICE">Sistemaren partizioa/diska zifratu...</control>
     <control lang="eu" key="IDM_FAQ">Maiz egindako galderak</control>
@@ -243,6 +254,7 @@
     <control lang="eu" key="IDM_UNMOUNT_VOLUME">Bolumena desmuntatu</control>
     <control lang="eu" key="IDM_VERIFY_RESCUE_DISK">Salbatze diska egiaztatu</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>
     <control lang="eu" key="IDM_VOLUME_WIZARD">Bolumenak sortzeko laguntzailea</control>
     <control lang="eu" key="IDM_WEBSITE">VeraCrypt-en web orria</control>
@@ -487,7 +499,11 @@
     <string lang="eu" key="FORMAT_FINISHED_HELP">\n\nVeraCrypt bolumena sortu egin da eta erabiltzeko prest. TrueCryp bolumen berri bat egin nahi baduzu Hurrengoa sakatu. Bestela Irten klikatu.</string>
     <string lang="eu" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nEzkutuko bolumena sortu egin da (ezkutuko sistema eragilea ezkutuko bolumenean egongo da).\n\n "Hurrengoa" klikatu jarraitzeko.</string>
     <string lang="eu" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Bolumena Guztiz Zifratu Da</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="eu" key="NONSYS_INPLACE_ENC_FINISHED_INFO">GARRANTZITSUA: ORAIN SORTU DUZUN VERACRYPT BOLUMEN HAU MUNTATU ETA HAN DAUDEN DATUAK IRAKURTZEKO, 'Gailuak Auto-Muntatu' KLIKATU TRUECYPT-EN LEHIO NAGUSIAN. Pasahitz (edo/eta gako-fitxategi) zuzena sartu eta gero, bolumena VeraCrypt-en lehio nagusiko zerrendan hautatutako unitate letrarekin muntatuko da (eta zifratutako datuak irakurri ahal izango dituzu unitate letra horren bitartez).\n\nMESEDEZ AIPATUTAKO PAUSOAK GOGORATU EDO IDATZI ITZAZU. BOLUMENA MUNTATU ETA DATUAK IRAKURRI NAHI DITUZUN BAKOITZEAN JARRAITU BEHAR IZANGO DITUZU. Alternatiboki, VeraCrypt-en lehio nagusian, 'Gailua Aukeratu' botoian klik egin, partizioa/bolumena hautatu eta 'Muntatu' klikatu.\n\nPartizioa/Bolumena arazorik gabe zifratu da (guztiz zifratutako VeraCrypt bolumena dauka orain) eta erabiltzeko prest dago.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="eu" key="FORMAT_FINISHED_INFO">VeraCrypt bolumena sortu egin da.</string>
     <string lang="eu" key="FORMAT_FINISHED_TITLE">Bolumena Sortu Da.</string>
     <string lang="eu" key="FORMAT_HELP">GARRANTZITSUA: Zure xagua ahalik eta ausazkoen mugitu ezazu lehio honen barruan. Zenbat eta gehiago, hobeto. Honek gakoaren zifraketa boterea asko indartzen du. Gero 'Formatatu' sakatu bolumena sortzeko.</string>
@@ -525,6 +541,7 @@
     <string lang="eu" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Errore bat jazo da sistemaren enkripzio egoera irakurtzen ari zenean.</string>
     <string lang="eu" key="INIT_SYS_ENC">Ezin izan dira aplikazioaren osagaiak hasieratu sistema zifratzeko.</string>
     <string lang="eu" key="INIT_RAND">Ausazko zenbakien sortzailea hasieratzerakoan hutse egin du!</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="eu" key="INIT_REGISTER">Ezin izan da aplikazioa hasieratu. 'Dialog Class'-a erregistratzerakoan huts egin du.</string>
     <string lang="eu" key="INIT_RICHEDIT">Errorea: Ezin izan da Rich Edit sistemaren liburutegia kargatu.</string>
     <string lang="eu" key="INTRO_TITLE">VeraCrypt Bolumenak Sortzeko Laguntzailea</string>
@@ -537,6 +554,7 @@
     <string lang="eu" key="MOUNT_BUTTON">&amp;Muntatu</string>
     <string lang="eu" key="NEW_VERSION_REQUIRED">Bolumen hau muntazteko VeraCrypt-en bertsio berriago bat behar da.</string>
     <string lang="eu" key="VOL_CREATION_WIZARD_NOT_FOUND">Errorea: Bolumenak Sortzeko Laguntzailea ez da aurkitu.\n\nZiurta zaitez 'VeraCrypt Format.exe' fitxategia 'VeraCrypt.exe' abiatu zeneko karpeta berdinean dagoela. Ez badago, VeraCrypt berriro instalatu, edo zure diskan 'VeraCrypt Format.exe' aurkitu eta exekutatu.</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="eu" key="NEXT">&amp;Hurrengoa &gt;</string>
     <string lang="eu" key="FINALIZE">&amp;Bukatu</string>
     <string lang="eu" key="INSTALL">&amp;Instalatu</string>
@@ -544,6 +562,7 @@
     <string lang="eu" key="NODRIVER">Ezin izan da VeraCrypt gailu kontrolatzailera konektatu. VeraCrypt ez dabil gailuaren kontrolatzailea martxan ez badago.\n\nOhartu zaitez, Windowsen arazo batengatik, beharrezkoa izan daitekela sesioa amaitzea edo ordenagailua berrabiatzea unitate kontrolatzaile kargatu ahal izan baino lehen.</string>
     <string lang="eu" key="NOFONT">Letra-tipoak kargatzerakoan/prestatzerakoan errore bat gertatu da.</string>
     <string lang="eu" key="NOT_FOUND">Unitatearen letra ez da aurkitu edo ez da letrarik zehaztu.</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="eu" key="DRIVE_LETTER_UNAVAILABLE">Unitatearen letra ez dago eskuragarri.</string>
     <string lang="eu" key="NO_FILE_SELECTED">Ez da fitxategirik hautatu!</string>
     <string lang="eu" key="NO_FREE_DRIVES">Ez daude unitate letra gehiago eskuragarri.</string>
@@ -563,15 +582,18 @@
     <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_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="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="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="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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="eu" key="IDD_PCDM_CHANGE_PKCS5_PRF">Goiguruaren Gakoa Lortzeko Algoritmoa Ezarri</string>
     <string lang="eu" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Bolumenari Gako-fitxategiak Gehitu/Kendu</string>
     <string lang="eu" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Gako-fitxategi Guztiak Bolumenatik Kendu</string>
-    <string lang="eu" key="PASSWORD_CHANGED">Pasahitza edo/eta gako-fitxategia(k) aldatu egin da/dira.\n\nGARRANTZITSUA: Ziurtatu zaitez VeraCrypt-en Erabiltzaile Gidaren 'Sekurtasun Baldintzak eta Neurriak' kapituloko 'Pasahitzak eta gako-fitxategiak aldatzen' atala irakurri duzula.</string>
+    <string lang="eu" key="PASSWORD_CHANGED">Pasahitza, PIM edo/eta gako-fitxategia(k) aldatu egin da/dira.\n\nGARRANTZITSUA: Ziurtatu zaitez VeraCrypt-en Erabiltzaile Gidaren 'Sekurtasun Baldintzak eta Neurriak' kapituloko 'Pasahitzak eta gako-fitxategiak aldatzen' atala irakurri duzula.</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="eu" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">GARRANTZITSUA: VeraCrypt-en Salbatze Diska txikitu ez baduzu, zure sistemaren partizio/unitatea oraindik pasahitz zaharrarekin argitu daiteke (VeraCrypt-en Sablatze Diskarekin sistema abiatuz eta pasahitz zaharra sartuz). VeraCrypt Salbatze Diska berri bat sortu eta zaharra txikitu beharko zenuke.\n\nVeraCrypt Salbatze Diska berri bat sortu nahi al duzu?</string>
     <string lang="eu" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Ohartu zaitez VeraCrypt-en Salbatze Diskak oraindik algoritmo zaharra erabiltze duela. Algoritmo zaharra segurua ez dela iruditzen bazaizu, VeraCrypt Salbatze Diska berri bat sortu eta gero zaharra txikitu beharko zenuke.\n\nVeraCrypt Salbatze Diska berri bat sortu nahi al duzu?</string>
     <string lang="eu" key="KEYFILES_NOTE">Edozein fitxategi mota erabili daiteke (adibidez, .mp3, .jpg, .zip, .avi) VeraCrypt gako-fitxategi bezala. Kontutan hartu ezazu VeraCrypt-ek ez duela fitxategiaren edukia aldatzen. Karpeta bat aukeratzen baduzu, bertan dauden ezkutu gabeko fitxategi guztiak erabiliko dira gako-fitxategi moduan. 'Agiri Fitxategiak Gehitu' sakatu ezazu segurtasun agiri edo txartel azkarren barruan gordeta dauden gako-fitxategiak aukeratzeko (edo gako-fitxategiak sekurtasun agiri edo txartel azkarretara eramteko).</string>
@@ -580,6 +602,7 @@
     <string lang="eu" key="PKCS5_PRF_CHANGED">Goiburua lortzeko algoritmoa zuzenki ezarri da.</string>
     <string lang="eu" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">Mesedez, bertan zifratzeko prozesua berrabiatu nahi duzun sistemakoa ez den bolumenaren pasahitz edo/eta gakofitxategiak sartu itzazu.\n\n\nOharra: 'Hurrengoa' sakatu eta gero, VeraCrypt-ek  sistemakoak ez diren bolumenak, non zifraketa prozesua eten den eta VeraCrypt-en bolumenaren goiburua emandako pasahitz edo/eta gako fitxategiekin argitu deitekeen, bilatuko ditu. Horrelako bolumen bat baino gehiago badago, hurrengo pausoan haietako bat aukeratu beharko duzu.</string>
     <string lang="eu" key="NONSYS_INPLACE_ENC_RESUME_VOL_SELECT_HELP">Mesedez, zerrendako bolumen bat aukeratu ezazu. Zerrenda erabili daitezkeen sistemakoak ez diren boluemenak, non zifraketa eten egin den eta goiburua emandako pasahitz eta/edo gako fitxategiarekin argitu daitezkenak, daude.</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="eu" key="PASSWORD_HELP">Oso garratzitsua da pasahitz ona aukeratzea. Hiztegi batean agertu daitekeen hitz bakar bat (edo horrelako 2,3 edo 4 hitzen konbinazioa) ez zenuke aukeratu behar. Ez luke izenik edo jaiotze datik ezan behar. Ez litzateke asmatzeko erraza izan behar. Pasahitz on bat letra larri eta xehe, zenbaki eta karaktere berezien (@ ^ = $ * + e.a.) ausazko konbinaketa da. 20 karaktere baino gehiagokoa (hainbat eta luzeago, hobeto) izatea gomendatzen dugu. Gehienezko luzeera 64 karaktere dira.</string>
     <string lang="eu" key="PASSWORD_HIDDENVOL_HELP">Mesedez, ezkutuko bolumenarentzat pasahitza aukeratu </string>
     <string lang="eu" key="PASSWORD_HIDDEN_OS_HELP">Mesedez, ezkutuko sistema eragilearentzat pasahitza aukeratu (hau da, ezkutuko bolumenarentzat). </string>
@@ -599,11 +622,26 @@
     <string lang="eu" key="PASSWORD_WRONG_AUTOMOUNT">Pasahitz okerra edo ez da VeraCrypt bolumenik aurkitu.</string>
     <string lang="eu" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Gako-fitxategi/pasahitz ez zuzena edo ez da VeraCrypt bolumena aurkitu.</string>
     <string lang="eu" key="PASSWORD_WRONG_CAPSLOCK_ON">\n\nKontuz: Caps Lock gaituta dago. Honek pasahitza gaizki sartzea eragin dezake.</string>
+    <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
+    <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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="eu" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nKONTUZ: Ezkutuko fitxategiak aurkitu dira gako-fitxategiak bilatzeko helbidean. Honako ezkutuko fitxategiak ezin dira gako-fitxategi moduan erabili. Gako-fitxategi moduan erabili nahi badituzu, 'Ezkututa' ezaugarria kendu iezaiezu (eskubiko klik egin, 'Ezaugarriak' aukeratu, 'Ezkututa' marka kendu eta 'Ados' sakatu). Oharra: Ezkutuko fitxategiak hori egiteko aukera gaituta badago bakarrik ikus daitezke (Ordenagailua &gt; Kudeatu &gt; Karpeta eta Bilaketa Aukerak &gt; Ikusi).</string>
     <string lang="eu" key="HIDDEN_VOL_PROT_PASSWORD_US_KEYB_LAYOUT">Ezkutuko sistema baten barruan dagoen ezkutuko bolumen bat babesten saiatzen ari bazara, ziurtatu zaitez US teklatu estandarra erabiltzen ari zarela pasahitza idazteko. Hau beharrezkoa da pasahitza hasieraketa aurreko giroan (Windows hasi aurretik) sartu behar delako eta bertan US teklatuak ez diren teklatu motak ez dutelako balio.</string>
     <string lang="eu" key="FOUND_NO_PARTITION_W_DEFERRED_INPLACE_ENC">VeraCrypt-ek ez du aurkitu bolumenik non sistemakoa ez den zifraketa eten den eta bolumenaren goiburua emandako pasahitz edo gako-fitxategiarekin argitzen dena..\n\n Mesedez, ziurta zaitez pasahitza edo/eta gako fitxategiak zuzenak direla eta partizioa/bolumena erabiltzen ari den prozesurik ez dagoela (Antibirusa barne).</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="eu" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nOharra: Hasieraketa aurreko kautotzerik gabeko sistemaren unitate zifratu baten barruan dagoen partizio bat edo erabiltzen ari ez den zifratutako sistema eragile bat muntatzen saiatzen ari bazara, hori egin dezakezu 'Sistema' &gt; 'Muntatu Hasieraketa Aurreko Kautotzerik Gabe' aukeratuz.</string>
     <string lang="eu" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">Modu honetan, ezin duzu muntatu orango sistemaren zifraketaren gakoaren eremuan dagoen unitate batean dagoen partizioa.\n\nPartizio hau modu honetan muntatu baino lehen, beste unitate batean dagoen sistema eragilea (zifratu edo zifratu gabe) edo zifratu gabeko sistema eragile bat abatu behar duzu.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <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>
@@ -703,11 +741,18 @@
     <string lang="eu" key="FOR_MORE_INFO_ON_PARTITIONS">Partizioak nola sortu eta kudeatzeko informazioa lortzeko, zure sistema eragilearekin datorren dokumentazioa irakurri ezazu edo zure ordenagailuaren saltzailearen zerbitzu teknikoarekin harremanetan jarri zaitez laguntza eske.</string>
     <string lang="eu" key="SYSTEM_PARTITION_NOT_ACTIVE">Errorea: Martxan dagoen sistema eragilea ez dago hasieraketa partizioan instalatuta (lehendabiziko partizio aktiboa). Hau ez da onartzen.</string>
     <string lang="eu" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">VeraCrypt bolumen honetan 4GB baino gehiagoko fitxategiak gordetzeko asmoa zeneukala adierazi duzu. Hala ere, FAT fitxategi sistema aukeratu duzu, zein ez duen 4GB baino gehiagoko fitxategirik onartzen.\n\nZiur zaude bolumena FAT moduan formatatu nahi duzula?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="eu" key="CANT_ACCESS_VOL">Errorea: Ezin da bolumena aurkitu!\n\nZiurtatu zaitez bolumena esistitzen dela, muntatuta ez dagoela, ez dagoela beste aplikaziorik edo sistemarik hori erabiltzen, bolumenean irakurri eta idazteko beimanak dituzula eta ez dagoela idazketaren aurka babesturik.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="eu" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Errorea: Ezin da bolumena aurkitu eta/edo bolumenari buruzko informazioa lortu.\n\nZiurtatu zaitez bolumena esistitzen dela, ez dagoela beste aplikaziorik edo sistemarik hori erabiltzen, bolumenean irakurri eta idazteko beimanak dituzula eta ez dagoela idazketaren aurka babesturik.</string>
     <string lang="eu" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Errorea: Ezin izan da bolumenera irakurri edo/eta hari buruzko informazioa lortu. Ziurtatu zaitez bolumena esistitzen dela, erabiltzen ari den sistema eta aplikaziorik ez dagoela, bolumenean irkurri eta idazteko baimena duzula eta idazketaren aurkako babesik ez duela.\n\nArazoak jarraitzen badu, hurrengo pausoak jarraitzeak lagundu dezake.</string>
     <string lang="eu" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">Errore batek partizioaren zifraketa eragotzi du. Adierazitako erroreak konpontzen saiatu zaitez eta berriro saiatu. Arazoek jarraitzen badute, hurrengo instrukzioak jarraitzeak lagundu dezake.</string>
     <string lang="eu" key="INPLACE_ENC_GENERIC_ERR_RESUME">Errore batek partizioaren zifratze prozesuaren jarraipena eragotzi du.\nMesedez, hau baino lehen arazorik aipatu badira, hauek konpontzen saiatu eta berriz prozesua jarratzen saiatu zaitez. Ohartu zaitez bolumena ezin dela muntatu guztiz zifratuta dagoen arte.</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="eu" key="CANT_DISMOUNT_OUTER_VOL">Errorea: Ezin izan da kanpoko bolumena desmuntatu!\n\nBolumena ezin da desmuntatu sistemak edo programek han dauden fitxategi edo karpetak erabiltzen ari badira.\n\nMesedez, bolumenean dauden fitxategiak edo karpetak erabiltzen ari daitekeen programak itxi eta 'Berriro Saiatu klikatu.</string>
     <string lang="eu" key="CANT_GET_OUTER_VOL_INFO">Errorea: Ezin izan da kanpoko bolumenari buruz informazioa eskuratu.\nBolumenaren sorrerak ezin du jarraitu.</string>
     <string lang="eu" key="CANT_ACCESS_OUTER_VOL">Errorea: Ezin izan da kanpoko bolumenara heldu! Bolumenaren sorrerak ezin du jarraitu.</string>
@@ -792,7 +837,7 @@
     <string lang="eu" key="TC_INSTALLER_IS_RUNNING">VeraCrypt-en instalatzailea dagoeneko martxan dago sistema honetan instalazio bat egiten edo prestatzen edo VeraCrypt-en eguneraketa batekin. Jarraitu baino lehen, mesedez, bukatzen den arte itxaron ezazu edo itxi ezazu. Ezin baduzu itxi, mesedez, zure ordenagailua berrabiatu ezazu jarraitu baino lehen.</string>
     <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 www.veracrypt.org).</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="EXTRACTING_VERB">Ateratzen</string>
     <string lang="eu" key="CANNOT_READ_FROM_PACKAGE">Ezin da paketeko informazioa irakurri.</string>
@@ -979,6 +1024,7 @@
     <string lang="eu" key="CONFIRM_EXIT_UNIVERSAL">Irten?</string>
     <string lang="eu" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt-ek ez dauka informazio nahikoa jakiteko zifratu edo argitu behar duen.</string>
     <string lang="eu" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt-ek ez dauka informazio nahikoa jakiteko zifratu edo argitu behar duen. Oharra: Hasieraketa-aurreko ingurunean sistemaren unitatea/partizioa argitu baduzu, agian prozesua bukatu behar izango duzu 'Argitu' sakatuz.</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="eu" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">Partizio/bolumenaren zifratze prozesua eten eta gerorako utzi nahi al duzu?\n\nOharra: Kontuan izan ezazu ezin izango duzula bolumena muntatu guztiz zifratuta dagoen arte. Prozesua jarraitzeko aukera izango duzu eta hau gelditu zen tokian hasiko da berriz. Hori egiteko, adibidez, 'Bolumenak' &gt; 'Etendako Prozesua Jarraitu' aukeratu ezazu VeraCrypt lehio nagusiaren menuan.</string>
     <string lang="eu" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Sistemaren partizo/unitatearen zifratze prozesua eten eta gerorako utzi nahi al duzu?\n\nOharra: Prozesua jarraitzeko aukera izango duzu eta hau gelditu zen tokian hasiko da berriz. Hau egin dezakezu 'Sistema' &gt; 'Etendako Prozesua Jarraitu' aukeratuz VeraCrypt lehio nagusiaren menuan. Zifratze prozesua bertan behera utzi nahi baduzu edo zifratze prozesua desegin nahi baduzu, 'Sistema'  &gt; 'Sistemaren Partizio/Unitatea Betirako Argitu' aukera hautatu ezazu.</string>
     <string lang="eu" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Sistemaren partizioaren/unitatearen argitze prozesua eten nahi duzu eta gerorako utzi?\n\nOharra: Prozesua jarraitu ahal izango duzu eta gelditu den tokian jarraituko du. Hori egin dezakezu, adibidez, 'Sistema' &gt; 'Etendako Prozesua Jarraitu' VeraCrypteko lehioko menuan aukeratuz. Argitze prozesua desegin nahi baduzu (eta zifratzen hasi) 'Sistema' &gt; 'Sistemaren Partizioa/Unitatea Zifratu' aukeratu ezazu.</string>
@@ -988,6 +1034,7 @@
     <string lang="eu" key="FAILED_TO_START_WIPING">Errorea: Ezabatze prozesua hasterakoan huts egin du.</string>
     <string lang="eu" key="INCONSISTENCY_RESOLVED">Datuen hutsala konpondu da.\n\n\n(Akats honen berri ematen baduzu, mesedez hurrengo informazioa gehitu ezazu akatsaren txostenean:\n%hs)</string>
     <string lang="eu" key="UNEXPECTED_STATE">Errorea: ustekabeko egoera.\n\n\n(Akats honi buruz txosten bat bidaltzen baduzu, mesedez, hurrengo informazio teknikoa erantsi iezaiozu akatsaren txostenari:\n%hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="eu" key="NOTHING_TO_RESUME">Ez dago jarraitzeko prozesu edo lanik.</string>
     <string lang="eu" key="HIDVOL_PROT_BKG_TASK_WARNING">KONTUZ: TruekCrypt-en Ezkutuko Ataza ezgaituta dago.VeraCrypt-etik atera eta gero informatuko zaizu ezkutuko bolumenaren kaltea eragotzi den.\n\nOharra: VeraCrypt-en Ezkutuko Ataza edozein momentutan gelditu dezakezu VeraCrypt erreteiluko ikonoan eskubiko klik eginez eta 'Irten' aukeratuz.\n\n VeraCrypt-en Ezkutuko Ataza gaitu?</string>
     <string lang="eu" key="LANG_PACK_VERSION">Hizkuntza paketearen bertsioa: %s</string>
@@ -1015,6 +1062,7 @@
     <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>
     <string lang="eu" key="ERROR_MBR_PROTECTED">MBR sektorea idazterakoan huts egin du.\n\nZure BIOSAK agian MBR sektorea babesteko konfiguratuta dago. Zure BIOS-aren konfigurazioa begiratu ezazu (zure ordenagailua abiatu bezain laister F2, SUPR edo ESC sakatuz) MBR/antibirus babesen bila.</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="eu" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">Beharrezkoa den TrueCryp-en Hasieraketa Kargatzailearen bertsioa ez dago instalatuta. Honek ezarpen batzuk ez gordetzea ekar dezake.</string>
     <string lang="eu" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Oharra: Zenbait kasuetan ordenagailua abiatzen zauden bitartean pertsona bat zuri begira badago (arerioa) eta ez duzu VeraCrypt erabiltzen duzula jakinarazi nahi. Goiko aukerek VeraCrypt Hasieraketa Kargatzailearen lehioa pertsonalizatzeko aukera ematen dizute. Lehendabiziko aukera gaitzen baduzu, ez dira testurik erakutsiko hasieraketa kargatzailean (ezta pasahitza gaizki sartu duzularen mezua ere). Ordenagailua "izoztuta" (ezer egin gabe) balego bezala agertuko da pasahitza sartzen duzun bitartean. Gaineara neurrira egindako mezu bat agertu daiteke arerioa nahasteko. Adibidez, gezurrezko errore mezu bat, adibidez "Sistema Eragilerik Ez Dago" ("Missing operating system", testu hau normalean Windowsen hasieraketa kargatzaileak erakusten du Windows hasieraketa partiziorik ez dagoenean). Hala ere, garrantzisua da jakitea arerio batek disko gogorraren edukia arakatu baldin badezake, VeraCrypt Hasieraketa Kargatzailea hor dagoela aurkitu dezakela.</string>
     <string lang="eu" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">KONTUZ: Ohartu zaitez aukera hau gaitzen baduzu, VeraCrypt Hasieraketa Kargatzaileak ez duela testurik erakutsiko (ezta pasahitz okerra sartzen duzunean). Ordenagailua "izoztuta" (ezer egin gabe) balego bezala agertuko da pasahitza sartzen duzun bitartean (kursorea ez da mugituko eta ez da izartxorik agertuko tekla zapaltzerakoan).\n\nZiur zaude aukera hau gaitu nahi duzula?</string>
@@ -1036,8 +1084,11 @@
     <string lang="eu" key="EXTRA_BOOT_PARTITION_REMOVAL_INSTRUCTIONS">\nAbiatze partizio gehigarria Windows instalatu aurretik kendu daiteke. Hori egitueko, hurrengo pausoak jarraitu itzazu:\n\n1) Zure Windows instalatze diska abiatu ezazu.\n\n2) Windows instalatzailearen lehioan 'Orain Instalatu' &gt; 'Pertsonalizatua (aurreratua)' aukeratu.\n\n3) 'Unitate Aukerak' sakatu ezazu.\n\n4) Sistemaren partizio nagusia aukeratu eta ezabatu ezazu 'Ezabatu' eta 'Ados'-en klik eginez.\n\n5) 'Sistemaren Erreserbatua' partizioa aukeratu ezazu eta 'Hedatu' aukeratu ezazu, ondoren, berre tamaina handitu ezazu bertan sistema eragilea instalatu ahal izan dadin.\n\n6) 'Aplikatu' eta 'Ados'-en klik egin ezazu.\n\n7) 'Sistemaren Erreserbatua' partizioan Windows instalatu ezazu.\n\nErasotzaile batek Abiatze partizio gehigarria ezabatzeari buruz galdetzen badizu, zifratu gabeko abiatze partiziora daturik ez galtzearren egin duzula erantzun diezaiokezu.\n\nOharra: Testu hau inprimatu dezakezu azpian dagoen 'Inprimatu' botoian klik eginez. Testu honen kopia bat gorde edo inprimatzen baduzu (hau gogor gomendatzen da, zure inprimagailuak inprimitzen dituen dokumentuen kopia bere barneko memorian gordetzen ez baditu), abiatze partizio gehigarria ezabatu eta gero kopia horiek suntsitu beharko zenituzke (bestela, kopia hori aurkituko balitz, ordenagailu honetan ezkutuko sistema eragile bat dagoelaren susmoa eman dezake).</string>
     <string lang="eu" key="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">Kontuz: Alokatu gabeko tarte bat dago sistemaren partizioa eta haren hurrengo partizioaren artean. Ezkutuko sistema eragilea sortu eta gero ezin izango duzu tarte horretan partizio berririk egin. Bestela, ezin izango da ezkutuko sistema eragilea hasieratu (partizio berri horiek ezabatu arte).</string>
     <string lang="eu" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Algoritmo honek momentuz ez du balio sistema zifratzeko .</string>
-	<string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="eu" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Momentuz ezin dira gako-fitxategiak erabili sistema zifratzeko.</string>
     <string lang="eu" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Kontuz: VeraCrypt-ek ezin izan du teklatua diseinu originaera leheneratu. Honek pasahitza gaizki sartzea ekar dezake.</string>
     <string lang="eu" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Errorea: Ezin da VeraCrypt-entzat teklatuaren diseinua aldatu EB teklatu estandar diseinura.\n\nOhartu zaitez pasahitza hasieraketa aurreko ingurunean (Windows hasi aurretik) sartu behar dela eta bertan EB-etako teklatu diseinuak ez daudela eskuragarri. Horregatik, pasahitza beti sartu behar da EB-etako teklatu estandarraren diseinuarekin.</string>
@@ -1122,6 +1173,7 @@
     <string lang="eu" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">Aurre-proba arazorik gabe bukatu da.\n\nKONTUZ: Argindarra bat-batean mozten bada bertan zifraketa egiten den bitartean, edo sistema eragileak errore bat ematen badu software edo hardware akats batengatik bertan zifraketa egiten den bitartean, datu zatiak hondatu edo galduko dira. Horregatik, zifratzen hasi aurretik, ziurtatu zaitez zifratu nahi dituzun fitxategien babeskopiak dituzula. Ez badituzu, mesedez, haien babeskopiak orain egin itzazu ('Atzeratu' sakatu dezakezu, fitxategien babeskopia egin, eta ondoren, edozein momentutan berriz VeraCrypt abiatu eta 'Sistema' &gt; 'Etendako Prozesua Jarraitu' aukeratu zifratze prozesuarekin jarraitzeko).\n\nPrest zaudenean 'Zifratu' klikatu ezazu zifratzen hasteko.</string>
     <string lang="eu" key="SYSENC_ENCRYPTION_PAGE_INFO">Edozein momentutan Eten edo Atzeratu botoiak klikatu ditzakezu zifratze edo argitze prozesua eteteko, laguntzaile honetatik irten, ordenagailua iztali edo berrabiatu eta, ondoren, prozesua jarraitu, hau automatikoki gelditu zen tokitik jarraituko du. Sistemak edo aplikazioak sistemaren unitatean datuak irakurri edo idazterakoan mantxotze bat gerta ez dadin, VeraCrypt-ek automatikoki itxaroten du datuak idatzi edo irakurtzen diren arte (goian dagoen Egoera begiratu ezazu) eta ondoren automatikoki zifratzen edo argitzen jarraituko du.</string>
     <string lang="eu" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nEdozein momentutan Eten edo Atzeratu klikatu dezakezu zifratze prozesua eteteko, laguntzaile honetatik irten, zure ordenagailua itzali edo berrabiatu, eta ondoren prozesuarekin jarraitu, honek eten zen puntutik jarraituko du. Ohartu zaitez bolumena ezin izango dela muntatu guztiz zifratuta dagoen arte.</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="eu" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Ezkutuko Sistema Hasi da</string>
     <string lang="eu" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Jatorrizko Sistema</string>
     <string lang="eu" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windowsek (normalean erabiltzailearen ezagutza eta baimenik gabe) log fitxategi, behin behineko fitxategiak e.a. sistemaren partizioan sortzen ditu. Horretaz gain RAM memoriaren edukia gordetzen du hibernatzerakoan eta baita sistemaren partizioan dauden paginatze fitxategiak ere. Horregatik, arerio batek sistema originalean (noren ezkutuko sistema klon bat den) dauden fitxategiak arakatzen baditu, VeraCrypt laguntzailea ezkutuko sistema sortzeko moduan erabili zela jakin dezake (eta horrek ezkutuko sistema eragile bat esistitzen delaren seinale izan daiteke).\n\nArazo horiek eragozteko, hurrengo pausoetan VeraCrypt-ek sekurtasunez ezabatuko du sistema originala ostatzen duen partizioa. Hori eta gero, ezeztapen onargarria lortzeko, sistema berri bat instalatu eta zifratu beharko duzu. Horrekin sistema amua sortuko duzu eta sistema eragile ezkutua sortzeko prozesua bukatuta egondo da.</string>
@@ -1161,7 +1213,7 @@
     <string lang="eu" key="HIDDEN_OS_CREATION_PREINFO_HELP">Hurrengo urratsetan VeraCrypt ezkutuko sistema eragile berria sortuko du sistemaren partizioa ezkutuko bolumenera kopiatuz (kopiatutako datuak segidan zifratuko dira sistema amu bezala dagoen sistema eragileak daukan gako ezberdinarekin).\n\nKontutan izan ezazu prozesu hau hasieraketa aurreko ingurunean (Windows hasi aurretik) egingo dela eta asko iraun dezakela; orduak edo egunak (sistemaren partizioaren tamaina eta ordenagailuaren potentziaren arabera).\n\nProzesua bertan bera uzti ahal izango duzu ordenagailua itzaliz, sistema eragilea hasieratu eta prozesua jarraitu. Hala ere, prozesua mozten baduzu, sistema kopiatzeko prozesu guztia haieratik hasi behar izando da berriro (sistemaren partizioaren edukia ezin daitekeelako aldatu klonatze prozesua martxan dagoenean).</string>
     <string lang="eu" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Ezkutuko sistema eragilearen sortzeko prozesua bertan behera utzi nahi al duzu?n\nOharra: Orain uzten baduzu ezingo diozu prozesuari berrekin.</string>
     <string lang="eu" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Sistema zifratzeko aurre-azterketa bertan behera utzi nahi al duzu?</string>
-    <string lang="eu" key="BOOT_PRETEST_FAILED_RETRY">VeraCrypt-en sistema zifratzeko aurre-azterketak huts egin du. Berriz saiatu nahi duzu?\n\n'Ez' aukeratzen baduzu, hasieraketa aurreko kautotze osagarria desinstalatuko da.\n\nOharrak:\n\n- VeraCrypt Hasieraketa Kargatzaileak ez badizu pasahitzik eskatu Windows hasi aurretik, agian zure sistema eragilea ez da abiatzen instalatuta dagoen unitatetik. Hori ez dago onartua.\n\n- AES ez den zifraketa algoritmo bat erabili baduzu eta aurre-azterketak huts egin badu (eta pasahitza sartu duzu), gaizki diseinatuta dagoen erabiltzaile baten errua izan daiteke. 'Ez' aukeratu ezazu eta sistemaren partizio/unitatea berriz zifratzen saiatu zatez, baina oraingoan AES zifratze algoritmoa erabiliz (zeinek memoria behar baxuenak dituen).\n\n- Zergati eta konponbide gehiago ikusteko: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="eu" key="BOOT_PRETEST_FAILED_RETRY">VeraCrypt-en sistema zifratzeko aurre-azterketak huts egin du. Berriz saiatu nahi duzu?\n\n'Ez' aukeratzen baduzu, hasieraketa aurreko kautotze osagarria desinstalatuko da.\n\nOharrak:\n\n- VeraCrypt Hasieraketa Kargatzaileak ez badizu pasahitzik eskatu Windows hasi aurretik, agian zure sistema eragilea ez da abiatzen instalatuta dagoen unitatetik. Hori ez dago onartua.\n\n- AES ez den zifraketa algoritmo bat erabili baduzu eta aurre-azterketak huts egin badu (eta pasahitza sartu duzu), gaizki diseinatuta dagoen erabiltzaile baten errua izan daiteke. 'Ez' aukeratu ezazu eta sistemaren partizio/unitatea berriz zifratzen saiatu zatez, baina oraingoan AES zifratze algoritmoa erabiliz (zeinek memoria behar baxuenak dituen).\n\n- Zergati eta konponbide gehiago ikusteko: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="eu" key="SYS_DRIVE_NOT_ENCRYPTED">Sistemaren partizioa/unitatea ez dirudi zifratuta dagoenik (ez zati bat, ez guztiz).</string>
     <string lang="eu" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">Zure sistemaren partizioa/unitatea (zatika edo guztiz) zifratuta dago.\n\nMesedez, sistemaren partizio/unitate osoa argitu jarraitu aurretik. Hori egiteko, 'Sistema' &gt; 'Sistemaren Partizioa/Unitatea Betirako Argitu' aukeratu VeraCrypt lehio nagusiaren menuan.</string>
     <string lang="eu" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">Sistemaren partizioa/unitatea (zatika edo guztiz) zifratuta dagoenean, ezin zara VeraCrypt-en bertsio zahar batera aldatu (baina berri bat instalatu edo martxan dagoena berrinstalatu bai).</string>
@@ -1178,6 +1230,8 @@
     <string lang="eu" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">Sistemaren partizio/unitatea (edo hasieraketa partizioa) aukeratu duzu, baina aukeratu duzun laguntzailearen moduan bakarrik sistemakoak ez diren partizio/unitateekin dabil.\n\nHasieraketa aurreko kautotzea ezarri nahi (honek esan nahi du Windows abiatzen den bakoitzean zure pasahitza sartu beharko duzula) eta sistemaren partizio/unitatea zifratu?</string>
     <string lang="eu" key="CONFIRM_DECRYPT_SYS_DEVICE">Ziur zaude sistemaren partizioa/unitatea betirako argitu nahi duzula?</string>
     <string lang="eu" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">KONTUZ: Sistemaren partizio/unitatea betirako argitzen baduzu, bertan zifratu gabeko datuak idatziko dira.\n\nBenetan ziur zaude sistemaren partizio/unitatea betirako argitu nahi duzula?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
     <string lang="eu" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Kontuz: Sistema zifratzeko zifraketa algoritmo kaskada erabiltzen baduzu, hondorengo arazoak aurkitu ditzakezu:\n\n1) VeraCrypt-en Hasiera Kargatzailea ohi baino handiagoa da, eta horregatik, ez dago tokirik unitatearen lehendabiziko pistan VeraCrypt Hasieraketa Kargatzailearen babeskopiarentzat. Horregatik, hau hondatzen bada (eta hau maiz gertatzen da, adibidez, programa batzuk dituzten gaizki diseinatuta dauden pirateriaren aurkako aktibatze moduak, VeraCrypt Salbatze Diska erabili beharko duzu abiatzeko edo VeraCrypt Hasieraketa Kargatzailea konpontzeko.\n\n2) Ordenagailu batzuetan, hibernaziotik bueltatzeko denbora gehiago behar da.\n\nEgon daitezkeen arazo hauek eragotzi daitezke kaskadan ez den algoritmo bat erabiliz (adidbidez, AES).\n\nZiur zaude zifraketa algoritmo kaskada erabili nahi duzula?</string>
     <string lang="eu" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">Aurrean aipatutako arazoren bat badaukazu, partizioa/unitatea argitu (zifratuta badago) eta ondoren berriro saiatu zaitez kaskadan ez den algoritmo batekin zifratzen (AES, adibidez).</string>
     <string lang="eu" key="UPDATE_TC_IN_DECOY_OS_FIRST">KONTUZ: Sekurtasun arrazoiengatik, VeraCrypt ezkutuko sistema eragilean eguneratu baino lehen, sistema eragile amuan eguneratu beharko zenuke.\n\nHori egiteko, sistema amua abiatu eta bertan VeraCrypt instalatzailea abiatu ezazu. Ondoren sistema eragile ezkutua abiatu eta bertan ere instalatzailea abiatu ezazu.\n\nOharra: Sistema amuak eta sistema ezkutuak hasieraketa kargatzaile bera daukate. VeraCrypt bakarrik ezkutuko sisteman eguneratuko bazenu (eta ez sistema amuan), sistema amuak daukan VeraCrypt kontrolatzailearen bertsio zenbakia eta VeraCrypt Abiaketa Kargatzailearen bersio zenbakiak ezberdinak izango lirateke. Ezberdintasun horrek ordenagailuan sistema eragile ezkutu bat dagoelaren seinale izan liteke.\n\nJarraitu nahi al duzu?</string>
@@ -1193,6 +1247,7 @@
     <string lang="eu" key="ENABLE_BAD_SECTOR_ZEROING">Errorea: Diskaren sektore bat edo gehiagoren edukia ezin da irakurri (ziurenik arazo fisiko batengatik).\n\nBertan zifratzeko prozesua sektore hauek irakurri ahal direnean bakarrik jarraituko du. VeraCrypt-ek sektore hauek irakurgarri bihurtu dezake bertan zeroak idatziz (ondorioz, zeroz beteriko blokeak zifratuko dira). Hala ere, ohartu zaitez irakurri ezin daitezkeen sektoreen edukia galduko dela. Hori eragotzi nahi baduzu, hondatuko datuen zati batzuk berreskuratzen saiatu zaitezke hirugarren baten tresna aproposak erabiliz.\n\nOharra: Fisikoki hondatutako sektoreak badira (hau da, datuak hondatu edo egiaztapeneko baturaren errorea ez bada) memoria gailu gehienek hondatutako sektoreetan idazten saiatzerakoan datuak beste tokitan idazten dituzte (ondorioz unitatean hondatutako sektoreen datuak zifratu gabe jarraituko dute).\n\nVeraCrypt-ek zeroak idaztea nahi duzu irakurri ezin diren sektoreetan?</string>
     <string lang="eu" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Errorea: Diskoaren sektore bat edo gehiago ezin dira irakurri (ziurenik akats fisiko batengatik).\n\nArgitze prozesua egin ahal izateko VeraCrypt-ek irakurri ezin daitezkeen sektoreen edukia alde batera utzi beharko du (edukia pseudoausazko datuengatik aldatuko da). Ohartu zaitez, jarraitu aurretik, hondatutako datuen zati bat berreskuratzen saiatu zaitezkeela hirugarren baten tresnak erabiltzen.\n\nVeraCrypt-ek irakurri ezin daitezkeen datuak orain alde batera uztea nahi al duzu?</string>
     <string lang="eu" key="ZEROED_BAD_SECTOR_COUNT">Oharra: VeraCrypt-ek irakurri ezin zitekeen %I64d sektoreen (%s) edukia aldatu du zifratutako zeroz beteriko testu blokeekin.</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="eu" key="ENTER_TOKEN_PASSWORD">'%s' agiriaren pasahitza/PIN-a sartu ezazu:</string>
     <string lang="eu" key="PKCS11_LIB_LOCATION_HELP">VeraCrypt-i sekurtasun agirira edo txartel azkarrera sartzen ahalbidetzeko, agiriaren edo txartel azkarraren PKCS #11 software liburutegia instalatu behar duzu. Libreria hori gailuarekin etorri beharko zen edo saltzailearen edo hirugarren baten weborritik deskargatzeko prest egon beharko liteke.\n\nLiburutegia instalatu eta gero, eskuz aukeratu dezakezu 'Liburutegia Aukeratu'-n sakatuz edo VeraCrypt automatikoki aurkitu dezake 'Liburutegia Auto-Aurkitu'-n sakatuz (bakarrik Windowsen sistemaren karpetan bilatuko da).</string>
     <string lang="eu" key="SELECT_PKCS11_MODULE_HELP">Oharra: zure sekurtasun agiriaren edo txartel azkarraren instalatutako PKCS #11 liburutegiaren izena eta helbidea jakiteko, mesedez agiri, txartel edo hirugarren baten softwarearen dokumentazioa irakurri ezazu.\n\n'Ados' sakatu helbidea eta fitxategi izena aukeratzeko.</string>

Translations/Language.fa.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="fa" name="فارسي" en-name="Persian" version="0.1.0" translators="Ali Bitazar, Rodabeh Sarmadi" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <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="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>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <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="fa" key="IDT_CONFIRM">تاييد:</control>
     <control lang="fa" key="IDT_DONE">انجامشد</control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="fa" key="IDT_ENCRYPTION_ALGO">الگوريتم رمزنگاري</control>
     <control lang="fa" key="IDT_FILESYSTEM">فايل سيستم</control>
     <control lang="en" key="IDT_FILE_CONTAINER">Creates a virtual encrypted disk within a file. Recommended for inexperienced users.</control>
@@ -85,6 +88,8 @@
     <control lang="en" key="IDT_PARTIAL_POOL_CONTENTS">Current pool content (partial)</control>
     <control lang="en" key="IDT_PASS">Pass</control>
     <control lang="fa" 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="en" key="IDT_PROGRESS">Progress:</control>
     <control lang="en" key="IDT_RANDOM_POOL">Random Pool: </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>
@@ -142,6 +147,8 @@
     <control lang="fa" key="IDC_MOUNT_OPTIONS">&amp;تنظيمات فايل سيستم</control>
     <control lang="fa" key="IDC_MOUNT_READONLY">&amp;فايل سيستم فقط خواندني</control>
     <control lang="fa" key="IDC_NEW_KEYFILES">...كليد فايلها</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="fa" key="IDC_PREF_BKG_TASK_ENABLE">فعال است</control>
     <control lang="fa" key="IDC_PREF_CACHE_PASSWORDS">كلمه عبور را در حافظه درايور ذخيره كند</control>
     <control lang="fa" key="IDC_PREF_DISMOUNT_INACTIVE">اگر اطلاعاتي خوانده و يا نوشته نشد فايل سيستم را اتوماتيك ببند</control>
@@ -155,6 +162,7 @@
     <control lang="fa" key="IDC_PREF_MOUNT_READONLY">فايل سيستم فقط خواندني را استارت كند</control>
     <control lang="fa" key="IDC_PREF_MOUNT_REMOVABLE">فايل سيستم را براي درايوهاي جداپذير شروع كند</control>
     <control lang="fa" 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="en" key="IDC_PREF_USE_DIFF_TRAY_ICON_IF_VOL_MOUNTED">Use a different taskbar icon when there are mounted volumes</control>
     <control lang="en" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Wipe cached passwords on auto-dismount</control>
     <control lang="en" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Wipe cached passwords on exit</control>
@@ -167,11 +175,12 @@
     <control lang="en" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Display password</control>
     <control lang="en" key="IDC_TRAVEL_OPEN_EXPLORER">Open &amp;Explorer window for mounted volume</control>
     <control lang="en" key="IDC_TRAV_CACHE_PASSWORDS">&amp;Cache password in driver memory</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="en" key="IDC_UNMOUNTALL">Di&amp;smount All</control>
     <control lang="en" key="IDC_VOLUME_PROPERTIES">&amp;Volume Properties...</control>
     <control lang="en" key="IDC_VOLUME_TOOLS">Volume &amp;Tools...</control>
     <control lang="en" key="IDC_WIPE_CACHE">&amp;Wipe Cache</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
     <control lang="en" key="IDD_HOTKEYS_DLG">VeraCrypt - System-Wide Hot Keys</control>
     <control lang="en" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="en" key="IDM_CREATE_HIDDEN_OS">Create Hidden Operating System...</control>
     <control lang="en" key="IDM_CREATE_RESCUE_DISK">Create Rescue Disk...</control>
     <control lang="en" key="IDM_CREATE_VOLUME">Create New Volume...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="en" key="IDM_DEFAULT_KEYFILES">Default Keyfiles...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="en" key="IDM_ENCRYPT_SYSTEM_DEVICE">Encrypt System Partition/Drive...</control>
     <control lang="en" key="IDM_FAQ">Frequently Asked Questions</control>
@@ -243,6 +254,7 @@
     <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_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>
     <control lang="en" key="IDM_VOLUME_WIZARD">Volume Creation Wizard</control>
     <control lang="en" key="IDM_WEBSITE">VeraCrypt Website</control>
@@ -369,7 +381,7 @@
     <string lang="en" key="ACCESS_DENIED">Error: Access denied.\n\nThe partition you are trying to access is either 0 sectors long, or it is the boot device.</string>
     <string lang="en" key="ADMINISTRATOR">Administrator</string>
     <string lang="en" key="ADMIN_PRIVILEGES_DRIVER">In order to load the VeraCrypt driver, you need to be logged into an account with administrator privileges.</string>
-    <string lang="en" key="ADMIN_PRIVILEGES_WARN_DEVICES">Please note that in order to encrypt/format a partition/device you need to be logged into an account with administrator privileges.\n\nThis does not apply to file-hosted volumes.</string>
+    <string lang="en" key="ADMIN_PRIVILEGES_WARN_DEVICES">Please note that in order to encrypt, decrypt or format a partition/device you need to be logged into an account with administrator privileges.\n\nThis does not apply to file-hosted volumes.</string>
     <string lang="en" key="ADMIN_PRIVILEGES_WARN_HIDVOL">In order to create a hidden volume you need to be logged into an account with administrator privileges.\n\nContinue?</string>
     <string lang="en" key="ADMIN_PRIVILEGES_WARN_NTFS">Please note that in order to format the volume as NTFS you need to be logged into an account with administrator privileges.\n\nWithout administrator privileges, you can format the volume as FAT.</string>
     <string lang="en" key="AES_HELP">FIPS-approved cipher (Rijndael, published in 1998) that may be used by U.S. government departments and agencies to protect classified information up to the Top Secret level. 256-bit key, 128-bit block, 14 rounds (AES-256). Mode of operation is XTS.</string>
@@ -485,7 +497,11 @@
     <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>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Volume Fully Encrypted</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_INFO">IMPORTANT: TO MOUNT THIS NEWLY CREATED VERACRYPT VOLUME AND TO ACCESS DATA STORED IN IT, CLICK 'Auto-Mount Devices' IN THE MAIN VERACRYPT WINDOW. After you enter the correct password (and/or supply correct keyfiles), the volume will be mounted to the drive letter you select from the list in the main VeraCrypt window (and you will be able to access the encrypted data via the selected drive letter).\n\nPLEASE REMEMBER OR WRITE DOWN THE ABOVE STEPS. YOU MUST FOLLOW THEM WHENEVER YOU WANT TO MOUNT THE VOLUME AND ACCESS DATA STORED IN IT. Alternatively, in the main VeraCrypt window, click 'Select Device', then select this partition/volume, and click 'Mount'.\n\nThe partition/volume has been successfully encrypted (it contains a fully encrypted VeraCrypt volume now) and is ready for use.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="en" key="FORMAT_FINISHED_INFO">The VeraCrypt volume has been successfully created.</string>
     <string lang="en" key="FORMAT_FINISHED_TITLE">Volume Created</string>
     <string lang="en" key="FORMAT_HELP">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 Format to create the volume.</string>
@@ -523,6 +539,7 @@
     <string lang="en" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">An error occurred when obtaining the system encryption status.</string>
     <string lang="en" key="INIT_SYS_ENC">Cannot initialize application components for system encryption.</string>
     <string lang="en" key="INIT_RAND">Failed to initialize the random number generator!</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="en" key="INIT_REGISTER">Unable to initialize the application. Failed to register the Dialog class.</string>
     <string lang="en" key="INIT_RICHEDIT">Error: Failed to load the Rich Edit system library.</string>
     <string lang="fa" key="INTRO_TITLE">جادوگر ساخت درايو</string>
@@ -535,6 +552,7 @@
     <string lang="en" key="MOUNT_BUTTON">&amp;Mount</string>
     <string lang="en" key="NEW_VERSION_REQUIRED">A newer version of VeraCrypt is required to mount this volume.</string>
     <string lang="en" key="VOL_CREATION_WIZARD_NOT_FOUND">Error: Volume Creation Wizard not found.\n\nPlease make sure that the file 'VeraCrypt Format.exe' is in the folder from which 'VeraCrypt.exe' was launched. If it is not, please reinstall VeraCrypt, or locate 'VeraCrypt Format.exe' on your disk and run it.</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="en" key="NEXT">&amp;Next &gt;</string>
     <string lang="en" key="FINALIZE">&amp;Finish</string>
     <string lang="en" key="INSTALL">&amp;Install</string>
@@ -542,6 +560,7 @@
     <string lang="en" key="NODRIVER">Unable to connect to the VeraCrypt device driver. VeraCrypt cannot work if the device driver is not running.\n\nPlease note that, due to a Windows issue, it may be necessary to log off or restart the system before the device driver can be loaded.</string>
     <string lang="en" key="NOFONT">Error occurred when loading/preparing fonts.</string>
     <string lang="en" key="NOT_FOUND">The drive letter was not found or no drive letter was specified.</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="en" key="DRIVE_LETTER_UNAVAILABLE">Drive letter not available.</string>
     <string lang="en" key="NO_FILE_SELECTED">No file selected!</string>
     <string lang="en" key="NO_FREE_DRIVES">No drive letters available.</string>
@@ -561,15 +580,18 @@
     <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_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="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_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt.\n\nDo you have such a backup?</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_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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="en" key="IDD_PCDM_CHANGE_PKCS5_PRF">Set Header Key Derivation Algorithm</string>
     <string lang="en" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Add/Remove Keyfiles to/from Volume</string>
     <string lang="en" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Remove All Keyfiles from Volume</string>
-    <string lang="en" key="PASSWORD_CHANGED">Password and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</string>
+    <string lang="en" key="PASSWORD_CHANGED">Password, PIM and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</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="en" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">IMPORTANT: If you did not destroy your VeraCrypt Rescue Disk, your system partition/drive can still be decrypted using the old password (by booting the VeraCrypt Rescue Disk and entering the old password). You should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</string>
     <string lang="en" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Note that your VeraCrypt Rescue Disk still uses the previous algorithm. If you consider the previous algorithm insecure, you should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,7 +600,8 @@
     <string lang="en" key="PKCS5_PRF_CHANGED">Header key derivation algorithm successfully set.</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_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="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 more than 20 characters (the longer, the better). The maximum possible length is 64 characters.</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="en" key="PASSWORD_HIDDENVOL_HELP">Please choose a password for the hidden volume. </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_HELP">Please choose a password for the hidden operating system (i.e. for the hidden volume). </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_NOTE">IMPORTANT: The password that you choose for the hidden operating system in this step must be substantially different from the other two passwords (i.e. from the password for the outer volume and from the password for the decoy operating system).</string>
@@ -588,7 +611,7 @@
     <string lang="en" key="PASSWORD_HIDVOL_HOST_TITLE">Outer Volume Password</string>
     <string lang="en" key="PASSWORD_HIDVOL_TITLE">Hidden Volume Password</string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_TITLE">Password for Hidden Operating System</string>
-    <string lang="en" key="PASSWORD_LENGTH_WARNING">WARNING: Short passwords are easy to crack using brute force techniques!\n\nWe recommend choosing a password consisting of more than 20 characters. Are you sure you want to use a short password?</string>
+    <string lang="en" key="PASSWORD_LENGTH_WARNING">WARNING: Short passwords are easy to crack using brute force techniques!\n\nWe recommend choosing a password consisting of 20 or more characters. Are you sure you want to use a short password?</string>
     <string lang="en" key="PASSWORD_TITLE">Volume Password</string>
     <string lang="en" key="PASSWORD_WRONG">Incorrect password or not a VeraCrypt volume.</string>
     <string lang="en" key="PASSWORD_OR_KEYFILE_WRONG">Incorrect keyfile(s) and/or password or not a VeraCrypt volume.</string>
@@ -597,11 +620,26 @@
     <string lang="en" key="PASSWORD_WRONG_AUTOMOUNT">Incorrect password or no VeraCrypt volume found.</string>
     <string lang="en" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Incorrect keyfile(s)/password or no VeraCrypt volume found.</string>
     <string lang="en" key="PASSWORD_WRONG_CAPSLOCK_ON">\n\nWarning: Caps Lock is on. This may cause you to enter your password incorrectly.</string>
+    <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
+    <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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_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>
+    <string lang="en" key="SELECTED_PARTITION_NOT_INPLACE_ENC">The selected partition/device is not using in-place encryption.\nHeader Flags = 0x%.8X</string>
     <string lang="en" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nNote: If you are attempting to mount a partition located on an encrypted system drive without pre-boot authentication or to mount the encrypted system partition of an operating system that is not running, you can do so by selecting 'System' &gt; 'Mount Without Pre-Boot Authentication'.</string>
     <string lang="en" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">In this mode, you cannot mount a partition located on a drive whose portion is within the key scope of active system encryption.\n\nBefore you can mount this partition in this mode, you need to either boot an operating system installed on a different drive (encrypted or unencrypted) or boot an unencrypted operating system.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <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>
@@ -701,11 +739,18 @@
     <string lang="en" key="FOR_MORE_INFO_ON_PARTITIONS">For information on how to create and manage partitions, please refer to the documentation supplied with your operating system or contact your computer vendor's technical support team for assistance.</string>
     <string lang="en" key="SYSTEM_PARTITION_NOT_ACTIVE">Error: The currently running operating system is not installed on the boot partition (first Active partition). This is not supported.</string>
     <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="en" key="CANT_ACCESS_VOL">Error: Cannot access the volume!\n\nMake sure that the selected volume exists, that it is not mounted or being used by the system or an application, that you have read/write permission for the volume, and that it is not write-protected.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Error: Cannot access the volume and/or obtain information about the volume.\n\nMake sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Error: Cannot access the volume and/or obtain information about the volume. Make sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.\n\nIf the problem persists, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">An error prevented VeraCrypt from encrypting the partition. Please try fixing any previously reported problems and then try again. If the problems persist, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_RESUME">An error prevented VeraCrypt from resuming the process of encryption of the partition.\n\nPlease try fixing any previously reported problems and then try resuming the process again. Note that the volume cannot be mounted until it has been fully encrypted.</string>
+    <string lang="en" key="INPLACE_DEC_GENERIC_ERR">An error prevented VeraCrypt from decrypting the volume. Please try fixing any previously reported problems and then try again if possible.</string>
     <string lang="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="en" key="CANT_ACCESS_OUTER_VOL">Error: Cannot access the outer volume! Volume creation cannot continue.</string>
@@ -790,7 +835,7 @@
     <string lang="en" key="TC_INSTALLER_IS_RUNNING">VeraCrypt Installer is currently running on this system and performing or preparing installation or update of VeraCrypt. Before you proceed, please wait for it to finish or close it. If you cannot close it, please restart your computer before proceeding.</string>
     <string lang="en" key="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 www.veracrypt.org).</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="EXTRACTING_VERB">Extracting</string>
     <string lang="en" key="CANNOT_READ_FROM_PACKAGE">Cannot read data from the package.</string>
@@ -977,6 +1022,7 @@
     <string lang="en" key="CONFIRM_EXIT_UNIVERSAL">Exit?</string>
     <string lang="en" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt does not have sufficient information to determine whether to encrypt or decrypt.</string>
     <string lang="en" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt does not have sufficient information to determine whether to encrypt or decrypt.\n\nNote: If you decrypted the system partition/drive in the pre-boot environment, you may need to finalize the process by clicking Decrypt.</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_REVERSE_INFO">Note: When you are encrypting a non-system partition/volume in place and an error persistently prevents you from finishing the process, you will not be able to mount the volume (and access data stored on it) until you entirely DECRYPT the volume (i.e. reverse the process).\n\nIf you need to do so, follow these steps:\n1) Exit this wizard.\n2) In the main VeraCrypt window, select 'Volumes' &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="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Do you want to interrupt and postpone the process of encryption of the system partition/drive?\n\nNote: You will be able to resume the process and it will continue from the point it was stopped. You can do so, for example, by selecting 'System' &gt; 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window. If you want to permanently terminate or reverse the encryption process, select 'System' &gt; 'Permanently Decrypt System Partition/Drive'.</string>
     <string lang="en" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Do you want to interrupt and postpone the process of decryption of the system partition/drive?\n\nNote: You will be able to resume the process and it will continue from the point it was stopped. You can do so, for example, by selecting 'System' &gt; 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window. If you want to reverse the decryption process (and start encrypting), select 'System' &gt; 'Encrypt System Partition/Drive'.</string>
@@ -986,6 +1032,7 @@
     <string lang="en" key="FAILED_TO_START_WIPING">Error: Failed to start the process of wiping.</string>
     <string lang="en" key="INCONSISTENCY_RESOLVED">Inconsistency resolved.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="en" key="NOTHING_TO_RESUME">There is no process/task to resume.</string>
     <string lang="en" key="HIDVOL_PROT_BKG_TASK_WARNING">WARNING: VeraCrypt Background Task is disabled. After you exit VeraCrypt, you will not be notified if damage to hidden volume is prevented.\n\nNote: You may shut down the Background Task anytime by right-clicking the VeraCrypt tray icon and selecting 'Exit'.\n\nEnable VeraCrypt Background Task?</string>
     <string lang="en" key="LANG_PACK_VERSION">Language pack version:  %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="en" key="ERROR_MBR_PROTECTED">Failed to write the MBR sector.\n\nYour BIOS may be configured to protect the MBR sector. Check your BIOS settings (press F2, Delete, or Esc, after powering on your computer) for MBR/antivirus protection.</string>
+    <string lang="en" key="BOOT_LOADER_FINGERPRINT_CHECK_FAILED">WARNING: The verification of VeraCrypt bootloader fingerprint failed!\nYour disk may have been tampered with by an attacker ("Evil Maid" attack).\n\nThis warning can also be triggered if you restored VeraCrypt boot loader using an Rescue Disk generated using a different VeraCrypt version.\n\nYou are advised to change your password immediately which will also restore the correct VeraCrypt bootloader. It is recommended to reinstall VeraCrypt and to take measures to avoid access to this machine by untrusted entities.</string>
     <string lang="en" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">The required version of the VeraCrypt Boot Loader is currently not installed. This may prevent some of the settings from being saved.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Note: In some situations, you may wish to prevent a person (adversary) that is watching you start the computer from knowing that you use VeraCrypt. The above options allow you to do that by customizing the VeraCrypt boot loader screen. If you enable the first option, no texts will be displayed by the boot loader (not even when you enter the wrong password). The computer will appear to be "frozen" while you can type your password. In addition, a custom message can be displayed to mislead the adversary. For example, fake error messages such as "Missing operating system" (which is normally displayed by the Windows boot loader if it finds no Windows boot partition). It is, however, important to note that if the adversary can analyze the content of the hard drive, he can still find out that it contains the VeraCrypt boot loader.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">WARNING: Please keep in mind that if you enable this option, the VeraCrypt boot loader will not display any texts (not even when you enter the wrong password). The computer will appear to be "frozen" (unresponsive) while you can type your password (the cursor will NOT move and no asterisk will be displayed when you press a key).\n\nAre you sure you want to enable this option?</string>
@@ -1034,8 +1082,11 @@
     <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="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">Warning: There is unallocated space between the system partition and the first partition behind it. After you create the hidden operating system, you must not create any new partitions in that unallocated space. Otherwise, the hidden operating system will be impossible to boot (until you delete such newly created partitions).</string>
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">This algorithm is currently not supported for system encryption.</string>
-	<string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</string>
     <string lang="en" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Error: Cannot set the keyboard layout for VeraCrypt to the standard US keyboard layout.\n\nNote that the password needs to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout.</string>
@@ -1120,6 +1171,7 @@
     <string lang="en" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">The pretest has been successfully completed.\n\nWARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt. If you do not, please back up the files now (you can click Defer, back up the files, then run VeraCrypt again anytime, and select 'System' &gt; 'Resume Interrupted Process' to start encrypting).\n\nWhen ready, click Encrypt to start encrypting.</string>
     <string lang="en" key="SYSENC_ENCRYPTION_PAGE_INFO">You can click Pause or Defer anytime to interrupt the process of encryption or decryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. To prevent slowdown when the system or applications write or read data from the system drive, VeraCrypt automatically waits until the data is written or read (see Status above) and then automatically continues encrypting or decrypting.</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nYou can click Pause or Defer anytime to interrupt the process of encryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. Note that the volume cannot be mounted until it has been fully encrypted.</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="en" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Hidden System Started</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Original System</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows creates (typically, without your knowledge or consent) various log files, temporary files, etc., on the system partition. It also saves the content of RAM to hibernation and paging files located on the system partition. Therefore, if an adversary analyzed files stored on the partition where the original system (of which the hidden system is a clone) resides, he might find out, for example, that you used the VeraCrypt wizard in the hidden-system-creation mode (which might indicate the existence of a hidden operating system on your computer).\n\nTo prevent such issues, VeraCrypt will, in the next steps, securely erase the entire content of the partition where the original system resides. Afterwards, in order to achieve plausible deniability, you will need to install a new system on the partition and encrypt it. Thus you will create the decoy system and the whole process of creation of the hidden operating system will be completed.</string>
@@ -1159,7 +1211,7 @@
     <string lang="en" key="HIDDEN_OS_CREATION_PREINFO_HELP">In the next steps, VeraCrypt will create the hidden operating system by copying the content of the system partition to the hidden volume (data being copied will be encrypted on the fly with an encryption key different from the one that will be used for the decoy operating system).\n\nPlease note that the process will be performed in the pre-boot environment (before Windows starts) and it may take a long time to complete; several hours or even several days (depending on the size of the system partition and on the performance of your computer).\n\nYou will be able to interrupt the process, shut down your computer, start the operating system and then resume the process. However, if you interrupt it, the entire process of copying the system will have to start from the beginning (because the content of the system partition must not change during cloning).</string>
     <string lang="en" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Do you want to cancel the entire process of creation of the hidden operating system?\n\nNote: You will NOT be able to resume the process if you cancel it now.</string>
     <string lang="en" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Do you want to cancel the system encryption pretest?</string>
-    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="en" key="SYS_DRIVE_NOT_ENCRYPTED">The system partition/drive does not appear to be encrypted (neither partially nor fully).</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">Your system partition/drive is encrypted (partially or fully).\n\nPlease decrypt your system partition/drive entirely before proceeding. To do so, select 'System' &gt; 'Permanently Decrypt System Partition/Drive' from the menu bar of the main VeraCrypt window.</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">When the system partition/drive is encrypted (partially or fully), you cannot downgrade VeraCrypt (but you can upgrade it or reinstall the same version).</string>
@@ -1176,6 +1228,8 @@
     <string lang="en" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">You have selected the system partition/drive (or the boot partition), but the wizard mode you selected is suitable only for non-system partitions/drives.\n\nDo you want to set up pre-boot authentication (which means that you will need to enter your password each time before Windows boots/starts) and encrypt the system partition/drive?</string>
     <string lang="en" key="CONFIRM_DECRYPT_SYS_DEVICE">Are you sure you want to permanently decrypt the system partition/drive?</string>
     <string lang="en" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the system partition/drive, unencrypted data will be written to it.\n\nAre you really sure you want to permanently decrypt the system partition/drive?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
     <string lang="en" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Warning: If you use a cascade of ciphers for system encryption, you may encounter the following issues:\n\n1) The VeraCrypt Boot Loader is larger than normal and, therefore, there is not enough space in the first drive track for a backup of the VeraCrypt Boot Loader. Hence, whenever it gets damaged (which often happens, for example, during inappropriately designed anti-piracy activation procedures of certain programs), you will need to use the VeraCrypt Rescue Disk to boot or to repair the VeraCrypt Boot Loader.\n\n2) On some computers, resuming from hibernation takes longer.\n\nThese potential issues can be prevented by choosing a non-cascade encryption algorithm (e.g. AES).\n\nAre you sure you want to use a cascade of ciphers?</string>
     <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>
@@ -1191,6 +1245,7 @@
     <string lang="en" key="ENABLE_BAD_SECTOR_ZEROING">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nThe process of in-place encryption can continue only when the sectors have been made readable again. VeraCrypt can attempt to make these sectors readable by writing zeros to the sectors (subsequently such all-zero blocks would be encrypted). However, note that any data stored in the unreadable sectors will be lost. If you want to avoid that, you can attempt to recover portions of the corrupted data using appropriate third-party tools.\n\nNote: In case of physically damaged sectors (as opposed to mere data corruption and checksum errors) most types of storage devices internally reallocate the sectors when data is attempted to be written to them (so the existing data in the damaged sectors may remain unencrypted on the drive).\n\nDo you want VeraCrypt to write zeroes to unreadable sectors?</string>
     <string lang="en" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nTo be able to proceed with decryption, VeraCrypt will have to discard the content of the unreadable sectors (the content will be replaced with pseudorandom data). Please note that, before proceeding, you can attempt to recover portions of any corrupted data using appropriate third-party tools.\n\nDo you want VeraCrypt to discard data in the unreadable sectors now?</string>
     <string lang="en" key="ZEROED_BAD_SECTOR_COUNT">Note: VeraCrypt has replaced the content of %I64d unreadable sectors (%s) with encrypted all-zero plaintext blocks.</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="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>

Translations/Language.fi.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="fi" name="Suomi" en-name="Finnish" version="0.1.0" translators="Matti Ruhanen" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <control lang="fi" key="IDC_KEY_FILES">&amp;Avaintiedostot..</control>
     <control lang="fi" key="IDC_LINK_HASH_INFO">Tietoa hash algoritmeista</control>
     <control lang="fi" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Lisätietoa</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="fi" key="IDC_MB">&amp;MB</control>
     <control lang="fi" key="IDC_MORE_INFO_ON_CONTAINERS">Lisätietoa</control>
     <control lang="fi" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">Lisätietoa järjestelmän salauksesta</control>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <control lang="fi" key="IDT_COLLECTING_RANDOM_DATA_NOTE">TÄRKEÄÄ: Siirrä hiiresi satunnaisesti tässä ikkunassa. Mitä kauemmin siirrät sitä parempi. Tämä merkittävästi kasvattaa salakuvauksen vahvuutta salausavaimelle. Paina seuraavaksi Seuraava jatkaaksesi.</control>
     <control lang="fi" key="IDT_CONFIRM">&amp;Vahvista:</control>
     <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_FILE_CONTAINER">Luo virtuaalisesti salattu levy tiedoston sisälle. Tämä valinta on suositeltava aloittelijalle.</control>
@@ -85,6 +88,8 @@
     <control lang="fi" key="IDT_PARTIAL_POOL_CONTENTS">Nykyisen poolin sisältö (osittainen)</control>
     <control lang="fi" key="IDT_PASS">Läpi</control>
     <control lang="fi" key="IDT_PASSWORD">Salasana:</control>
+    <control lang="en" key="IDT_PIM">Volume PIM:</control>
+    <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
     <control lang="fi" key="IDT_PROGRESS">Suorittaa:</control>
     <control lang="fi" key="IDT_RANDOM_POOL">Satunnaisluku: </control>
     <control lang="fi" key="IDT_SINGLE_BOOT">Valitse tämä valinta jos vain yksi käyttöjärjestelmä on asennettuna (vaikka olisikin useampi käyttäjä).</control>
@@ -142,6 +147,8 @@
     <control lang="fi" key="IDC_MOUNT_OPTIONS">Yhdistä V&amp;alinta..</control>
     <control lang="fi" key="IDC_MOUNT_READONLY">Yhdistä taltio vain luku&amp;tilassa</control>
     <control lang="fi" key="IDC_NEW_KEYFILES">Avaintiedostot..</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="fi" key="IDC_PREF_BKG_TASK_ENABLE">Päällä</control>
     <control lang="fi" key="IDC_PREF_CACHE_PASSWORDS">Salasanat Ohjaimen Välimuistiin</control>
     <control lang="fi" key="IDC_PREF_DISMOUNT_INACTIVE">Automaattinen yhteyden poisto taltiolle kun dataa ei ole luettu/kirjoitettu sille</control>
@@ -155,6 +162,7 @@
     <control lang="fi" key="IDC_PREF_MOUNT_READONLY">Yhdistä taltiot vain lukutilaan</control>
     <control lang="fi" key="IDC_PREF_MOUNT_REMOVABLE">Yhdistä taltiot liikutettavina välineinä</control>
     <control lang="fi" key="IDC_PREF_OPEN_EXPLORER">Avaa Selaus ikkuna onnistuneesti yhdistetyille taltioille</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</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="fi" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Tyhjennä tallennetut välimuisti salasanat taltioilta auto-poiskytketyillä yhteyksillä</control>
     <control lang="fi" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Pyyhi välimuisti salasanat poistuttaessa</control>
@@ -167,11 +175,12 @@
     <control lang="fi" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Näytä Salasana</control>
     <control lang="fi" key="IDC_TRAVEL_OPEN_EXPLORER">Avaa &amp;Tutkinta Ikkuna Yhdistetyille taltioille</control>
     <control lang="fi" key="IDC_TRAV_CACHE_PASSWORDS">&amp;Välimuistisalasana ajurin muistille</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="fi" key="IDC_UNMOUNTALL">P&amp;oista Kaikki Yhteydet</control>
     <control lang="fi" key="IDC_VOLUME_PROPERTIES">Taltion Ominaisuu&amp;det..</control>
     <control lang="fi" key="IDC_VOLUME_TOOLS">Taltio&amp;n Työkalut..</control>
     <control lang="fi" key="IDC_WIPE_CACHE">Tyhjennä &amp;Välimuisti</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
     <control lang="fi" key="IDD_HOTKEYS_DLG">VeraCrypt - Järjestelmän Pikanäppäimet</control>
     <control lang="fi" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="fi" key="IDM_CREATE_HIDDEN_OS">Luo Piilotettu Käyttöjärjestelmä..</control>
     <control lang="fi" key="IDM_CREATE_RESCUE_DISK">Luo Pelastuslevy..</control>
     <control lang="fi" key="IDM_CREATE_VOLUME">Luo Uusi Taltio..</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="fi" key="IDM_DEFAULT_KEYFILES">Oletus Avaintiedosto..</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="fi" key="IDM_ENCRYPT_SYSTEM_DEVICE">Salaa Järjestelmän Osio/Asema..</control>
     <control lang="fi" key="IDM_FAQ">Usein Kysyttyjä Kysymyksiä</control>
@@ -243,6 +254,7 @@
     <control lang="fi" key="IDM_UNMOUNT_VOLUME">Poista Yhdistetyt Taltio</control>
     <control lang="fi" key="IDM_VERIFY_RESCUE_DISK">Tarkista Pelastuslevy</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>
     <control lang="fi" key="IDM_VOLUME_WIZARD">Opastettu Taltion Luonti</control>
     <control lang="fi" key="IDM_WEBSITE">VeraCryptin Nettisivut</control>
@@ -485,7 +497,11 @@
     <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>
     <string lang="fi" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Asema Täysin Salattu</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="fi" key="NONSYS_INPLACE_ENC_FINISHED_INFO">TÄRKEÄÄ: KYTKEÄKSESI TÄMÄN UUDEN LUODUN VERACRYPT TALTION JA PÄÄSY TALLENTAMAAN SILLE, PAINA 'Autoyhdistä Laitteet' VERACRYPT PÄÄIKKUNASSA. Sen jälkeen kun annat oikean salasanan (ja/tai toimitat oikean avaintiedoston), taltio yhdistetään asema kirjaimelle jonka valitsit VeraCrypt ohjelman pääikkunasta (ja sinun on mahdollista päästä salatuille tiedolle valitun asema kirjaimen kautta).\n\nMUISTA TAI KIRJOITA YLöS ALLA OLEVAT VAIHEET. SINUN TULLE SEURATA NIITÄ AINA KUN HALUAT YHDISTÄÄ TALTION JA PÄÄSTÄ KIINNI TALLENNETTUIHIN TIETOIHIN. Vaihtoehtoisesti, VeraCrypt pääikkunasta, paina 'Valitse Laite', ja sitten valitse osio/taltio, ja paina 'Yhdistä'.\n\nOsio/taltio on onnistuneesti salattu (se sisältää nyt täysin salatun VeraCrypt taltion) ja on valmis käytettäväksi.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="fi" key="FORMAT_FINISHED_INFO">VeraCrypt taltio on luotu onnistuneesti.</string>
     <string lang="fi" key="FORMAT_FINISHED_TITLE">Taltio Luotu</string>
     <string lang="fi" key="FORMAT_HELP">TÄRKEÄÄ: Siirrä hiirtäsi satunnaisesti tässä ikkunassa. Mitä kauemmin siirrät sen parempi. Tämä merkittävästi kasvattaa salausavaimen vahvuutta. Paina 'Alusta' luodaksesi taltion.</string>
@@ -523,6 +539,7 @@
     <string lang="fi" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Virhe tapahtui kun haettiin järjestelmän salakirjoitus arvoa.</string>
     <string lang="fi" key="INIT_SYS_ENC">Sovelluksen komponentteja ei voida alustaa järjestelmän salakirjoitusta varten.</string>
     <string lang="fi" key="INIT_RAND">Satunnaisnumeron luonnin alustus epäonnistui!</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="fi" key="INIT_REGISTER">Sovellusta ei pystytä alustamaan. Viestiruudun ikkunan rekisteröinti epäonnistui.</string>
     <string lang="fi" key="INIT_RICHEDIT">Virhe: Virhe ladattaessa Rich edit järjestelmä kirjastoa.</string>
     <string lang="fi" key="INTRO_TITLE">Opastettu VeraCrypt Taltion Luonti</string>
@@ -535,6 +552,7 @@
     <string lang="fi" key="MOUNT_BUTTON">Y&amp;hdistä Laite</string>
     <string lang="fi" key="NEW_VERSION_REQUIRED">Uusi VeraCrypt versio vaaditaan jotta tämän taltion yhdistäminen on mahdollista.</string>
     <string lang="fi" key="VOL_CREATION_WIZARD_NOT_FOUND">Virhe: Taltion Luonti Velhoa ei löydetty.\n\nOle hyvä ja varmista että tiedosto 'VeraCrypt Format.exe' on hakemistossa missä 'VeraCrypt.exe' on perustettu. Jos se ei ole, asenna uudelleen VeraCrypt ohjelma, tai määritä 'VeraCrypt Format.exe' levylläsi ja aja se.</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="fi" key="NEXT">&amp;Seuraava &gt;</string>
     <string lang="fi" key="FINALIZE">&amp;Valmis</string>
     <string lang="fi" key="INSTALL">&amp;Asenna</string>
@@ -542,6 +560,7 @@
     <string lang="fi" key="NODRIVER">Mahdotonta yhdistää VeraCrypt laiteohjain. VeraCrypt ei voi toimia jos oikea laiteohjain ei ole käytössä.\n\nHuomioi tämä, Windows ongelmista johtuen, voi olla tarpeen että kirjaudut ulos tai käynnistät järjestelmän uudelleen ennen kuin laiteohjain voidaan ladata.</string>
     <string lang="fi" key="NOFONT">Virhe tapahtui kun ladattiin/valmisteltiin fontteja.</string>
     <string lang="fi" key="NOT_FOUND">Aseman kirjainta ei löydetty tai kirjainta ei määritelty</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="fi" key="DRIVE_LETTER_UNAVAILABLE">Aseman kirjain ei käytettävissä.</string>
     <string lang="fi" key="NO_FILE_SELECTED">Ei valittua tiedostoa!</string>
     <string lang="fi" key="NO_FREE_DRIVES">Ei vapaita tunnuksia vapaana.</string>
@@ -561,15 +580,18 @@
     <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_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="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="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="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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="fi" key="IDD_PCDM_CHANGE_PKCS5_PRF">Aseta Otsikkoavaimen Periytyvä algoritmi</string>
     <string lang="fi" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Lisää/Poista Avaintiedosto Taltiolta(lle)</string>
     <string lang="fi" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Poista Kaikki Avaintiedostot Taltiolta</string>
-    <string lang="fi" key="PASSWORD_CHANGED">Salasana ja/tai avaintiedosto(t) on onnistuneesti vaihdettu.\n\nTÄRKEÄÄ: Varmista, että luet osuuden 'Muuttaa Salasanat ja Avaintiedostot' kappaleesta 'Turvallisuus Varotoimet' VeraCrypt Käyttäjä Oppaasta.</string>
+    <string lang="fi" key="PASSWORD_CHANGED">Salasana, PIM ja/tai avaintiedosto(t) on onnistuneesti vaihdettu.\n\nTÄRKEÄÄ: Varmista, että luet osuuden 'Muuttaa Salasanat ja Avaintiedostot' kappaleesta 'Turvallisuus Varotoimet' VeraCrypt Käyttäjä Oppaasta.</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="fi" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">TÄRKEÄÄ: Jos et tuhoa VeraCrypt Pelastuslevyäsi, sinun käyttöjärjestelmäosio/asema voi silti olla salaamaton käyttäen vanhaa salasanaa (käynnistämällä VeraCrypt Pelastuslevy ja antamalla vanhan salasanan). Sinun täytyy luoda uusi VeraCrypt Pelastuslevy ja sitten tuhota vanha.\n\nHaluatko luoda uuden VeraCrypt Pelastuslevyn?</string>
     <string lang="fi" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Huomioi, että VeraCrypt Pelastuslevy käyttää vielä edellistä algoritmia. Jos harkitset että edellinen algoritmi on turvaton, sinun täytyy luoda ensin uusi VeraCrypt Pelastuslevy ja sitten tuhota vanha.\n\nHaluatko luoda uuden VeraCrypt Pelastuslevyn?</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,6 +600,7 @@
     <string lang="fi" key="PKCS5_PRF_CHANGED">Otsikkoavain Periytyvä algoritmin asetus onnistui.</string>
     <string lang="fi" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">Anna salasana ja/tai avaintiedosto(t) ei-järjestelmätaltiolle minne haluat aloittaa uudelleen prosessin paikallaan salaukselle.\n\n\nHuomaa: Sen jälkeen kun painat Seuraava, VeraCrypt yrittää etsiä ei-järjestelmätaltioita missä salaus prosessi on keskeytynyt ja missä VeraCrypt taltio otsikko voi olla salauspurettu käyttäen hankittua salasanaa ja/tai avaintiedostoa(t). Jos enemmin kuin yksi tällainen taltio löydetään, sinun tarvitsee valita yksi niistä seuraavassa askeleessa.</string>
     <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_HIDDEN_OS_HELP">Valitse salasana piilotetulle käyttöjärjestelmälle (esim. piilotetulle taltiolle). </string>
@@ -597,11 +620,26 @@
     <string lang="fi" key="PASSWORD_WRONG_AUTOMOUNT">Väärä salasana tai VeraCrypt taltiota ei löydetty.</string>
     <string lang="fi" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Väärä avaintiedosto(t)/salasana tai VeraCrypt taltiota ei löydetty.</string>
     <string lang="fi" key="PASSWORD_WRONG_CAPSLOCK_ON">\n\nVaroitus: Caps Lock on päällä. Tämä saattaa johtaa siihen että salasanasi on virheellinen.</string>
+    <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
+    <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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="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>
+    <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="fi" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nTiedotus: Jos yrität yhdistää osiota joka sijaitsee salatulla järjestelmäosiolla ilman esikäynnistys autentikointia tai yhdistät salatun järjestelmäosion käyttöjärjestelmälle joka ei ole ajossa, voit tehdä sen valitsemalla 'Järjestelmä' &gt; 'Yhdistä Ilman esikäynnistys Autentikointia'.</string>
     <string lang="fi" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">Tässä tilassa, et voi valita kytketyn osion sijaintia asemalla jonka osa on aktiivisen järjestelmä salauksen avain ala.\n\nEnnen kuin voit kytkeä osion tähän tilaan, sinun tarvitsee joko käynnistää järjestelmä uudelleen, joka on asennettuna eri asemalle (salattu tai salaamaton) tai käynnistää salaamaton käyttöjärjestelmä.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <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>
@@ -701,11 +739,18 @@
     <string lang="fi" key="FOR_MORE_INFO_ON_PARTITIONS">Lisätietoa kuinka luoda ja hallita osioita, ole hyvä ja katso ohjetta joko käyttöjärjestelmän toimittajalta tai ota yhteys tietokoneen toimittajan tekniseen tukeen.</string>
     <string lang="fi" key="SYSTEM_PARTITION_NOT_ACTIVE">Virhe: Nykyinen käynnissä oleva käyttöjärjestelmä ei ole asennettu käynnistys osiolle (ensimmäinen Aktiivinen osio). Tämä ei ole tuettuna.</string>
     <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="fi" key="CANT_ACCESS_VOL">Virhe: Ei pääsyä taltiolle!\n\nTarkista että valittu taltio löytyy, että sen on poistettu yhteys järjestelmän tai ohjelman toimesta, että sinulla on luku/kirjoitus taltiolle, ja että levy ei ole kirjoitussuojattu.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="fi" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Virhe: Ei voida yhdistää taltiota ja/tai hankkia tietoa taltiosta.\n\nVarmista että valittu taltio on olemassa, että se ei ole järjestelmän tai sovelluksen käytössä, että sinulla on luku/kirjoitus oikeudet taltiolle, ja että se ei ole kirjoitussuojattu.</string>
     <string lang="fi" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Virhe: Ei voida yhdistää taltiota ja/tai hankkia tietoa taltiosta. Varmista että valittu taltio on olemassa, että se ei ole järjestelmän tai sovelluksen käytössä, että sinulla on luku/kirjoitus oikeudet taltiolle, ja että se ei ole kirjoitussuojattu.\n\nJos ongelmaa edelleen esiintyy, saattaa auttaa jos seuraat alla olevia ohjeita.</string>
     <string lang="fi" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">Virhe estettäessä VeraCrypt salaus osiolle. Yritä korjata mikä tahansa edellinen raportoitu ongelma ja sitten yritä uudelleen. Jos ongelma yhä esiintyy, saattaa auttaa että seuraat seuraavia askeleita.</string>
     <string lang="fi" key="INPLACE_ENC_GENERIC_ERR_RESUME">Virhe estettäessä VeraCrypt aloittaa uudelleen salaus prosessi taltiolla.\n\nYritä korjata mikä tahansa edellinen raportoitu ongelma ja yritä aloittaa prosessi uudelleen . Huomioi että taltiota ei voida yhdistää ennen kuin se on täysin salattu.</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="fi" key="CANT_DISMOUNT_OUTER_VOL">Virhe: Ei voida poistaa yhteyttä ulkoiselta taltiolta!\n\nTaltiolta ei voida poistaa yhteyttä jos se sisältää tietoja tai hakemistoja jotka ovat ohjelmien tai järjestelmän käytössä.\n\nSulje ohjelma joka saattaa käyttää tiedostoa tai hakemistoa taltiolla ja paina Yritä uudelleen.</string>
     <string lang="fi" key="CANT_GET_OUTER_VOL_INFO">Virhe: Ulkoisen taltion tietoja ei saada! Taltion luontia ei voida jatkaa.</string>
     <string lang="fi" key="CANT_ACCESS_OUTER_VOL">Virhe: Ulkoiselle asemalle pääsy estetty! Taltion luontia ei voida jatkaa.</string>
@@ -790,7 +835,7 @@
     <string lang="fi" key="TC_INSTALLER_IS_RUNNING">VeraCrypt asennusohjelma on juuri käynnissä tässä järjestelmässä ja suorittaa tai valmistelee asennusta tai VeraCrypt päivittämistä. Ennen kuin aloitat, ole hyvä ja odota sen loppumista tai sulje se. Jos et voi sulkea sitä, ole hyvä ja käynnistä tietokoneesi uudelleen ennen tätä suoritusta.</string>
     <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 www.veracrypt.org).</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="EXTRACTING_VERB">Puretaan</string>
     <string lang="fi" key="CANNOT_READ_FROM_PACKAGE">Ei voida lukea tietoja paketista.</string>
@@ -977,6 +1022,7 @@
     <string lang="fi" key="CONFIRM_EXIT_UNIVERSAL">Poistu?</string>
     <string lang="fi" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt ei ole tarpeeksi tietoa havaitakseen, että tehdäänkö salaus vaiko salauksenpurku.</string>
     <string lang="fi" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt ohjelmalla ei ole tarpeeksi tietoa siitä havaitakseen onko kyse salauksesta vaiko salauksenpurusta.\n\nTiedotus: Jos teet salauksenpurun järjestelmäosiolta/asemalta esikäynnistys ympäristössä, saatat tarvita viimeistellä prosessin painamalla Salauksenpurku.</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="fi" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">Haluatko keskeyttää ja siirtää osion/taltion salaus prosessia?\n\nHuomioi: Pidä mielessäsi että taltiota ei voida yhdistää ennen kuin se on täysin salattu. Sinun on mahdollista aloittaa uudelleen salaus prosessi ja se jatkuu kohdasta jonne se pysähtyi aiemmin. Voit tehdä näin,esimerkiksi, valitsemalla 'Taltiot' &gt; 'Aloita Uudelleen Keskeytetty Prosessi' VeraCrypt pääikkuna valikosta.</string>
     <string lang="fi" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Haluatko keskeyttää ja siirtää järjestelmäosion/levyn salaus prosessia?\n\nTiedotus: Sinun on mahdollista aloittaa prosessi uudelleen ja se jatkuu kohdasta johon pysähdyttiin. Voit tehdä niin, esim. valitsemalla 'Järjestelmä' &gt; 'Aloita Uudelleen Keskeytetty Prosessi' menu palkista VeraCrypt pääikkunasta. Jos haluat pysyvästi keskeyttää tai peruuttaa salakirjoitus prosessin, valitse 'Järjestelmä' &gt; 'Avaa Salaus Pysyvästi järjestelmäosiolta/Asemalta'.</string>
     <string lang="fi" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Haluatko keskeyttää ja siirtää järjestelmäosion/levyn salaus prosessia?\n\nTiedotus: Sinun on mahdollista aloittaa prosessi uudelleen ja se jatkuu kohdasta johon pysähdyttiin. Voit tehdä niin, esim. valitsemalla 'Järjestelmä' &gt; 'Aloita Uudelleen Keskeytetty Prosessi' menu palkista VeraCrypt pääikkunasta. Jos haluat peruuttaa salauksenpurun prosessin (ja aloittaa salauksen), valitse 'Järjestelmä' &gt; 'Salaa järjestelmäosio/Asema'.</string>
@@ -986,6 +1032,7 @@
     <string lang="fi" key="FAILED_TO_START_WIPING">Virhe: Epäonnistunut pyyhkimisen aloitus.</string>
     <string lang="fi" key="INCONSISTENCY_RESOLVED">Epäjohdonmukaisesti ratkaistu.\n\n\n(Jos raportoit viasta yhdistäessäsi näin, sisällytä seuraavat tekniset tiedot vikaraporttiin: %hs)</string>
     <string lang="fi" key="UNEXPECTED_STATE">Virhe: Odottamaton tila.\n\n\n(Jos raportoit virheestä yhteydessä tähän, ole hyvä ja sisällytä seuraavat tekniset tiedot virhe raporttiin: %hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="fi" key="NOTHING_TO_RESUME">Ei ole uudelleen aloitettavaa prosessia/tehtävää.</string>
     <string lang="fi" key="HIDVOL_PROT_BKG_TASK_WARNING">VAROITUS: VeraCrypt taustatehtävä on pois käytöstä. Poistuessasi VeraCrypt ohjelmasta, sinulle ilmoitetaan jos piilotetun taltion tuhot on torjuttu.\n\nTiedotus: Voit sulkea taustatehtävät milloin vain hiiren oikealla näppäimellä tai VeraCrypt palkin kuvakkeesta valitsemalla 'Poistu'.\n\nAktivoi VeraCrypt taustatehtävät?</string>
     <string lang="fi" key="LANG_PACK_VERSION">Kielipaketin versio:  %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="fi" key="ERROR_MBR_PROTECTED">Epäonnistunut kirjoitus MBR sektorille.\n\nSinun BIOS saattaa olla asetettu suojatulle MBR sektorille. Tarkista BIOS asetukset (paina F2, Delete, tai Esc, sen jälkeen kun kone on käynnistynyt) MBR/virussuojauksen takia.</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="fi" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">Vaadittua versiota VeraCrypt Käynnistyslataajasta ei ole nyt asennettuna. Tämä saattaa estää joitakin tallennettuja asetuksia.</string>
     <string lang="fi" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Huomioi: Joissakin tapauksissa, haluat estää henkilöä (vastustaja) että katsoo sinun käynnistävän tietokoneen tietäen että käytät VeraCrypt ohjelmaa. Yllä oleva vaihtoehto sallii sinua tekemään räätälöity VeraCrypt Käynnistyslataajan ikkuna. Jos mahdollistat ensimmäisen vaihtoehdon, ei tekstiä näytetä Käynnistyslataajassa (ei edes silloin kuin annat väärän salasanan). Tietokone näyttää "jäätyvän" ennen kuin voit kirjoittaa salasanasi. Lisäksi, muokattu sanoma voidaan näyttää harhaan johtamaan vastustaja. Esimerkiksi, väärennetty virhe sanoma kuten "Puuttuva käyttöjärjestelmä" (mikä tavallisesti näytetään Windows Käynnistyslataajassa jos se ei löydä Windows käynnistys osiota). Tämä on, kuitenkin, tärkeä havaita jos vastustaja voi analysoida kovalevyn sisältöä, hän voi havaita että se sisältää VeraCrypt Käynnistyslataajan.</string>
     <string lang="fi" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">VAROITUS: Pidä mielessäsi että valitsit tämän valinnan, VeraCrypt Käynnistyslataaja ei näytä mitään tekstejä (ei edes silloin kun annat väärän salasanan). Tietokone näyttää kuin olisi "jäätynyt" (reagoimaton) kun voit kirjoittaa salasanasi (kursori EI liiku eikä tähtimerkkiä näytetä kun painat näppäintä).\n\nOletko varma että haluat valita tämän valinnan?</string>
@@ -1034,8 +1082,11 @@
     <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="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>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="fi" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Avaintiedostot eivät ole nykyisin tuettuna järjestelmä salaukselle.</string>
     <string lang="fi" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Varoitus: VeraCrypt ei voi palauttaa alkuperäistä näppäimistä ulkoasua. Tämä saattaa johtaa sinun antamasta väärästä salasanasta.</string>
     <string lang="fi" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Virhe: Ei voida asettaa näppäimistö ulkoasua VeraCrypt standardi US näppäin ulkoasuksi.\n\nHuomioi, että salasana täytyy kirjoittaa esikäynnistys ympäristössä (ennen kuin Windows käynnistyy) kun ei-US Windows näppäimistö ulkoasu ei ole saatavana. Siksi salasana tulee aina kirjoittaa käyttäen standardia näppäin asetusta.</string>
@@ -1120,6 +1171,7 @@
     <string lang="fi" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">Esitesti on onnistuneesti suoritettu.\n\nVAROITUS: Huomioi että jos virta katkeaa äkillisesti kun salaus on meneillään, tai kun käyttöjärjestelmä kaatuu johtuen ohjelmisto virheestä tai laitteisto viasta johtuen kun VeraCrypt on salaamassa olemassa olevaa data, osa datasta korruptoituu tai häviää. Siksi, ennen kuin aloitat salauksen, varmista että sinulla on varmuustallennus kopio näistä tiedostoista jotka haluat salata. Jos ei ole, ole hyvä ja tee se nyt (voit painaa Lykkää, varmuustallenna nämä tiedostot, sitten aja VeraCrypt uudelleen, ja valitse 'Järjestelmä' &gt; 'Aloita Uudelleen Keskeytetty Prosessi' aloittaaksesi salauksen).\n\nKun valmis, paina Salaus aloittaaksesi salauksen.</string>
     <string lang="fi" key="SYSENC_ENCRYPTION_PAGE_INFO">Voit painaa tauko tai siirrä milloin tahansa keskeyttääksesi salaus/salauksenpurku toiminnon, poistu opastuksesta, uudelleen käynnistä tai sulje tietokone, ja sitten aloita prosessi uudelleen, mikä jatkuu edelleen siitä kohdasta johon pysähdyttiin. Torjuaksesi sulkemisen kun järjestelmä tai sovellus kirjoittaa tai lukee dataa järjestelmälevyltä, VeraCrypt automaattisesti odottaa ennen kuin dataa kirjoitetaan tai luetaan (katso Tilanne yläpuolella) ja sitten automaattisesti jatketaan salausta/salauksenpurkua.</string>
     <string lang="fi" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nVoit painaa Keskeytä tai Siirrä milloin tahansa keskeyttääksesi salaus prosessin, poistu tästä opastuksesta, aloita uudelleen tai sulje tietokone ja aloita uudelleen prosessi, mikä jatkaa kohdasta mihin aiemmin pysähdyttiin. Huomioi että taltiota ei voida yhdistää ennen kuin se on täysin salattu.</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="fi" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Piilotettu Järjestelmä Käynnistetty</string>
     <string lang="fi" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Alkuperäinen Järjestelmä</string>
     <string lang="fi" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows luo (tavallisesti sinun tietämättä tai ilman suostumustasi) erilaisia loki tiedostoja, väliaikaistiedostot, jne., järjestelmäosiolla. Se myös tallentaa RAM sisällön nukkumistilalle ja siivutus tiedostoille järjestelmäosiolle. Siksi, jos vastustaja tutkii tallennettuja tiedostoja osiolla missä alkuperäinen järjestelmä (mistä piilotettu järjestelmä on kloonattu) sijaitsee, hän saattaa havaita, esimerkiksi, että olet käyttänyt VeraCrypt opastettua piilotetun järjestelmän luonti tilassa (mikä saattaa osoittaa olemassa olevan piilotetun käyttöjärjestelmän tietokoneellasi).\n\nEstääksesi tällaisen ongelman, VeraCrypt tekee seuraavassa kohdassa, turvallisen poiston osio koko sisällölle missä alkuperäinen järjestelmä sijaitsee. Jälkeenpäin, saavuttaaksesi uskottavan tilanteen, sinun tulee asentaa uusi järjestelmäosiolle ja salata se. Joten sinun tulee luoda houkutuslintu järjestelmä ja piilotetun  käyttöjärjestelmä luonti suoritetaan loppuun.</string>
@@ -1159,7 +1211,7 @@
     <string lang="fi" key="HIDDEN_OS_CREATION_PREINFO_HELP">Seuraavassa askeleessa, VeraCrypt luo piilotetun käyttöjärjestelmän kopioimalla järjestelmäosion sisällön piilotetulle taltiolle (kopioitava data salataan lennossa salausavaimella joka eroaa siitä mitä käytetään houkutuslintu käyttöjärjestelmälle).\n\nOle hyvä ja huomioi että prosessi suorittaa esikäynnistys ympäristössä (ennen kuin Windows käynnistyy) ja sen valmistuminen saattaa kestää kauemmin; useita tunteja tai jopa useita päiviä (riippuen järjestelmäosion koosta ja tietokoneen suorituskyvystä).\n\nSinun on mahdollista keskeyttää prosessi, sulkea tietokone, käynnistää käyttöjärjestelmä ja sitten aloittaa uudelleen prosessi. Kuitenkin, jos keskeytät sen, koko järjestelmän kopiointi prosessi täytyy aloittaa alusta (koska järjestelmäosion sisältö ei saa muuttua kloonauksen aikana).</string>
     <string lang="fi" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Haluatko peruuttaa koko piilotetun käyttöjärjestelmän luonti tehtävän?\n\nHuomioi: EI ole mahdollista aloittaa tehtävää uudelleen jos keskeytät tehtävän nyt.</string>
     <string lang="fi" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Haluatko perua järjestelmän salauksen esitestauksen?</string>
-    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="fi" key="SYS_DRIVE_NOT_ENCRYPTED">järjestelmäosio/asema ei ole salattu (ei osittain eikä täysin).</string>
     <string lang="fi" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">järjestelmäosio/asema on suojattu (osittain tai täysin).\n\nValitse salauksenpurku järjestelmäosiolle/asemalle pelkästään ennen suoritusta. Tee näin, valitse 'Järjestelmä' &gt; 'Pysyvästi salasanapurettu järjestelmäosio/asema' menusta VeraCrypt pääikkunasta.</string>
     <string lang="fi" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">Kun järjestelmäosio/asema on salattu (osittain tai täysin), et voi käyttää vanhempaa versiota VeraCrypt ohjelmasta (mutta voit päivittää sen tai uudelleen asentaa saman version).</string>
@@ -1176,6 +1228,8 @@
     <string lang="fi" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">Olet valinnut järjestelmäosion/aseman, mutta opastus tilassa valintasi on mahdollista ainoastaan ei-järjestelmäosioille/asemille.\n\nHaluatko luoda esikäynnistys autentikoinnin (tämä tarkoittaa että sinun tarvitsee antaa salasana joka kerta ennen kuin Windows käynnistyy) ja salata järjestelmäosio/asema?</string>
     <string lang="fi" key="CONFIRM_DECRYPT_SYS_DEVICE">Oletko varma, että todella haluat salapurkaa pysyvästi järjestelmän osion/levyn?</string>
     <string lang="fi" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">VAROITUS: Jos pysyvästi purat salatun järjestelmäosion/levyn, salaamaton tieto kirjoitetaan sen päälle.\n\nOletko varma, että todella haluat salapurkaa pysyvästi järjestelmän osion/levyn?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
     <string lang="fi" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Varoitus: Jos käytät järjestelmä salaukselle salattua kytkentää, saatat kohdata seuraavat ongelmat:\n\n1) VeraCrypt Käynnistyslataaja on isompi kuin tavallisesti ja siksi ei ole riittävästi tilaa ensimmäisellä aseman uralla jotta VeraCrypt käynnistyslataaja voitaisiin varmuustallentaa. Näin ollen, milloin vain se vahingoittuu (jota usein tapahtuu, esimerkiksi, epäasiallisesti suunniteltu virustorjunta aktivointimenettely tietyillä ohjelmilla), sinun tarvitsee käyttää VeraCrypt Pelastuslevyä käynnistääksesi tai korjataksesi VeraCrypt Käynnistyslataajan.\n\n2) Joissakin tietokoneissa, paluu lepotilasta kestää kauemmin.\n\nNämä mahdolliset ongelmat voidaan ehkäistä valitsemalla ei-kytketty salausalgoritmi (esim. AES).\n\nOletko varma että haluat käyttää salattua kytkentää?</string>
     <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>
@@ -1191,6 +1245,7 @@
     <string lang="fi" key="ENABLE_BAD_SECTOR_ZEROING">Virhe: Yhden tai useamman sektorin sisältöä ei voida lukea (johtuen ehkä fyysisestä virheestä).\n\nPaikallaan salausprosessi voi jatkua ainoastaan kun sektori on luettavissa uudelleen. VeraCrypt voi yrittää tehdä nämä sektorit luettavaksi kirjoittamalla nollia sektorille (Myöhemmin tällaiset nollat lohkot salataan). Kuitenkin, huomioi että tieto tallennettuna lukemiseen kelpaamattomille sektoreille saattaa kadotat. Jos haluat ehkäistä tämän, voit yrittää varmuustallentaa osan tuhoutuneesta tiedosta käyttäen tarkoituksenmukaista kolmannen osapuolen työkaluja.\n\nHuomioi: Tapauksessa jossa on fyysisesti tuhoutuneita sektoreita (toisin kuin paljon tietoa turmeltunut tai virheellinen tarkistussumma) useimmista tallennettujen taltioiden sisäisistä uudelleenallokoiduista sektori tyypeistä kun tietoa on yritetty kirjoittaa niihin (niin olemassa oleva tieto tuhoutuneella sektorilla saattaa jäädä asemalle salaamattomaksi).\n\nHaluatko VeraCrypt kirjoittaa nollia lukemiseen kelpaamattomille sektoreille?</string>
     <string lang="fi" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Virhe: Yhden tai useamman sektorin sisältöä levyllä ei voida lukea (mahdollisesti johtuen fyysisestä viasta).\n\nJotta salauksen purkamista olisi mahdollista jatkaa, VeraCrypt hylkää lukemiseen kelpaamattomien sektoreiden sisällön (sisältö korvataan näennäisarvo tiedolla). Huomioi, että ennen kuin jatkat, voit yrittää varmuuskopioida osan mistä tahansa vioittuneesta tiedosta käyttäen tarkoituksenmukaista kolmannen osapuolen työkaluja.\n\nHaluatko että VeraCrypt nyt hylkää lukemattomaksi kelpaamattomat sektorit?</string>
     <string lang="fi" key="ZEROED_BAD_SECTOR_COUNT">Huomioi: VeraCrypt on korvannut sisällön %I64d lukukelvottomalla sektorilla (%s) salatulla kaikki nollatuilla lohkoilla.</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="fi" key="ENTER_TOKEN_PASSWORD">Anna salasana/PIN merkille '%s':</string>
     <string lang="fi" key="PKCS11_LIB_LOCATION_HELP">Salliaksesi VeraCrypt pääsyn turvallisuustunnisteisiin tai älykorttiin, sinun tarvitsee asentaa PKCS #11 ohjelmisto kirjastomerkeille tai älykortille ensin. Tällainen kirjasto saatetaan toimittaa laitteen mukana tai se voi olla ladattavissa toimittajan web sivuilta tai muulta kolmannelta osapuolelta.\n\nKun olet asentanut kirjaston, voit joko valita sen käsin painamalla 'Valitse kirjasto' tai voit antaa VeraCrypt löytää sen ja valita sen automaattisesti painamalla  'Auto-tunnista Kirjasto' (vain Windows järjestelmä hakemisto tutkitaan).</string>
     <string lang="fi" key="SELECT_PKCS11_MODULE_HELP">Tiedote: Asennettu PKCS #11 kirjaston turvallisuustunniste tai älykortti tiedostonimelle ja sijainnille, mainitaan dokumentissa, joka on toimitettu tunnisteen, kortin tai kolmannen osapuolen ohjelmiston mukana.\n\nPaina 'OK' valitaksesi polun tai tiedostonimen.</string>

Translations/Language.hu.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="hu" name="Magyar" en-name="Hungarian" version="0.1.0" translators="Nyul Balazs" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <control lang="en" key="IDC_KEY_FILES">&amp;Keyfiles...</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="hu" 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>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <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="hu" key="IDT_CONFIRM">&amp;Megerősítés:</control>
     <control lang="hu" key="IDT_DONE">Kész </control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="hu" key="IDT_ENCRYPTION_ALGO">Titkosítási Algoritmus</control>
     <control lang="hu" key="IDT_FILESYSTEM">Fájlrendszer </control>
     <control lang="en" key="IDT_FILE_CONTAINER">Creates a virtual encrypted disk within a file. Recommended for inexperienced users.</control>
@@ -85,6 +88,8 @@
     <control lang="en" key="IDT_PARTIAL_POOL_CONTENTS">Current pool content (partial)</control>
     <control lang="en" key="IDT_PASS">Pass</control>
     <control lang="hu" key="IDT_PASSWORD">Jelszó:</control>
+    <control lang="en" key="IDT_PIM">Volume PIM:</control>
+    <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
     <control lang="en" key="IDT_PROGRESS">Progress:</control>
     <control lang="hu" key="IDT_RANDOM_POOL">Random Pool: </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>
@@ -142,6 +147,8 @@
     <control lang="en" key="IDC_MOUNT_OPTIONS">Mount Opti&amp;ons...</control>
     <control lang="hu" key="IDC_MOUNT_READONLY">Kötet csak &amp;olvasható módú csatolása</control>
     <control lang="hu" key="IDC_NEW_KEYFILES">Kulcsfájlok...</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="hu" key="IDC_PREF_BKG_TASK_ENABLE">Engedélyezve</control>
     <control lang="hu" key="IDC_PREF_CACHE_PASSWORDS">Jelszavak tárolása a driver memóriájában</control>
     <control lang="hu" key="IDC_PREF_DISMOUNT_INACTIVE">Kötet leválasztása, ha adatot nem írtak/olvastak róla ennyi ideje:</control>
@@ -155,6 +162,7 @@
     <control lang="hu" key="IDC_PREF_MOUNT_READONLY">Kötetek csak olvasható csatolása</control>
     <control lang="hu" key="IDC_PREF_MOUNT_REMOVABLE">Kötetek csatolása cserélhető lemezként</control>
     <control lang="hu" key="IDC_PREF_OPEN_EXPLORER">Sikeresen csatolt kötet Explorerben való megnyitása</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</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="hu" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Tárolt jelszavak törlése auto-leválasztáskor</control>
     <control lang="hu" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Tárolt jelszavak törlése kilépéskor</control>
@@ -167,11 +175,12 @@
     <control lang="en" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Display password</control>
     <control lang="hu" key="IDC_TRAVEL_OPEN_EXPLORER">&amp;Explorer ablak nyitása a csatolt kötethez</control>
     <control lang="hu" key="IDC_TRAV_CACHE_PASSWORDS">&amp;Jelszó tárolása a driver memóriájában</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="hu" key="IDC_UNMOUNTALL">M&amp;inden lecsatolása</control>
     <control lang="hu" key="IDC_VOLUME_PROPERTIES">&amp;Kötet Tulajdonságok...</control>
     <control lang="hu" key="IDC_VOLUME_TOOLS">Kötet &amp;Eszközök...</control>
     <control lang="hu" key="IDC_WIPE_CACHE">&amp;Cache ürítés</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
     <control lang="hu" key="IDD_HOTKEYS_DLG">VeraCrypt - Rendszer szintű gyorsgombok</control>
     <control lang="hu" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="en" key="IDM_CREATE_HIDDEN_OS">Create Hidden Operating System...</control>
     <control lang="en" key="IDM_CREATE_RESCUE_DISK">Create Rescue Disk...</control>
     <control lang="hu" key="IDM_CREATE_VOLUME">Új kötet létrehozása...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="hu" key="IDM_DEFAULT_KEYFILES">Alap. kulcsfájlok...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="en" key="IDM_ENCRYPT_SYSTEM_DEVICE">Encrypt System Partition/Drive...</control>
     <control lang="hu" key="IDM_FAQ">Gyakran Ismételt Kérdések</control>
@@ -243,6 +254,7 @@
     <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="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>
     <control lang="hu" key="IDM_VOLUME_WIZARD">Kötet létrehozás varázsló</control>
     <control lang="hu" key="IDM_WEBSITE">VeraCrypt Honlap</control>
@@ -369,7 +381,7 @@
     <string lang="hu" key="ACCESS_DENIED">Hiba: Belépés megtagadva.\n\nA partíció amihez hozzá próbált hozzéférni vagy 0 szektor hosszú, vagy az a boot eszköz.</string>
     <string lang="en" key="ADMINISTRATOR">Administrator</string>
     <string lang="en" key="ADMIN_PRIVILEGES_DRIVER">In order to load the VeraCrypt driver, you need to be logged into an account with administrator privileges.</string>
-    <string lang="en" key="ADMIN_PRIVILEGES_WARN_DEVICES">Please note that in order to encrypt/format a partition/device you need to be logged into an account with administrator privileges.\n\nThis does not apply to file-hosted volumes.</string>
+    <string lang="en" key="ADMIN_PRIVILEGES_WARN_DEVICES">Please note that in order to encrypt, decrypt or format a partition/device you need to be logged into an account with administrator privileges.\n\nThis does not apply to file-hosted volumes.</string>
     <string lang="en" key="ADMIN_PRIVILEGES_WARN_HIDVOL">In order to create a hidden volume you need to be logged into an account with administrator privileges.\n\nContinue?</string>
     <string lang="en" key="ADMIN_PRIVILEGES_WARN_NTFS">Please note that in order to format the volume as NTFS you need to be logged into an account with administrator privileges.\n\nWithout administrator privileges, you can format the volume as FAT.</string>
     <string lang="en" key="AES_HELP">FIPS-approved cipher (Rijndael, published in 1998) that may be used by U.S. government departments and agencies to protect classified information up to the Top Secret level. 256-bit key, 128-bit block, 14 rounds (AES-256). Mode of operation is XTS.</string>
@@ -485,7 +497,11 @@
     <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>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Volume Fully Encrypted</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_INFO">IMPORTANT: TO MOUNT THIS NEWLY CREATED VERACRYPT VOLUME AND TO ACCESS DATA STORED IN IT, CLICK 'Auto-Mount Devices' IN THE MAIN VERACRYPT WINDOW. After you enter the correct password (and/or supply correct keyfiles), the volume will be mounted to the drive letter you select from the list in the main VeraCrypt window (and you will be able to access the encrypted data via the selected drive letter).\n\nPLEASE REMEMBER OR WRITE DOWN THE ABOVE STEPS. YOU MUST FOLLOW THEM WHENEVER YOU WANT TO MOUNT THE VOLUME AND ACCESS DATA STORED IN IT. Alternatively, in the main VeraCrypt window, click 'Select Device', then select this partition/volume, and click 'Mount'.\n\nThe partition/volume has been successfully encrypted (it contains a fully encrypted VeraCrypt volume now) and is ready for use.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="en" key="FORMAT_FINISHED_INFO">The VeraCrypt volume has been successfully created.</string>
     <string lang="hu" key="FORMAT_FINISHED_TITLE">Kötet elkészült</string>
     <string lang="en" key="FORMAT_HELP">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 Format to create the volume.</string>
@@ -522,7 +538,8 @@
     <string lang="en" key="CONFIRM_RESTART">Your computer must be restarted.\n\nDo you want to restart it now?</string>
     <string lang="en" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">An error occurred when obtaining the system encryption status.</string>
     <string lang="en" key="INIT_SYS_ENC">Cannot initialize application components for system encryption.</string>
-    <string lang="en" key="INIT_RAND">Failed to initialize the random number generator!</string>
+    <string lang="en" key="INIT_RAND">Failed to initialize the random number generator!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="en" key="INIT_REGISTER">Unable to initialize the application. Failed to register the Dialog class.</string>
     <string lang="en" key="INIT_RICHEDIT">Error: Failed to load the Rich Edit system library.</string>
     <string lang="en" key="INTRO_TITLE">VeraCrypt Volume Creation Wizard</string>
@@ -535,6 +552,7 @@
     <string lang="en" key="MOUNT_BUTTON">&amp;Mount</string>
     <string lang="en" key="NEW_VERSION_REQUIRED">A newer version of VeraCrypt is required to mount this volume.</string>
     <string lang="en" key="VOL_CREATION_WIZARD_NOT_FOUND">Error: Volume Creation Wizard not found.\n\nPlease make sure that the file 'VeraCrypt Format.exe' is in the folder from which 'VeraCrypt.exe' was launched. If it is not, please reinstall VeraCrypt, or locate 'VeraCrypt Format.exe' on your disk and run it.</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="hu" key="NEXT">&amp;Következő &gt;</string>
     <string lang="en" key="FINALIZE">&amp;Finish</string>
     <string lang="en" key="INSTALL">&amp;Install</string>
@@ -542,6 +560,7 @@
     <string lang="en" key="NODRIVER">Unable to connect to the VeraCrypt device driver. VeraCrypt cannot work if the device driver is not running.\n\nPlease note that, due to a Windows issue, it may be necessary to log off or restart the system before the device driver can be loaded.</string>
     <string lang="en" key="NOFONT">Error occurred when loading/preparing fonts.</string>
     <string lang="en" key="NOT_FOUND">The drive letter was not found or no drive letter was specified.</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="en" key="DRIVE_LETTER_UNAVAILABLE">Drive letter not available.</string>
     <string lang="hu" key="NO_FILE_SELECTED">Nincs fájl kiválasztva!</string>
     <string lang="en" key="NO_FREE_DRIVES">No drive letters available.</string>
@@ -561,15 +580,18 @@
     <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_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="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_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt.\n\nDo you have such a backup?</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_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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="en" key="IDD_PCDM_CHANGE_PKCS5_PRF">Set Header Key Derivation Algorithm</string>
     <string lang="en" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Add/Remove Keyfiles to/from Volume</string>
     <string lang="en" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Remove All Keyfiles from Volume</string>
-    <string lang="en" key="PASSWORD_CHANGED">Password and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</string>
+    <string lang="en" key="PASSWORD_CHANGED">Password, PIM and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</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="en" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">IMPORTANT: If you did not destroy your VeraCrypt Rescue Disk, your system partition/drive can still be decrypted using the old password (by booting the VeraCrypt Rescue Disk and entering the old password). You should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</string>
     <string lang="en" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Note that your VeraCrypt Rescue Disk still uses the previous algorithm. If you consider the previous algorithm insecure, you should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,7 +600,8 @@
     <string lang="en" key="PKCS5_PRF_CHANGED">Header key derivation algorithm successfully set.</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_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="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 more than 20 characters (the longer, the better). The maximum possible length is 64 characters.</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="en" key="PASSWORD_HIDDENVOL_HELP">Please choose a password for the hidden volume. </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_HELP">Please choose a password for the hidden operating system (i.e. for the hidden volume). </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_NOTE">IMPORTANT: The password that you choose for the hidden operating system in this step must be substantially different from the other two passwords (i.e. from the password for the outer volume and from the password for the decoy operating system).</string>
@@ -588,7 +611,7 @@
     <string lang="en" key="PASSWORD_HIDVOL_HOST_TITLE">Outer Volume Password</string>
     <string lang="en" key="PASSWORD_HIDVOL_TITLE">Hidden Volume Password</string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_TITLE">Password for Hidden Operating System</string>
-    <string lang="en" key="PASSWORD_LENGTH_WARNING">WARNING: Short passwords are easy to crack using brute force techniques!\n\nWe recommend choosing a password consisting of more than 20 characters. Are you sure you want to use a short password?</string>
+    <string lang="en" key="PASSWORD_LENGTH_WARNING">WARNING: Short passwords are easy to crack using brute force techniques!\n\nWe recommend choosing a password consisting of 20 or more characters. Are you sure you want to use a short password?</string>
     <string lang="hu" key="PASSWORD_TITLE">Kötet jelszó</string>
     <string lang="hu" key="PASSWORD_WRONG">Hibás jelszó, vagy nem VeraCrypt kötet.</string>
     <string lang="en" key="PASSWORD_OR_KEYFILE_WRONG">Incorrect keyfile(s) and/or password or not a VeraCrypt volume.</string>
@@ -597,11 +620,26 @@
     <string lang="hu" key="PASSWORD_WRONG_AUTOMOUNT">Hibás jelszó, vagy nem találni a VeraCrypt kötet.</string>
     <string lang="en" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Incorrect keyfile(s)/password or no VeraCrypt volume found.</string>
     <string lang="hu" key="PASSWORD_WRONG_CAPSLOCK_ON">\n\nFigyelem: CapsLock bekapcsolva. Ez azt eredményezheti, hogy hibásan írja be a jelszavát.</string>
+    <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
+    <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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_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>
+    <string lang="en" key="SELECTED_PARTITION_NOT_INPLACE_ENC">The selected partition/device is not using in-place encryption.\nHeader Flags = 0x%.8X</string>
     <string lang="en" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nNote: If you are attempting to mount a partition located on an encrypted system drive without pre-boot authentication or to mount the encrypted system partition of an operating system that is not running, you can do so by selecting 'System' &gt; 'Mount Without Pre-Boot Authentication'.</string>
     <string lang="en" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">In this mode, you cannot mount a partition located on a drive whose portion is within the key scope of active system encryption.\n\nBefore you can mount this partition in this mode, you need to either boot an operating system installed on a different drive (encrypted or unencrypted) or boot an unencrypted operating system.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <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>
@@ -701,11 +739,18 @@
     <string lang="en" key="FOR_MORE_INFO_ON_PARTITIONS">For information on how to create and manage partitions, please refer to the documentation supplied with your operating system or contact your computer vendor's technical support team for assistance.</string>
     <string lang="en" key="SYSTEM_PARTITION_NOT_ACTIVE">Error: The currently running operating system is not installed on the boot partition (first Active partition). This is not supported.</string>
     <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="en" key="CANT_ACCESS_VOL">Error: Cannot access the volume!\n\nMake sure that the selected volume exists, that it is not mounted or being used by the system or an application, that you have read/write permission for the volume, and that it is not write-protected.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Error: Cannot access the volume and/or obtain information about the volume.\n\nMake sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Error: Cannot access the volume and/or obtain information about the volume. Make sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.\n\nIf the problem persists, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">An error prevented VeraCrypt from encrypting the partition. Please try fixing any previously reported problems and then try again. If the problems persist, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_RESUME">An error prevented VeraCrypt from resuming the process of encryption of the partition.\n\nPlease try fixing any previously reported problems and then try resuming the process again. Note that the volume cannot be mounted until it has been fully encrypted.</string>
+    <string lang="en" key="INPLACE_DEC_GENERIC_ERR">An error prevented VeraCrypt from decrypting the volume. Please try fixing any previously reported problems and then try again if possible.</string>
     <string lang="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="en" key="CANT_ACCESS_OUTER_VOL">Error: Cannot access the outer volume! Volume creation cannot continue.</string>
@@ -790,7 +835,7 @@
     <string lang="en" key="TC_INSTALLER_IS_RUNNING">VeraCrypt Installer is currently running on this system and performing or preparing installation or update of VeraCrypt. Before you proceed, please wait for it to finish or close it. If you cannot close it, please restart your computer before proceeding.</string>
     <string lang="en" key="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 www.veracrypt.org).</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="EXTRACTING_VERB">Extracting</string>
     <string lang="en" key="CANNOT_READ_FROM_PACKAGE">Cannot read data from the package.</string>
@@ -977,6 +1022,7 @@
     <string lang="en" key="CONFIRM_EXIT_UNIVERSAL">Exit?</string>
     <string lang="en" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt does not have sufficient information to determine whether to encrypt or decrypt.</string>
     <string lang="en" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt does not have sufficient information to determine whether to encrypt or decrypt.\n\nNote: If you decrypted the system partition/drive in the pre-boot environment, you may need to finalize the process by clicking Decrypt.</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_REVERSE_INFO">Note: When you are encrypting a non-system partition/volume in place and an error persistently prevents you from finishing the process, you will not be able to mount the volume (and access data stored on it) until you entirely DECRYPT the volume (i.e. reverse the process).\n\nIf you need to do so, follow these steps:\n1) Exit this wizard.\n2) In the main VeraCrypt window, select 'Volumes' &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="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Do you want to interrupt and postpone the process of encryption of the system partition/drive?\n\nNote: You will be able to resume the process and it will continue from the point it was stopped. You can do so, for example, by selecting 'System' &gt; 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window. If you want to permanently terminate or reverse the encryption process, select 'System' &gt; 'Permanently Decrypt System Partition/Drive'.</string>
     <string lang="en" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Do you want to interrupt and postpone the process of decryption of the system partition/drive?\n\nNote: You will be able to resume the process and it will continue from the point it was stopped. You can do so, for example, by selecting 'System' &gt; 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window. If you want to reverse the decryption process (and start encrypting), select 'System' &gt; 'Encrypt System Partition/Drive'.</string>
@@ -986,6 +1032,7 @@
     <string lang="en" key="FAILED_TO_START_WIPING">Error: Failed to start the process of wiping.</string>
     <string lang="en" key="INCONSISTENCY_RESOLVED">Inconsistency resolved.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="en" key="NOTHING_TO_RESUME">There is no process/task to resume.</string>
     <string lang="en" key="HIDVOL_PROT_BKG_TASK_WARNING">WARNING: VeraCrypt Background Task is disabled. After you exit VeraCrypt, you will not be notified if damage to hidden volume is prevented.\n\nNote: You may shut down the Background Task anytime by right-clicking the VeraCrypt tray icon and selecting 'Exit'.\n\nEnable VeraCrypt Background Task?</string>
     <string lang="hu" key="LANG_PACK_VERSION">Nyelvi csomag verziója:  %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="en" key="ERROR_MBR_PROTECTED">Failed to write the MBR sector.\n\nYour BIOS may be configured to protect the MBR sector. Check your BIOS settings (press F2, Delete, or Esc, after powering on your computer) for MBR/antivirus protection.</string>
+    <string lang="en" key="BOOT_LOADER_FINGERPRINT_CHECK_FAILED">WARNING: The verification of VeraCrypt bootloader fingerprint failed!\nYour disk may have been tampered with by an attacker ("Evil Maid" attack).\n\nThis warning can also be triggered if you restored VeraCrypt boot loader using an Rescue Disk generated using a different VeraCrypt version.\n\nYou are advised to change your password immediately which will also restore the correct VeraCrypt bootloader. It is recommended to reinstall VeraCrypt and to take measures to avoid access to this machine by untrusted entities.</string>
     <string lang="en" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">The required version of the VeraCrypt Boot Loader is currently not installed. This may prevent some of the settings from being saved.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Note: In some situations, you may wish to prevent a person (adversary) that is watching you start the computer from knowing that you use VeraCrypt. The above options allow you to do that by customizing the VeraCrypt boot loader screen. If you enable the first option, no texts will be displayed by the boot loader (not even when you enter the wrong password). The computer will appear to be "frozen" while you can type your password. In addition, a custom message can be displayed to mislead the adversary. For example, fake error messages such as "Missing operating system" (which is normally displayed by the Windows boot loader if it finds no Windows boot partition). It is, however, important to note that if the adversary can analyze the content of the hard drive, he can still find out that it contains the VeraCrypt boot loader.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">WARNING: Please keep in mind that if you enable this option, the VeraCrypt boot loader will not display any texts (not even when you enter the wrong password). The computer will appear to be "frozen" (unresponsive) while you can type your password (the cursor will NOT move and no asterisk will be displayed when you press a key).\n\nAre you sure you want to enable this option?</string>
@@ -1034,8 +1082,11 @@
     <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="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">Warning: There is unallocated space between the system partition and the first partition behind it. After you create the hidden operating system, you must not create any new partitions in that unallocated space. Otherwise, the hidden operating system will be impossible to boot (until you delete such newly created partitions).</string>
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">This algorithm is currently not supported for system encryption.</string>
-	<string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</string>
     <string lang="en" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Error: Cannot set the keyboard layout for VeraCrypt to the standard US keyboard layout.\n\nNote that the password needs to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout.</string>
@@ -1120,6 +1171,7 @@
     <string lang="en" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">The pretest has been successfully completed.\n\nWARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt. If you do not, please back up the files now (you can click Defer, back up the files, then run VeraCrypt again anytime, and select 'System' &gt; 'Resume Interrupted Process' to start encrypting).\n\nWhen ready, click Encrypt to start encrypting.</string>
     <string lang="en" key="SYSENC_ENCRYPTION_PAGE_INFO">You can click Pause or Defer anytime to interrupt the process of encryption or decryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. To prevent slowdown when the system or applications write or read data from the system drive, VeraCrypt automatically waits until the data is written or read (see Status above) and then automatically continues encrypting or decrypting.</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nYou can click Pause or Defer anytime to interrupt the process of encryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. Note that the volume cannot be mounted until it has been fully encrypted.</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="en" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Hidden System Started</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Original System</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows creates (typically, without your knowledge or consent) various log files, temporary files, etc., on the system partition. It also saves the content of RAM to hibernation and paging files located on the system partition. Therefore, if an adversary analyzed files stored on the partition where the original system (of which the hidden system is a clone) resides, he might find out, for example, that you used the VeraCrypt wizard in the hidden-system-creation mode (which might indicate the existence of a hidden operating system on your computer).\n\nTo prevent such issues, VeraCrypt will, in the next steps, securely erase the entire content of the partition where the original system resides. Afterwards, in order to achieve plausible deniability, you will need to install a new system on the partition and encrypt it. Thus you will create the decoy system and the whole process of creation of the hidden operating system will be completed.</string>
@@ -1159,7 +1211,7 @@
     <string lang="en" key="HIDDEN_OS_CREATION_PREINFO_HELP">In the next steps, VeraCrypt will create the hidden operating system by copying the content of the system partition to the hidden volume (data being copied will be encrypted on the fly with an encryption key different from the one that will be used for the decoy operating system).\n\nPlease note that the process will be performed in the pre-boot environment (before Windows starts) and it may take a long time to complete; several hours or even several days (depending on the size of the system partition and on the performance of your computer).\n\nYou will be able to interrupt the process, shut down your computer, start the operating system and then resume the process. However, if you interrupt it, the entire process of copying the system will have to start from the beginning (because the content of the system partition must not change during cloning).</string>
     <string lang="en" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Do you want to cancel the entire process of creation of the hidden operating system?\n\nNote: You will NOT be able to resume the process if you cancel it now.</string>
     <string lang="en" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Do you want to cancel the system encryption pretest?</string>
-    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="en" key="SYS_DRIVE_NOT_ENCRYPTED">The system partition/drive does not appear to be encrypted (neither partially nor fully).</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">Your system partition/drive is encrypted (partially or fully).\n\nPlease decrypt your system partition/drive entirely before proceeding. To do so, select 'System' &gt; 'Permanently Decrypt System Partition/Drive' from the menu bar of the main VeraCrypt window.</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">When the system partition/drive is encrypted (partially or fully), you cannot downgrade VeraCrypt (but you can upgrade it or reinstall the same version).</string>
@@ -1176,6 +1228,8 @@
     <string lang="en" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">You have selected the system partition/drive (or the boot partition), but the wizard mode you selected is suitable only for non-system partitions/drives.\n\nDo you want to set up pre-boot authentication (which means that you will need to enter your password each time before Windows boots/starts) and encrypt the system partition/drive?</string>
     <string lang="en" key="CONFIRM_DECRYPT_SYS_DEVICE">Are you sure you want to permanently decrypt the system partition/drive?</string>
     <string lang="en" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the system partition/drive, unencrypted data will be written to it.\n\nAre you really sure you want to permanently decrypt the system partition/drive?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
     <string lang="en" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Warning: If you use a cascade of ciphers for system encryption, you may encounter the following issues:\n\n1) The VeraCrypt Boot Loader is larger than normal and, therefore, there is not enough space in the first drive track for a backup of the VeraCrypt Boot Loader. Hence, whenever it gets damaged (which often happens, for example, during inappropriately designed anti-piracy activation procedures of certain programs), you will need to use the VeraCrypt Rescue Disk to boot or to repair the VeraCrypt Boot Loader.\n\n2) On some computers, resuming from hibernation takes longer.\n\nThese potential issues can be prevented by choosing a non-cascade encryption algorithm (e.g. AES).\n\nAre you sure you want to use a cascade of ciphers?</string>
     <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>
@@ -1191,6 +1245,7 @@
     <string lang="en" key="ENABLE_BAD_SECTOR_ZEROING">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nThe process of in-place encryption can continue only when the sectors have been made readable again. VeraCrypt can attempt to make these sectors readable by writing zeros to the sectors (subsequently such all-zero blocks would be encrypted). However, note that any data stored in the unreadable sectors will be lost. If you want to avoid that, you can attempt to recover portions of the corrupted data using appropriate third-party tools.\n\nNote: In case of physically damaged sectors (as opposed to mere data corruption and checksum errors) most types of storage devices internally reallocate the sectors when data is attempted to be written to them (so the existing data in the damaged sectors may remain unencrypted on the drive).\n\nDo you want VeraCrypt to write zeroes to unreadable sectors?</string>
     <string lang="en" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nTo be able to proceed with decryption, VeraCrypt will have to discard the content of the unreadable sectors (the content will be replaced with pseudorandom data). Please note that, before proceeding, you can attempt to recover portions of any corrupted data using appropriate third-party tools.\n\nDo you want VeraCrypt to discard data in the unreadable sectors now?</string>
     <string lang="en" key="ZEROED_BAD_SECTOR_COUNT">Note: VeraCrypt has replaced the content of %I64d unreadable sectors (%s) with encrypted all-zero plaintext blocks.</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="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>

Translations/Language.id.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="id" name="Bahasa Indonesia" en-name="Indonesian" version="0.1.0" translators="Tajuddin N. F." />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <control lang="id" key="IDC_KEY_FILES">&amp;File kunci..</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="id" 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>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <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="id" key="IDT_CONFIRM">&amp;Penegasan:</control>
     <control lang="id" key="IDT_DONE">Selesai</control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="id" key="IDT_ENCRYPTION_ALGO">Algoritma pengacak</control>
     <control lang="id" key="IDT_FILESYSTEM">File system </control>
     <control lang="en" key="IDT_FILE_CONTAINER">Creates a virtual encrypted disk within a file. Recommended for inexperienced users.</control>
@@ -85,6 +88,8 @@
     <control lang="en" key="IDT_PARTIAL_POOL_CONTENTS">Current pool content (partial)</control>
     <control lang="en" key="IDT_PASS">Pass</control>
     <control lang="id" key="IDT_PASSWORD">Password:</control>
+    <control lang="en" key="IDT_PIM">Volume PIM:</control>
+    <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
     <control lang="en" key="IDT_PROGRESS">Progress:</control>
     <control lang="id" key="IDT_RANDOM_POOL">Kumpulan acak: </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>
@@ -142,6 +147,8 @@
     <control lang="id" key="IDC_MOUNT_OPTIONS">Pilih&amp;an...</control>
     <control lang="id" key="IDC_MOUNT_READONLY">Sambung volume hanya bisa dibac&amp;a</control>
     <control lang="id" key="IDC_NEW_KEYFILES">File kunci...</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="id" key="IDC_PREF_BKG_TASK_ENABLE">Bisa dijalankan</control>
     <control lang="id" key="IDC_PREF_CACHE_PASSWORDS">Simpan password pada driver memory</control>
     <control lang="id" key="IDC_PREF_DISMOUNT_INACTIVE">Tutup otomatis volume jika tidak ada data dibaca/ditulis setelah:</control>
@@ -155,6 +162,7 @@
     <control lang="id" key="IDC_PREF_MOUNT_READONLY">Sambung volume hanya bisa-baca</control>
     <control lang="id" key="IDC_PREF_MOUNT_REMOVABLE">Sambung volume jadi media lepas-pasang</control>
     <control lang="id" key="IDC_PREF_OPEN_EXPLORER">Buka jendela explorer dari volume yang berhasil disambung</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</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="id" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Bersihkan password tersimpan pada sambung otomatist</control>
     <control lang="id" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Bersihkan password tersimpan saat keluar</control>
@@ -167,11 +175,12 @@
     <control lang="id" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Tampilkan password</control>
     <control lang="id" key="IDC_TRAVEL_OPEN_EXPLORER">Buka jendela &amp;Explorer untuk volume yang tersambung</control>
     <control lang="id" key="IDC_TRAV_CACHE_PASSWORDS">&amp;Simpan password pada driver memory</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="id" key="IDC_UNMOUNTALL">Putu&amp;skan semua</control>
     <control lang="id" key="IDC_VOLUME_PROPERTIES">Profil &amp;Volume...</control>
     <control lang="id" key="IDC_VOLUME_TOOLS">Penga&amp;turan volume...</control>
     <control lang="id" key="IDC_WIPE_CACHE">Bersih&amp;kan Simpanan</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
     <control lang="id" key="IDD_HOTKEYS_DLG">Kunci pintas Sistem - VeraCrypt</control>
     <control lang="id" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="en" key="IDM_CREATE_HIDDEN_OS">Create Hidden Operating System...</control>
     <control lang="en" key="IDM_CREATE_RESCUE_DISK">Create Rescue Disk...</control>
     <control lang="id" key="IDM_CREATE_VOLUME">Buat Volume Baru...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="id" key="IDM_DEFAULT_KEYFILES">File Kunci Dasar...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="en" key="IDM_ENCRYPT_SYSTEM_DEVICE">Encrypt System Partition/Drive...</control>
     <control lang="id" key="IDM_FAQ">Pertanyaan yang sering diajukan</control>
@@ -243,6 +254,7 @@
     <control lang="id" key="IDM_UNMOUNT_VOLUME">Putuskan Volume</control>
     <control lang="en" key="IDM_VERIFY_RESCUE_DISK">Verify Rescue Disk</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>
     <control lang="id" key="IDM_VOLUME_WIZARD">Panduan pembuatan Volume</control>
     <control lang="id" key="IDM_WEBSITE">Halaman Web VeraCrypt</control>
@@ -369,7 +381,7 @@
     <string lang="en" key="ACCESS_DENIED">Error: Access denied.\n\nThe partition you are trying to access is either 0 sectors long, or it is the boot device.</string>
     <string lang="en" key="ADMINISTRATOR">Administrator</string>
     <string lang="en" key="ADMIN_PRIVILEGES_DRIVER">In order to load the VeraCrypt driver, you need to be logged into an account with administrator privileges.</string>
-    <string lang="en" key="ADMIN_PRIVILEGES_WARN_DEVICES">Please note that in order to encrypt/format a partition/device you need to be logged into an account with administrator privileges.\n\nThis does not apply to file-hosted volumes.</string>
+    <string lang="en" key="ADMIN_PRIVILEGES_WARN_DEVICES">Please note that in order to encrypt, decrypt or format a partition/device you need to be logged into an account with administrator privileges.\n\nThis does not apply to file-hosted volumes.</string>
     <string lang="en" key="ADMIN_PRIVILEGES_WARN_HIDVOL">In order to create a hidden volume you need to be logged into an account with administrator privileges.\n\nContinue?</string>
     <string lang="en" key="ADMIN_PRIVILEGES_WARN_NTFS">Please note that in order to format the volume as NTFS you need to be logged into an account with administrator privileges.\n\nWithout administrator privileges, you can format the volume as FAT.</string>
     <string lang="en" key="AES_HELP">FIPS-approved cipher (Rijndael, published in 1998) that may be used by U.S. government departments and agencies to protect classified information up to the Top Secret level. 256-bit key, 128-bit block, 14 rounds (AES-256). Mode of operation is XTS.</string>
@@ -485,7 +497,11 @@
     <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>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Volume Fully Encrypted</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_INFO">IMPORTANT: TO MOUNT THIS NEWLY CREATED VERACRYPT VOLUME AND TO ACCESS DATA STORED IN IT, CLICK 'Auto-Mount Devices' IN THE MAIN VERACRYPT WINDOW. After you enter the correct password (and/or supply correct keyfiles), the volume will be mounted to the drive letter you select from the list in the main VeraCrypt window (and you will be able to access the encrypted data via the selected drive letter).\n\nPLEASE REMEMBER OR WRITE DOWN THE ABOVE STEPS. YOU MUST FOLLOW THEM WHENEVER YOU WANT TO MOUNT THE VOLUME AND ACCESS DATA STORED IN IT. Alternatively, in the main VeraCrypt window, click 'Select Device', then select this partition/volume, and click 'Mount'.\n\nThe partition/volume has been successfully encrypted (it contains a fully encrypted VeraCrypt volume now) and is ready for use.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="en" key="FORMAT_FINISHED_INFO">The VeraCrypt volume has been successfully created.</string>
     <string lang="id" key="FORMAT_FINISHED_TITLE">Volume Telah Dibuat</string>
     <string lang="en" key="FORMAT_HELP">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 Format to create the volume.</string>
@@ -523,6 +539,7 @@
     <string lang="en" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">An error occurred when obtaining the system encryption status.</string>
     <string lang="en" key="INIT_SYS_ENC">Cannot initialize application components for system encryption.</string>
     <string lang="en" key="INIT_RAND">Failed to initialize the random number generator!</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="en" key="INIT_REGISTER">Unable to initialize the application. Failed to register the Dialog class.</string>
     <string lang="en" key="INIT_RICHEDIT">Error: Failed to load the Rich Edit system library.</string>
     <string lang="en" key="INTRO_TITLE">VeraCrypt Volume Creation Wizard</string>
@@ -535,6 +552,7 @@
     <string lang="id" key="MOUNT_BUTTON">Sa&amp;mbung</string>
     <string lang="en" key="NEW_VERSION_REQUIRED">A newer version of VeraCrypt is required to mount this volume.</string>
     <string lang="en" key="VOL_CREATION_WIZARD_NOT_FOUND">Error: Volume Creation Wizard not found.\n\nPlease make sure that the file 'VeraCrypt Format.exe' is in the folder from which 'VeraCrypt.exe' was launched. If it is not, please reinstall VeraCrypt, or locate 'VeraCrypt Format.exe' on your disk and run it.</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="en" key="NEXT">&amp;Next &gt;</string>
     <string lang="en" key="FINALIZE">&amp;Finish</string>
     <string lang="en" key="INSTALL">&amp;Install</string>
@@ -542,6 +560,7 @@
     <string lang="en" key="NODRIVER">Unable to connect to the VeraCrypt device driver. VeraCrypt cannot work if the device driver is not running.\n\nPlease note that, due to a Windows issue, it may be necessary to log off or restart the system before the device driver can be loaded.</string>
     <string lang="en" key="NOFONT">Error occurred when loading/preparing fonts.</string>
     <string lang="en" key="NOT_FOUND">The drive letter was not found or no drive letter was specified.</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="en" key="DRIVE_LETTER_UNAVAILABLE">Drive letter not available.</string>
     <string lang="en" key="NO_FILE_SELECTED">No file selected!</string>
     <string lang="en" key="NO_FREE_DRIVES">No drive letters available.</string>
@@ -561,15 +580,18 @@
     <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_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="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_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt.\n\nDo you have such a backup?</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_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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="en" key="IDD_PCDM_CHANGE_PKCS5_PRF">Set Header Key Derivation Algorithm</string>
     <string lang="en" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Add/Remove Keyfiles to/from Volume</string>
     <string lang="en" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Remove All Keyfiles from Volume</string>
-    <string lang="en" key="PASSWORD_CHANGED">Password and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</string>
+    <string lang="en" key="PASSWORD_CHANGED">Password, PIM and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</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="en" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">IMPORTANT: If you did not destroy your VeraCrypt Rescue Disk, your system partition/drive can still be decrypted using the old password (by booting the VeraCrypt Rescue Disk and entering the old password). You should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</string>
     <string lang="en" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Note that your VeraCrypt Rescue Disk still uses the previous algorithm. If you consider the previous algorithm insecure, you should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,7 +600,8 @@
     <string lang="en" key="PKCS5_PRF_CHANGED">Header key derivation algorithm successfully set.</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_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="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 more than 20 characters (the longer, the better). The maximum possible length is 64 characters.</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="en" key="PASSWORD_HIDDENVOL_HELP">Please choose a password for the hidden volume. </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_HELP">Please choose a password for the hidden operating system (i.e. for the hidden volume). </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_NOTE">IMPORTANT: The password that you choose for the hidden operating system in this step must be substantially different from the other two passwords (i.e. from the password for the outer volume and from the password for the decoy operating system).</string>
@@ -588,7 +611,7 @@
     <string lang="en" key="PASSWORD_HIDVOL_HOST_TITLE">Outer Volume Password</string>
     <string lang="en" key="PASSWORD_HIDVOL_TITLE">Hidden Volume Password</string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_TITLE">Password for Hidden Operating System</string>
-    <string lang="en" key="PASSWORD_LENGTH_WARNING">WARNING: Short passwords are easy to crack using brute force techniques!\n\nWe recommend choosing a password consisting of more than 20 characters. Are you sure you want to use a short password?</string>
+    <string lang="en" key="PASSWORD_LENGTH_WARNING">WARNING: Short passwords are easy to crack using brute force techniques!\n\nWe recommend choosing a password consisting of 20 or more characters. Are you sure you want to use a short password?</string>
     <string lang="id" key="PASSWORD_TITLE">Parssword Volume</string>
     <string lang="id" key="PASSWORD_WRONG">Password salah atau bukan volume VeraCrypt.</string>
     <string lang="en" key="PASSWORD_OR_KEYFILE_WRONG">Incorrect keyfile(s) and/or password or not a VeraCrypt volume.</string>
@@ -597,11 +620,26 @@
     <string lang="id" key="PASSWORD_WRONG_AUTOMOUNT">Password SALAH ! atau bukan volume VeraCrypt.</string>
     <string lang="en" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Incorrect keyfile(s)/password or no VeraCrypt volume found.</string>
     <string lang="id" key="PASSWORD_WRONG_CAPSLOCK_ON">\n\nPeringatan: Caps Lock aktif !. Ini busa membuat password yang anda masukkan tidak tepat.</string>
+    <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
+    <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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_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>
+    <string lang="en" key="SELECTED_PARTITION_NOT_INPLACE_ENC">The selected partition/device is not using in-place encryption.\nHeader Flags = 0x%.8X</string>
     <string lang="en" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nNote: If you are attempting to mount a partition located on an encrypted system drive without pre-boot authentication or to mount the encrypted system partition of an operating system that is not running, you can do so by selecting 'System' &gt; 'Mount Without Pre-Boot Authentication'.</string>
     <string lang="en" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">In this mode, you cannot mount a partition located on a drive whose portion is within the key scope of active system encryption.\n\nBefore you can mount this partition in this mode, you need to either boot an operating system installed on a different drive (encrypted or unencrypted) or boot an unencrypted operating system.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <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>
@@ -701,11 +739,18 @@
     <string lang="en" key="FOR_MORE_INFO_ON_PARTITIONS">For information on how to create and manage partitions, please refer to the documentation supplied with your operating system or contact your computer vendor's technical support team for assistance.</string>
     <string lang="en" key="SYSTEM_PARTITION_NOT_ACTIVE">Error: The currently running operating system is not installed on the boot partition (first Active partition). This is not supported.</string>
     <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="en" key="CANT_ACCESS_VOL">Error: Cannot access the volume!\n\nMake sure that the selected volume exists, that it is not mounted or being used by the system or an application, that you have read/write permission for the volume, and that it is not write-protected.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Error: Cannot access the volume and/or obtain information about the volume.\n\nMake sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Error: Cannot access the volume and/or obtain information about the volume. Make sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.\n\nIf the problem persists, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">An error prevented VeraCrypt from encrypting the partition. Please try fixing any previously reported problems and then try again. If the problems persist, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_RESUME">An error prevented VeraCrypt from resuming the process of encryption of the partition.\n\nPlease try fixing any previously reported problems and then try resuming the process again. Note that the volume cannot be mounted until it has been fully encrypted.</string>
+    <string lang="en" key="INPLACE_DEC_GENERIC_ERR">An error prevented VeraCrypt from decrypting the volume. Please try fixing any previously reported problems and then try again if possible.</string>
     <string lang="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="en" key="CANT_ACCESS_OUTER_VOL">Error: Cannot access the outer volume! Volume creation cannot continue.</string>
@@ -790,7 +835,7 @@
     <string lang="en" key="TC_INSTALLER_IS_RUNNING">VeraCrypt Installer is currently running on this system and performing or preparing installation or update of VeraCrypt. Before you proceed, please wait for it to finish or close it. If you cannot close it, please restart your computer before proceeding.</string>
     <string lang="en" key="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 www.veracrypt.org).</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="EXTRACTING_VERB">Extracting</string>
     <string lang="en" key="CANNOT_READ_FROM_PACKAGE">Cannot read data from the package.</string>
@@ -977,6 +1022,7 @@
     <string lang="en" key="CONFIRM_EXIT_UNIVERSAL">Exit?</string>
     <string lang="en" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt does not have sufficient information to determine whether to encrypt or decrypt.</string>
     <string lang="en" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt does not have sufficient information to determine whether to encrypt or decrypt.\n\nNote: If you decrypted the system partition/drive in the pre-boot environment, you may need to finalize the process by clicking Decrypt.</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_REVERSE_INFO">Note: When you are encrypting a non-system partition/volume in place and an error persistently prevents you from finishing the process, you will not be able to mount the volume (and access data stored on it) until you entirely DECRYPT the volume (i.e. reverse the process).\n\nIf you need to do so, follow these steps:\n1) Exit this wizard.\n2) In the main VeraCrypt window, select 'Volumes' &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="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Do you want to interrupt and postpone the process of encryption of the system partition/drive?\n\nNote: You will be able to resume the process and it will continue from the point it was stopped. You can do so, for example, by selecting 'System' &gt; 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window. If you want to permanently terminate or reverse the encryption process, select 'System' &gt; 'Permanently Decrypt System Partition/Drive'.</string>
     <string lang="en" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Do you want to interrupt and postpone the process of decryption of the system partition/drive?\n\nNote: You will be able to resume the process and it will continue from the point it was stopped. You can do so, for example, by selecting 'System' &gt; 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window. If you want to reverse the decryption process (and start encrypting), select 'System' &gt; 'Encrypt System Partition/Drive'.</string>
@@ -986,6 +1032,7 @@
     <string lang="en" key="FAILED_TO_START_WIPING">Error: Failed to start the process of wiping.</string>
     <string lang="en" key="INCONSISTENCY_RESOLVED">Inconsistency resolved.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="en" key="NOTHING_TO_RESUME">There is no process/task to resume.</string>
     <string lang="en" key="HIDVOL_PROT_BKG_TASK_WARNING">WARNING: VeraCrypt Background Task is disabled. After you exit VeraCrypt, you will not be notified if damage to hidden volume is prevented.\n\nNote: You may shut down the Background Task anytime by right-clicking the VeraCrypt tray icon and selecting 'Exit'.\n\nEnable VeraCrypt Background Task?</string>
     <string lang="en" key="LANG_PACK_VERSION">Language pack version:  %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="en" key="ERROR_MBR_PROTECTED">Failed to write the MBR sector.\n\nYour BIOS may be configured to protect the MBR sector. Check your BIOS settings (press F2, Delete, or Esc, after powering on your computer) for MBR/antivirus protection.</string>
+    <string lang="en" key="BOOT_LOADER_FINGERPRINT_CHECK_FAILED">WARNING: The verification of VeraCrypt bootloader fingerprint failed!\nYour disk may have been tampered with by an attacker ("Evil Maid" attack).\n\nThis warning can also be triggered if you restored VeraCrypt boot loader using an Rescue Disk generated using a different VeraCrypt version.\n\nYou are advised to change your password immediately which will also restore the correct VeraCrypt bootloader. It is recommended to reinstall VeraCrypt and to take measures to avoid access to this machine by untrusted entities.</string>
     <string lang="en" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">The required version of the VeraCrypt Boot Loader is currently not installed. This may prevent some of the settings from being saved.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Note: In some situations, you may wish to prevent a person (adversary) that is watching you start the computer from knowing that you use VeraCrypt. The above options allow you to do that by customizing the VeraCrypt boot loader screen. If you enable the first option, no texts will be displayed by the boot loader (not even when you enter the wrong password). The computer will appear to be "frozen" while you can type your password. In addition, a custom message can be displayed to mislead the adversary. For example, fake error messages such as "Missing operating system" (which is normally displayed by the Windows boot loader if it finds no Windows boot partition). It is, however, important to note that if the adversary can analyze the content of the hard drive, he can still find out that it contains the VeraCrypt boot loader.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">WARNING: Please keep in mind that if you enable this option, the VeraCrypt boot loader will not display any texts (not even when you enter the wrong password). The computer will appear to be "frozen" (unresponsive) while you can type your password (the cursor will NOT move and no asterisk will be displayed when you press a key).\n\nAre you sure you want to enable this option?</string>
@@ -1034,8 +1082,11 @@
     <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="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">Warning: There is unallocated space between the system partition and the first partition behind it. After you create the hidden operating system, you must not create any new partitions in that unallocated space. Otherwise, the hidden operating system will be impossible to boot (until you delete such newly created partitions).</string>
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">This algorithm is currently not supported for system encryption.</string>
-	<string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</string>
     <string lang="en" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Error: Cannot set the keyboard layout for VeraCrypt to the standard US keyboard layout.\n\nNote that the password needs to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout.</string>
@@ -1120,6 +1171,7 @@
     <string lang="en" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">The pretest has been successfully completed.\n\nWARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt. If you do not, please back up the files now (you can click Defer, back up the files, then run VeraCrypt again anytime, and select 'System' &gt; 'Resume Interrupted Process' to start encrypting).\n\nWhen ready, click Encrypt to start encrypting.</string>
     <string lang="en" key="SYSENC_ENCRYPTION_PAGE_INFO">You can click Pause or Defer anytime to interrupt the process of encryption or decryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. To prevent slowdown when the system or applications write or read data from the system drive, VeraCrypt automatically waits until the data is written or read (see Status above) and then automatically continues encrypting or decrypting.</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nYou can click Pause or Defer anytime to interrupt the process of encryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. Note that the volume cannot be mounted until it has been fully encrypted.</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="en" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Hidden System Started</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Original System</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows creates (typically, without your knowledge or consent) various log files, temporary files, etc., on the system partition. It also saves the content of RAM to hibernation and paging files located on the system partition. Therefore, if an adversary analyzed files stored on the partition where the original system (of which the hidden system is a clone) resides, he might find out, for example, that you used the VeraCrypt wizard in the hidden-system-creation mode (which might indicate the existence of a hidden operating system on your computer).\n\nTo prevent such issues, VeraCrypt will, in the next steps, securely erase the entire content of the partition where the original system resides. Afterwards, in order to achieve plausible deniability, you will need to install a new system on the partition and encrypt it. Thus you will create the decoy system and the whole process of creation of the hidden operating system will be completed.</string>
@@ -1159,7 +1211,7 @@
     <string lang="en" key="HIDDEN_OS_CREATION_PREINFO_HELP">In the next steps, VeraCrypt will create the hidden operating system by copying the content of the system partition to the hidden volume (data being copied will be encrypted on the fly with an encryption key different from the one that will be used for the decoy operating system).\n\nPlease note that the process will be performed in the pre-boot environment (before Windows starts) and it may take a long time to complete; several hours or even several days (depending on the size of the system partition and on the performance of your computer).\n\nYou will be able to interrupt the process, shut down your computer, start the operating system and then resume the process. However, if you interrupt it, the entire process of copying the system will have to start from the beginning (because the content of the system partition must not change during cloning).</string>
     <string lang="en" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Do you want to cancel the entire process of creation of the hidden operating system?\n\nNote: You will NOT be able to resume the process if you cancel it now.</string>
     <string lang="en" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Do you want to cancel the system encryption pretest?</string>
-    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="en" key="SYS_DRIVE_NOT_ENCRYPTED">The system partition/drive does not appear to be encrypted (neither partially nor fully).</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">Your system partition/drive is encrypted (partially or fully).\n\nPlease decrypt your system partition/drive entirely before proceeding. To do so, select 'System' &gt; 'Permanently Decrypt System Partition/Drive' from the menu bar of the main VeraCrypt window.</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">When the system partition/drive is encrypted (partially or fully), you cannot downgrade VeraCrypt (but you can upgrade it or reinstall the same version).</string>
@@ -1176,6 +1228,8 @@
     <string lang="en" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">You have selected the system partition/drive (or the boot partition), but the wizard mode you selected is suitable only for non-system partitions/drives.\n\nDo you want to set up pre-boot authentication (which means that you will need to enter your password each time before Windows boots/starts) and encrypt the system partition/drive?</string>
     <string lang="en" key="CONFIRM_DECRYPT_SYS_DEVICE">Are you sure you want to permanently decrypt the system partition/drive?</string>
     <string lang="en" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the system partition/drive, unencrypted data will be written to it.\n\nAre you really sure you want to permanently decrypt the system partition/drive?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
     <string lang="en" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Warning: If you use a cascade of ciphers for system encryption, you may encounter the following issues:\n\n1) The VeraCrypt Boot Loader is larger than normal and, therefore, there is not enough space in the first drive track for a backup of the VeraCrypt Boot Loader. Hence, whenever it gets damaged (which often happens, for example, during inappropriately designed anti-piracy activation procedures of certain programs), you will need to use the VeraCrypt Rescue Disk to boot or to repair the VeraCrypt Boot Loader.\n\n2) On some computers, resuming from hibernation takes longer.\n\nThese potential issues can be prevented by choosing a non-cascade encryption algorithm (e.g. AES).\n\nAre you sure you want to use a cascade of ciphers?</string>
     <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>
@@ -1191,6 +1245,7 @@
     <string lang="en" key="ENABLE_BAD_SECTOR_ZEROING">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nThe process of in-place encryption can continue only when the sectors have been made readable again. VeraCrypt can attempt to make these sectors readable by writing zeros to the sectors (subsequently such all-zero blocks would be encrypted). However, note that any data stored in the unreadable sectors will be lost. If you want to avoid that, you can attempt to recover portions of the corrupted data using appropriate third-party tools.\n\nNote: In case of physically damaged sectors (as opposed to mere data corruption and checksum errors) most types of storage devices internally reallocate the sectors when data is attempted to be written to them (so the existing data in the damaged sectors may remain unencrypted on the drive).\n\nDo you want VeraCrypt to write zeroes to unreadable sectors?</string>
     <string lang="en" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nTo be able to proceed with decryption, VeraCrypt will have to discard the content of the unreadable sectors (the content will be replaced with pseudorandom data). Please note that, before proceeding, you can attempt to recover portions of any corrupted data using appropriate third-party tools.\n\nDo you want VeraCrypt to discard data in the unreadable sectors now?</string>
     <string lang="en" key="ZEROED_BAD_SECTOR_COUNT">Note: VeraCrypt has replaced the content of %I64d unreadable sectors (%s) with encrypted all-zero plaintext blocks.</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="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>

Translations/Language.it.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="it" name="Italiano" en-name="Italian" version="1.0.1" translators="Maurizio Ballo, Consiglio Gaetano" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <control lang="it" key="IDC_KEY_FILES">File chiave...</control>
     <control lang="it" key="IDC_LINK_HASH_INFO">Info sugli algoritmi confusione</control>
     <control lang="it" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Altre informazioni</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="it" key="IDC_MB">MB</control>
     <control lang="it" key="IDC_MORE_INFO_ON_CONTAINERS">Altre informazioni</control>
     <control lang="it" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">Altre informazioni sulla codifica di sistema</control>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <control lang="it" key="IDT_COLLECTING_RANDOM_DATA_NOTE">IMPORTANTE: Muovere il vostro mouse il più casualmente possibile entro questa finestra. E' preferibile un movimento più lungo perchè aumenta in modo significativo l'effetto delle chiavi di codifica. Quindi fate click su Avanti per continure</control>
     <control lang="it" key="IDT_CONFIRM">Conferma:</control>
     <control lang="it" key="IDT_DONE">Fatto</control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="it" key="IDT_ENCRYPTION_ALGO">Algoritmo di codifica</control>
     <control lang="it" key="IDT_FILESYSTEM">File system</control>
     <control lang="it" key="IDT_FILE_CONTAINER">Crea un disco virtuale criptato all'interno di un file. Raccomandato per utenti inesperti.</control>
@@ -85,6 +88,8 @@
     <control lang="it" key="IDT_PARTIAL_POOL_CONTENTS">Contenuto del pool corrente (parziale)</control>
     <control lang="it" key="IDT_PASS">Passo</control>
     <control lang="it" key="IDT_PASSWORD">Password:</control>
+    <control lang="en" key="IDT_PIM">Volume PIM:</control>
+    <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
     <control lang="it" key="IDT_PROGRESS">Progresso:</control>
     <control lang="it" key="IDT_RANDOM_POOL">Pool casuale:</control>
     <control lang="it" key="IDT_SINGLE_BOOT">Selezionare questa opzione se esiste solo un sistema operativo installato su questo computer (anche se esso ha multipli utenti).</control>
@@ -142,6 +147,8 @@
     <control lang="it" key="IDC_MOUNT_OPTIONS">Opzioni...</control>
     <control lang="it" key="IDC_MOUNT_READONLY">Monta il volume in sola lettura</control>
     <control lang="it" key="IDC_NEW_KEYFILES">File chiave...</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="it" key="IDC_PREF_BKG_TASK_ENABLE">Attiva</control>
     <control lang="it" key="IDC_PREF_CACHE_PASSWORDS">Mantieni le password nella cache</control>
     <control lang="it" key="IDC_PREF_DISMOUNT_INACTIVE">Smontaggio automatico del volume in mancanza di attività successive</control>
@@ -155,6 +162,7 @@
     <control lang="it" key="IDC_PREF_MOUNT_READONLY">Monta i volumi in sola lettura</control>
     <control lang="it" key="IDC_PREF_MOUNT_REMOVABLE">Monta i volumi come unità rimovibili</control>
     <control lang="it" key="IDC_PREF_OPEN_EXPLORER">Apri la finestra di Esplora risorse dopo aver montato un volume correttamente</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</control>
     <control lang="it" key="IDC_PREF_USE_DIFF_TRAY_ICON_IF_VOL_MOUNTED">Usa un icona diversa nella barra di sistema se ci sono volumi montati</control>
     <control lang="it" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Azzera le password nella cache allo smontaggio automatico</control>
     <control lang="it" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Azzera le password nella cache in uscita</control>
@@ -167,11 +175,12 @@
     <control lang="it" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Mostra password</control>
     <control lang="it" key="IDC_TRAVEL_OPEN_EXPLORER">Apri la finestra di Esplora risorse per il volume montato</control>
     <control lang="it" key="IDC_TRAV_CACHE_PASSWORDS">Mantieni la password nella cache</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="it" key="IDC_UNMOUNTALL">Smonta tutti</control>
     <control lang="it" key="IDC_VOLUME_PROPERTIES">Proprietà volume...</control>
     <control lang="it" key="IDC_VOLUME_TOOLS">Strumenti volume...</control>
     <control lang="it" key="IDC_WIPE_CACHE">Azzera la cache</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="it" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Volumi preferiti</control>
     <control lang="it" key="IDD_HOTKEYS_DLG">VeraCrypt - Tasti di scelta rapida (hotkey)</control>
     <control lang="it" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="it" key="IDM_CREATE_HIDDEN_OS">Crea sistema operativo nascosto...</control>
     <control lang="it" key="IDM_CREATE_RESCUE_DISK">Crea un disco di ripristino...</control>
     <control lang="it" key="IDM_CREATE_VOLUME">Crea un nuovo volume...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="it" key="IDM_DEFAULT_KEYFILES">File chiave predefiniti...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="it" key="IDM_DONATE">Donazione...</control>
     <control lang="it" key="IDM_ENCRYPT_SYSTEM_DEVICE">Codifica la partizione o disco di sistema...</control>
     <control lang="it" key="IDM_FAQ">Domande frequenti</control>
@@ -243,6 +254,7 @@
     <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="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>
     <control lang="it" key="IDM_VOLUME_WIZARD">Creazione guidata volume...</control>
     <control lang="it" key="IDM_WEBSITE">Sito web di VeraCrypt</control>
@@ -369,7 +381,7 @@
     <string lang="it" key="ACCESS_DENIED">ERRORE: accesso negato.\n\nLa partizione a cui si sta tentando di accedere ha lunghezza di 0 (zero) settori oppure è l’unità di avvio del sistema.</string>
     <string lang="it" key="ADMINISTRATOR">Amministratore</string>
     <string lang="it" key="ADMIN_PRIVILEGES_DRIVER">Per caricare il driver VeraCrypt è necessario accedere come utente con privilegi di amministratore.</string>
-    <string lang="it" key="ADMIN_PRIVILEGES_WARN_DEVICES">Per codificare/formattare un unità/partizione è necessario accedere come utente con privilegi di amministratore.\n\nQuesta restrizione non si applica ai volumi basati su file.</string>
+    <string lang="it" key="ADMIN_PRIVILEGES_WARN_DEVICES">Per codificare/decodificare/formattare un unità/partizione è necessario accedere come utente con privilegi di amministratore.\n\nQuesta restrizione non si applica ai volumi basati su file.</string>
     <string lang="it" key="ADMIN_PRIVILEGES_WARN_HIDVOL">Per creare un volume nascosto è necessario accedere come utente con privilegi di amministratore.\n\nContinuare?</string>
     <string lang="it" key="ADMIN_PRIVILEGES_WARN_NTFS">Per formattare il volume come NTFS è necessario accedere come utente con privilegi di amministratore.\n\nSenza i privilegi di amministrazione si può formattare il volume come FAT.</string>
     <string lang="it" key="AES_HELP">Algoritmo di codifica (Rijndael, pubblicato nel 1998) approvato per la FIPS, che può essere usato dai dipartimenti ed agenzie federali U.S.A. per proteggere le informazioni Top Secret. Chiave a 256-bit, blocco a 128-bit, 14 passaggi (AES-256). Modo operativo XTS.</string>
@@ -485,7 +497,11 @@
     <string lang="it" key="FORMAT_FINISHED_HELP">\n\nIl volume VeraCrypt è stato creato ed è pronto per l'uso. Se si desidera creare un altro volume VeraCrypt, fate click su 'Avanti'. Altrimenti, fate click su 'Esci'.</string>
     <string lang="it" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">n\nIl volume VeraCrypt nascosto è stato creato con successo (il sistema operativo nascosto deve risiedere all’interno di questo volume nascosto).\n\nFate click su Avanti per continuare.</string>
     <string lang="it" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Volume criptato totalmente</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="it" key="NONSYS_INPLACE_ENC_FINISHED_INFO">IMPORTANTE: PER MONTARE QUESTO VOLUME NUOVAMENTE CREATO E PER ACCEDERE AI DATI MEMORIZZATI IN ESSO, FATE CLICK SU 'Auto-monta unità' NELLA FINESTRA PRINCIPALE DI VERACRYPT. Dopo aver inserito la password corretta (e/o fornito i file chiave corretti), il volume sarà montato nel disco la cui lettera avete selezionato dall’elenco della finestra principale di VeraCrypt (e potete accedere ai dati codificati selezionando la lettera del disco).\n\nPREGO RICORDARE O SCRIVERE I PASSI SOPRA. DOVETE SEGUIRLI OGNI QUAL VOLTA VOLETE MONTARE IL VOLUME ED ACCEDERE AI DATI MEMORIZZATI IN ESSO. In alternativa, nella finestra principale di VeraCrypt, fate click su 'Seleziona unità',quindi selezionare la partizione/volume, e ciccare su 'Monta'.\n\nLa partizione/volume è stata Crittata con successo (contiene ora un volume VeraCrypt totalmente criptato) ed è pronto per l’uso.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="it" key="FORMAT_FINISHED_INFO">Il volume VeraCrypt è stato creato con successo.</string>
     <string lang="it" key="FORMAT_FINISHED_TITLE">Volume creato</string>
     <string lang="it" key="FORMAT_HELP">IMPORTANTE:Muovere il vostro mouse il più casualmente possibile entro questa finestra. E' preferibile un movimento più lungo perchè aumenta in modo significativo l'effetto delle chiavi di codifica, quindi fate click su Formatta per creare il volume.</string>
@@ -523,6 +539,7 @@
     <string lang="it" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Si è verificato un errore nel dare lo stato di codifica del sistema.</string>
     <string lang="it" key="INIT_SYS_ENC">Impossibile inizializzare i componenti dell’applicazione per la codifica del sistema.</string>
     <string lang="it" key="INIT_RAND">Inizializzazione del generatore di numeri casuali fallita!</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="it" key="INIT_REGISTER">Impossibile inizializzare l'applicazione. Registrazione della classe Finestra di dialogo fallita.</string>
     <string lang="it" key="INIT_RICHEDIT">ERRORE: Fallito nel caricare il Rich Edit della libreria di sistema.</string>
     <string lang="it" key="INTRO_TITLE">Creazione guidata volume VeraCrypt</string>
@@ -535,6 +552,7 @@
     <string lang="it" key="MOUNT_BUTTON">Monta</string>
     <string lang="it" key="NEW_VERSION_REQUIRED">Per montare questo volume è richiesta una versione più recente di VeraCrypt.</string>
     <string lang="it" key="VOL_CREATION_WIZARD_NOT_FOUND">ERRORE: procedura guidata per la creazione del volume non trovata.\n\nAssicurarsi che il file 'VeraCrypt Format.exe' sia nella cartella dalla quale 'VeraCrypt.exe' è stato eseguito. Altrimenti reinstallare VeraCrypt o individuare 'VeraCrypt Format.exe' sul disco ed eseguirlo.</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="it" key="NEXT">Avanti &gt;</string>
     <string lang="it" key="FINALIZE">&amp;Fine</string>
     <string lang="it" key="INSTALL">&amp;Installa</string>
@@ -542,6 +560,7 @@
     <string lang="it" key="NODRIVER">Impossibile connettersi al driver di unità VeraCrypt. VeraCrypt non può lavorare se il driver di unità non è in esecuzione.\n\nNotare che, a causa di un requisito di Windows, può essere necessario disconnettersi oppure riavviare il sistema prima che il driver di unità possa essere caricato.</string>
     <string lang="it" key="NOFONT">Si è verificato un errore nel caricamento/preparazione dei font.</string>
     <string lang="it" key="NOT_FOUND">Lettera dell'unità non trovata oppure non specificata.</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="it" key="DRIVE_LETTER_UNAVAILABLE">Lettera di unità non disponibile.</string>
     <string lang="it" key="NO_FILE_SELECTED">Nessun file selezionato.!</string>
     <string lang="it" key="NO_FREE_DRIVES">Nessuna lettera di unità disponibile.</string>
@@ -561,15 +580,18 @@
     <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_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="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="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="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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="it" key="IDD_PCDM_CHANGE_PKCS5_PRF">Impostare algoritmo per la chiave di testata</string>
     <string lang="it" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Aggiungere/rimuovere i file chiave al/dal volume</string>
     <string lang="it" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Rimuovere tutti i file chiave dal volume</string>
-    <string lang="it" key="PASSWORD_CHANGED">Password e/o file chiave cambiato con successo.\n\nIMPORTANTE: Assicuratevi di aver letto la sezione 'Changing Passwords and Keyfiles' nel capitolo 'Security Requirements and Precautions' nella VeraCrypt User Guide.</string>
+    <string lang="it" key="PASSWORD_CHANGED">Password, PIM e/o file chiave cambiato con successo.\n\nIMPORTANTE: Assicuratevi di aver letto la sezione 'Changing Passwords and Keyfiles' nel capitolo 'Security Requirements and Precautions' nella VeraCrypt User Guide.</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="it" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">IMPORTANTE: Se non avete distrutto il vostro disco di ripristino di VeraCrypt, la vostra partizione/disco di sistema può essere ancora deCrittata usando la vecchia password (tramite l'avvio del disco di ripristino di VeraCrypt e digitando la vecchia password). Dovete creare un nuovo disco di ripristino di VeraCrypt e quindi distruggere il vecchio.\n\nVolete creare un nuovo disco di ripristino di VeraCrypt?</string>
     <string lang="it" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Da notare che il vostro disco di ripristino di VeraCrypt usa ancora l'algoritmo precedente. Se considerate il precedente algoritmo non sicuro, dovete creare un nuovo disco di ripristino di VeraCrypt e distruggere il precedente.\n\nVolete creare un nuovo disco di ripristino di VeraCrypt?</string>
     <string lang="it" key="KEYFILES_NOTE">Qualsiasi tipo di file (ad esempio Mp3, Jpg, Zip, Avi) può essere utilizzato come un file-chiave di VeraCrypt. Si noti che VeraCrypt non modifica mai il contenuto del file-chiave. È possibile selezionare più di un file-chiave (l'ordine non ha importanza). Se si aggiunge una cartella, tutti i file non nascosti trovat in essa saranno utilizzati come file-chiave. Cliccare su 'Aggiungi file chiave' per selezionare un file-chiave memorizzato su di un token di sicurezza o una smart card (o per importarvi il file-chiave).</string>
@@ -578,6 +600,7 @@
     <string lang="it" key="PKCS5_PRF_CHANGED">Algoritmo di derivazione della chiave di testata impostato con successo.</string>
     <string lang="it" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">Digitate la password e /o file chiave per il volume non di sistema dove volete riprendere il processo di codifica in posto.\n\n\nNota: Dopo aver fatto click su Avanti, VeraCrypt tenterà di cercare tutti i volumi non di sistema dove il processo di codifica è stato interrotto e dove la testata del volume VeraCrypt può essere DeCrittata usando la password e/o file chiave fornito. Se più di uno di tali volumi viene trovato, avete bisogno di selezionare uno di essi nel passo successivo.</string>
     <string lang="it" key="NONSYS_INPLACE_ENC_RESUME_VOL_SELECT_HELP">Selezionare uno dei volumi elencati. L’elenco contiene ogni volume non di sistema accessibile dove il processo di codifica è stato interrotto e le quali testate devono essere decodificate usando la password o file chiave forniti.</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="it" key="PASSWORD_HELP">E' molto importante di scegliere una buona password. Dovete evitare di scegliere una che contenga solo una parola singola che possa essere trovata in un dizionario (oppure una combinazione di  2, 3, o 4 parole del genere). Essa non deve contenere nessun nome o data di nascita. Essa non dovrebbe essere facile da indovinare. Una buona password è una combinazione casuale di lettere maiuscole e minuscole, numeri e caratteri speciali come @ ^ = $ * + ecc. Vi raccomandiamo di scegliere una password consistente di più di 20 caratteri (più è lunga, è meglio). La lunghezza massima possibile è di 64 caratteri.</string>
     <string lang="it" key="PASSWORD_HIDDENVOL_HELP">Scegliere una password per il volume nascosto.</string>
     <string lang="it" key="PASSWORD_HIDDEN_OS_HELP">Scegliere una password per il sistema operativo nascosto (cioè per il volume nascosto).</string>
@@ -597,11 +620,26 @@
     <string lang="it" key="PASSWORD_WRONG_AUTOMOUNT">Password errata o nessun volume VeraCrypt trovato.</string>
     <string lang="it" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">File chiave e/o password non corretti o nessun volume VeraCrypt trovato.</string>
     <string lang="it" key="PASSWORD_WRONG_CAPSLOCK_ON">\n\nATTENZIONE: il tasto di blocco delle maiuscole è attivato. Ciò può comportare un inserimento non corretto della password.</string>
+    <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
+    <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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="it" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nATTENZIONE: dei file nascosti sono stati trovati nel percorso di ricerca del file chiave. Tali file nascosti non possono essere utilizzati come file-chiave. Se avete bisogno di usarli come un file-chiave, rimuovere l'attributo 'Nascosto' (tasto destro del mouse su ogni file, selezionare 'Proprietà' e deselezionare l'attributo 'Nascosto', quindi clic su OK). Nota: I file nascosti sono visibili solo se l'opzione che ne permette la visione è abilitata (Computer &gt; Organizza &gt; 'Opzioni cartelle e ricerca' &gt; Visualizzazione).</string>
     <string lang="it" key="HIDDEN_VOL_PROT_PASSWORD_US_KEYB_LAYOUT">Se state tentando di proteggere un volume nascosto contenente un sistema operativo nascosto, assicuratevi di usare la tastiera standard con layout americano quando digitate la password per il volume nascosto. Questo è richiesto dal fatto che la password deve essere digitata in ambiente di pre-avvio (prima dell'avvio di Windows) dove le tastiere con layout non americano non sono disponibili.</string>
     <string lang="it" key="FOUND_NO_PARTITION_W_DEFERRED_INPLACE_ENC">VeraCrypt non ha trovato nessun volume dove la codifica non di sistema è stata interrotta e dove la testata del volume può essere DeCrittata usando la password e/o file chiave fornita.\n\nAssicuratevi che la password e/o file chiave digitata sia corretta e che la partizione/volume non sia in uso dal sistema o da applicazioni (compresi i software antivirus).</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="it" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nNota: Se state tentando di montare una partizione collocata su un percorso di sistema criptato senza autenticazione di pre-boot oppure di montare la partizione di sistema Crittata su un sistema operativo che non è in esecuzione, dovete fare questo selezionando 'Sistema' &gt; 'Monta senza autenticazione di pre-boot'.</string>
     <string lang="it" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">In questo modo, non potete montare una partizione collocata su un drive la quale porzione è all’interno dello scopo della chiave di codifica del sistema attivo.\n\nPrima di poter montare questa partizione in questo modo, dovete avviare un sistema operativo installato su un percorso differente (criptato o decriptato) oppure avviare un sistema operativo Decriptato.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <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>
@@ -701,11 +739,18 @@
     <string lang="it" key="FOR_MORE_INFO_ON_PARTITIONS">Per maggiori informazioni su come creare e gestire le partizioni, riferitevi alla documentazione fornita con il vostro sistema operativo oppure il supporto tecnico del venditore del vostro computer per l’assistenza.</string>
     <string lang="it" key="SYSTEM_PARTITION_NOT_ACTIVE">ERRORE: Il sistema operativo attualmente in esecuzione non è installato nella partizione di avvio (prima partizione attiva). Questo non è supportato.</string>
     <string lang="it" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">Avete segnalato che intendete memorizzare dei file maggiori di 4 GB in questo volume VeraCrypt. Comunque avete scelto il file system FAT, nel quale i file maggiori di 4 GB non possono essere salvati.\n\nSiete sicuri di volere formattare il volume come FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="it" key="CANT_ACCESS_VOL">ERRORE: impossibile accedere al volume!\n\nAssicurarsi che il volume selezionato esista, che non sia montato o in uso da parte del sistema o delle applicazioni, di avere permessi di lettura/scrittura e che non sia protetto da scrittura.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="it" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">ERRORE: Impossibile accedere al volume e/o ottenere le informazioni a proposito del volume.\n\nAssicuratevi che il volume selezionato esista, che non sia usato dal sistema oppure applicazioni, che voi abbiate i permessi di lettura e scrittura e che il volume non sia protetto da scrittura.</string>
     <string lang="it" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">ERRORE: Impossibile accedere al volume e/o ottenere le informazioni a proposito del volume.Assicuratevi che il volume selezionato esista, che non sia usato dal sistema oppure applicazioni, che voi abbiate i permessi di lettura e scrittura e che il volume non sia protetto da scrittura.\n\nSe il problema persiste, può esservi di aiuto seguire i passi seguenti.</string>
     <string lang="it" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">Un errore ha impedito a VeraCrypt di codificare la partizione. Tentate la correzione di qualsiasi problema segnalato precedentemente e quindi ritentare. Se il problema persiste, può esservi di aiuto seguire i passi seguenti.</string>
     <string lang="it" key="INPLACE_ENC_GENERIC_ERR_RESUME">Un errore ha impedito a VeraCrypt di riprendere il processo di codifica della partizione.\n\n Tentate la correzione di qualsiasi problema segnalato precedentemente e quindi tentare di riprendere nuovamente il processo. Notate che il volume non può essere montato finché esso non viene criptato completamente.</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="it" key="CANT_DISMOUNT_OUTER_VOL">ERRORE: impossibile smontare il volume esterno!\n\nIl volume non può essere smontato se contiene file o cartelle utilizzati dalle applicazioni o dal sistema.\n\nChiudere tutti i programmi che potrebbero usare i file o le cartelle sul volume e cliccare su 'Riprova'.</string>
     <string lang="it" key="CANT_GET_OUTER_VOL_INFO">ERRORE: Non si possono ottenere le informazioni a proposito del volume esterno! La creazione del volume non può proseguire.</string>
     <string lang="it" key="CANT_ACCESS_OUTER_VOL">ERRORE: impossibile accedere al volume esterno! La creazione del volume non può proseguire.</string>
@@ -977,6 +1022,7 @@
     <string lang="it" key="CONFIRM_EXIT_UNIVERSAL">Chiudere?</string>
     <string lang="it" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt non ha informazioni sufficienti per determinare se codificare o decodificare.</string>
     <string lang="it" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt non dispone di informazioni sufficienti per determinare se codificare o Decodificare.\n\nNota: Se voi codificate la partizione o disco di sistema in ambiente pre-boot, avete bisogno di finalizzare il processo facendo click su 'Decodifica'.</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="it" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">Volete interrompere e rimandare il processo di codifica della partizione/volume?\n\nNota: Tenete in mente che il volume non può essere montato finché esso non viene totalmente criptato. Potrete riprendere il processo di codifica ed esso continuerà dal punto in cui è stato fermato. Potete fare questo, per esempio, selezionando 'Volumi' &gt; 'Riprendi i processi interrotti' dalla barra del menu nella finestra principale di VeraCrypt</string>
     <string lang="it" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Volete interrompere o rimandare il processo di codifica della partizione/disco di sistema?\n\nNota: Potrete riprendere il processo e continuare dal punto dove esso viene interrotto selezionando 'Sistema' &gt; 'Riprendi i processi interrotti 'dalla barra menu della finestra principale di VeraCrypt. Se volete terminare o annullare definitivamente il processo di codifica, selezionare 'Sistema' &gt; 'Decodifica definitivamente la partizione/disco di sistema'.</string>
     <string lang="it" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Volete interrompere o rimandare il processo di codifica della partizione/disco di sistema?\n\nNota: Potrete riprendere il processo e continuare dal punto dove esso viene interrotto selezionando 'Sistema' &gt; 'Riprendi i processi interrotti ' dalla barra menu della finestra principale di VeraCrypt. Se volete terminare o annullare definitivamente il processo di decodifica (ed avviare la codifica) , selezionare 'Sistema' &gt; 'Codifica la partizione/disco di sistema'.</string>
@@ -986,6 +1032,7 @@
     <string lang="it" key="FAILED_TO_START_WIPING">ERRORE: Fallito nell’avviare il processo di pulizia.</string>
     <string lang="it" key="INCONSISTENCY_RESOLVED">Inconsistenza risolta.\n\n\n(Se voi segnalate un errore in connessione con questo, includere le seguenti informazioni tecniche nel rapporto di errore: %hs)</string>
     <string lang="it" key="UNEXPECTED_STATE">ERRORE: Stato inatteso.\n\n\n(Se segnalate un errore in connessione con questo, includere le seguenti informazioni tecniche nel rapporto di errore: %hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="it" key="NOTHING_TO_RESUME">Non c'è nessun processo/operazione da riprendere.</string>
     <string lang="it" key="HIDVOL_PROT_BKG_TASK_WARNING">ATTENZIONE: il processo in background di VeraCrypt è disabilitato. Dopo l'uscita da VeraCrypt non si riceveranno avvisi nel caso venga evitato il danneggiamento del volume nascosto.\n\nNota: è possibile chiudere il processo in background in qualsiasi momento facendo click destro sull'icona di VeraCrypt nella barra sistema e selezionando 'Esci'.\n\nAbilitare il processo in background di VeraCrypt?</string>
     <string lang="it" key="LANG_PACK_VERSION">Versione del file di lingua:  %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="it" key="ERROR_MBR_PROTECTED">Errore nello scrivere il settore MBR .\n\nIl vostro BIOS non è configurato per proteggere il settore MBR. Verificate le impostazioni del vostro BIOS (pemete F2, Canc oppure Esc dopo aver acceso il vostro computer) per la protezione 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>
     <string lang="it" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">La versione richiesta del loader di avvio di VeraCrypt attualmente non è installato. Questo può prevenire il salvataggio di alcune impostazioni.</string>
     <string lang="it" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Nota: In alcune situazioni, volete evitare ad una persona (avversario) che sta aspettando l’avvio del vostro computer per sapere che state usando VeraCrypt. Le opzioni in basso vi consentono di fare questo personalizzando lo schermo di avvio di VeraCrypt. Se abilitate la prima opzione, nessun testo sarà mostrato dal loader di avvio (non anche quando avete digitato la passwoed errata). Il computer sembrerà essere "congelato", mentre però  voi potete digitare la vostra password. In aggiunta, un messaggio personale può essere mostrato per ingannare l’avversario. Per esempio, un messaggio di errore fasullo come "Sistema operativo mancante" (che viene normalmente mostrato dal loader di avvio di Windows se esso non trova nessuna partizione di avvio di Windows). E’ comunque importante notare che se l’avversario può analizzare il contenuto del disco rigido, esso può ancora trovare che esso contiene il loader di avvio di VeraCrypt.</string>
     <string lang="it" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">AVVERTENZA: Tenere in mente che, se attivate questa opzione, il loader di avvio di VeraCrypt non mostrerà nessun testo (non anche quando inserite una password errata). Il computer sembrerà come "congelato" (non rispondente) mentre potete digitare la vostra password (Il cursore NON si muoverà e nessun asterisco non sarà mostrando premendo un tasto).\n\nSiete sicuri di voler attivare questa opzione?</string>
@@ -1034,8 +1082,11 @@
     <string lang="it" key="EXTRA_BOOT_PARTITION_REMOVAL_INSTRUCTIONS">\nL’extra boot della partizione può essere rimosso prima di installare Windows. Per fare questo, seguite questa procedura:\n\n1) Avviate il vostro disco di installazione di Windows.\n\n2)Nello schermo di installazione di  Windows fate clic su “Installa”&gt; “Personalizzata (avanzata)”.\n\n3) Fate clic su “Opzioni unità”.\n\n4) Selezionare la partizione di sistema ed eliminatela facendo clic su “Elimina”e quindi “OK”.\n\n5) Selezionare la partizione “Riservata al sistema”, fate clic su “Estendi” ed aumentate la sua dimensione in modo che il sistema operative possa essere installato in essa.\n\n6)Fate clic su “Applica” ed “OK”.\n\n7) Installare Windows nella partizione “Riservata al sistema”.\n\n\nDovrebbe ora un attaccante chiedervi chi ha rimosso l’extra boot della partizione. Potreste quindi rispondere che volevate prevenire qualsiasi danno ai dati nella partizione di avvio non Crittata.\n\nNota: Potete stampare questo testo facendo clic sul tasto “Stampa” sotto. Se voi salvate una copia di questo testo o la stampate (raccomandata rigorosamente, finché la vostra stampante conserva delle copie di documenti nella sua unità interna), dovete distruggere qualsiasi copia di esso dopo la rimozione dell’extra boot della partizione (diversamente, se viene trovata una di tali copie, essa potrebbe segnalare la presenza di un sistema operativo nascosto in questo computer).</string>
     <string lang="it" key="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">AVVERTENZA: C’è uno spazio non allocato tra la partizione di sistema e la prima partizione dietro di essa. Dopo aver creato il sistema operativo nascosto, non dovete creare nessuna nuova partizione in questo spazio non allocato. Diversamente sarà impossibile avviare il sistema operativo nascosto (finché voi eliminate tali nuove partizioni create).</string>
     <string lang="it" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Questo algoritmo non è attualmente supportato per la codifica del sistema.</string>
-	<string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="it" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">I file chiave sono attualmente non supportate dalla codifica di sistema.</string>
     <string lang="it" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">AVVERTENZA: VeraCrypt non può ripristinare la configurazione originale della tastiera. Questo può causare la digitazione errata della password.</string>
     <string lang="it" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">ERRORE: Impossibile impostare la configurazione della tastiera per VeraCrypt nel layout standard tastiera USA.\n\nNotare che la password necessita di essere digitata in ambiente di pre-boot (prima dell’avvio di Windows) dove la configurazione delle tastiere Windows non americane non sono disponibili. Pertanto, la password deve essere sempre digitata usando il layout tastiera standard USA.</string>
@@ -1120,6 +1171,7 @@
     <string lang="it" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">Il pre-test è stato completato con successo.\n\nATTENZIONE: Notate che se l’alimentazione elettrica viene interrotta bruscamente mentre avviene la codifica in posto dei dati esistenti, oppure quando il sistema operativo va in crash a causa di un errore software o malfunzionamento hardware mentre VeraCrypt sta codificando i dati in posto, porzioni di dati potranno essere corrotte o distrutti. Pertanto, prima di avviare la codifica, assicuratevi di essere sicuri di aver fatto delle copie di back up dei file che volete codificare. Se non fate questo, fate ora il back up dei file (potete fare click su Rimanda, fare il back up dei file, eseguire VeraCrypt nuovamente, e selezionare 'Sistema' &gt; 'Ripristina processi interrotti' per avviare la codifica).\n\nQuando siete pronti, fate click su Codifica per avviare la codifica.</string>
     <string lang="it" key="SYSENC_ENCRYPTION_PAGE_INFO">Potete fare clic su Pausa oppure Rimanda ogni volta per interrompere il processo di codifica o decodifica, uscire da questa procedura, riavviare o spegnere il vostro computer  e quindi riprendere il processo, che continuerà dal punto in cui è stato fermato. Per evitare il rallentamento quando il sistema o le applicazioni legge o scrive dati dal disco di sistema, VeraCrypt attende automaticamente finché i dati vengono scritti o letti (vedere Status sopra) e quindi continua automaticamente la cifratura o decifratura.</string>
     <string lang="it" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nPotete fare click Pausa o Rimanda ogni volta per interrompere il processo di codifica, chiudere questa procedura, riavviare o spegnere il vostro computer e quindi riprendere il processo che continuerà dal punto in cui è stata fermata. Notate che il volume non può essere montato finché non viene totalmente criptato.</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="it" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Sistema nascosto avviato</string>
     <string lang="it" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Sistema originale</string>
     <string lang="it" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows crea (tipicamente, a vostra insaputa e senza vostro consenso) vari file log, temporanei ecc. nella partizione di sistema. Esso anche salva il contenuto della RAM nei file di ibernazione e file paging collocati nella partizione di sistema. Pertanto, se un avversario analizza i file memorizzati nella partizione di sistema dove risiede il sistema originale (del quale il sistema nascosto è un clone), potrebbe scoprire, per esempio, che avete usato la procedura guidata di VeraCrypt nella modalità di creazione del sistema nascosto (che potrebbe segnalare l’esistenza di un sistema operativo nascosto nel vostro computer).\n\nPer evitare tale problema, VeraCrypt deve, nei passi successivi, eliminare sicuramente l’intero contenuto della partizione dove risiede il sistema originale.  Dopo, allo scopo di realizzare una scusa plausibile, dovete installare un nuovo sistema nella partizione e codificarla. Quindi voi creerete il sistema di richiamo e l’intero processo di creazione del sistema operativo nascosto sarà completato.</string>
@@ -1159,7 +1211,7 @@
     <string lang="it" key="HIDDEN_OS_CREATION_PREINFO_HELP">Nei passi successivi, VeraCrypt creerà il sistema operativo nascosto copiando il contenuto della partizione di sistema nel volume nascosto (i dati in copia saranno Codificati al volo con una chiave di codifica differente da quella usata per il sistema operativo di richiamo).\n\nNotate che il processo sarà eseguito in ambiente di pre-boot(prima dell’avvio di Windows) e può impiegare molto tempo per essere completato; diverse ore o anche diversi giorni (a seconda della dimensione della partizione di sistema e dalle prestazioni del vostro computer).\n\nVoi potrete interrompere il processo, spegnere il vostro computer, avviare il sistema operativo e riavviare il processo. Comunque, se interrompete tale processo, l’intera procedura di copia del sistema dovrà ripartire dall’inizio (perché il contenuto della partizione di sistema non deve cambiare durante la clonazione).</string>
     <string lang="it" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Volete annullare l’intero processo di creazione del sistema operativo nascosto?\n\nNota: NON potrete ripristinare il processo se lo annullate adesso.</string>
     <string lang="it" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Volete annullare il pre-test per la codifica di sistema?</string>
-    <string lang="it" key="BOOT_PRETEST_FAILED_RETRY">La richiesta di codifica di sistema VeraCrypt è fallita. Volete ritentare?\n\nSelezionando 'No', il componente di autenticazione in pre-boot sarà disinstallato.\n\nNota:\n\n- Se il Boot Loader di VeraCrypt non vi richiede di digitare la password prima dell'avvio di Windows, è possibile che il vostro sistema operativo non si it is avvia dall'unità nella quale esso è installato. Questo non è supportato.\n\n- Se usate un algoritmo di cifratura diverso di AES e la richiesta è fallita (ed avete digitato la password), questo è stato causato da un driver designato inadeguatamente. Selezionare 'No', e ritentare la cifratura della partizione/unità di sistema, usando l'algoritmo di codifica AES (che ha dei requisiti di memoria inferiori).\n\n- Per più possibili cause e soluzioni, visitare: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="it" key="BOOT_PRETEST_FAILED_RETRY">La richiesta di codifica di sistema VeraCrypt è fallita. Volete ritentare?\n\nSelezionando 'No', il componente di autenticazione in pre-boot sarà disinstallato.\n\nNota:\n\n- Se il Boot Loader di VeraCrypt non vi richiede di digitare la password prima dell'avvio di Windows, è possibile che il vostro sistema operativo non si it is avvia dall'unità nella quale esso è installato. Questo non è supportato.\n\n- Se usate un algoritmo di cifratura diverso di AES e la richiesta è fallita (ed avete digitato la password), questo è stato causato da un driver designato inadeguatamente. Selezionare 'No', e ritentare la cifratura della partizione/unità di sistema, usando l'algoritmo di codifica AES (che ha dei requisiti di memoria inferiori).\n\n- Per più possibili cause e soluzioni, visitare: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="it" key="SYS_DRIVE_NOT_ENCRYPTED">La partizione/disco di sistema non sembra essere criptato (né parzialmente né interamente).</string>
     <string lang="it" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">La vostra partizione/disco di sistema è criptato (parzialmente o completamente).\n\nDeCodificate la vostra partizione/disco interamente prima di procedere. Per fare questo, selezionate 'Sistema'&gt;'Decodifica definitivamente la partizione/disco di sistema' dal menu della barra strumenti della finestra principale di VeraCrypt.</string>
     <string lang="it" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">Quando la partizione/unità di sistema è crittata (parzialmente o totalmente), non potete tornare ad una precedente versione di VeraCrypt (ma potete aggiornare o reinstallare la stessa versione di esso).</string>
@@ -1176,6 +1228,8 @@
     <string lang="it" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">Avete selezionato la partizione/unità di sistema (oppure la partizione di avvio),ma la modalità guidata è adeguata solo per partizioni /unità non di sistema.\n\nVolete impostare l’autenticazione di  pre-boot  (significa che voi dovete inserire la vostra password ogni volta prima del boot/avvio di  Windows) e crittare la partizione/unità di sistema?</string>
     <string lang="it" key="CONFIRM_DECRYPT_SYS_DEVICE">Siete sicuri di voler Decodificare definitivamente la partizione/disco di sistema?</string>
     <string lang="it" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">ATTENZIONE: Se Decodificate in permanenza la partizione/disco di sistema, i dati Decodificati saranno scritti in essa.\n\nSiete sicuri di voler decodificare definitivamente la partizione/disco di sistema?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
     <string lang="it" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Attenzione: Se usate una cascata di cifre per la codifica del sistema, potete incontrare i seguenti problemi:\n\n1) Il loader di avvio di VeraCrypt è più grande che il normale e, pertanto, non c'è spazio sufficiente nella prima traccia del disco per un backup del loader di avvio di VeraCrypt. Da adesso, se esso risulta danneggiato (questo avviene spesso, per esempio, durante l'attivazione di una procedura anti pirateria designata inadeguatamente per certe applicazioni), voi avrete bisogno di usare il disco di emergenza di VeraCrypt per avviare o per riparare il loader di avvio di VeraCrypt.\n\n2) In alcuni computer, ritornando dallo stato di sospensione piuttosto lungo.\n\nQuesti problemi potenziali possono essere evitati scegliendo un algoritmo di cifratura non a cascata (esempio AES).\n\nSiete sicuri di voler usare una cascata di cifre?</string>
     <string lang="it" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">Se riscontrate uno qualsiasi dei problemi descritti,  Decodificate la partizione/disco di sistema (se esso è criptato) e quindi tentare di Codificarla usando un algoritmo di codifica non a cascata (esempio AES).</string>
     <string lang="it" key="UPDATE_TC_IN_DECOY_OS_FIRST">ATTENZIONE: Per ragioni di sicurezza, è necessario aggiornare VeraCrypt sul sistema operativo esca prima di aggiornarlo sul sistema operativo nascosto.\n\nPer farlo, avviare il sistema esca ed eseguire il programma di installazione VeraCrypt. Poi avviare il sistema nascosto ed eseguire il programma di installazione anche su quest'ultimo.\n\nNota: Il sistema esca e il sistema nascosto condividono un singolo boot d'avvio. Se avete aggiornato VeraCrypt solo sul sistema nascosto (ma non sul sistema esca), il sistema esca conterrebbe un driver e l'applicazioni di VeraCrypt il cui numero di versione è diverso dal numero di versione di VeraCrypt del boot d'avvio. Tale discrepanza potrebbe svelare che vi è un sistema operativo nascosto su questo computer.\n\n\nContinuare?</string>
@@ -1191,6 +1245,7 @@
     <string lang="it" key="ENABLE_BAD_SECTOR_ZEROING">Errore: Il contenuto di uno o più settori di questo disco non possono essere letti (probabilmente a causa di un difetto fisico).\n\nTIl processo di cifratura in-posto può proseguire solamente quando i settori sono stati resi nuovamente leggibili. VeraCrypt può tentare di fare questo scrivendo degli zeri nei settori (di conseguenza questi blocchi di tutto-zeri verrebbero codificati). Notate comunque che ogni dato immagazzinato nei settori illeggibili verranno persi. Se volete evitare questo, potete tentare di recuperare delle porzioni di dati corrotti usando degli strumenti adatti da terze parti.\n\nNota: In caso di settori danneggiati fisicamente (contrariamente alla mera corruzione dei dati ed il controllo degli errori)la maggior parte delle periferiche di memoria riassegnano internamente i settori quando si tenta di scrivere dei dati in essi (in questo modo, i dati esistenti nei settori danneggiati possono rimanere non codificati sul drive).\n\nVolete che VeraCrypt scrivi degli zero nei settori illegibili?</string>
     <string lang="it" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Errore: Il contenuto di uno o più settori di questo disco non possono essere letti (probabilmente a causa di un difetto fisico).\n\nPer poter procedere con la decifratura, VeraCrypt dovrà scartare il contenuto dei settori illegibili (esso sarà sostituito da dati pseudo-casuali). Da notare che, prima di procedere, potete tentare di recuperare delle porzioni di qualsiasi dato danneggiato usando degli strumenti di terze parti appropriati.\n\nVolete che VeraCrypt scarti i dati nei settori illegibili adesso?</string>
     <string lang="it" key="ZEROED_BAD_SECTOR_COUNT">Nota: VeraCrypt ha sostituito il contenuto di %I64d settori illegibili (%s) con blocchi di testo tutti-zero Decodificati.</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="it" key="ENTER_TOKEN_PASSWORD">Digitare la password/PIN per il gettone '%s':</string>
     <string lang="it" key="PKCS11_LIB_LOCATION_HELP">Allo scopo di consentire a VeraCrypt di accedere al gettone di sicurezza o smart card, dovete prima installate una libreria software PKCS #11 per gettone o smartcard. Libreria di questo tipo può essere fornita con la periferica oppure essere disponibile per il download dal sito web del venditore oppure da altre terze parti.\n\nDopo aver installato la libreria, potete sia selezionarla manualmente facendo click su 'Seleziona libreria' o lasciare che  VeraCrypt la trovi e selezioni automaticam. facendo click su 'Scopri automaticamente la libreria' (solo nella directory Windows System).</string>
     <string lang="it" key="SELECT_PKCS11_MODULE_HELP">Nota: Per il nome e posizione del file libreria PKCS #11 installata per il vostro gettone di sicurezza o smart card, riferitevi alla documentazione fornita con il gettone, scheda oppure software di terze parti.\n\nFate click 'OK' per selezionare il percorso ed il nome del file.</string>

Translations/Language.ja.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="ja" name="日本語" en-name="Japanese" version="1.0.0" translators="OGOSHI Masayuki" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <control lang="ja" key="IDC_KEY_FILES">キーファイル(&amp;K)</control>
     <control lang="ja" key="IDC_LINK_HASH_INFO">ハッシュアルゴリズムについて</control>
     <control lang="ja" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">暗号について</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="ja" key="IDC_MB">&amp;MB</control>
     <control lang="ja" key="IDC_MORE_INFO_ON_CONTAINERS">コンテナについて</control>
     <control lang="ja" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">システムの暗号化について</control>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <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="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_FILE_CONTAINER">ファイルとして仮想暗号化ディスクを作成します。\n初心者にはこちらを推奨します。</control>
@@ -85,6 +88,8 @@
     <control lang="ja" key="IDT_PARTIAL_POOL_CONTENTS">カレントプールの内容（部分）</control>
     <control lang="ja" key="IDT_PASS">パス</control>
     <control lang="ja" 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="ja" key="IDT_PROGRESS">進行状況:</control>
     <control lang="ja" key="IDT_RANDOM_POOL">ランダムプール：</control>
     <control lang="ja" key="IDT_SINGLE_BOOT">このマシンにインストールされたOSが一つだけの場合はこのオプションを選択してください（複数ユーザーで使っていても同様）。</control>
@@ -142,6 +147,8 @@
     <control lang="ja" key="IDC_MOUNT_OPTIONS">ﾏｳﾝﾄｵﾌﾟｼｮﾝ...(&amp;O)</control>
     <control lang="ja" key="IDC_MOUNT_READONLY">ボリュームを読み取り専用でマウント(&amp;O)</control>
     <control lang="ja" key="IDC_NEW_KEYFILES">キーファイル...</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="ja" key="IDC_PREF_BKG_TASK_ENABLE">常駐する</control>
     <control lang="ja" key="IDC_PREF_CACHE_PASSWORDS">パスワードをドライバのメモリに記憶する</control>
     <control lang="ja" key="IDC_PREF_DISMOUNT_INACTIVE">右に示す時間内に読み書きがなければ自動的にアンマウント</control>
@@ -155,6 +162,7 @@
     <control lang="ja" key="IDC_PREF_MOUNT_READONLY">ボリュームを読み取り専用でマウント</control>
     <control lang="ja" key="IDC_PREF_MOUNT_REMOVABLE">ボリュームをリムーバブルメディアとしてマウント</control>
     <control lang="ja" 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="ja" key="IDC_PREF_USE_DIFF_TRAY_ICON_IF_VOL_MOUNTED">マウントされたボリュームがあるときにタスクバーアイコンを変える</control>
     <control lang="ja" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">自動アンマウントの際に記憶していたパスワードを消去</control>
     <control lang="ja" key="IDC_PREF_WIPE_CACHE_ON_EXIT">終了時に記憶していたパスワードを消去</control>
@@ -167,11 +175,12 @@
     <control lang="ja" key="IDC_SHOW_PASSWORD_CHPWD_ORI">パスワードを表示</control>
     <control lang="ja" key="IDC_TRAVEL_OPEN_EXPLORER">マウントされたボリュームのウィンドウを開く(&amp;E)</control>
     <control lang="ja" key="IDC_TRAV_CACHE_PASSWORDS">パスワードをドライバのメモリに記憶(&amp;C)</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="ja" key="IDC_UNMOUNTALL">全てアンマウント(&amp;S)</control>
     <control lang="ja" key="IDC_VOLUME_PROPERTIES">ボリュームのプロパティ(&amp;V)...</control>
     <control lang="ja" key="IDC_VOLUME_TOOLS">ボリュームツール(&amp;T)...</control>
     <control lang="ja" key="IDC_WIPE_CACHE">記憶済ﾊﾟｽﾜｰﾄﾞの消去(&amp;W)</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="ja" key="IDD_FAVORITE_VOLUMES">VeraCrypt - お気に入りボリューム</control>
     <control lang="ja" key="IDD_HOTKEYS_DLG">VeraCrypt - システム全体のホットキーの設定</control>
     <control lang="ja" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="ja" key="IDM_CREATE_HIDDEN_OS">隠しOSを作成...</control>
     <control lang="ja" key="IDM_CREATE_RESCUE_DISK">レスキューディスク作成...</control>
     <control lang="ja" key="IDM_CREATE_VOLUME">新規ボリュームの作成...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="ja" key="IDM_DEFAULT_KEYFILES">デフォルトキーファイル...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="ja" key="IDM_DONATE">寄付する...</control>
     <control lang="ja" key="IDM_ENCRYPT_SYSTEM_DEVICE">システムパーティション/ドライブの暗号化...</control>
     <control lang="ja" key="IDM_FAQ">よくある質問と答え</control>
@@ -243,6 +254,7 @@
     <control lang="ja" key="IDM_UNMOUNT_VOLUME">ボリュームをアンマウント</control>
     <control lang="ja" key="IDM_VERIFY_RESCUE_DISK">レスキューディスクのベリファイ</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>
     <control lang="ja" key="IDM_VOLUME_WIZARD">ボリューム作成ウィザード</control>
     <control lang="ja" key="IDM_WEBSITE">VeraCryptウェブサイト</control>
@@ -485,7 +497,11 @@
     <string lang="ja" key="FORMAT_FINISHED_HELP">\n\nVeraCryptボリュームが作成され、使用できる状態になりました。VeraCryptボリュームを続けて作成する場合は「次へ」をクリックしてください。そうでなければ「終了」をクリックしてください。</string>
     <string lang="ja" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\n隠しボリュームの作成に成功しました（隠しOSがこの隠しボリュームに作成されます）。\n\n「次へ」をクリックしてください。</string>
     <string lang="ja" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">ボリューム全体が暗号化されました。</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="ja" key="NONSYS_INPLACE_ENC_FINISHED_INFO">重要：この新規作成したVeraCryptボリュームをマウントしてデータにアクセスするには、VeraCryptのメインウィンドウで「デバイスの自動マウント」をクリックしてください。そして正しいパスワードを入力（そして正しいキーファイルを指定）すると、メインウィンドウで選択していたドライブレターにそのボリュームがマウントされ、そのドライブを通して暗号化されたデータにアクセスすることができます。\n\n上記の手順を記憶するかメモしておいてください。このボリュームをマウントしてデータにアクセスするためにはこの手順に沿わなければなりません。あるいは、メインウィンドウで「デバイスを選択」をクリックし、このパーティションあるいはボリュームを選択してから「マウント」をクリックしてください。\n\nこのパーティション/デバイスの暗号化に成功し、使用する準備ができました。</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="ja" key="FORMAT_FINISHED_INFO">VeraCryptボリュームの作成に成功しました。</string>
     <string lang="ja" key="FORMAT_FINISHED_TITLE">ボリュームが作成されました</string>
     <string lang="ja" key="FORMAT_HELP">重要：このウィンドウ内にてできるかぎりランダムにマウスを動かしてください。これにより暗号鍵の強度を大幅に上げられます。長く動かすほど良い結果を得られます。「フォーマット」をクリックするとボリュームを作成します。</string>
@@ -523,6 +539,7 @@
     <string lang="ja" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">システムの暗号ステータスの取得中にエラーが見つかりました。</string>
     <string lang="ja" key="INIT_SYS_ENC">システムを暗号化するアプリケーションコンポーネントを初期化できませんでした。</string>
     <string lang="ja" key="INIT_RAND">乱数生成機構の初期化に失敗しました！</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="ja" key="INIT_REGISTER">アプリケーションを初期化できません。ダイアログクラスの登録に失敗しました。</string>
     <string lang="ja" key="INIT_RICHEDIT">エラー：リッチエディットシステムライブラリの読込に失敗しました。</string>
     <string lang="ja" key="INTRO_TITLE">VeraCryptボリューム作成ウィザード</string>
@@ -535,6 +552,7 @@
     <string lang="ja" key="MOUNT_BUTTON">マウント(&amp;M)</string>
     <string lang="ja" key="NEW_VERSION_REQUIRED">このボリュームをマウントするには、新しいバージョンのVeraCryptが必要です。</string>
     <string lang="ja" key="VOL_CREATION_WIZARD_NOT_FOUND">エラー：ボリューム作成ウィザードが見つかりません。\n\n'VeraCrypt.exe' が起動されたフォルダに 'VeraCrypt Format.exe' があるか確認してください。 もし存在しなければ、VeraCryptを再インストールするか、ディスク上の 'VeraCrypt Fromat.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="ja" key="NEXT">次へ(&amp;N)＞</string>
     <string lang="ja" key="FINALIZE">終了(&amp;F)</string>
     <string lang="ja" key="INSTALL">インストール(&amp;I)</string>
@@ -542,6 +560,7 @@
     <string lang="ja" key="NODRIVER">VeraCryptデバイスドライバに接続できません。デバイスドライバが実行されていないとVeraCryptは実行できません。\n\nWindows自体の問題によって、デバイスドライバを読み込むためにはログオフあるいは再起動が必要かもしれません。</string>
     <string lang="ja" key="NOFONT">フォントの読み込み・準備中にエラーが発生しました。</string>
     <string lang="ja" 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="ja" key="DRIVE_LETTER_UNAVAILABLE">ドライブレターが利用できません。</string>
     <string lang="ja" key="NO_FILE_SELECTED">ファイルが選択されていません！</string>
     <string lang="ja" key="NO_FREE_DRIVES">有効な空きドライブレターがありません。</string>
@@ -561,15 +580,18 @@
     <string lang="ja" key="OVERWRITEPROMPT">警告：そのファイル '%hs' はすでに存在しています！\n\n重要：VeraCryptはそのファイル自体を暗号化するのではなく、消去して上書きします。 本当にそのファイルを消去して新しいVeraCryptコンテナで置き換えますか？</string>
     <string lang="ja" key="OVERWRITEPROMPT_DEVICE">注意：選択された %s '%hs'%s に存在しているすべてのファイルは消去され失われます（暗号化されるのではありません）！\n\n本当にフォーマットを続けてよいですか？</string>
     <string lang="ja" key="NONSYS_INPLACE_ENC_CONFIRM">警告：暗号化が完全に終了するまで、このボリューム上のファイルにはアクセスできなくなります。\n\n選択された %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 '%hs'%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_SECOND_WARNING_LOTS_OF_DATA">警告：選択されたパーティションには大量のデータがあります！ そのパーティションにあるすべてのデータが削除され、失われます。それらのファイルは暗号化されません！</string>
     <string lang="ja" key="ERASE_FILES_BY_CREATING_VOLUME">このパーティションにVeraCryptボリュームを作成して、既存データすべてを削除する</string>
     <string lang="ja" key="PASSWORD">パスワード</string>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="ja" key="IDD_PCDM_CHANGE_PKCS5_PRF">ヘッダキー導出アルゴリズムの設定</string>
     <string lang="ja" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">ボリュームへのキーファイルの追加/削除</string>
     <string lang="ja" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">ボリュームから全てのキーファイルを削除</string>
     <string lang="ja" key="PASSWORD_CHANGED">パスワードまたはキーファイルの変更に成功しました。\n\n重要：ユーザーズガイドの「安全のための必要事項と予防策」の章にある「パスワードとキーファイルの変更」節をよくお読みください。</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="ja" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">重要：VeraCryptレスキューディスクを壊していなければ、システムパーティション/ドライブはまだ古いパスワードで復号可能です（レスキューディスクで起動して古いパスワードを入力します）。新しいVeraCryptレスキューディスクを作成し、古い方は壊してしまうべきです。\n\n新しいVeraCryptレスキューディスクを作成しますか？</string>
     <string lang="ja" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">今お持ちのVeraCryptレスキューディスクは従来の暗号化アルゴリズムが使用されています。もし従来の暗号化アルゴリズムが安全でないとお考えなら、新しいVeraCryptレスキューディスクを作成し、古い方は壊してしまうべきです。\n\n新しいVeraCryptレスキューディスクを作成しますか？</string>
     <string lang="ja" key="KEYFILES_NOTE">あらゆる種類のファイル（例：.mp3, .jpg, .zip, .avi）をVeraCryptのキーファイルとして使用できます。VeraCryptはキーファイルの内容を変更しません。キーファイルを複数選択することもできます（選択順序は無関係です）。フォルダを追加した場合は、その中にあって隠されていないファイルすべてがキーファイルとして使用されます。セキュリティトークンやスマートカードに保存されているキーファイルを選択する（あるいはキーファイルをセキュリティトークンやスマートカードにインポートする）には「トークンファイルの追加」をクリックしてください。</string>
@@ -578,6 +600,7 @@
     <string lang="ja" key="PKCS5_PRF_CHANGED">ヘッダキー導出アルゴリズムの設定に成功しました</string>
     <string lang="ja" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">非システムボリュームのその場での暗号化処理に復帰するため、パスワードを入力（またはキーファイルを指定）してください。\n\n\n注：「次へ」をクリックすると、VeraCryptは暗号化処理が中断されていて、与えられたパスワードあるいはキーファイルで復号できるすべての非システムボリュームを検索します。もし複数のボリュームが見つかった場合は、次のステップでその内の一つを選択する必要があります。</string>
     <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_HIDDEN_OS_HELP">隠しOS用のパスワードを入力してください（つまり隠しボリューム用です）。</string>
@@ -597,11 +620,26 @@
     <string lang="ja" key="PASSWORD_WRONG_AUTOMOUNT">パスワードが正しくないか、VeraCryptボリュームが見つかりません。</string>
     <string lang="ja" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">キーファイルあるいはパスワードが正しくないか、VeraCryptのボリュームが見つかりません。</string>
     <string lang="ja" 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="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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="ja" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\n警告：指定フォルダのキーファイル探索中に隠しファイルが見つかりました。このような隠しファイルはキーファイルとして使用されません。キーファイルとして使用したい場合は隠し属性を解除してください（該当ファイルを右クリックしてプロパティを開き、隠しファイルのチェックを外して「OK」をクリックします）。注：隠しファイルはフォルダオプションですべてのファイルを表示する設定になっていないと表示されません。</string>
     <string lang="ja" key="HIDDEN_VOL_PROT_PASSWORD_US_KEYB_LAYOUT">もし隠しシステムを持つ隠しボリュームを保護しようとしているのであれば、隠しボリューム用のパスワードを入力する際には、標準USキーボードレイアウトであることを確認してください。Windows起動前の環境では、パスワードを入力する場合に非USキーボードレイアウトが無効であるためです。</string>
     <string lang="ja" 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="en" key="SELECTED_PARTITION_NOT_INPLACE_ENC">The selected partition/device is not using in-place encryption.\nHeader Flags = 0x%.8X</string>
     <string lang="ja" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\n注：メニューから[システム]-[起動前認証をせずにマウント]を選ぶことで、起動前の認証をせずに暗号化したシステムドライブ上のパーティションをマウントすること、あるいは起動していないオペレーションシステムを暗号化したパーティションをマウントすることが可能です。</string>
     <string lang="ja" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">現在のモードでは、アクティブなシステムの暗号化対象となっている部分を含むドライブ上のパーティションをマウントすることができません。\n\nこのモードでそのパーティションをマウントする前に、他のドライブ（暗号化されてる否かは問いません）にインストールされているシステムから起動するか、暗号化されていないOSを起動する必要があります。</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <string lang="ja" key="PREV">&lt; 戻る(&amp;B)</string>
     <string lang="ja" key="RAWDEVICES">このシステムのデバイスを列挙できません！</string>
     <string lang="ja" key="READONLYPROMPT">ボリューム '%hs' は読み取り専用としてすでに存在しています。本当に置き換えますか？</string>
@@ -701,11 +739,18 @@
     <string lang="ja" key="FOR_MORE_INFO_ON_PARTITIONS">パーティションの作成と管理の方法については、OS付属のマニュアルを参照するか、メーカーの技術サポートにご相談ください。</string>
     <string lang="ja" key="SYSTEM_PARTITION_NOT_ACTIVE">エラー：現在動作中のOSはブートパーティション（最初のアクティブパーティション）にインストールされていません。この状態には対応していません。</string>
     <string lang="ja" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">このVeraCryptボリュームに4GB超のファイルを保存する意向のようですが、ファイルシステムにはFATが指定されているため、4GB超のファイルを保存することはできません。\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="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="ja" key="CANT_ACCESS_VOL">エラー：ボリュームにアクセスできません！\n\n選択されたボリュームが実在するか、未マウントでないか、システムやアプリケーションですでに使用されていないか、そのボリュームへの読み書き権限があるか、書き込みプロテクトされていないか、などを確認してください。</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="ja" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">エラー：このボリュームにアクセスできないかボリュームの情報を取得できません。\n\n選択されたボリュームが存在しているか、そのボリュームがシステムやアプリケーションで使用されていないか、ボリュームへの読み書き権限があるか、ボリュームが書き込み禁止になっていないか、などを確認してください。</string>
     <string lang="ja" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">エラー：このボリュームにアクセスできないかボリュームの情報を取得できません。\n\n選択されたボリュームが存在しているか、そのボリュームがシステムやアプリケーションで使用されていないか、ボリュームへの読み書き権限があるか、ボリュームが書き込み禁止になっていないか、などを確認してください。\n\n問題が解決しない場合は、以下の手順を試してみてください。</string>
     <string lang="ja" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">エラーによりパーティションの暗号化が中断されました。ここまでに報告された問題を解決してから再度やり直してください。問題が解決しない場合は、以下の手順を試してみてください。</string>
     <string lang="ja" key="INPLACE_ENC_GENERIC_ERR_RESUME">エラーによりパーティションの暗号化処理への復帰が中断されました。\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="ja" key="CANT_DISMOUNT_OUTER_VOL">エラー：外殻ボリュームをアンマウントできません！\n\nボリューム内にプログラムやシステムで使用中のファイルあるいはフォルダがあると、ボリュームのアンマウントができません。\n\nファイルやフォルダを使用していると思われるプログラムを終了させてから「再試行」をクリックしてください。</string>
     <string lang="ja" key="CANT_GET_OUTER_VOL_INFO">エラー：外殻ボリュームの情報を取得できませんでした！ ボリュームの作成を続行できません。</string>
     <string lang="ja" key="CANT_ACCESS_OUTER_VOL">エラー：外殻ボリュームにアクセスできません！ ボリュームの作成を続行できません。</string>
@@ -790,7 +835,7 @@
     <string lang="ja" key="TC_INSTALLER_IS_RUNNING">現在VeraCryptインストーラが起動しており、インストールあるいはアップデートの実行中です。インストーラの処理が終わるのを待つか、閉じるかしてください。閉じることができない場合は再起動してください。</string>
     <string lang="ja" key="INSTALL_FAILED">インストールに失敗しました。</string>
     <string lang="ja" key="UNINSTALL_FAILED">アンインストールに失敗しました。</string>
-    <string lang="ja" key="DIST_PACKAGE_CORRUPTED">この配布パッケージは破損しています。（なるべくVeraCryptの公式サイト www.veracrypt.org から）もう一度ダウンロードしてみてください。</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="EXTRACTING_VERB">展開</string>
     <string lang="ja" key="CANNOT_READ_FROM_PACKAGE">パッケージからデータを読み込めません。</string>
@@ -977,6 +1022,7 @@
     <string lang="ja" key="CONFIRM_EXIT_UNIVERSAL">終了しますか？</string>
     <string lang="ja" key="CHOOSE_ENCRYPT_OR_DECRYPT">暗号化なのか復号なのかを決定するための十分な情報がありません。</string>
     <string lang="ja" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">暗号化なのか復号なのかを決定するための十分な情報がありません。\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="ja" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">パーティション/ボリュームの暗号化処理を中断して後に回しますか？\n\n注：ボリュームは暗号化処理を完了するまでマウントできないことに注意してください。後で暗号化処理を中断した箇所から再開することができます。その際はVeraCryptのメインウィンドウから、[ボリューム]-[中断処理を再開]を選択してください。</string>
     <string lang="ja" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">システムパーティション/ドライブの暗号化処理を中断して先送りにしますか？\n\n注：この処理は中断した箇所から後で再開することができます。それはたとえばVeraCryptメインウィンドウのメニューから[システム]-[中断処理を再開]を選択することで可能です。もし暗号化自体を解除したい場合は[システム]-[システムパーティション/ドライブの暗号化を解除]を選択してください。</string>
     <string lang="ja" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">システムパーティション/ドライブの暗号化解除処理を中断して先送りにしますか？\n\n注：この処理は中断した箇所から後で再開することができます。それはたとえばVeraCryptメインウィンドウのメニューから[システム]-[中断処理を再開]を選択することで可能です。もし暗号化解除をやめて暗号化する場合は[システム]-[システムパーティション/ドライブの暗号化]を選択してください。</string>
@@ -986,6 +1032,7 @@
     <string lang="ja" key="FAILED_TO_START_WIPING">エラー：ワイプ処理の開始に失敗しました。</string>
     <string lang="ja" key="INCONSISTENCY_RESOLVED">不整合状態を解決しました。\n\n\n（もしこの問題についてバグ報告をしてくださるなら、以下の技術的情報を付け加えてくださるようお願いします： %hs）</string>
     <string lang="ja" key="UNEXPECTED_STATE">エラー：予期しない状態です。\n\n\n（この状態をバグ報告する場合、次の情報も報告に含めるようお願いいたします。: %hs）</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="ja" key="NOTHING_TO_RESUME">再開される処理/タスクはありません。</string>
     <string lang="ja" key="HIDVOL_PROT_BKG_TASK_WARNING">警告：VeraCryptの常駐は無効になっています。VeraCryptの終了後は、隠しボリュームの保護機能が働いても告知されません。\n\n注：VeraCryptのトレイアイコンを右クリックして終了を選べば、いつでも常駐を終了できます。\n\nVeraCryptの常駐を有効にしますか？</string>
     <string lang="ja" key="LANG_PACK_VERSION">言語パックのバージョン： %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="ja" key="ERROR_MBR_PROTECTED">MBRセクターに書き込めませんでした。\n\nBIOSの設定でMBRセクターが保護されていると思われますので、BIOSの設定を確認してください（電源投入後にF2、Delete、あるいはEscキーを押してください）。</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="ja" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">VeraCryptブートローダーの必要なバージョンがインストールされていません。そのため指定された設定のいくつかは保存されません。</string>
     <string lang="ja" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">注：時と場合によっては、このコンピュータを起動しているところを見ている他人に、あなたがVeraCryptを使っていることを知られたくないということもあるかもしれません。上記のオプションで、VeraCryptのブートローダー画面をカスタマイズすることができます。最初のオプションを有効にすると、ブートローダーの起動時に一切の文字表示をしません（誤ったパスワードを入力したときでさえもです）。コンピュータは正しいパスワードが入力されるまで固まっているように見えます。あるいはカスタムメッセージを表示させて敵対者に誤解を与えることもできます。たとえば次のような偽のエラーメッセージ「Missing operating system」（これは通常のWindowsブートローダーが、Windowsのブートパーティションを見つけられないときのものです）などです。ただし、もし敵対者がハードディスクの内容を解析できるのであれば、VeraCryptブートローダーの存在を検出することは可能です。</string>
     <string lang="ja" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">警告：このオプションを有効にした場合、VeraCryptブートローダーは起動画面において一切の文字表示を行いません（パスワードが誤っていても同様です）。このコンピュータは正しいパスワードが入力されるまで固まってしまったかのように見えます。カーソルは動かず、キーを押してもアスタリスクは表示されません。\n\n本当にこのオプションを有効にしますか？</string>
@@ -1034,8 +1082,11 @@
     <string lang="ja" key="EXTRA_BOOT_PARTITION_REMOVAL_INSTRUCTIONS">\nWindowsをインストールする前に追加のブートパーティションを削除できます。そのためには次の手順に従ってください:\n\n1) Windowsインストールディスクで起動します。\n\n2) Windowsインストール画面で「今すぐインストール」→「カスタム（詳細）」とクリックします。\n\n3) 「ドライブオプション」をクリックします。\n\n4) メインのシステムパーティションを選択し、「消去」→「OK」とクリックして消去します。\n\n5) 「System Reserved」パーティションを選択し、「拡張」をクリックしてOSをインストール可能なサイズを指定します。6) 「適用」→「OK」をクリックします。\n\n7) 「System Reserved」パーティションにWindowsをインストールします。\n\n\n攻撃者が追加のブートパーティションを削除した理由を尋ねてくるかもしれません。そのときは、あなたは暗号化されていないブートパーティションへのデータ漏洩の可能性を無くしたかったからだと言うことができます。\n\n注：下の「印刷」ボタンをクリックしてこの文章を印刷することができます。もしこの文章をコピーあるいは印刷（プリンタの内蔵ドライブに文面が保存されるのでなければ、強くお勧めします）したならば、追加のブートパーティションを削除後にその紙やコピーを破棄すべきです。そうしないと、もしその紙やコピーが見つかったならば、このコンピュータに隠しOSがあることを推測されるおそれがあるからです。</string>
     <string lang="ja" key="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">警告：システムパーティションとその次のパーティションの間に未割り当ての領域が存在しています。隠しOSを作成した後は、この未割り当ての領域に新たにパーティションを作成してはいけません。さもなければ（新たに作成したパーティションを削除するまで）隠しOSが起動できなくなります。</string>
     <string lang="ja" 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="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="ja" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">現在、システムの暗号化でのキーファイル使用には対応していません。</string>
     <string lang="ja" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">警告：VeraCryptは元のキーボードレイアウトを復元できませんでした。そのためパスワードを正確に入力できないおそれがあります。</string>
     <string lang="ja" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">エラー：キーボードのレイアウトを標準USキーボードとして設定できません。\n\nシステム起動前に必要なパスワードがUS Windowsレイアウト以外のキーボードで入力されても無効となります。したがってパスワードは常に標準USレイアウトのキーボードで入力される必要があります。</string>
@@ -1120,6 +1171,7 @@
     <string lang="ja" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">予備検査が無事に完了しました。\n\n警告：もし既存データをその場での暗号化中に電源が突然切られたり、ソフトウェアエラーやハードウェア障害によってOSがクラッシュしたりした場合、データの一部が壊れたり失われたりする可能性があります。したがって暗号化する前に必ずファイルのバックアップをとってください。まだバックアップをとっていなければすぐにバックアップしてください。「保留」をクリックしてから、ファイルのバックアップを行い、VeraCryptを再度起動して[システム]-[中断処理を再開]を選択することで暗号化を再開できます。\n\n準備ができたら「暗号化」で暗号化を開始してください。</string>
     <string lang="ja" key="SYSENC_ENCRYPTION_PAGE_INFO">「一時中断」か「保留」をクリックすることで暗号化あるいは復号処理をいつでも中断することができます。ウィザードを終了した後、コンピュータを再起動あるいはシャットダウンした後に、中断したところから処理を再開できます。またシステムやアプリケーションがシステムドライブを読み書きするときに遅くなることを防ぐため、VeraCryptは自動的にその読み書きが終わるのを待ちます（上のステータスを見てください）。その読み書きが終わると暗号化/復号処理を再開します。</string>
     <string lang="ja" 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="ja" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">隠しシステムの開始</string>
     <string lang="ja" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">オリジナルシステム</string>
     <string lang="ja" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windowsは様々な種類のログファイルや一時ファイル等を、通常はユーザーに特に知らせることなくシステムパーティションに作成します。同様にメモリー上の情報を一時休止ファイルやページングファイルとして保存します。そのため、敵対者が元OSのパーティションにあるデータ（隠しシステムのコピー元）を解析した場合、たとえばあなたがVeraCryptのウィザードを隠しシステム作成モードで実行したことなどを見つけるかもしれません。これは隠しOSの存在を示唆します。\n\nこの問題を防ぐため、VeraCryptは次のステップで、元OSのあったパーティション上のデータすべてを安全に抹消します。その後、「みせかけの拒否」を達成するために、そのパーティションに新しいシステムをインストールし、暗号化しておく必要があります。このように囮システムを作成して、隠しOSを作成するすべての手順を終えてください。</string>
@@ -1159,7 +1211,7 @@
     <string lang="ja" key="HIDDEN_OS_CREATION_PREINFO_HELP">次のステップで、VeraCryptはシステムパーティションから隠しボリュームへファイルをコピーすることで隠しOS領域を作成します（囮OS領域とは別の暗号鍵で即時暗号化しながらコピーします）。\n\nこの処理はWindows起動前の環境で行われ、完了するまでに長時間かかることに注意してください。処理時間はシステムパーティションのサイズやコンピュータの性能にもよりますが、数時間から数日かかることもあります。\n\nこの処理を途中で中断し、コンピュータを再起動した後にあらためて再開することも可能です。ただし、もし処理を中断した場合は、システムのコピー処理からやり直しになります。これはシステムパーティションとコピー先の内容を同一にするために必要です。</string>
     <string lang="ja" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">隠しOSの作成をキャンセルしますか？\n\nここで処理をキャンセルした場合、後で処理を再開することはできません。</string>
     <string lang="ja" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">システム暗号化の予備検査をキャンセルしますか？</string>
-    <string lang="ja" key="BOOT_PRETEST_FAILED_RETRY">VeraCryptのシステム暗号化予備検査に失敗しました。もう一度予備検査をしますか？\n\nもし「いいえ」を選んだ場合、起動前認証用コンポーネントがアンインストールされます。\n\n注：\n\n- もしVeraCryptブートローダーがWindowsが起動する前にパスワードの入力を要求してこなかった場合、ブートローダーがインストールされたのではないドライブからOSが起動している可能性があります。このケースには対応していません。\n\n- もしAES以外の暗号化アルゴリズムを使って予備検査に失敗した（そしてパスワードは入力した）場合、不適切な設計のドライバーに起因している可能性があります。「いいえ」を選択し、システムパーティション/ドライブをAESを使って暗号化しなおしてみてください（メモリ使用量が最少になります）。\n\n- その他に考えられる原因や対処方法については、http://www.veracrypt.org/docs/?s=troubleshooting をご覧ください。</string>
+    <string lang="ja" key="BOOT_PRETEST_FAILED_RETRY">VeraCryptのシステム暗号化予備検査に失敗しました。もう一度予備検査をしますか？\n\nもし「いいえ」を選んだ場合、起動前認証用コンポーネントがアンインストールされます。\n\n注：\n\n- もしVeraCryptブートローダーがWindowsが起動する前にパスワードの入力を要求してこなかった場合、ブートローダーがインストールされたのではないドライブからOSが起動している可能性があります。このケースには対応していません。\n\n- もしAES以外の暗号化アルゴリズムを使って予備検査に失敗した（そしてパスワードは入力した）場合、不適切な設計のドライバーに起因している可能性があります。「いいえ」を選択し、システムパーティション/ドライブをAESを使って暗号化しなおしてみてください（メモリ使用量が最少になります）。\n\n- その他に考えられる原因や対処方法については、https://veracrypt.codeplex.com/wikipage?title=Troubleshooting をご覧ください。</string>
     <string lang="ja" key="SYS_DRIVE_NOT_ENCRYPTED">システムパーティション/ドライブは部分的にも全体的にも暗号化されていないようです。</string>
     <string lang="ja" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">システムパーティション/デバイスは暗号化されています（部分的あるいは全体的）。\n\n処理を進める前にシステムパーティション/デバイス全体の暗号化を解除してください。VeraCryptのメインウィンドウのメニューから[システム]-[暗号化の解除]を選択することで解除できます。</string>
     <string lang="ja" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">システムパーティション/ドライブが部分的であれ全体であれ暗号化されている場合は、VeraCryptをダウングレードできません。ただしアップグレードあるいは同じバージョンでの再インストールは可能です。</string>
@@ -1176,6 +1228,8 @@
     <string lang="ja" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">システムパーティション/ドライブ（あるいはブートパーティション）が選択されていますが、このウィザードモードはシステム以外のパーティション/ドライブにのみ適応しています。\n\n起動前に認証（つまりWindowsを起動するたびに起動前のパスワード入力が必要になります）を行うようにし、システムパーティション/ドライブを暗号化しますか？</string>
     <string lang="ja" key="CONFIRM_DECRYPT_SYS_DEVICE">本当にシステムパーティション/ドライブの暗号化を解除しますか？</string>
     <string lang="ja" 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="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="ja" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">警告：多段アルゴリズムを使用してシステムを暗号化した場合、次のような問題に直面する可能性があります。\n\n1) VeraCryptブートローダーが通常より大きなサイズになるため、VeraCryptブートローダーのバックアップのための十分な領域をドライブの最初のトラックに得られません。そのためにその領域が破損する（これはしばしば発生します。たとえば設計が不適切なプログラムによるアクティベーション処理などです）たびにレスキューディスクから起動して、ブートローダー領域を修復する必要があります。\n\n2) 一部のコンピュータでは休止状態からの復帰により時間がかかるようになります。\n\n多段ではないアルゴリズム（例：AES）を使えば、このような潜在的な問題には遭遇しません。\n\n本当に多段アルゴリズムでの暗号化を行いますか？</string>
     <string lang="ja" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">もし上記の問題が発生した場合は、もし暗号化されているのならパーティション/ドライブを復号し、あらためて多段ではないアルゴリズム（例：AES）での再暗号化を試みてください。</string>
     <string lang="ja" key="UPDATE_TC_IN_DECOY_OS_FIRST">警告：安全性とセキュリティ上の理由により、隠しOSより先に囮用OSのVeraCryptをアップデートすべきです。\n\nそのためにはまず囮用OSを起動し、そこに入れたVeraCryptインストーラを実行してください。次に隠しOSを起動し、そこに入れたVeraCryptインストーラを実行するようにします。\n\n注：囮用OSと隠しOSは一つのブートローダーを共有しています。もし隠しOSのVeraCryptのみアップグレードした場合、囮用OSにはブートローダーと違うバージョン番号を持つVeraCryptドライバおよびアプリケーションが残されることになります。このような矛盾は隠しOSが存在することを示唆することになります。\n\n\n本当に続けますか？</string>
@@ -1191,6 +1245,7 @@
     <string lang="ja" key="ENABLE_BAD_SECTOR_ZEROING">エラー：ディスク上の一つあるいは複数のセクターが読み込めません（おそらく物理的な原因です）。\n\nその場での暗号化処理は、セクターの読み込みが回復するまで続行できません。VeraCryptはセクターに0を書き込むことで読み込みが回復するか確認できます（その後、そのようにすべて0のブロックも暗号化されます）。ただしこの場合、読み込めなかったセクターの元の内容が失われることに注意してください。それを避けたいのであれば、他の適切なソフトウェアで破損データの回復を試すこともできます。\n\n注：単なるデータ破損やチェックサムエラーではなく、セクターが物理的に破損していた場合、ほとんどの記憶装置では、そのようなセクターへの書き込みを内部的に別セクターに差し替えます。そのため、破損セクター上のデータは暗号化されずに残ったままとなります。\n\nVeraCryptが読み込めないセクターに0を書き込んでも良いですか？</string>
     <string lang="ja" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">エラー：ディスク上の一つあるいは複数のセクターが読み込めません（おそらく物理的な原因です）。\n\n復号処理を続行するためには、VeraCryptは読み込めないセクターの内容を破棄する必要があります（その内容は疑似乱数データに書き換えられます）。復号処理を続行する前に他の適切なソフトウェアで破損データの回復を試すことができます。\n\n読み込めないセクターの内容を破棄しますか？</string>
     <string lang="ja" 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="ja" key="ENTER_TOKEN_PASSWORD">トークン '%s' に対するパスワード/PINを入力してください：</string>
     <string lang="ja" key="PKCS11_LIB_LOCATION_HELP">VeraCryptがセキュリティトークンやスマートカードへアクセスするためには、事前にPKCS#11ソフトウェアライブラリのインストールが必要です。そのようなライブラリは、トークンやカードに付属しているか、あるいはメーカー等のウェブサイトからダウンロードできるようになっているものと思われます。\n\nライブラリをインストールした後、「ライブラリの選択」をクリックしてライブラリを指定するか、「ライブラリ自動検出」をクリックしてライブラリの自動検出をしてください（なお自動検出はWindowsのシステムディレクトリのみ検索します）。</string>
     <string lang="ja" key="SELECT_PKCS11_MODULE_HELP">注：セキュリティトークンやスマートカード用のPKCS#11ライブラリの場所とファイル名を指定します。トークンやカードなどに付属の説明書も参照してください。「OK」をクリックしてファイル名と場所を指定してください。</string>

Translations/Language.ka.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="ka" name="ქართული" en-name="Georgian" version="0.1.0" translators="Kakha Lomiashvili" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <control lang="ka" key="IDC_KEY_FILES">ფაილები</control>
     <control lang="ka" key="IDC_LINK_HASH_INFO">ჰეშ-ალგორითმების შესახებ</control>
     <control lang="ka" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">დამატებით ინფორმაცია</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="ka" key="IDC_MB">მბ</control>
     <control lang="ka" key="IDC_MORE_INFO_ON_CONTAINERS">დამატებით ინფორმაცია</control>
     <control lang="ka" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">დამატებით ინფორმაცია სისტემის შიფრაციის შესახებ</control>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <control lang="ka" key="IDT_COLLECTING_RANDOM_DATA_NOTE">მნიშვნელოვანია: ამოძრავეთ მაუსი რაც შეიძლება რთული ტრაექტორიით და დიდხანს. ეს აამაღლებს შიფრაციის გასაღებების კრიპტოგრაფიული დაცულობის დონეს. შემდეგ დააჭირეთ "შემდეგ"-ს გასაგრძელებლად.</control>
     <control lang="ka" key="IDT_CONFIRM">დაამოწმეთ:</control>
     <control lang="ka" key="IDT_DONE">მზადაა </control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="ka" key="IDT_ENCRYPTION_ALGO">შიფრაციის ალგორითმი</control>
     <control lang="ka" key="IDT_FILESYSTEM">ფაილური სისტემა</control>
     <control lang="ka" key="IDT_FILE_CONTAINER">ქმნის დაშიფრულ ტომს ფაილის შიგნით. რეკომენდებულია გამოუცდელი მომხმარებლისათვის.</control>
@@ -85,6 +88,8 @@
     <control lang="ka" key="IDT_PARTIAL_POOL_CONTENTS">პულის მიმდინარე შიგთავსი (ნაწილობრივი)</control>
     <control lang="en" key="IDT_PASS">Pass</control>
     <control lang="ka" 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="ka" key="IDT_PROGRESS">პროგრესი:</control>
     <control lang="ka" key="IDT_RANDOM_POOL">შემთხვევითი: </control>
     <control lang="ka" key="IDT_SINGLE_BOOT">აირციეთ ეს ოფცია, თუ კომპიუტერზე ინსტალირებულია მხოლოდ ერთი ოპერაციული სისტემა (თუნდაც რამდენიმე მპომხმარებლით).</control>
@@ -142,6 +147,8 @@
     <control lang="ka" key="IDC_MOUNT_OPTIONS">ოფციები</control>
     <control lang="ka" key="IDC_MOUNT_READONLY">ტომის მიერთება მხოლოდ კითხვისთვის</control>
     <control lang="ka" key="IDC_NEW_KEYFILES">გასაღების ფაილები</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="ka" key="IDC_PREF_BKG_TASK_ENABLE">ჩართულია</control>
     <control lang="ka" key="IDC_PREF_CACHE_PASSWORDS">პაროლების ქეშირება მეხსიერებაში</control>
     <control lang="ka" key="IDC_PREF_DISMOUNT_INACTIVE">ტომის ავტოგამოერთება უმოქმედობისას</control>
@@ -155,6 +162,7 @@
     <control lang="ka" key="IDC_PREF_MOUNT_READONLY">ტომის მიერთება მხოლოდ კითხვისათვის</control>
     <control lang="ka" key="IDC_PREF_MOUNT_REMOVABLE">მიერთება გარე მოწყობილობის სახით</control>
     <control lang="ka" key="IDC_PREF_OPEN_EXPLORER">წარმატებული მიერთების შემთხვევაში Explorer-ის გახსნა</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</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="ka" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">პაროლების ქეშის წაშლა ავტოგამოერთებისას</control>
     <control lang="ka" key="IDC_PREF_WIPE_CACHE_ON_EXIT">პაროლების ქეშის წაშლა გასვლისას</control>
@@ -167,11 +175,12 @@
     <control lang="ka" key="IDC_SHOW_PASSWORD_CHPWD_ORI">პაროლის ჩვენება</control>
     <control lang="ka" key="IDC_TRAVEL_OPEN_EXPLORER">მიერთებული ტომის Explorer-ის ფანჯარაში გახსნა</control>
     <control lang="ka" key="IDC_TRAV_CACHE_PASSWORDS">პაროლის ქეშირება დრაივერის მეხსიერებაში</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="ka" key="IDC_UNMOUNTALL">ყველას გამოერთება</control>
     <control lang="ka" key="IDC_VOLUME_PROPERTIES">ტომის პარამეტრები</control>
     <control lang="ka" key="IDC_VOLUME_TOOLS">ოპერაციები</control>
     <control lang="ka" key="IDC_WIPE_CACHE">ქეშის წაშლა</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
     <control lang="ka" key="IDD_HOTKEYS_DLG">VeraCrypt - საერთოსისტემური ცხელი კლავიშები</control>
     <control lang="ka" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="en" key="IDM_CREATE_HIDDEN_OS">Create Hidden Operating System...</control>
     <control lang="ka" key="IDM_CREATE_RESCUE_DISK">აღმდგენი დისკის შექმნა</control>
     <control lang="ka" key="IDM_CREATE_VOLUME">ახალი ტომის შექმნა</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="ka" key="IDM_DEFAULT_KEYFILES">გასაღების ფაილები (საწყისი)</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="ka" key="IDM_ENCRYPT_SYSTEM_DEVICE">სისტემური განაყოფის/დისკის შიფრაცია</control>
     <control lang="ka" key="IDM_FAQ">ხშირად დასმადი კითხვები</control>
@@ -243,9 +254,10 @@
     <control lang="ka" key="IDM_UNMOUNT_VOLUME">ტომის გამოერთება</control>
     <control lang="ka" key="IDM_VERIFY_RESCUE_DISK">აღმდგენი დისკის შემოწმება</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>
     <control lang="ka" key="IDM_VOLUME_WIZARD">ტომების შექმნის ოსტატი</control>
-    <control lang="ka" key="IDM_WEBSITE">www.VeraCrypt.org</control>
+    <control lang="ka" key="IDM_WEBSITE">veracrypt.codeplex.com</control>
     <control lang="ka" key="IDM_WIPE_CACHE">პაროლების ქეშის წაშლა</control>
     <control lang="ka" key="IDOK">დიახ</control>
     <control lang="en" key="IDT_ACCELERATION_OPTIONS">Hardware Acceleration</control>
@@ -485,7 +497,11 @@
     <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>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Volume Fully Encrypted</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_INFO">IMPORTANT: TO MOUNT THIS NEWLY CREATED VERACRYPT VOLUME AND TO ACCESS DATA STORED IN IT, CLICK 'Auto-Mount Devices' IN THE MAIN VERACRYPT WINDOW. After you enter the correct password (and/or supply correct keyfiles), the volume will be mounted to the drive letter you select from the list in the main VeraCrypt window (and you will be able to access the encrypted data via the selected drive letter).\n\nPLEASE REMEMBER OR WRITE DOWN THE ABOVE STEPS. YOU MUST FOLLOW THEM WHENEVER YOU WANT TO MOUNT THE VOLUME AND ACCESS DATA STORED IN IT. Alternatively, in the main VeraCrypt window, click 'Select Device', then select this partition/volume, and click 'Mount'.\n\nThe partition/volume has been successfully encrypted (it contains a fully encrypted VeraCrypt volume now) and is ready for use.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="ka" key="FORMAT_FINISHED_INFO">VeraCrypt-ს ტომი წარმატებით შეიქმნა.</string>
     <string lang="ka" key="FORMAT_FINISHED_TITLE">ტომი შექმნილია</string>
     <string lang="ka" key="FORMAT_HELP">მნიშვნელოვანია: ამოძრავეთ მაუსი რაც შეიძლება რთული ტრაექტორიით და დიდხანს. ეს აამაღლებს გასაღების კრიპტოგრაფიული დაცულობის დონეს. შემდეგ დაწკაპეთ "ფორმატირება" ახალი ტომის შესაქმნელად.</string>
@@ -523,6 +539,7 @@
     <string lang="ka" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">სისტემის შიფრაციის სტატუსის მიღების დროს მოხდა შეცდომა.</string>
     <string lang="ka" key="INIT_SYS_ENC">ვერ ხერხდება სისტემის შიფრაციისათვის პროგრამის კომპონენტების ინიციალიზაცია.</string>
     <string lang="ka" key="INIT_RAND">შემთხვევითი რიცხვების გენერატორის ინიციალიზაციის შეცდომა.</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="ka" key="INIT_REGISTER">პროგრამის ინიციალიზაციის შეცდომა. Dialog კლასის რეგისტრირება შეუძლებელია.</string>
     <string lang="en" key="INIT_RICHEDIT">Error: Failed to load the Rich Edit system library.</string>
     <string lang="ka" key="INTRO_TITLE">VeraCrypt-ის ტომების შექმნის ოსტატი</string>
@@ -535,6 +552,7 @@
     <string lang="ka" key="MOUNT_BUTTON">მიერთება</string>
     <string lang="ka" key="NEW_VERSION_REQUIRED">ამ ტომის მიერთებისათვის საჭიროა VeraCrypt-ის უფრო ახალი ვერსია.</string>
     <string lang="ka" 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="ka" key="NEXT">შემდეგ</string>
     <string lang="ka" key="FINALIZE">მზადაა</string>
     <string lang="ka" key="INSTALL">ინსტალაცია</string>
@@ -542,6 +560,7 @@
     <string lang="ka" key="NODRIVER">VeraCrypt-ის მოწყობილობის დრაივერთან მიერთება არ ხერხდება. VeraCrypt-ის ფუნქციონირება ამ დრაივერის გარეშე შეუძლებელია.\n\nმოწყობილობის დრაივერის ჩართვამდე, შესაძლოა საჭირო გახდეს სისტემიდან გამოსვლა ან სისტემის გადატვირთვა.</string>
     <string lang="ka" key="NOFONT">შეცდომა ფონტების ჩატვირთვისას.</string>
     <string lang="ka" 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="ka" key="DRIVE_LETTER_UNAVAILABLE">დისკის სახელი არ არის თავისუფალი.</string>
     <string lang="ka" key="NO_FILE_SELECTED">ფაილი არ არის არჩეული.</string>
     <string lang="ka" key="NO_FREE_DRIVES">დისკის თავისუფალი სახელები არ არის.</string>
@@ -561,15 +580,18 @@
     <string lang="ka" key="OVERWRITEPROMPT">გაფრთხილება: ფაილი '%hs' უკვე არსებობს!\n\nVeraCrypt არ დაშიფრავს ფაილს, იგი წაიშლება. დარწმუნებული ხართ, რომ გსურთ ამ ფაილის წაშლა და ახალი ფაილ-კონტეინერის შექმნა?</string>
     <string lang="ka" key="OVERWRITEPROMPT_DEVICE">გაფრთხილება: %s '%hs'%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_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt.\n\nDo you have such a backup?</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_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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="ka" key="IDD_PCDM_CHANGE_PKCS5_PRF">სათაურის გასაღების დერივაციის ალგორითმი</string>
     <string lang="ka" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">ტომ(ებ)იდან გასაღების ფაილ(ებ)ის დამატება/წაშლა</string>
     <string lang="ka" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">ტომიდან ყველა გასაღების ფაილის წაშლა</string>
-    <string lang="en" key="PASSWORD_CHANGED">Password and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</string>
+    <string lang="en" key="PASSWORD_CHANGED">Password, PIM and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</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="en" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">IMPORTANT: If you did not destroy your VeraCrypt Rescue Disk, your system partition/drive can still be decrypted using the old password (by booting the VeraCrypt Rescue Disk and entering the old password). You should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</string>
     <string lang="ka" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">შენიშვნა:VeraCrypt-ის აღმდგენი დისკი ჯერჯერობით ისევ ძველ ალგორითმს იყენებს. თუ ძველი ალგორითმი დაუცველად მიგაჩბნიათ, მაშინ შექმენით ახალი აღმდგენი დისკი და ძველი გაანადგურეთ.\n\nგსურთ ახალი აღმდგენი დისკის შექმნა?</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,7 +600,8 @@
     <string lang="ka" key="PKCS5_PRF_CHANGED">სათაურის გასაღების დერივაციის ალგორითმი წარმატებით დაყენდა.</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_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="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 more than 20 characters (the longer, the better). The maximum possible length is 64 characters.</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="ka" key="PASSWORD_HIDDENVOL_HELP">აირციეთ პაროლი ფარული ტომისათვის. </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_HELP">Please choose a password for the hidden operating system (i.e. for the hidden volume). </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_NOTE">IMPORTANT: The password that you choose for the hidden operating system in this step must be substantially different from the other two passwords (i.e. from the password for the outer volume and from the password for the decoy operating system).</string>
@@ -597,11 +620,26 @@
     <string lang="ka" key="PASSWORD_WRONG_AUTOMOUNT">პაროლი არასწორია, ან VeraCrypt-ის ტომი არ მოიძებნა.</string>
     <string lang="ka" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">პაროლი/გასაღების ფაილები არასწორია, ან VeraCrypt-ის ტომი არ მოიძებნა.</string>
     <string lang="ka" 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="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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_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>
+    <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="ka" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nშენიშვნა: თუ ცდილობთ დაშიფრულ სისტემურ დისკზე მოთავსებული განაყოფის მიერთებას, ჩატვირთვისწინა აუთენტიფიკაციის გარეშე ან დაშიფრული სისტემური განაყოფის მიერთებას, რომელზეც სისტემა არ მუშაობს, მაშინ აირჩიეთ "სისტემა"&gt;"ჩატვირთვისწინა აუთენტიფიკაციის გარეშე".</string>
     <string lang="en" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">In this mode, you cannot mount a partition located on a drive whose portion is within the key scope of active system encryption.\n\nBefore you can mount this partition in this mode, you need to either boot an operating system installed on a different drive (encrypted or unencrypted) or boot an unencrypted operating system.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <string lang="ka" key="PREV">უკან</string>
     <string lang="ka" key="RAWDEVICES">სისტემაში არსებული raw-მოწყობილობების სიის ჩვენება შეუძლებელია.</string>
     <string lang="ka" key="READONLYPROMPT">ტომი '%hs' არსებობს და წვდომადია მხოლოდ კითხვისათვის. ნამდვილად გსურთ მისი შეცვლა?</string>
@@ -701,11 +739,18 @@
     <string lang="en" key="FOR_MORE_INFO_ON_PARTITIONS">For information on how to create and manage partitions, please refer to the documentation supplied with your operating system or contact your computer vendor's technical support team for assistance.</string>
     <string lang="en" key="SYSTEM_PARTITION_NOT_ACTIVE">Error: The currently running operating system is not installed on the boot partition (first Active partition). This is not supported.</string>
     <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="ka" key="CANT_ACCESS_VOL">შეცდომა! ტომთან წვდომა არ არის.\n\nშეამოწმეთ, არსებობს თუ არა ეს ტომი, არ არის მიერთებული, არ გამოიყენება სისტემის ან სხვა პროგრამის მიერ, და დაცული არ არის ჩაწერისაგან.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Error: Cannot access the volume and/or obtain information about the volume.\n\nMake sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Error: Cannot access the volume and/or obtain information about the volume. Make sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.\n\nIf the problem persists, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">An error prevented VeraCrypt from encrypting the partition. Please try fixing any previously reported problems and then try again. If the problems persist, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_RESUME">An error prevented VeraCrypt from resuming the process of encryption of the partition.\n\nPlease try fixing any previously reported problems and then try resuming the process again. Note that the volume cannot be mounted until it has been fully encrypted.</string>
+    <string lang="en" key="INPLACE_DEC_GENERIC_ERR">An error prevented VeraCrypt from decrypting the volume. Please try fixing any previously reported problems and then try again if possible.</string>
     <string lang="ka" key="CANT_DISMOUNT_OUTER_VOL">შეცდომა! გარე ტომის გამოერთება შეუძლებელია.\n\nტომის გამოერთება შეუძლებელია, თუ იგი შეიცავს ფაილებს ან ფოლდერებს, რომლებიც გამოიყენება სისტემის ან სხვა პროგრამის მიერ.\n\nდახურეთ ყველა პროგრამა, რომლებიც შესაძლოა იყენებენ ფაილებს ამ ტომში, და დააჭირეთ "გამეორება"-ს.</string>
     <string lang="ka" key="CANT_GET_OUTER_VOL_INFO">შეცდომა: გარე ტომის შესახებ ინფორმაციის მიღება ვერ ხერხდება! ტომის შექმნის პროცესი შეწყვეტილია.</string>
     <string lang="ka" key="CANT_ACCESS_OUTER_VOL">შეცდომა! გარე ტომთან წვდომა არ არის. ტომის შექმნის გაგრძელება შეუძლებელია.</string>
@@ -790,7 +835,7 @@
     <string lang="en" key="TC_INSTALLER_IS_RUNNING">VeraCrypt Installer is currently running on this system and performing or preparing installation or update of VeraCrypt. Before you proceed, please wait for it to finish or close it. If you cannot close it, please restart your computer before proceeding.</string>
     <string lang="ka" key="INSTALL_FAILED">ინსტალაცია ჩაიშალა.</string>
     <string lang="ka" key="UNINSTALL_FAILED">დეინსტალაცია ჩაიშალა.</string>
-    <string lang="ka" key="DIST_PACKAGE_CORRUPTED">ეს საინსტალაციო პაკეტი დაზიანებულია. გთხოვთ, ხელახლან ჩამოტვირთოთ (უმჯობესია ოფიციალური საიტიდან www.veracrypt.org).</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="EXTRACTING_VERB">დეარქივაცია</string>
     <string lang="ka" key="CANNOT_READ_FROM_PACKAGE">პაკეტიდან მონაცემთა წაკითხვა არ ხერხდება.</string>
@@ -977,6 +1022,7 @@
     <string lang="ka" key="CONFIRM_EXIT_UNIVERSAL">გამოვიდეთ?</string>
     <string lang="ka" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt არ აქვს საკმარისი ინფორმაცია, შეასრულოს შიფრაციის თუ დეშიფრაციის ოპერაცია.</string>
     <string lang="ka" 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="ka" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">გსურთ შეწყვითოთ და გადადოთ სისტემური განაყოფის/მოწყობილობის შიფრაციის პროცესი?\n\nმომავალში შესაძლებლობა გექქნებათ შეწყვეტილი მომენტიდან გააგრძელოთ ეს პროცესი. ეს შეგიძლიათ გააკეთოთ შემდეგნაირად: აირჩიეთ მენიუდან სისტემა&gt;შეწყვეტილი პროცესის გაგრძელება. თუ სამუდამოდ გსურთ შეწყვიტოთ ან უკუაგდოთ  შიფრაციის პროცესი, აირჩიეთ სისტემა&gt;სისტემური განაყოფის/მოწყობილობის სამუდამოდ დეშიფრაცია.</string>
     <string lang="ka" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">გსურთ შეწყვითოთ და გადადოთ სისტემური განაყოფის/მოწყობილობის დეშიფრაციის პროცესი?\n\nმომავალში შესაძლებლობა გექქნებათ შეწყვეტილი მომენტიდან გააგრძელოთ ეს პროცესი. ეს შეგიძლიათ გააკეთოთ შემდეგნაირად: აირჩიეთ მენიუდან სისტემა&gt;შეწყვეტილი პროცესის გაგრძელება. თუ გსურთ დეშიფრაციის პროცესის უკან დაბრუნება (და შიფრაციის დაწყება), აირჩიეთ სისტემა&gt;სისტემური განაყოფის/მოწყობილობის შიფრაცია.</string>
@@ -986,6 +1032,7 @@
     <string lang="en" key="FAILED_TO_START_WIPING">Error: Failed to start the process of wiping.</string>
     <string lang="ka" key="INCONSISTENCY_RESOLVED">გაუმართაობა აღმოფხვრილია.\n\n\n(თუ გამოგზავნით ამ შეცდომასთან დაკავშირებით ინფორმაციას, დაურთეთ შემდეგი ტექნიკური ინფორმაცია: %hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="ka" key="NOTHING_TO_RESUME">გასაგრძელებელი პროცესი/დავალება არ არის.</string>
     <string lang="ka" key="HIDVOL_PROT_BKG_TASK_WARNING">ყურადღება: VeraCrypt-ის ფონური რეჟიმი გამორთულია. VeraCrypt-ის დახურვის შემდეგ, იგი არ შეგატყობინებთ ფარული ტომის დაზიანების შემთხვევაზე.\n\nგსურთ ჩართოთ VeraCrypt-ის ფონური რეჟიმი?</string>
     <string lang="ka" key="LANG_PACK_VERSION">ენის მოდულის ვერსია: %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="ka" key="ERROR_MBR_PROTECTED">MBR სექტორის ჩაწერა ჩაიშალა.\n\nთქვენი BIOS შესაძლოა ჩაწერისაგან იცავს MBR სექტორს. შეამოწმეთ BIOS-ის პარამეტრები.</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="en" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">The required version of the VeraCrypt Boot Loader is currently not installed. This may prevent some of the settings from being saved.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Note: In some situations, you may wish to prevent a person (adversary) that is watching you start the computer from knowing that you use VeraCrypt. The above options allow you to do that by customizing the VeraCrypt boot loader screen. If you enable the first option, no texts will be displayed by the boot loader (not even when you enter the wrong password). The computer will appear to be "frozen" while you can type your password. In addition, a custom message can be displayed to mislead the adversary. For example, fake error messages such as "Missing operating system" (which is normally displayed by the Windows boot loader if it finds no Windows boot partition). It is, however, important to note that if the adversary can analyze the content of the hard drive, he can still find out that it contains the VeraCrypt boot loader.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">WARNING: Please keep in mind that if you enable this option, the VeraCrypt boot loader will not display any texts (not even when you enter the wrong password). The computer will appear to be "frozen" (unresponsive) while you can type your password (the cursor will NOT move and no asterisk will be displayed when you press a key).\n\nAre you sure you want to enable this option?</string>
@@ -1034,8 +1082,11 @@
     <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="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>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="ka" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">გაფრთხილება: VeraCrypt ვერ აღადგენს კლავიატურის ორიგინალ განლაგებას. ამან შესაძლოა პაროლის არასწორი შეტანა გამოიწვიოს.</string>
     <string lang="ka" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">შეცდომა: VeraCrypt-ისთვის კლავიატურის სტანდარტული US  განლაგების დაყენება ვერ ხერხდება.\n\nპაროლი შეტანილ უნდა იქნას ჩატვირთვის პროცესში (Windows-ის სტარტამდე), როდესაც არა-US განლაგების ჩართვა შეუძლებელია. ამიტომ პაროლი აკრეფილნ უნდა იქნას კლავიატურის სტანდარტული US განლაგებით.</string>
@@ -1120,6 +1171,7 @@
     <string lang="en" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">The pretest has been successfully completed.\n\nWARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt. If you do not, please back up the files now (you can click Defer, back up the files, then run VeraCrypt again anytime, and select 'System' &gt; 'Resume Interrupted Process' to start encrypting).\n\nWhen ready, click Encrypt to start encrypting.</string>
     <string lang="en" key="SYSENC_ENCRYPTION_PAGE_INFO">You can click Pause or Defer anytime to interrupt the process of encryption or decryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. To prevent slowdown when the system or applications write or read data from the system drive, VeraCrypt automatically waits until the data is written or read (see Status above) and then automatically continues encrypting or decrypting.</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nYou can click Pause or Defer anytime to interrupt the process of encryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. Note that the volume cannot be mounted until it has been fully encrypted.</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="en" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Hidden System Started</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Original System</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows creates (typically, without your knowledge or consent) various log files, temporary files, etc., on the system partition. It also saves the content of RAM to hibernation and paging files located on the system partition. Therefore, if an adversary analyzed files stored on the partition where the original system (of which the hidden system is a clone) resides, he might find out, for example, that you used the VeraCrypt wizard in the hidden-system-creation mode (which might indicate the existence of a hidden operating system on your computer).\n\nTo prevent such issues, VeraCrypt will, in the next steps, securely erase the entire content of the partition where the original system resides. Afterwards, in order to achieve plausible deniability, you will need to install a new system on the partition and encrypt it. Thus you will create the decoy system and the whole process of creation of the hidden operating system will be completed.</string>
@@ -1159,7 +1211,7 @@
     <string lang="en" key="HIDDEN_OS_CREATION_PREINFO_HELP">In the next steps, VeraCrypt will create the hidden operating system by copying the content of the system partition to the hidden volume (data being copied will be encrypted on the fly with an encryption key different from the one that will be used for the decoy operating system).\n\nPlease note that the process will be performed in the pre-boot environment (before Windows starts) and it may take a long time to complete; several hours or even several days (depending on the size of the system partition and on the performance of your computer).\n\nYou will be able to interrupt the process, shut down your computer, start the operating system and then resume the process. However, if you interrupt it, the entire process of copying the system will have to start from the beginning (because the content of the system partition must not change during cloning).</string>
     <string lang="en" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Do you want to cancel the entire process of creation of the hidden operating system?\n\nNote: You will NOT be able to resume the process if you cancel it now.</string>
     <string lang="ka" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">გსურთ სისტემის შიფრაციისწინა ტესტირების შეწყვეტა?</string>
-    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="ka" key="SYS_DRIVE_NOT_ENCRYPTED">სისტემური განაყოფი/დისკი არ არის დაშიფრული (ნაწილობრივ ან მთლიანად).</string>
     <string lang="ka" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">სისტემური განაყოფი/დისკი დაშიფრულია (ნაწილობრივ ან მთლიანად).\n\nგაგრძელებამდე გთხოვთ, დეშიფრაცია გაუკეთოთ მთლიანად სისტემურ განაყოფს/დისკს. ამისათვის, აირჩიეთ პროგრამის მენიუში "სისტემა" &gt; "სისტემური განაყოფის/დისკის სამუდამო დეშიფრაცია".</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">When the system partition/drive is encrypted (partially or fully), you cannot downgrade VeraCrypt (but you can upgrade it or reinstall the same version).</string>
@@ -1176,6 +1228,8 @@
     <string lang="en" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">You have selected the system partition/drive (or the boot partition), but the wizard mode you selected is suitable only for non-system partitions/drives.\n\nDo you want to set up pre-boot authentication (which means that you will need to enter your password each time before Windows boots/starts) and encrypt the system partition/drive?</string>
     <string lang="ka" key="CONFIRM_DECRYPT_SYS_DEVICE">ნამდვილად გსურთ სისტემური განაყოფის/დისკის სამუდამო დეშიფრაცია?</string>
     <string lang="ka" 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="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="en" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Warning: If you use a cascade of ciphers for system encryption, you may encounter the following issues:\n\n1) The VeraCrypt Boot Loader is larger than normal and, therefore, there is not enough space in the first drive track for a backup of the VeraCrypt Boot Loader. Hence, whenever it gets damaged (which often happens, for example, during inappropriately designed anti-piracy activation procedures of certain programs), you will need to use the VeraCrypt Rescue Disk to boot or to repair the VeraCrypt Boot Loader.\n\n2) On some computers, resuming from hibernation takes longer.\n\nThese potential issues can be prevented by choosing a non-cascade encryption algorithm (e.g. AES).\n\nAre you sure you want to use a cascade of ciphers?</string>
     <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>
@@ -1191,6 +1245,7 @@
     <string lang="en" key="ENABLE_BAD_SECTOR_ZEROING">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nThe process of in-place encryption can continue only when the sectors have been made readable again. VeraCrypt can attempt to make these sectors readable by writing zeros to the sectors (subsequently such all-zero blocks would be encrypted). However, note that any data stored in the unreadable sectors will be lost. If you want to avoid that, you can attempt to recover portions of the corrupted data using appropriate third-party tools.\n\nNote: In case of physically damaged sectors (as opposed to mere data corruption and checksum errors) most types of storage devices internally reallocate the sectors when data is attempted to be written to them (so the existing data in the damaged sectors may remain unencrypted on the drive).\n\nDo you want VeraCrypt to write zeroes to unreadable sectors?</string>
     <string lang="en" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nTo be able to proceed with decryption, VeraCrypt will have to discard the content of the unreadable sectors (the content will be replaced with pseudorandom data). Please note that, before proceeding, you can attempt to recover portions of any corrupted data using appropriate third-party tools.\n\nDo you want VeraCrypt to discard data in the unreadable sectors now?</string>
     <string lang="en" key="ZEROED_BAD_SECTOR_COUNT">Note: VeraCrypt has replaced the content of %I64d unreadable sectors (%s) with encrypted all-zero plaintext blocks.</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="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>

Translations/Language.ko.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="ko" name="한국어" en-name="Korean" version="0.1.0" translators="Kim Young" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <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_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>
@@ -57,6 +58,7 @@
     <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_QUICKFORMAT">빠른 포맷</control>
     <control lang="ko" key="IDC_SHOW_PASSWORD">비밀번호 표시(&amp;D)</control>
     <control lang="ko" key="IDC_SHOW_PASSWORD_SINGLE">비밀번호 표시(&amp;D)</control>
@@ -72,6 +74,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_ENCRYPTION_ALGO">암호 알고리듬</control>
     <control lang="ko" key="IDT_FILESYSTEM">파일시스템 </control>
     <control lang="ko" key="IDT_FILE_CONTAINER">파일 안에 가상의 암호화된 디스크를 만듭니다. 경험 없는 사용자에게 권장합니다.</control>
@@ -85,6 +88,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="en" key="IDT_OLD_PIM">Volume 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>
@@ -142,6 +147,8 @@
     <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="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</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>
@@ -155,6 +162,7 @@
     <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="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_WIPE_CACHE_ON_AUTODISMOUNT">“자동 꺼냄”시 보관된 비밀번호 삭제</control>
     <control lang="ko" key="IDC_PREF_WIPE_CACHE_ON_EXIT">“종료”시 보관된 비밀번호 삭제</control>
@@ -167,11 +175,12 @@
     <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="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</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="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
     <control lang="ko" key="IDD_HOTKEYS_DLG">VeraCrypt - 시스템 일반 단축키</control>
     <control lang="ko" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <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_DEFAULT_KEYFILES">기본 키파일...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="ko" key="IDM_ENCRYPT_SYSTEM_DEVICE">시스템 파티션/드라이브 암호화...</control>
     <control lang="ko" key="IDM_FAQ">자주 묻는 질문</control>
@@ -243,6 +254,7 @@
     <control lang="ko" key="IDM_UNMOUNT_VOLUME">볼륨 꺼내기</control>
     <control lang="ko" key="IDM_VERIFY_RESCUE_DISK">응급복구 디스크 검증</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_PROPERTIES">볼륨 속성</control>
     <control lang="ko" key="IDM_VOLUME_WIZARD">볼륨 만들기 마법사</control>
     <control lang="ko" key="IDM_WEBSITE">VeraCrypt 웹사이트</control>
@@ -369,7 +381,7 @@
     <string lang="ko" key="ACCESS_DENIED">오류: 접근이 허용되지 않습니다.\n\n접근하려고 하는 파티션의 0 섹터이거나 부팅 장치입니다.</string>
     <string lang="ko" key="ADMINISTRATOR">관리자</string>
     <string lang="ko" key="ADMIN_PRIVILEGES_DRIVER">VeraCrypt 드라이버를 로드하려면, 관리자 권한의 계정으로 로그온해야 합니다.</string>
-    <string lang="ko" key="ADMIN_PRIVILEGES_WARN_DEVICES">파티션/장치를 암호화/포맷하려면 관리자 권한의 계정으로 로그온해야 합니다.\n\n이는 파일에 의한 볼륨에는 해당되지 않습니다.</string>
+    <string lang="ko" key="ADMIN_PRIVILEGES_WARN_DEVICES">파티션/장치를 암호화/암호해제/포맷하려면 관리자 권한의 계정으로 로그온해야 합니다.\n\n이는 파일에 의한 볼륨에는 해당되지 않습니다.</string>
     <string lang="ko" key="ADMIN_PRIVILEGES_WARN_HIDVOL">숨긴 볼륨을 만들려면 관리자 권한의 계정으로 로그온해야 합니다.\n\n계속하시겠습니까?</string>
     <string lang="ko" key="ADMIN_PRIVILEGES_WARN_NTFS">NTFS로 볼륨을 포맷하려면 관리자 권한의 계정으로 로그온해야 합니다.\n\n관리자 권한이 없는 경우에는 볼륨을 FAT으로 포맷할 수 있습니다.</string>
     <string lang="ko" key="AES_HELP">FIPS에 의해 승인된 암호(Rijndael, 1998년 발표)는 미국부무 및 각 부서에서 1급 기밀로 분류된 정보를 보호하는데 이용되고 있습니다. 256-비트 키, 128-비트 블록, 14 라운드 (AES-256). 작업 모드는 XTS입니다.</string>
@@ -485,7 +497,11 @@
     <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_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="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>
     <string lang="ko" key="FORMAT_FINISHED_TITLE">볼륨 생성</string>
     <string lang="ko" key="FORMAT_HELP">중요: 이 창 안에서 마우스를 가능한 한 무작위로 움직이세요. 마우스를 더 오래 움직일수록 더욱 좋습니다. 이 작업은 암호키의 암호력을 상당히 증대시킵니다. 이제 볼륨을 생성하려면 “포맷”을 클릭하세요.</string>
@@ -523,6 +539,7 @@
     <string lang="ko" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">시스템 암호 상태를 얻는 동안 오류가 발생했습니다.</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="INIT_REGISTER">프로그램을 초기화할 수 없습니다. 다이얼로그 클래스 등록에 실패했습니다.</string>
     <string lang="ko" key="INIT_RICHEDIT">오류: Rich Edit 시스템 라이브러리를 로드하는데 실패했습니다.</string>
     <string lang="ko" key="INTRO_TITLE">VeraCrypt 볼륨 만들기 마법사</string>
@@ -535,6 +552,7 @@
     <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="NEXT">다음(&amp;N) &gt;</string>
     <string lang="ko" key="FINALIZE">마침(&amp;F)</string>
     <string lang="ko" key="INSTALL">설치(&amp;I)</string>
@@ -542,6 +560,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="DRIVE_LETTER_UNAVAILABLE">드라이브 문자를 사용할 수 없습니다.</string>
     <string lang="ko" key="NO_FILE_SELECTED">선택한 파일이 없습니다!</string>
     <string lang="ko" key="NO_FREE_DRIVES">이용가능한 드라이브 문자가 없습니다.</string>
@@ -561,15 +580,18 @@
     <string lang="ko" key="OVERWRITEPROMPT">주의: “%hs” 파일이 이미 존재합니다! 중요: VeraCrypt는 파일을 암호화하지 않고, 삭제합니다. 파일을 삭제하고, 그 파일을 새로운 VeraCrypt 보관소로 교체하시겠습니까?</string>
     <string lang="ko" key="OVERWRITEPROMPT_DEVICE">주의: 선택한 %s “%hs”%s에 현재 저장되어 있는 모든 파일이 삭제되고 사라지게 됩니다(이 파일들은 암호화되지 않습니다)!\n\n정말로 포맷을 계속 진행하시겠습니까?</string>
     <string lang="ko" key="NONSYS_INPLACE_ENC_CONFIRM">주의: 볼륨이 완전히 암호화되기 전에는 이 볼륨을 삽입하거나 볼륨에 저장된 파일에 접근할 수 없습니다.\n\n선택한 %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 '%hs'%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_SECOND_WARNING_LOTS_OF_DATA">주의: 선택한 파티션에 큰 규모의 데이터가 포함되어 있습니다! 파티션에 저장되어 있는 파일들은 지워지고 손실됩니다(* 이들은 암호화되지 않습니다)!</string>
     <string lang="ko" key="ERASE_FILES_BY_CREATING_VOLUME">VeraCrypt 볼륨을 파티션 내에 만들면서 이 파티션에 저장되어 있는 파일들은 지워집니다.</string>
     <string lang="ko" key="PASSWORD">비밀번호</string>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="ko" key="IDD_PCDM_CHANGE_PKCS5_PRF">헤더 키 도출 알고리듬 설정</string>
     <string lang="ko" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">볼륨에 키파일 추가/삭제</string>
     <string lang="ko" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">볼륨에서 모든 키파일 제거</string>
     <string lang="ko" key="PASSWORD_CHANGED">비밀번호/키파일이 성공적으로 변경되었습니다.\n\n중요: VeraCrypt 사용자 안내서의 “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="ko" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">중요: 만약 사용자가 VeraCrypt 응급복구 디스크를 파괴하지 않았다면, 이전의 비밀번호를 사용해서 시스템 파티션/드라이브의 암호를 해제할 수 있습니다(→ VeraCrypt 응급복구 디스크를 부팅한 다음 이전의 비밀번호를 입력하는 방법). 새로운 VeraCrypt 응급복구 디스크를 만들고 이전 복구 디스크를 파괴해야 합니다.\n\n새로운 VeraCrypt 응급복구 디스크를 만드시겠습니까?</string>
     <string lang="ko" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">VeraCrypt 응급복구 디스크는 여전히 이전의 알고리듬을 사용하고 있습니다. 만약 이전의 알고리듬이 불안하다고 생각되면, 새로운 VeraCrypt 응급복구 디스크를 만들고 이전 복구 디스크를 파괴해야 합니다.\n\n새로운 VeraCrypt 응급복구 디스크를 만드시겠습니까?</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,6 +600,7 @@
     <string lang="ko" key="PKCS5_PRF_CHANGED">헤더 키 도출 알고리듬을 성공적으로 설정했습니다.</string>
     <string lang="ko" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">자체 암호화 과정을 다시 시작하고자 하는 “비-시스템 볼륨”에 대한 비밀번호/키파일을 입력해 주십시오.\n\n\n참고: “다음”을 클릭하면 VeraCrypt는 ① 암호화 과정이 중단된 곳에서의 모든 비-시스템 볼륨 및 ② 제공된 비밀번호/키파일을 사용해서 VeraCrypt 볼륨 헤더의 암호를 해제할 수 있는 곳에서의 모든 비-시스템 볼륨의 검색을 시도합니다. 한 개 이상의 볼륨이 검색되면, 사용자는 다음 단계에서 이러한 볼륨 중 하나를 선택해야 합니다.</string>
     <string lang="ko" key="NONSYS_INPLACE_ENC_RESUME_VOL_SELECT_HELP">나열된 볼륨 중 하나를 선택해 주십시오. 목록에는 ① 암호화 과정이 중단된 곳에서의 모든 비-시스템 볼륨 및 ② 제공된 비밀번호/키파일을 사용해서 VeraCrypt 볼륨 헤더의 암호를 해제할 수 있는 곳에서의 접근가능한 모든 비-시스템 볼륨이 포함되어 있습니다.</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="ko" key="PASSWORD_HELP">좋은 비밀번호를 선택하는 것은 매우 중요합니다. 사전에 나오는 한 개의 단어만을 포함하는 것 또는 2, 3개 단어의 조합은 피해야 합니다. 이름이나 생일 등도 피해야 합니다. 추측하기가 쉽기 때문입니다. 좋은 비밀번호는 무작위 조합입니다. 즉 대소문자, 숫자 및 @ ^ = $ * + 등과 같은 특수기호의 조합입니다. 적어도 20개 이상의 문자로 이루어진 비밀번호를 선택할 것을 권장합니다.  가능한 최대 길이는 64개 문자입니다.</string>
     <string lang="ko" key="PASSWORD_HIDDENVOL_HELP">숨긴 볼륨에 대한 비밀번호를 선택해 주세요. </string>
     <string lang="ko" key="PASSWORD_HIDDEN_OS_HELP">숨긴 운영체제(즉 숨긴 볼륨)에 대한 비밀번호를 입력해 주세요. </string>
@@ -597,11 +620,26 @@
     <string lang="ko" key="PASSWORD_WRONG_AUTOMOUNT">올바르지 못한 비밀번호이거나 VeraCrypt 볼륨을 찾을 수 없습니다.</string>
     <string lang="ko" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">올바르지 못한 키파일 또는 비밀번호이거나 VeraCrypt 볼륨을 찾을 수 없습니다.</string>
     <string lang="ko" 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="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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="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>
+    <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="ko" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\n참고: ① 부팅-전 인증 없이 암호화된 시스템 드라이브에 위치한 파티션에 삽입을 시도하거나 ② 실행 중이 아닌 운영체제의 암호화된 시스템 파티션에 삽입하려고 하는 경우, “시스템 ▶ 부팅-전 인증 없이 삽입”을 선택해서 이 작업을 할 수 있습니다.</string>
     <string lang="ko" 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="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>
@@ -701,11 +739,18 @@
     <string lang="ko" key="FOR_MORE_INFO_ON_PARTITIONS">파티션의 생성과 관리에 대한 자세한 정보는 운영체제와 함께 제공된 문서를 참고하거나 컴퓨터 판매업체의 기술지원 팀에게 도움을 요청하시기 바랍니다.</string>
     <string lang="ko" key="SYSTEM_PARTITION_NOT_ACTIVE">오류: 현재 실행 중인 운영체제는 부트 파티션(→ 첫번째 활성 파티션)에 설치되어 있지 않습니다. 이것은 지원되지 않습니다.</string>
     <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="ko" key="CANT_ACCESS_VOL">오류: 볼륨에 접근할 수 없습니다!\n\n선택한 볼륨이 존재하는지 여부, 삽입되었는지 여부, 시스템 또는 프로그램에 의해 사용 중인지 여부 및 볼륨에 대한 읽기/쓰기 권한이 있는지 아니면 쓰기금지가 되어 있는지 확인해 주세요.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="ko" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">오류: 볼륨에 접근할 수 없거나 볼륨 정보를 얻을 수 없습니다.\n\n선택한 볼륨이 존재하는지 여부, 삽입되었는지 여부, 시스템 또는 프로그램에 의해 사용 중인지 여부 및 볼륨에 대한 읽기/쓰기 권한이 있는지 아니면 쓰기금지가 되어 있는지 확인해 주세요.</string>
     <string lang="ko" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">오류: 볼륨에 접근할 수 없거나 볼륨 정보를 얻을 수 없습니다. 선택한 볼륨이 존재하는지 여부, 삽입되었는지 여부, 시스템 또는 프로그램에 의해 사용 중인지 여부 및 볼륨에 대한 읽기/쓰기 권한이 있는지 아니면 쓰기금지가 되어 있는지 확인해 주세요.\n\n문자가 계속되면 다음 단계를 따르면 도움이 될 것입니다.</string>
     <string lang="ko" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">오류로 인해 VeraCrypt가 파티션을 암호화하는데 방해가 됩니다. 이전에 보고된 문제점들을 고친 후 다시 시도해 보십시오. 문제가 계속되면 다음 단계를 따르면 도움이 될 것입니다.</string>
     <string lang="ko" 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="ko" key="CANT_DISMOUNT_OUTER_VOL">오류: 외부 볼륨을 꺼낼 수 없습니다!\n\n프로그램이나 시스템에 의해 사용 중인 파일이나 폴더가 볼륨에 있는 경우에는 볼륨을 꺼낼 수 없습니다.\n\n볼륨에 있는 파일 또는 폴더를 사용 중인 다른 프로그램을 종료한 다음 “다시 시도”를 클릭하세요.</string>
     <string lang="ko" key="CANT_GET_OUTER_VOL_INFO">오류: 외부 볼륨에 대한 정보를 얻을 수 없습니다! 볼륨 만들기를 계속할 수 없습니다.</string>
     <string lang="ko" key="CANT_ACCESS_OUTER_VOL">오류: 외부 볼륨에 접근할 수 없습니다! 볼륨 만들기를 계속할 수 없습니다.</string>
@@ -790,7 +835,7 @@
     <string lang="ko" key="TC_INSTALLER_IS_RUNNING">VeraCrypt 설치기가 ① 현재 시스템에서 실행되고 있거나 ② 설치의 실행 및 준비 또는 ③ VeraCrypt를 업데이트하고 있습니다. 진행하기 전에, 그 작업이 끝날 때까지 기다리거나 닫아 주세요. 만약 닫기 작업이 되지 않는 경우에는 진행 전에 컴퓨터를 다시 시작해야 합니다.</string>
     <string lang="ko" key="INSTALL_FAILED">설치 실패.</string>
     <string lang="ko" key="UNINSTALL_FAILED">제거 실패.</string>
-    <string lang="ko" key="DIST_PACKAGE_CORRUPTED">배포 패키지가 손상되었습니다. 다시 다운로드해 보시기 바랍니다(VeraCrypt 공식 웹사이트 - www.veracrypt.org).</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="EXTRACTING_VERB">추출 중</string>
     <string lang="ko" key="CANNOT_READ_FROM_PACKAGE">패키지에서 데이터를 읽을 수 없습니다.</string>
@@ -977,6 +1022,7 @@
     <string lang="ko" key="CONFIRM_EXIT_UNIVERSAL">종료?</string>
     <string lang="ko" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt가 암호화를 할 지 아니면 암호해제를 할 것인가를 결정하는데 충분한 정보를 가지고 있지 않습니다.</string>
     <string lang="ko" 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="ko" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">파티션/볼륨의 암호화 진행을 중단하고 나중으로 연기하시겠습니까?\n\n참고: 볼륨이 완전히 암호화되기 전에는 이 볼륨을 삽입할 수 없습니다. 나중에 암호화 과정을 다시 시작할 수 있고, 이 경우 중단된 시점부터 계속 진행됩니다. 이 작업은 예컨대 VeraCrypt 메인 창의 메뉴 표시줄에 있는 “볼륨” ▶ “중단된 진행을 다시 시작”을 선택해서 실행할 수 있습니다.</string>
     <string lang="ko" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">시스템 파티션/드라이브의 암호화 진행을 중단하고 나중으로 연기하시겠습니까?\n\n참고: 나중에 이 과정을 다시 시작할 수 있고 중단된 시점부터 계속 진행됩니다. 이 작업은 예컨대 VeraCrypt 메인 창의 메뉴 표시줄에 있는 “시스템” ▶ “중단된 진행을 다시 시작”을 선택해서 실행할 수 있습니다. 암호화 진행을 완전히 종료하거나 되돌리려면, “시스템” ▶ “시스템 파티션/드라이브의 영구적 암호해제”를 선택하세요.</string>
     <string lang="ko" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">시스템 파티션/드라이브의 암호해제 진행을 중단하고 나중으로 연기하시겠습니까?\n\n참고: 나중에 이 과정을 다시 시작할 수 있고 중단된 시점부터 계속 진행됩니다. 이 작업은 예컨대 VeraCrypt 메인 창의 메뉴 표시줄에 있는 “시스템” ▶ “중단된 진행을 다시 시작”을 선택해서 실행할 수 있습니다. 암호해제 진행을 되돌리고, 암호화를 시작하려면, “시스템” ▶ “시스템 파티션/드라이브 암호화”를 선택하세요.</string>
@@ -986,6 +1032,7 @@
     <string lang="ko" key="FAILED_TO_START_WIPING">오류: 지우기 진행을 시작하는데 실패했습니다.</string>
     <string lang="ko" key="INCONSISTENCY_RESOLVED">불일치가 해결되었습니다.\n\n\n이와 관련된 버그를 보고하려면, 버그 보고서에 다음과 같은 기술 정보를 포함해 주세요: %hs</string>
     <string lang="ko" key="UNEXPECTED_STATE">오류: 예기치 않은 상태.\n\n\n(이와 관련된 버그를 보고하려면, 버그 보고서에 다음과 같은 기술 정보를 포함해 주세요: %hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="ko" key="NOTHING_TO_RESUME">다시 시작할 진행/작업이 없습니다.</string>
     <string lang="ko" key="HIDVOL_PROT_BKG_TASK_WARNING">주의: VeraCrypt 백그라운드 작업의 사용이 해제되었습니다. 프로그램을 종료하면, 숨긴 볼륨의 손상이 방지된 경우에도 그 알림을 통보받지 못합니다.\n\n참고: 언제라도 VeraCrypt 트레이 아이콘을 오른쪽 클릭하고 “종료”를 선택해서 백그라운드 작업을 종료할 수 있습니다.\n\nVeraCrypt 백그라운드 작업을 지금 사용가능하게 할까요?</string>
     <string lang="ko" key="LANG_PACK_VERSION">언어팩 버전:  %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="ko" key="ERROR_MBR_PROTECTED">MBR 섹터에 쓰는 데 실패했습니다.\n\n사용자의 BIOS가 MBR 섹터를 보호하도록 설정된 것으로 보입니다. MBR/안티바이러스 보호 상태를 확인하려면 (컴퓨터에 전원이 들어온 후 F2, Delete 또는 Esc를 눌러) BIOS 설정을 체크합니다.</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="ko" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">필요한 VeraCrypt Boot Loader 버전이 현재 설치되어 있지 않습니다. 이로 인해 일부 설정이 저장되지 않을 수도 있습니다.</string>
     <string lang="ko" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">참고: 사용자가 컴퓨터를 시작하는 것을 특정인(* 적대자)이 지켜보는 가운데 VeraCrypt를 사용한다는 사실을 숨기고 싶을 때가 있을 것입니다. VeraCrypt 부트 로더 화면을 정의하는 위 옵션을 이용해서 이러한 작업을 할 수 있습니다. 첫번째 옵션을 사용하게 되면, 부트 로더에 어떠한 텍스트도 표시되지 않습니다(* 심지어 잘못된 비밀번호를 입력했을 때도 마찬가지입니다). 사용자가 비밀번호를 입력할 수 있는 동안 컴퓨터는 작동이 멈춘 것처럼 보입니다. 게다가 적대자를 속이는 사용자 메시지를 표시할 수도 있습니다. 예컨대 “Missing operating system” 같은 가짜 오류 메시지입니다(* 이는 윈도우 부트 파티션을 찾을 수 없을 때 윈도우 부트 로더에 의해 표시되는 문구입니다). 그러나 적대자가 하드 드라이브의 내용을 분석할 수 있는 경우에는 드라이브에 VeraCrypt 부트 로더가 포함되어 있음을 발견할 수 있을 것입니다.</string>
     <string lang="ko" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">주의: 이 옵션을 사용하게 되면, VeraCrypt 부트 로더에 어떠한 텍스트도 표시되지 않습니다(* 심지어 잘못된 비밀번호를 입력했을 때도 마찬가지입니다). 사용자가 비밀번호를 입력할 수 있는 동안 컴퓨터는 작동이 멈춘 것처럼 보입니다(→ 커서가 움직이지 않고, 키를 누를 때 어떠한 별표(*)도 표시되지 않습니다.\n\n이 옵션을 사용하시겠습니까?</string>
@@ -1034,8 +1082,11 @@
     <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="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>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="ko" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">키파일이 현재 시스템 암호화에서 지원되지 않습니다.</string>
     <string lang="ko" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">주의: VeraCrypt가 원래의 키보드 레이아웃을 복구할 수 없습니다. 이 경우 비밀번호를 올바르게 입력할 수 없을지도 모릅니다.</string>
     <string lang="ko" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">오류: VeraCrypt 키보드 레이아웃을 표준 US 키보드 레이아웃에 설정할 수 없습니다.\n\n(윈도우 시작 전에) US가 아닌 윈도우 키보드 레이아웃을 사용할 수 없는 부팅-전 환경에서 비밀번호를 입력할 필요가 있다는 것을 참고하세요. 그래서 표준 US 키보드 레이아웃을 사용해서 항상 비밀번호를 입력해야 합니다.</string>
@@ -1120,6 +1171,7 @@
     <string lang="ko" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">예비테스트를 성공적으로 완료했습니다.\n\n주의: 기존의 자체 데이터를 암호화하는 동안 ① 전력 공급이 갑자기 중단되거나 ② 소프트웨어 또는 하드웨어의 문제때문에 운영체제가 충돌을 일으키면, 일부 데이터가 손상되거나 유실될 수 있습니다. 그러므로 암호화 작업을 시작하기 전에 암호화하고자 하는 파일의 복사을 백업해 두었는지를 확인해야 합니다. 백업을 하지 않은 경우라면 지금 파일들을 백업해 두시기 바랍니다. “연기”를 클릭해서 파일을 백업하고 VeraCrypt를 다시 실행한 다음, 암호화를 시작하려면 “시스템” ▶ “중단된 진행을 다시 시작”을 선택합니다.\n\n준비가 되었고 암호화 작업을 시작하려면 “암호화”를 클릭하세요.</string>
     <string lang="ko" key="SYSENC_ENCRYPTION_PAGE_INFO">사용자는 언제라도 암호화 또는 암호해제 작업을 중단시키기 위해 “정지” 또는 “연기”를 클릭할 수 있고, 마법사를 종료한 후 컴퓨터를 다시 시작하고, 중단된 시점부터 다시 작업을 진행시킬 수 있습니다. 시스템 또는 프로그램이 시스템 드라이브의 데이터를 읽고 쓸 때 속도저하를 막기 위해, VeraCrypt는 데이터가 읽고 쓰여질 때까지 자동으로 대기한 다음 암호화 또는 암호해제 작업을 자동으로 계속합니다.</string>
     <string lang="ko" 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="ko" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">숨겨진 시스템이 시작됨</string>
     <string lang="ko" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">원래의 시스템</string>
     <string lang="ko" key="SYSENC_HIDDEN_OS_WIPE_INFO">윈도우는 (대개 사용자의 인식 또는 동의 없이) 시스템 파티션에 다양한 로그 파일, 임시 파일 등을 만듭니다. 또한 RAM의 내용을 시스템 파티션에 위치한 최대 절전 모드 및 페이징 파일에 저장하기도 합니다. 그래서 적대자가 원래의 시스템(* 이 시스템의 숨겨진 시스템은 복제된 것임)이 존재했던 파티션에 저장된 내용을 분석해서 예컨대 숨긴-시스템-생성 모드에서 VeraCrypt 마법사를 사용했다는 사실(→ 이는 컴퓨터에 숨긴 운영체제가 존재한다는 것을 의미)을 발견할 수도 있습니다.\n\n이런 문제점을 방지하기 위해 VeraCrypt는 다음 단계에서 원래의 시스템이 있었던 파티션의 전체 내용을 안전하게 지우게 됩니다. 이후 그럴싸한 거절방법을 만들기 위해 사용자는 “파티션에 새로운 시스템을 설치해서 이를 암호화”할 필요가 있습니다. 사용자가 미끼용 시스템을 만들게 되면, 숨긴 운영체제 생성의 전체 과정은 마무리되게 됩니다.</string>
@@ -1159,7 +1211,7 @@
     <string lang="ko" key="HIDDEN_OS_CREATION_PREINFO_HELP">다음 단계에서 VeraCrypt는 시스템 파티션의 내용을 숨긴 볼륨에 복사하는 방법으로 숨긴 운영체제를 만듭니다. 복사되는 데이터는 미끼용 운영체제에서 사용되는 키와 다른 것으로 실시간으로 암호화됩니다.\n\n진행 과정은 부팅-전 환경(→ 윈도우 시작 전)에서 실행되고, 완료하는데 많은 시간이 소요될 수 있습니다(→ 시스템 파티션의 크기 및 컴퓨터의 성능에 따라 몇 시간 또는 몇 일이 걸릴 수 있습니다).\n\n여러분은 진행 과정에 간섭할 수 있으며, 컴퓨터를 종료하고 운영체제를 시작하며 진행 과정을 다시 시작할 수도 있습니다. 그러나 진행 과정에 간섭을 할 경우, 시스템 복사 작업은 처음부터 시작하게 됩니다. 왜냐하면 시스템 파티션의 내용은 복제하는 동안 변경되어선 안되기 때문입니다.</string>
     <string lang="ko" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">숨긴 운영체제의 전체 생성 작업을 취소하시겠습니까?\n\n참고: 지금 취소하게 되면 이 진행 작업을 다시 시작할 수 없게 됩니다.</string>
     <string lang="ko" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">시스템 암호화 예비테스트를 취소하시겠습니까?</string>
-    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="ko" key="SYS_DRIVE_NOT_ENCRYPTED">시스템 파티션/드라이브가 (부분적으로 또는 완전히) 암호화되지 않은 것으로 보입니다.</string>
     <string lang="ko" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">시스템 파티션/드라이브가 (완전히 또는 부분적으로) 암호화되었습니다.\n\n작업을 진행하기 전에 시스템 파티션/드라이브를 완전히 암호해제시켜 주세요. 해제하려면 VeraCrypt 메인 창의 메뉴표시줄에서 “시스템” ▶ “시스템 파티션/드라이브 영구적 암호해제”를 선택하세요.</string>
     <string lang="ko" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">시스템 파티션/드라이브가 (완전히 또는 부분적으로) 암호화된 경우, VeraCrypt를 다운그레이드할 수 없습니다(* 업그레이드하거나 동일 버전을 재설치할 수는 있습니다).</string>
@@ -1176,6 +1228,8 @@
     <string lang="ko" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">사용자가 시스템 파티션/드라이브 (또는 부트 파티션)을 선택했지만, 선택한 마법사 모드는 비-시스템 파티션/드라이브에만 해당됩니다.\n\n부팅-전 인증(→ 이는 윈도우 부팅/시작 전에 매번 비밀번호를 입력해야 한다는 것을 의미)을 설정하고, 시스템/드라이브를 암호화하시겠습니까?</string>
     <string lang="ko" key="CONFIRM_DECRYPT_SYS_DEVICE">시스템 파티션/드라이브를 영구적으로 암호해제하시겠습니까?</string>
     <string lang="ko" 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="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="ko" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">주의: 시스템 암호화에 층계적 암호문을 사용한 경우, 다음과 같은 문제점을 만날 수 있습니다:\n\n1) VeraCrypt 부트 로더의 크기가 보통보다 커서 부트 로더의 백업용 첫번째 드라이브의 트랙에 충분한 공간이 없습니다. 그러므로 부트 로더가 손상(→ 악성코드 프로그램의 실행 등으로 종종 발생함)될 때마다 부팅하기 위해 또는 부트 로더를 수리하기 위해 VeraCrypt 응급복구 디스크를 사용할 필요가 있습니다.\n\n2) (일부 컴퓨터에서) 최대 절전 모드에서의 시스템 시작 시간이 길어집니다.\n\n이러한 잠재적 문제점은 비-층계적 암호 알고리듬(예: AES)을 선택해서 방지할 수 있습니다.\n\n정말로 층계적 암호문을 사용하시겠습니까?</string>
     <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>
@@ -1191,6 +1245,7 @@
     <string lang="ko" key="ENABLE_BAD_SECTOR_ZEROING">오류: 디스크에서 한 개 또는 그 이상의 섹터 내용을 읽을 수 없습니다(* 물리적 결함일 수 있음).\n\n자체 암호화 과정은 섹터를 다시 읽을 수 있을 때만 계속될 수 있습니다. VeraCrypt는 이러한 섹터에 0을 작성해서 이 섹터들을 읽을 수 있도록 시도할 수 있습니다(* 그 결과 0으로 된 모든 블록은 암호화됨). 그러나 읽을 수 없는 섹터에 저장된 데이터는 모두 손실된다는 것을 참고해 주십시오. 이러한 경우, 적당한 제3의 도구를 이용해서 손상된 데이터의 복구를 시도해 볼 수 있습니다.\n\n참고: 섹터가 물리적으로 손상된 경우(→ 이는 단순한 데이터 손실 및 체크섬 오류와는 반대개념), 대부분 형식의 저장 장치는 데이터가 장치에 쓰여질 때 이를 내부적으로 재할당하게 됩니다(* 그 결과 손상된 섹터에 있던 기존 데이터는 암호화되지 않은 상태로 드라이브에 남게 됩니다).\n\n읽을 수 없는 섹터에 0을 VeraCrypt를 이용해서 작성하시겠습니까?</string>
     <string lang="ko" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">오류: 디스크에서 한 개 또는 그 이상의 섹터 내용을 읽을 수 없습니다(* 물리적 결함일 수 있음).\n\n암호해제 작업을 계속 진행할 수 있으려면, 읽기-불능 섹터의 내용을 모두 버려야 합니다(→ 그 섹터의 내용은 유사무작위 데이터로 교체됩니다). 작업을 계속하기 전에, 적당한 제3의 도구를 이용해서 손상된 데이터의 복구를 시도해 볼 수 있습니다.\n\n읽기-불능 섹터의 데이터를 지금 버리시겠습니까?</string>
     <string lang="ko" 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="ko" key="ENTER_TOKEN_PASSWORD">“%s” 토큰을 위한 비밀번호/PIN 입력:</string>
     <string lang="ko" key="PKCS11_LIB_LOCATION_HELP">VeraCrypt를 통해 보안 토큰 또는 스마트 카드에 접근하려면 먼저 토큰 또는 스마트 카드용 PKCS #11 소프트웨어 라이브러리를 설치해야 합니다. 해당 라이브러리는 장치에 의해 제공되거나 판매업체 또는 다른 제3업체의 웹사이트를 통해 다운로드할 수 있습니다.\n\n라이브러리를 설치한 이후 ① “라이브러리 선택”을 클릭해서 수동으로 이를 선택하거나 ② “라이브러리 자동-탐지”를 클릭해서 자동으로 선택할 수 있습니다(* 윈도우 시스템 디렉토리만 검색됩니다).</string>
     <string lang="ko" key="SELECT_PKCS11_MODULE_HELP">참고: 보안 토큰 또는 스마트 카드를 위해 설치된 PKCS #11 라이브러리의 파일 이름 및 경로를 알아보려면, 토큰, 카드 또는 제3자 소프트웨어와 함께 제공된 문서를 참고해 주십시오.\n\n“확인”을 클릭한 후 경로 및 파일 이름을 선택해 주십시오.</string>

Translations/Language.lv.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="lv" name="Latviešu" en-name="Latvian" version="0.1.0" translators="Edmunds Melkers" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <control lang="en" key="IDC_KEY_FILES">&amp;Keyfiles...</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="lv" 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>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <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="lv" key="IDT_CONFIRM">Atkārtoti:</control>
     <control lang="lv" key="IDT_DONE">Izpildīts</control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="lv" key="IDT_ENCRYPTION_ALGO">Šifrēšanas algoritms</control>
     <control lang="lv" key="IDT_FILESYSTEM">Datņu sistēma</control>
     <control lang="en" key="IDT_FILE_CONTAINER">Creates a virtual encrypted disk within a file. Recommended for inexperienced users.</control>
@@ -85,6 +88,8 @@
     <control lang="en" key="IDT_PARTIAL_POOL_CONTENTS">Current pool content (partial)</control>
     <control lang="en" key="IDT_PASS">Pass</control>
     <control lang="lv" key="IDT_PASSWORD">Parole:</control>
+    <control lang="en" key="IDT_PIM">Volume PIM:</control>
+    <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
     <control lang="en" key="IDT_PROGRESS">Progress:</control>
     <control lang="lv" key="IDT_RANDOM_POOL">Gadījumatlase: </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>
@@ -142,6 +147,8 @@
     <control lang="en" key="IDC_MOUNT_OPTIONS">Mount Opti&amp;ons...</control>
     <control lang="lv" key="IDC_MOUNT_READONLY">Uzstādīt apgabalu tikai lasīšanai</control>
     <control lang="lv" key="IDC_NEW_KEYFILES">Atslēgdatnes...</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="lv" key="IDC_PREF_BKG_TASK_ENABLE">Iespējots</control>
     <control lang="lv" key="IDC_PREF_CACHE_PASSWORDS">Ierakstīt paroles dziņa kešatmiņā</control>
     <control lang="lv" key="IDC_PREF_DISMOUNT_INACTIVE">Auto-demontēt apgabalu, ja dati tajā nav lasīti/rakstīti tajā ilgāk par</control>
@@ -155,6 +162,7 @@
     <control lang="lv" key="IDC_PREF_MOUNT_READONLY">Uzstādīt apgabalus tikai lasīšanai</control>
     <control lang="lv" key="IDC_PREF_MOUNT_REMOVABLE">Uzstādīt apgabalus kā removable media</control>
     <control lang="lv" key="IDC_PREF_OPEN_EXPLORER">Atvērt sekmīgi uzstādītu apgabalu Explorer logā</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</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="lv" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Auto-demontējot, iznīcināt kešatmiņā ierakstītās paroles</control>
     <control lang="lv" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Aizverot, iznīcināt kešatmiņā ier. paroles</control>
@@ -167,11 +175,12 @@
     <control lang="en" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Display password</control>
     <control lang="lv" key="IDC_TRAVEL_OPEN_EXPLORER">Atvērt uzstādīto apgabalu Explorer logā</control>
     <control lang="lv" key="IDC_TRAV_CACHE_PASSWORDS">Ierakstīt paroles dziņa kešatmiņā</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="lv" key="IDC_UNMOUNTALL">&amp;Demontēt visus</control>
     <control lang="lv" key="IDC_VOLUME_PROPERTIES">&amp;Apgabala īpašības...</control>
     <control lang="lv" key="IDC_VOLUME_TOOLS">Apgabala rīki...</control>
     <control lang="lv" key="IDC_WIPE_CACHE">Izdzēst kešatmiņu</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
     <control lang="lv" key="IDD_HOTKEYS_DLG">VeraCrypt - sistēmas līmeņa karstie taustiņi</control>
     <control lang="lv" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="en" key="IDM_CREATE_HIDDEN_OS">Create Hidden Operating System...</control>
     <control lang="en" key="IDM_CREATE_RESCUE_DISK">Create Rescue Disk...</control>
     <control lang="lv" key="IDM_CREATE_VOLUME">Izveidot jaunu apgabalu...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="lv" key="IDM_DEFAULT_KEYFILES">Noklusētās atslēgdatnes...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="en" key="IDM_ENCRYPT_SYSTEM_DEVICE">Encrypt System Partition/Drive...</control>
     <control lang="lv" key="IDM_FAQ">Bieži uzdotie jautājumi</control>
@@ -243,6 +254,7 @@
     <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="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>
     <control lang="lv" key="IDM_VOLUME_WIZARD">Apgabala izveidošanas vednis</control>
     <control lang="lv" key="IDM_WEBSITE">VeraCrypt mājaslapa</control>
@@ -369,7 +381,7 @@
     <string lang="en" key="ACCESS_DENIED">Error: Access denied.\n\nThe partition you are trying to access is either 0 sectors long, or it is the boot device.</string>
     <string lang="en" key="ADMINISTRATOR">Administrator</string>
     <string lang="en" key="ADMIN_PRIVILEGES_DRIVER">In order to load the VeraCrypt driver, you need to be logged into an account with administrator privileges.</string>
-    <string lang="en" key="ADMIN_PRIVILEGES_WARN_DEVICES">Please note that in order to encrypt/format a partition/device you need to be logged into an account with administrator privileges.\n\nThis does not apply to file-hosted volumes.</string>
+    <string lang="en" key="ADMIN_PRIVILEGES_WARN_DEVICES">Please note that in order to encrypt, decrypt or format a partition/device you need to be logged into an account with administrator privileges.\n\nThis does not apply to file-hosted volumes.</string>
     <string lang="en" key="ADMIN_PRIVILEGES_WARN_HIDVOL">In order to create a hidden volume you need to be logged into an account with administrator privileges.\n\nContinue?</string>
     <string lang="en" key="ADMIN_PRIVILEGES_WARN_NTFS">Please note that in order to format the volume as NTFS you need to be logged into an account with administrator privileges.\n\nWithout administrator privileges, you can format the volume as FAT.</string>
     <string lang="en" key="AES_HELP">FIPS-approved cipher (Rijndael, published in 1998) that may be used by U.S. government departments and agencies to protect classified information up to the Top Secret level. 256-bit key, 128-bit block, 14 rounds (AES-256). Mode of operation is XTS.</string>
@@ -485,7 +497,11 @@
     <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>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Volume Fully Encrypted</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_INFO">IMPORTANT: TO MOUNT THIS NEWLY CREATED VERACRYPT VOLUME AND TO ACCESS DATA STORED IN IT, CLICK 'Auto-Mount Devices' IN THE MAIN VERACRYPT WINDOW. After you enter the correct password (and/or supply correct keyfiles), the volume will be mounted to the drive letter you select from the list in the main VeraCrypt window (and you will be able to access the encrypted data via the selected drive letter).\n\nPLEASE REMEMBER OR WRITE DOWN THE ABOVE STEPS. YOU MUST FOLLOW THEM WHENEVER YOU WANT TO MOUNT THE VOLUME AND ACCESS DATA STORED IN IT. Alternatively, in the main VeraCrypt window, click 'Select Device', then select this partition/volume, and click 'Mount'.\n\nThe partition/volume has been successfully encrypted (it contains a fully encrypted VeraCrypt volume now) and is ready for use.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="en" key="FORMAT_FINISHED_INFO">The VeraCrypt volume has been successfully created.</string>
     <string lang="lv" key="FORMAT_FINISHED_TITLE">Apgabals izveidots</string>
     <string lang="en" key="FORMAT_HELP">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 Format to create the volume.</string>
@@ -522,7 +538,8 @@
     <string lang="en" key="CONFIRM_RESTART">Your computer must be restarted.\n\nDo you want to restart it now?</string>
     <string lang="en" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">An error occurred when obtaining the system encryption status.</string>
     <string lang="en" key="INIT_SYS_ENC">Cannot initialize application components for system encryption.</string>
-    <string lang="en" key="INIT_RAND">Failed to initialize the random number generator!</string>
+    <string lang="en" key="INIT_RAND">Failed to initialize the random number generator!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="en" key="INIT_REGISTER">Unable to initialize the application. Failed to register the Dialog class.</string>
     <string lang="en" key="INIT_RICHEDIT">Error: Failed to load the Rich Edit system library.</string>
     <string lang="lv" key="INTRO_TITLE">VeraCrypt apgabala izveidošanas vednis</string>
@@ -535,6 +552,7 @@
     <string lang="lv" key="MOUNT_BUTTON">Uzstādīt izvēlēto</string>
     <string lang="en" key="NEW_VERSION_REQUIRED">A newer version of VeraCrypt is required to mount this volume.</string>
     <string lang="en" key="VOL_CREATION_WIZARD_NOT_FOUND">Error: Volume Creation Wizard not found.\n\nPlease make sure that the file 'VeraCrypt Format.exe' is in the folder from which 'VeraCrypt.exe' was launched. If it is not, please reinstall VeraCrypt, or locate 'VeraCrypt Format.exe' on your disk and run it.</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="lv" key="NEXT">Nākamais &gt;</string>
     <string lang="en" key="FINALIZE">&amp;Finish</string>
     <string lang="en" key="INSTALL">&amp;Install</string>
@@ -542,6 +560,7 @@
     <string lang="en" key="NODRIVER">Unable to connect to the VeraCrypt device driver. VeraCrypt cannot work if the device driver is not running.\n\nPlease note that, due to a Windows issue, it may be necessary to log off or restart the system before the device driver can be loaded.</string>
     <string lang="en" key="NOFONT">Error occurred when loading/preparing fonts.</string>
     <string lang="en" key="NOT_FOUND">The drive letter was not found or no drive letter was specified.</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="en" key="DRIVE_LETTER_UNAVAILABLE">Drive letter not available.</string>
     <string lang="en" key="NO_FILE_SELECTED">No file selected!</string>
     <string lang="en" key="NO_FREE_DRIVES">No drive letters available.</string>
@@ -561,15 +580,18 @@
     <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_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="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_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt.\n\nDo you have such a backup?</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_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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="en" key="IDD_PCDM_CHANGE_PKCS5_PRF">Set Header Key Derivation Algorithm</string>
     <string lang="en" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Add/Remove Keyfiles to/from Volume</string>
     <string lang="en" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Remove All Keyfiles from Volume</string>
-    <string lang="en" key="PASSWORD_CHANGED">Password and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</string>
+    <string lang="en" key="PASSWORD_CHANGED">Password, PIM and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</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="en" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">IMPORTANT: If you did not destroy your VeraCrypt Rescue Disk, your system partition/drive can still be decrypted using the old password (by booting the VeraCrypt Rescue Disk and entering the old password). You should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</string>
     <string lang="en" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Note that your VeraCrypt Rescue Disk still uses the previous algorithm. If you consider the previous algorithm insecure, you should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,7 +600,8 @@
     <string lang="en" key="PKCS5_PRF_CHANGED">Header key derivation algorithm successfully set.</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_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="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 more than 20 characters (the longer, the better). The maximum possible length is 64 characters.</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="en" key="PASSWORD_HIDDENVOL_HELP">Please choose a password for the hidden volume. </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_HELP">Please choose a password for the hidden operating system (i.e. for the hidden volume). </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_NOTE">IMPORTANT: The password that you choose for the hidden operating system in this step must be substantially different from the other two passwords (i.e. from the password for the outer volume and from the password for the decoy operating system).</string>
@@ -597,11 +620,26 @@
     <string lang="en" key="PASSWORD_WRONG_AUTOMOUNT">Incorrect password or no VeraCrypt volume found.</string>
     <string lang="en" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Incorrect keyfile(s)/password or no VeraCrypt volume found.</string>
     <string lang="en" key="PASSWORD_WRONG_CAPSLOCK_ON">\n\nWarning: Caps Lock is on. This may cause you to enter your password incorrectly.</string>
+    <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
+    <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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_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>
+    <string lang="en" key="SELECTED_PARTITION_NOT_INPLACE_ENC">The selected partition/device is not using in-place encryption.\nHeader Flags = 0x%.8X</string>
     <string lang="en" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nNote: If you are attempting to mount a partition located on an encrypted system drive without pre-boot authentication or to mount the encrypted system partition of an operating system that is not running, you can do so by selecting 'System' &gt; 'Mount Without Pre-Boot Authentication'.</string>
     <string lang="en" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">In this mode, you cannot mount a partition located on a drive whose portion is within the key scope of active system encryption.\n\nBefore you can mount this partition in this mode, you need to either boot an operating system installed on a different drive (encrypted or unencrypted) or boot an unencrypted operating system.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <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>
@@ -701,11 +739,18 @@
     <string lang="en" key="FOR_MORE_INFO_ON_PARTITIONS">For information on how to create and manage partitions, please refer to the documentation supplied with your operating system or contact your computer vendor's technical support team for assistance.</string>
     <string lang="en" key="SYSTEM_PARTITION_NOT_ACTIVE">Error: The currently running operating system is not installed on the boot partition (first Active partition). This is not supported.</string>
     <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="en" key="CANT_ACCESS_VOL">Error: Cannot access the volume!\n\nMake sure that the selected volume exists, that it is not mounted or being used by the system or an application, that you have read/write permission for the volume, and that it is not write-protected.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Error: Cannot access the volume and/or obtain information about the volume.\n\nMake sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Error: Cannot access the volume and/or obtain information about the volume. Make sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.\n\nIf the problem persists, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">An error prevented VeraCrypt from encrypting the partition. Please try fixing any previously reported problems and then try again. If the problems persist, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_RESUME">An error prevented VeraCrypt from resuming the process of encryption of the partition.\n\nPlease try fixing any previously reported problems and then try resuming the process again. Note that the volume cannot be mounted until it has been fully encrypted.</string>
+    <string lang="en" key="INPLACE_DEC_GENERIC_ERR">An error prevented VeraCrypt from decrypting the volume. Please try fixing any previously reported problems and then try again if possible.</string>
     <string lang="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="en" key="CANT_ACCESS_OUTER_VOL">Error: Cannot access the outer volume! Volume creation cannot continue.</string>
@@ -790,7 +835,7 @@
     <string lang="en" key="TC_INSTALLER_IS_RUNNING">VeraCrypt Installer is currently running on this system and performing or preparing installation or update of VeraCrypt. Before you proceed, please wait for it to finish or close it. If you cannot close it, please restart your computer before proceeding.</string>
     <string lang="en" key="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 www.veracrypt.org).</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="EXTRACTING_VERB">Extracting</string>
     <string lang="en" key="CANNOT_READ_FROM_PACKAGE">Cannot read data from the package.</string>
@@ -977,6 +1022,7 @@
     <string lang="en" key="CONFIRM_EXIT_UNIVERSAL">Exit?</string>
     <string lang="en" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt does not have sufficient information to determine whether to encrypt or decrypt.</string>
     <string lang="en" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt does not have sufficient information to determine whether to encrypt or decrypt.\n\nNote: If you decrypted the system partition/drive in the pre-boot environment, you may need to finalize the process by clicking Decrypt.</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_REVERSE_INFO">Note: When you are encrypting a non-system partition/volume in place and an error persistently prevents you from finishing the process, you will not be able to mount the volume (and access data stored on it) until you entirely DECRYPT the volume (i.e. reverse the process).\n\nIf you need to do so, follow these steps:\n1) Exit this wizard.\n2) In the main VeraCrypt window, select 'Volumes' &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="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Do you want to interrupt and postpone the process of encryption of the system partition/drive?\n\nNote: You will be able to resume the process and it will continue from the point it was stopped. You can do so, for example, by selecting 'System' &gt; 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window. If you want to permanently terminate or reverse the encryption process, select 'System' &gt; 'Permanently Decrypt System Partition/Drive'.</string>
     <string lang="en" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Do you want to interrupt and postpone the process of decryption of the system partition/drive?\n\nNote: You will be able to resume the process and it will continue from the point it was stopped. You can do so, for example, by selecting 'System' &gt; 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window. If you want to reverse the decryption process (and start encrypting), select 'System' &gt; 'Encrypt System Partition/Drive'.</string>
@@ -986,6 +1032,7 @@
     <string lang="en" key="FAILED_TO_START_WIPING">Error: Failed to start the process of wiping.</string>
     <string lang="en" key="INCONSISTENCY_RESOLVED">Inconsistency resolved.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="en" key="NOTHING_TO_RESUME">There is no process/task to resume.</string>
     <string lang="en" key="HIDVOL_PROT_BKG_TASK_WARNING">WARNING: VeraCrypt Background Task is disabled. After you exit VeraCrypt, you will not be notified if damage to hidden volume is prevented.\n\nNote: You may shut down the Background Task anytime by right-clicking the VeraCrypt tray icon and selecting 'Exit'.\n\nEnable VeraCrypt Background Task?</string>
     <string lang="lv" key="LANG_PACK_VERSION">Valodas pakotnes versija:  %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="en" key="ERROR_MBR_PROTECTED">Failed to write the MBR sector.\n\nYour BIOS may be configured to protect the MBR sector. Check your BIOS settings (press F2, Delete, or Esc, after powering on your computer) for MBR/antivirus protection.</string>
+    <string lang="en" key="BOOT_LOADER_FINGERPRINT_CHECK_FAILED">WARNING: The verification of VeraCrypt bootloader fingerprint failed!\nYour disk may have been tampered with by an attacker ("Evil Maid" attack).\n\nThis warning can also be triggered if you restored VeraCrypt boot loader using an Rescue Disk generated using a different VeraCrypt version.\n\nYou are advised to change your password immediately which will also restore the correct VeraCrypt bootloader. It is recommended to reinstall VeraCrypt and to take measures to avoid access to this machine by untrusted entities.</string>
     <string lang="en" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">The required version of the VeraCrypt Boot Loader is currently not installed. This may prevent some of the settings from being saved.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Note: In some situations, you may wish to prevent a person (adversary) that is watching you start the computer from knowing that you use VeraCrypt. The above options allow you to do that by customizing the VeraCrypt boot loader screen. If you enable the first option, no texts will be displayed by the boot loader (not even when you enter the wrong password). The computer will appear to be "frozen" while you can type your password. In addition, a custom message can be displayed to mislead the adversary. For example, fake error messages such as "Missing operating system" (which is normally displayed by the Windows boot loader if it finds no Windows boot partition). It is, however, important to note that if the adversary can analyze the content of the hard drive, he can still find out that it contains the VeraCrypt boot loader.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">WARNING: Please keep in mind that if you enable this option, the VeraCrypt boot loader will not display any texts (not even when you enter the wrong password). The computer will appear to be "frozen" (unresponsive) while you can type your password (the cursor will NOT move and no asterisk will be displayed when you press a key).\n\nAre you sure you want to enable this option?</string>
@@ -1034,8 +1082,11 @@
     <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="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">Warning: There is unallocated space between the system partition and the first partition behind it. After you create the hidden operating system, you must not create any new partitions in that unallocated space. Otherwise, the hidden operating system will be impossible to boot (until you delete such newly created partitions).</string>
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">This algorithm is currently not supported for system encryption.</string>
-	<string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</string>
     <string lang="en" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Error: Cannot set the keyboard layout for VeraCrypt to the standard US keyboard layout.\n\nNote that the password needs to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout.</string>
@@ -1120,6 +1171,7 @@
     <string lang="en" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">The pretest has been successfully completed.\n\nWARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt. If you do not, please back up the files now (you can click Defer, back up the files, then run VeraCrypt again anytime, and select 'System' &gt; 'Resume Interrupted Process' to start encrypting).\n\nWhen ready, click Encrypt to start encrypting.</string>
     <string lang="en" key="SYSENC_ENCRYPTION_PAGE_INFO">You can click Pause or Defer anytime to interrupt the process of encryption or decryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. To prevent slowdown when the system or applications write or read data from the system drive, VeraCrypt automatically waits until the data is written or read (see Status above) and then automatically continues encrypting or decrypting.</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nYou can click Pause or Defer anytime to interrupt the process of encryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. Note that the volume cannot be mounted until it has been fully encrypted.</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="en" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Hidden System Started</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Original System</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows creates (typically, without your knowledge or consent) various log files, temporary files, etc., on the system partition. It also saves the content of RAM to hibernation and paging files located on the system partition. Therefore, if an adversary analyzed files stored on the partition where the original system (of which the hidden system is a clone) resides, he might find out, for example, that you used the VeraCrypt wizard in the hidden-system-creation mode (which might indicate the existence of a hidden operating system on your computer).\n\nTo prevent such issues, VeraCrypt will, in the next steps, securely erase the entire content of the partition where the original system resides. Afterwards, in order to achieve plausible deniability, you will need to install a new system on the partition and encrypt it. Thus you will create the decoy system and the whole process of creation of the hidden operating system will be completed.</string>
@@ -1159,7 +1211,7 @@
     <string lang="en" key="HIDDEN_OS_CREATION_PREINFO_HELP">In the next steps, VeraCrypt will create the hidden operating system by copying the content of the system partition to the hidden volume (data being copied will be encrypted on the fly with an encryption key different from the one that will be used for the decoy operating system).\n\nPlease note that the process will be performed in the pre-boot environment (before Windows starts) and it may take a long time to complete; several hours or even several days (depending on the size of the system partition and on the performance of your computer).\n\nYou will be able to interrupt the process, shut down your computer, start the operating system and then resume the process. However, if you interrupt it, the entire process of copying the system will have to start from the beginning (because the content of the system partition must not change during cloning).</string>
     <string lang="en" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Do you want to cancel the entire process of creation of the hidden operating system?\n\nNote: You will NOT be able to resume the process if you cancel it now.</string>
     <string lang="en" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Do you want to cancel the system encryption pretest?</string>
-    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="en" key="SYS_DRIVE_NOT_ENCRYPTED">The system partition/drive does not appear to be encrypted (neither partially nor fully).</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">Your system partition/drive is encrypted (partially or fully).\n\nPlease decrypt your system partition/drive entirely before proceeding. To do so, select 'System' &gt; 'Permanently Decrypt System Partition/Drive' from the menu bar of the main VeraCrypt window.</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">When the system partition/drive is encrypted (partially or fully), you cannot downgrade VeraCrypt (but you can upgrade it or reinstall the same version).</string>
@@ -1176,6 +1228,8 @@
     <string lang="en" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">You have selected the system partition/drive (or the boot partition), but the wizard mode you selected is suitable only for non-system partitions/drives.\n\nDo you want to set up pre-boot authentication (which means that you will need to enter your password each time before Windows boots/starts) and encrypt the system partition/drive?</string>
     <string lang="en" key="CONFIRM_DECRYPT_SYS_DEVICE">Are you sure you want to permanently decrypt the system partition/drive?</string>
     <string lang="en" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the system partition/drive, unencrypted data will be written to it.\n\nAre you really sure you want to permanently decrypt the system partition/drive?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
     <string lang="en" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Warning: If you use a cascade of ciphers for system encryption, you may encounter the following issues:\n\n1) The VeraCrypt Boot Loader is larger than normal and, therefore, there is not enough space in the first drive track for a backup of the VeraCrypt Boot Loader. Hence, whenever it gets damaged (which often happens, for example, during inappropriately designed anti-piracy activation procedures of certain programs), you will need to use the VeraCrypt Rescue Disk to boot or to repair the VeraCrypt Boot Loader.\n\n2) On some computers, resuming from hibernation takes longer.\n\nThese potential issues can be prevented by choosing a non-cascade encryption algorithm (e.g. AES).\n\nAre you sure you want to use a cascade of ciphers?</string>
     <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>
@@ -1191,6 +1245,7 @@
     <string lang="en" key="ENABLE_BAD_SECTOR_ZEROING">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nThe process of in-place encryption can continue only when the sectors have been made readable again. VeraCrypt can attempt to make these sectors readable by writing zeros to the sectors (subsequently such all-zero blocks would be encrypted). However, note that any data stored in the unreadable sectors will be lost. If you want to avoid that, you can attempt to recover portions of the corrupted data using appropriate third-party tools.\n\nNote: In case of physically damaged sectors (as opposed to mere data corruption and checksum errors) most types of storage devices internally reallocate the sectors when data is attempted to be written to them (so the existing data in the damaged sectors may remain unencrypted on the drive).\n\nDo you want VeraCrypt to write zeroes to unreadable sectors?</string>
     <string lang="en" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nTo be able to proceed with decryption, VeraCrypt will have to discard the content of the unreadable sectors (the content will be replaced with pseudorandom data). Please note that, before proceeding, you can attempt to recover portions of any corrupted data using appropriate third-party tools.\n\nDo you want VeraCrypt to discard data in the unreadable sectors now?</string>
     <string lang="en" key="ZEROED_BAD_SECTOR_COUNT">Note: VeraCrypt has replaced the content of %I64d unreadable sectors (%s) with encrypted all-zero plaintext blocks.</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="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>

Translations/Language.my.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="my" name="မြန်မာ" en-name="Burmese" version="1.0.0" translators="Zaw Myo Htet" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <control lang="my" key="IDC_KEY_FILES">ကီးဖိုင်များ...</control>
     <control lang="my" key="IDC_LINK_HASH_INFO">H​ash အယ်လဂိုရီသမ်များ၏ အချက်အလက်များ</control>
     <control lang="my" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">နောက်ထပ် အချက်အလက်</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="my" key="IDC_MB">&amp;MB</control>
     <control lang="my" key="IDC_MORE_INFO_ON_CONTAINERS">နောက်ထပ် အချက်အလက်</control>
     <control lang="my" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">ကွန်ပျူတာစနစ် စာဝှက်ခြင်းအကြောင်း အသေးစိတ် အချက်အလက်များ</control>
@@ -57,6 +58,7 @@
     <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="my" key="IDC_QUICKFORMAT">အမြန် မော်မက်ချရန်</control>
     <control lang="my" key="IDC_SHOW_PASSWORD">စကားဝှက်ကို ပြရန်</control>
     <control lang="my" key="IDC_SHOW_PASSWORD_SINGLE">စကားဝှက်ကို ပြရန်</control>
@@ -72,6 +74,7 @@
     <control lang="my" key="IDT_COLLECTING_RANDOM_DATA_NOTE">အရေးကြီးချက် - ဤ ၀င်းဒိုးအတွင်း သင့်ကြွက်ခလုတ်ကို ကျပန်းနည်းဖြင့် ရွှေ့လျားပါ။ အချိန်ပိုကြာလေ၊ ပိုကောင်းလေ ဖြစ်သည်။ ဤသို့ဖြင့် စာဝှက်ထားသော ကီးများ၏ ဝှက်စာ ရေးသားခြင်း အားကောင်းခိုင်မာမှုကို တိုးမြှင့်စေမည် ဖြစ်သည်။ လုပ်ပြီးပါက volume ကို ဖန်တီးရန် ဖော်မက်ချရန် ခလုတ်ကို နှိပ်ပါ။</control>
     <control lang="my" key="IDT_CONFIRM">အတည်ပြုရန် -</control>
     <control lang="my" key="IDT_DONE">ပြီးသွားပြီ</control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="my" key="IDT_ENCRYPTION_ALGO">စာဝှက်စနစ် အယ်လဂိုရီသမ်</control>
     <control lang="my" key="IDT_FILESYSTEM">ဖိုင်စနစ်</control>
     <control lang="my" key="IDT_FILE_CONTAINER">စာဝှက်ထားသော disk အတု တစ်ခုကို ဖိုင်တစ်ခုထဲ ဖန်တီးလိုက်ပါ။ အတွေ့အကြုံ မရှိသေးသော သုံးစွဲသူများအတွက် သင့်လျှော်သည်။</control>
@@ -85,6 +88,8 @@
     <control lang="my" key="IDT_PARTIAL_POOL_CONTENTS">လက်ရှိ စုပေါင်း အကြောင်းအရာ (တစ်ပိုင်းတစ်စ)</control>
     <control lang="my" key="IDT_PASS">အောင်မြင်သည်</control>
     <control lang="my" 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="my" key="IDT_PROGRESS">တိုးတက်မှု -</control>
     <control lang="my" key="IDT_RANDOM_POOL">ကျပန်း စုစည်းမှု -</control>
     <control lang="my" key="IDT_SINGLE_BOOT">ဤကွန်ပြူတာ၌ OS တစ်ခုတည်း ထည့်သွင်းထားလျှင် (သုံးစွဲသူ အများ ရှိနေလျှင်လည်း) ဒီရွေးစရာကို ရွေးပါ။</control>
@@ -142,6 +147,8 @@
     <control lang="my" key="IDC_MOUNT_OPTIONS">ရွေးစရာများကို အစပျိုးရန်...</control>
     <control lang="my" key="IDC_MOUNT_READONLY">Volume ကို ဖတ်ရှုရန်အတွက်သာ အစပျိုးရန်</control>
     <control lang="my" key="IDC_NEW_KEYFILES">ကီးဖိုင်များ...</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="my" key="IDC_PREF_BKG_TASK_ENABLE">ဖွင့်ထားသည်</control>
     <control lang="my" key="IDC_PREF_CACHE_PASSWORDS">စကားဝှက်ကို ဒရိုင်ဘာ မှတ်ဉာဏ်ထဲ၌ ခေတ္တ သိမ်းဆည်းရန်</control>
     <control lang="my" key="IDC_PREF_DISMOUNT_INACTIVE">ဒေတာများကို ဖတ်ရှုခြင်း/ရေးသားခြင်း မပြုသည့်အခါ volume ကို အလိုအလျောက် အဆုံးသတ်ပါ</control>
@@ -155,6 +162,7 @@
     <control lang="my" key="IDC_PREF_MOUNT_READONLY">Volumes များကို ဖတ်ရှုရန် အတွက်သာ အစပျိုးရန်</control>
     <control lang="my" key="IDC_PREF_MOUNT_REMOVABLE">Volumes များကို ဖြုတ်တပ်နိုင်သော ကြားခံအဖြစ်သာ အစပျိုးရန်</control>
     <control lang="my" key="IDC_PREF_OPEN_EXPLORER">အောင်မြင်စွာ အစပျိုးလိုက်သော volume အတွက် Explorer ၀င်းဒိုးကို ဖွင့်ရန်</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</control>
     <control lang="my" key="IDC_PREF_USE_DIFF_TRAY_ICON_IF_VOL_MOUNTED">အစပျိုးထားသော volumes များ ရှိပါက ခြားနားသော taskbar ပုံများကို သုံးစွဲရန်</control>
     <control lang="my" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">အလိုအလျောက် အဆုံးသတ်သည့်အခါ ခေတ္တ မှတ်ထားသော စကားဝှက်များကို ရှင်းလင်းရန်</control>
     <control lang="my" key="IDC_PREF_WIPE_CACHE_ON_EXIT">ထွက်သည့်အခါ ခေတ္တ မှတ်ထားသော စကားဝှက်များကို ရှင်းလင်းရန်</control>
@@ -167,11 +175,12 @@
     <control lang="my" key="IDC_SHOW_PASSWORD_CHPWD_ORI">စကားဝှက် ပြရန်</control>
     <control lang="my" key="IDC_TRAVEL_OPEN_EXPLORER">အစပျိုးထားသော volume အတွက် Explorer ၀င်းဒိုး ဖွင့်ရန်</control>
     <control lang="my" key="IDC_TRAV_CACHE_PASSWORDS">ဒရိုင်ဘာ မှတ်ဉာဏ်ထဲရှိ ယာယီ စကားဝှက်</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="my" key="IDC_UNMOUNTALL">အားလုံးကို အဆုံးသတ်ရန်</control>
     <control lang="my" key="IDC_VOLUME_PROPERTIES">Volume  ဂုဏ်အင်္ဂါရပ်များ...</control>
     <control lang="my" key="IDC_VOLUME_TOOLS">Volume ကိရိယာများ...</control>
     <control lang="my" key="IDC_WIPE_CACHE">ယာယီဖိုင်များကို ရှင်းလင်းရန်</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="my" key="IDD_FAVORITE_VOLUMES">VeraCrypt - စိတ်ကြိုက် Volumes များ</control>
     <control lang="my" key="IDD_HOTKEYS_DLG">VeraCrypt - စက်သုံး အထူး ကီးများ</control>
     <control lang="my" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="my" key="IDM_CREATE_HIDDEN_OS">လျှို့ဝှက် OS ဖန်တီးရန်...</control>
     <control lang="my" key="IDM_CREATE_RESCUE_DISK">ကယ်ဆယ်ရေး Disk ဖန်တီးရန်...</control>
     <control lang="my" key="IDM_CREATE_VOLUME">Volume အသစ် ဖန်တီးရန်...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="my" key="IDM_DEFAULT_KEYFILES">မူလ ကီးဖိုင်များ...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="my" key="IDM_DONATE">ယခု လှူဒါန်းရန်...</control>
     <control lang="my" key="IDM_ENCRYPT_SYSTEM_DEVICE">ကွန်ပျူတာ အခန်းကန့်/Drive ကို စာဝှက်ရန်...</control>
     <control lang="my" key="IDM_FAQ">မေးလေ့ရှိသော မေခွန်းများ</control>
@@ -243,6 +254,7 @@
     <control lang="my" key="IDM_UNMOUNT_VOLUME">Volume အဆုံးသတ်ရန်</control>
     <control lang="my" key="IDM_VERIFY_RESCUE_DISK">ကယ်ဆယ်ရေး Disk စစ်ဆေးရန်</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>
     <control lang="my" key="IDM_VOLUME_WIZARD">Volume ဖန်တီးမှု အညွှန်း</control>
     <control lang="my" key="IDM_WEBSITE">VeraCrypt ကွန်ရက် စာမျက်နှာ</control>
@@ -485,7 +497,11 @@
     <string lang="my" key="FORMAT_FINISHED_HELP">\n\n VeraCrypt volume ကို ဖန်တီးလိုက်ပြီ ဖြစ်၍ သုံးစွဲရန် အသင့် ဖြစ်နေပြီ။ အခြား VeraCrypt volume ကို ဖန်တီးလိုပါက၊ 'ရှေ့သို့' ကို နှိပ်ပါ။ ဒါမှမဟုတ် 'ထွက်ရန်' ကို နှိပ်ပါ။</string>
     <string lang="my" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\n လျှို့ဝှက် VeraCrypt volume ကို အောင်မြင်စွာ ဖန်တီးလိုက်ပြီ (လျှို့ဝှက် OS သည် ဤလျှို့ဝှက် volume ထဲ၌ ရှိနေမည် ဖြစ်သည်)။\n\n ဆက်လုပ်ရန် 'ရှေ့သို့' ကို နှိပ်ပါ။</string>
     <string lang="my" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Volume ကို အပြည့်အ၀ စာဝှက်ထားပြီ</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="my" key="NONSYS_INPLACE_ENC_FINISHED_INFO">အရေးကြီးချက် - အသစ်စက်စက် ဖန်တီးလိုက်သော VERACRYPT VOLUME ကို အစပျိုးပြီး ၄င်းအထဲ၌ သိုလှောင်ထားသော ဒေတာကို ရယူရန်၊ 'Devices များ အလိုလို အစပျိုးရန်' ကို နှိပ်ပါ။ စကားဝှက် (နှင့် ကီးဖိုင်) အမှန်ကို ထည့်သွင်းပြီးပါက ()၊ VeraCrypt ၏ ပင်မ ၀င်းဒိုးပေါ်ရှိ စာရင်းမှ သင် ရွေးချယ်လိုက်သော drive အက္ခရာဖြင့် volume ကို အစပျိုးလာမည် (ပြီးနောက် စာဝှက်ထားသော ဒေတာကို ရွေးချယ်​ထားသော drive အက္ခရာမှတဆင့် ၀င်ရောက်နိုင်မည်) ဖြစ်သည်။\n\nအ​ထက် ဖေါ်ပြပါ အဆင့်များကို မှတ်ထားခြင်း/ရေးမှတ်ခြင်း ပြုထားပါ။ VOLUME ကို အစပျိုးလိုသော အချိန်၊ အထဲ၌ သိုလှောင်ထားသော ဒေတာများကို ရယူလိုသည့်အချိန်တွင် ၄င်းအဆင့်များအတိုင်း လုပ်ဆောင်ပါ။ တနည်းအားဖြင့် - VeraCrypt ၏ ပင်မ ဝင်းဒိုးထဲ၌ တွင် 'Device ရွေးရန်' ကို နှိပ်ပါ၊ ထို့နောက် ဤ အခန်းကန့်/volume ကို ရေးပြီး၊ 'အစပျိုးရန်' ကို နှိပ်ပါ။\n\n အခန်းကန့်/volume ကို အောင်မြင်စွာ စာဝှက်လိုက်ပြီ ဖြစ်၍ သုံးစွဲရန် အသင့် ဖြစ်နေပြီ။</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="my" key="FORMAT_FINISHED_INFO">VeraCrypt volume ကို အောင်မြင်စွာ ဖန်တီးလိုက်ပြီ။</string>
     <string lang="my" key="FORMAT_FINISHED_TITLE">Volume ဖန်တီးလိုက်ပြီ</string>
     <string lang="my" key="FORMAT_HELP">အရေးကြီးချက် - သင့် ကြွက်ခလုတ်ကို ဤဝင်းဒိုးအတွင်း တက်နိုင်သမျ ကျပန်း ရွေ့လျားပါ။ ပိုကြာလေ ကောင်းလေ ဖြစ်သည်။ ၎င်းသည် စာဝှက် ကီးများ၏ ဝှက်စာ ကြံ့ခိုင်မှုကို အားကောင်းစေသည်။ ထို့နောက် volume ကို ဖန်တီးရန် ဖော်မက်ချရန် ကို နှိပ်ပါ။</string>
@@ -524,6 +540,7 @@
     <string lang="my" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">ကွန်ပျူတာစနစ်၏ စာဝှက်ခြင်း အနေအထားကို ရယူနေစဉ် ချို့ယွင်းချက် တစ်ခု ဖြစ်ပေါ်နေသည်။</string>
     <string lang="my" key="INIT_SYS_ENC">ကွန်ပျူတာစနစ် စာဝှက်ရန်အတွက် အပ္ပလီကေးရှင်း အစိတ်အပိုင်းများကို အစပြု၍ မရပါ။</string>
     <string lang="my" key="INIT_RAND">ကျပန်း နံပါတ် ထုတ်စနစ်ကို အစပြု၍ မရပါ။</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="my" key="INIT_REGISTER">အပ္ပလီကေးရှင်းကို အစပြု၍ မရပါ။ Dialog class ကို မှတ်ပုံတင်ရန် မအောင်မြင်ပါ။</string>
     <string lang="my" key="INIT_RICHEDIT">ချို့ယွင်းချက် - Rich Edit စနစ် လိုင်ဘရာရီကို ဖွင့်မရပါ။</string>
     <string lang="my" key="INTRO_TITLE">VeraCrypt Volume ဖန်တီးမှု အညွှန်း</string>
@@ -536,6 +553,7 @@
     <string lang="my" key="MOUNT_BUTTON">&amp;အစပျိုးပါ</string>
     <string lang="my" key="NEW_VERSION_REQUIRED">ဤ volume ကို အစပျိုးရန် VeraCrypt ဗားရှင်း အသစ် လိုအပ်သည်။</string>
     <string lang="my" key="VOL_CREATION_WIZARD_NOT_FOUND">ချို့ယွင်းချက် - Volume ဖန်တီးခြင်း အညွှန်းကို ရှာမတွေ့ပါ။\n\nဖိုင်တွဲထဲ၌ 'VeraCrypt Format.exe' ရှိရမည် ဖြစ်ပြီး၊ ၄င်းဖိုင်တွဲမှာ 'VeraCrypt.exe' ကို ဖွင့်ရမည် ဖြစ်သည်။ အကယ်၍ မရှိခဲ့လျှင် VeraCrypt ကို ဖက်ထဲ ထပ်မထည့်သွင်းပါ၊ (သို့) သင့် disk တွင် '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="my" key="NEXT">&amp;ရှေ့သို့ &gt;</string>
     <string lang="my" key="FINALIZE">&amp;ပြီးသွားပြီ</string>
     <string lang="my" key="INSTALL">စက်ထဲ ထည့်သွင်းရန်</string>
@@ -543,6 +561,7 @@
     <string lang="my" key="NODRIVER">VeraCrypt device ဒရိုင်ဘာကို ဆက်သွယ်၍ မရပါ။ အကယ်၍ device ဒရိုင်ဘာ အလုပ်မလုပ်လျှင် VeraCrypt အလုပ်လုပ်နိုင်မည် မဟုတ်ပါ။\n\nဝင်းဒိုး ပြဿနာ တစ်ရပ်ကြောင့်၊ device ဒရိုင်ဘာကို မဖွင့်ခင် ကွန်ပျူတာစနစ်ကို ခေတ္တပိတ်ထားရန် (သို့) စက်ပြန်ဖွင့်ရန် လိုအပ်လာနိုင်သည်။</string>
     <string lang="my" key="NOFONT">ဖောင့်များကို ဖွင့်နေစဉ်/ပြင်ဆင်နေစဉ် ချို့ယွင်းချက် ဖြစ်ပွားသည်။</string>
     <string lang="my" key="NOT_FOUND">Drive အက္ခရာကို ရှာမတွေ့ပါ (သို့) drive အက္ခရာကို သတ်မှတ်မထားပါ။</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="my" key="DRIVE_LETTER_UNAVAILABLE">Drive အက္ခရာ မရနိုင်ပါ။</string>
     <string lang="my" key="NO_FILE_SELECTED">ဖိုင် ရွေးမထားပါ!</string>
     <string lang="my" key="NO_FREE_DRIVES">Drive အက္ခရာ မရနိုင်ပါ။</string>
@@ -562,15 +581,18 @@
     <string lang="my" key="OVERWRITEPROMPT">သတိပေးချက် - ဖိုင်အမည် '%hs' ရှိနေပြီ ဖြစ်သည်!\n\nအရေးကြီးချက် - VeraCrypt သည် ဖိုင်ကို စာဝှက်ပေးမည် မဟုတ်ပါ၊ သို့သော် ၄င်းကို ပယ်ဖျက်မည် မဟုတ်ပါ။ ဖိုင်ကို ပယ်ဖျက်ပြီး VeraCrypt သိမ်းဆည်းခန်း အသစ် တစ်ခုနှင့် အစားထိုးလိုသလား?</string>
     <string lang="my" key="OVERWRITEPROMPT_DEVICE">သတိပေးချက် - လောလောဆယ် ရွေးချယ်ထားသော %s '%hs'%s ၌ သိမ်းဆည်းထားသော ဖိုင်အားလုံးကို ဖျက်ပစ်မည် ဖြစ်ပြီး၊ ​ပျောက်ဆုံးသွားမည် ဖြစ်သည် (၄င်းတို့ကို စာဝှက်ထားမည် မဟုတ်ပါ)!\n\nဖော်မက်ချပြီး သင် ဆက်လက် လုပ်ဆောင်လိုသလား?</string>
     <string lang="my" key="NONSYS_INPLACE_ENC_CONFIRM">သတိပေးချက် - Volume ကို အပြည့်အ၀ စာမဝှက်မီ ၎င်းကို အစပျိုးနိုင်မည် မဟုတ်ပါ (သို့) ၄င်းအထဲရှိ ဖိုင်များကို ရယူနိုင်မည် မဟုတ်ပါ။\n\nရွေးချယ်ထားသော %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 '%hs'%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_SECOND_WARNING_LOTS_OF_DATA">သတိပေးချက် - ရွေးချယ်ထားသော အခန်းကန့်၌ ဒေတာ အများအပြား ရှိနေသည်။ ၄င်း အခန်းကန့်၌ သိမ်းဆည်းထားသော ဖိုင်များသည် ဖျက်ဆီးခံရမည် ဖြစ်ပြီး ပျောက်ဆုံးသွားမည် ဖြစ်သည် (၎င်းဖိုင်များကို စာဝှက်မထားပါ)!</string>
     <string lang="my" key="ERASE_FILES_BY_CREATING_VOLUME">အခန်းကန့်ထဲ၌ VeraCrypt volume တစ်ခု ဖန်တီးပြီး သိမ်းဆည်းထားသော ဖိုင်များကို ပယ်ဖျက်ပါ။</string>
     <string lang="my" key="PASSWORD">စကားဝှက်</string>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="my" key="IDD_PCDM_CHANGE_PKCS5_PRF">ခေါင်းစီး ကီး ဆင်းသက်မှုလအယ်လဂိုရစ်သမ် သတ်မှတ်ရန်</string>
     <string lang="my" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Volume ထဲရှိ ကီးဖိုင်များကို ထည့်သွင်းရန်/ဖယ်ရှားရန်</string>
     <string lang="my" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Volume ထဲရှိ ကီးဖိုင်အားလုံးကို ဖယ်ရှားရန်</string>
     <string lang="my" key="PASSWORD_CHANGED">စကားဝှက်နှင့် ကီးဖိုင်(များ)ကို အောင်မြင်စွာ ပြောင်းလိုက်ပြီး။\n\nအရေးကြီးချက် - VeraCrypt သုံးစွဲသူ လမ်းညွှန်ထဲမှ 'လုံခြုံရေး လိုအပ်ချက်များနှင့် ကြိုတင်ကာကွယ်မှုများ' အခန်းမှ 'စကားဝှက်များနှင့် ကီးဖိုင်များ ပြောင်းလဲခြင်း' အပိုင်းကို သေချာ ဖတ်ရှုပါ။</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="my" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">အရေးကြီးချက် - အကယ်၍ VeraCrypt ဆယ်တင်​ရေး အခွေကို သင် မဖျက်ဆီးပါက၊သင့် ကွန်ပျူတာစနစ် အခန်းကန့်/drive ကို စကားဝှက် အဟောင်းဖြင့် (VeraCrypt ဆယ်တင်ရေး အခွေကို ထည့်၊ စကားဝှက်ကို ရေးထည့်ပြီး) စာဝှက်ဖြည်နိုင်မည် ဖြစ်သည်။ VeraCrypt ဆယ်ဆင်ရေး အခွေကို ဖန်တီးပြီး အဟောင်းကို ဖျက်ဆီးလိုက်ပါ။\n\nVeraCrypt ဆယ်တင်ရေး ​အခွေသစ် တစ်ခုကို သင် ဖန်တီးလိုသလား?</string>
     <string lang="my" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">သင့် VeraCrypt ဆယ်တင်ရေး ​အခွေသည် ယခင် အယ်လဂိုရီသမ်ကို သုံးစွဲနေဆဲဖြစ်သည်ကို သတိပြုပါ။ အကယ်၍ ယခင်က အယ်လဂိုရီသမ်သည် လုံခြုံမှုမရှိဟု ယူဆပါက၊ VeraCrypt ဆယ်တင်ရေး အခွေသစ် တစ်ခု ဖန်တီးပြီး အဟောင်းကို ဖျက်ဆီးလိုက်ပါ။\n\nVeraCrypt ပျက်စီးဒေတာပြန်ဖော်ဓာတ်ပြားကို သင်သည် ဖန်တီးလိုပါသလား?</string>
     <string lang="my" key="KEYFILES_NOTE">မည်သည့် ဖိုင်အမျိုးအစားမဆို (ဥပမာ - .mp3, .jpg, .zip, .avi) VeraCrypt ကီးဖိုင် အဖြစ် အသုံးပြုနိုင်သည်။ VeraCrypt သည် ကီးဖိုင်ပါ အကြောင်းအရာများကို အပြောင်းအလဲ မလုပ်ပါ။ သင်သည် ကီးဖိုင် တစ်ခုပို၍ ရွေးချယ်နိုင်သည် (ဖိုင်ဟောင်းလျှင်လည်း ကိစ္စမရှိပါ)။ အကယ်၍ ဖိုင်တွဲ တစ်ခုကို သင် ထည့်သွင်းလျှင်၊ ၄င်း၌ တွေ့ရှိသော လျှို့ဝှက်မထားသည့် ဖိုင်အားလုံးကို ကီးဖိုင်များအဖြင့် အသုံးပြုလိမ့်မည်။ လုံခြုံရေး တိုကင်များ သို့မဟုတ် စမတ်ကတ်များ၌ သိမ်းဆည်းထားသော ကီးဖိုင်များကို ရွေးချယ်ရန် (သို့မဟုတ် တိုကင်များ (သို့) စမတ်ကတ်များ အတွက် ကီးဖိုင်များကို တင်သွင်းရန်) 'တိုကင် ဖိုင်များ ထည့်သွင်းရန်' ကို နှိပ်ပါ။</string>
@@ -579,6 +601,7 @@
     <string lang="my" key="PKCS5_PRF_CHANGED">ခေါင်းစီး ကီး ဆင်းသက်မှု အယ်လဂိုရီသမ်ကို အောင်မြင်စွာ သတ်မှတ်လိုက်ပြီ။</string>
     <string lang="my" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">စာဝှက်သည့် လုပ်ငန်းစဉ်ကို အစီအစဉ်တကျ ပြန်လည် လုပ်ဆောင်လိုသည့် စာဝှက်မထားသော ကွန်ပျူတာစနစ် volume အတွက် စကားဝှက်/ကီးဖိုင်(များ)ကို ရေးထည့်ပါ။\n\n\nမှတ်ချက် - ရှေ့သို့ ခလုတ်ကို နှိပ်ပြီးနောက် VeraCrypt သည် စာဝှက်ခြင်း လုပ်ငန်းစဉ် အနှောင့်အယှက် ခံရသောနေရာ့၊ VeraCrypt volume ခေါင်းစီးသည် ပေး​ထားသော စကာဝှက်/ကီးဖိုင်(များ)ကို သုံးပြီး စာဝှက်ဖြည်နိုင်သော နေရာ ဖြစ်သည့် ကွန်ပျူတာစနစ် မဟုတ်သည့် volumes အားလုံးကို ကြိုးစား ရှာဖွေ​လာလိမ့်မည်။ အကယ်၍ ယင်းကဲ့သို့ volume ကို တစ်ခုထက်ပိုပြီး တွေ့ရှိပါက၊ ၄င်းတို့အထဲက တစ်ခုကို နောက်အဆင့်၌ သင် ရွေးချယ်ရမည် ဖြစ်သည်။</string>
     <string lang="my" key="NONSYS_INPLACE_ENC_RESUME_VOL_SELECT_HELP">စာရင်းထဲ၌ ပါသော volumes များထဲက တစ်ခုကို ရွေးချယ်ပါ။ စာရင်းထဲ၌ စာဝှက်ခြင်း လုပ်ငန်းစဉ် အနှောင့်အယှက် ခံရသည့် ကွန်ပျူတာစနစ် မဟုတ်သော volume ပါရှိပြီး ၄င်း၏ ခေါင်းစီးကို ပေးထားသော စကားဝှက်/ကီး(ဖိုင်)များကို သုံးပြီး စာဝှက်ဖြည်နိုင်သည်။</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="my" key="PASSWORD_HELP">ကြံ့ခိုင်သော စကားဝှက် တစ်ခုကို ရွေးချယ်ရန် အရေးကြီးသည်။ အဘိဓါန်ကျမ်း၌ တွေ့နိုင်​သည့် စာလုံး တစ်လုံးတည်း (၂၊ ၃၊ ၄ ကဲ့သို့ စာလုံး စုစည်းချက် တစ်ခုခု) ပါ၀င်သော စာလုံးမျိုးကို မရွေးချယ်မိရန် ရှောင်ရှားပါ။ နာမည်များ (သို့) မွေးနေ့များ မပါရပါ။ ခန့်မှန်းရန် လွယ်ကူသော စာလုံး မဖြစ်ရပါ။ ကြံ့ခိုင်သော စကားဝှက် ဟူသည် စာလုံးအကြီး အသေး၊ နံပါတ်များ၊ @ ^ = $ * + ကဲ့သို့သော အထူး စာလုံးများ ပါ၀င်သော ကျန်ပန်း အစုအစည်း ဖြစ်သည်။ စာလုံးရေ ၂၀ ကျော် ပါသော စကားဝှက် တစ်ခုခုကို ရွေးချယ်ရန် ကျွန်ုပ်တို့ အကြံပြုလိုသည် (စာလုံးရေ များလေ၊ ကောင်းလေ ဖြစ်သည်)။ အများဆုံး လက်ခံနိုင်သော အရေအတွက်မှာ ၆၄ လုံး ဖြစ်သည်။</string>
     <string lang="my" key="PASSWORD_HIDDENVOL_HELP">လျှို့ဝှက် volume အတွက် စကားဝှက် တစ်ခု ရွေးပါ။</string>
     <string lang="my" key="PASSWORD_HIDDEN_OS_HELP">လျှို့ဝှက် OS အတွက် စကားဝှက် တစ်ခု ရွေးပါ (ဥပမာ လျှို့ဝှက် volume အတွက်)။</string>
@@ -599,11 +622,26 @@
     <string lang="my" key="PASSWORD_WRONG_AUTOMOUNT">စကားဝှက် မမှန်ပါ (သို့) VeraCrypt volume မရှိပါ။</string>
     <string lang="my" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">ကီးဖိုင်(များ)/စကားဝှက် မမှန်ပါ (သို့) VeraCrypt volume မရှိပါ။</string>
     <string lang="my" 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="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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="my" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nသတိပေးချက် - လျှို့ဝှက် ဖိုင်(များ)ကို ကီးဖိုင် ရှာဖွေရေး လမ်းကြောင်း၌ တွေ့ရှိရသည်။ ယင်းကဲ့သို့ လျှို့ဝှက် ဖိုင်များကို ကီးဖိုင်အဖြစ် သုံးစွဲ၍ မရပါ။ ၄င်းတို့ကို ကီးဖိုင်များ အဖြစ် သုံးစွဲလိုပါက၊ ၄င်းတို့၏ 'Hidden' သတ်မှတ်ချက်ကို ဖယ်ရှားလိုက်ပါ (၄င်းတို့ကို ညာဖက် နှိပ်ပါ၊ 'Properties' ကို ရွေး၊ 'Hidden' အမှန်ခြစ်ကို ​ဖြုတ်ပြီး OK နှိပ်လိုက်ပါ)။ မှတ်ချက် - လျှို့ဝှက် ဖိုင်များသည် အကယ်၍ သက်ဆိုင်ရာ ရွေးစရာ (Computer &gt; Organize &gt; 'Folder and search options' &gt; View)ကို ဖွင့်ထားမှသာ မြင်နိုင်သည်။</string>
     <string lang="my" key="HIDDEN_VOL_PROT_PASSWORD_US_KEYB_LAYOUT">အကယ်၍ သင်သည် လျှို့ဝှက် ကွန်ပျူတာစနစ် ပါရှိသော လျှို့ဝှက် volume တစ်ခုကို ကာကွယ်ရန် ကြိုးစားနေပါက၊ လျှို့ဝှက် volume အတွက် စကားဝှက် ​ရိုက်ထည့်သည့်အခါ အမေရိကန် ကီးဘုတ် လေးအောက်ကို သုံးပါ။ ဤကဲ့သို့ ပြုလုပ်ရခြင်း အကြောင်းမှာ အမေရိကန် ကီးဘုတ် မဟုတ်သော ကီးဘုတ် မရှိနိုင်သောနေရာတွင် စကားဝှက်ကို စက်မဖွင့်မီ (ဝင်းဒိုးမတက်ခင်) အနေအထား၌ ရိုက်ထည့်ရမည် ဖြစ်​သောကြောင့် ဖြစ်သည်။</string>
     <string lang="my" key="FOUND_NO_PARTITION_W_DEFERRED_INPLACE_ENC">VeraCrypt သည် ကွန်ပျူတာစနစ် မဟုတ်သော စာဝှက်စနစ် အနှောင့်အယှက် ခံရသည့်နေရာ၊ volume ခေါင်းစီးကို ပေးထားသော စကားဝှက်နှင့် ကီးဖိုင်(များ) သုံးပြီး စာဝှက်ဖြည်နိုင်သည့်နေရာတွေ volume တစ်ခုမျှ မတွေ့ရပါ။\n\nစကားဝှက်နှင့် ကီးဖိုင်(များ)သည် မှန်ကန်ရမည် ဖြစ်ပြီး၊ အခန်းကန့်/volume ကို (ဗိုင်းရပ်စ်သတ် ဆော့ဗ်ဝဲ အပါအ၀င်) ကွန်ပျူတာစနစ် (သို့) အပ္ပလီကေးရှင်းများက အသုံးမပြု​ရချေ။</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="my" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nမှတ်ချက် - အကယ်၍ သင်သည် လျှို့ဝှက် ကွန်ပျူတာစနစ် drive ထဲ၌ ရှိသော အခန်းကန့် တစ်ခုကို စက်ဖွင့်ပြီး စစ်ဆေးစရာ မလိုပဲ အစပျိုးရန် (သို့) အသုံးမပြုသော OS စနစ် တစ်ခု၏ စာဝှက်ထားသော ကွန်ပျူတာစနစ် အခန်းကန့်ကို အစပျိုးရန် သင် ကြိုးစားနေပါက၊ သင်သည် 'ကွန်ပျူတာစနစ်' &gt; 'စက်ဖွင့်ပြီး စစ်ဆေးစရာ မလိုပဲ အစပျိုးရန်' ကို ရွေးပြီး လုပ်ဆောင်နိုင်သည်။</string>
     <string lang="my" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">ဤစနစ်တွင်၊ လက်ရှိ သက်၀င်နေသော စာဝှက်စနစ်၏ ကီးနယ်ပယ်အတွင်း ရှိနေသော drive တစ်ခု၌ တည်ရှိသော အခန်းကန့်ကို အစပျိုး၍ မရပါ။\n\nဤအခန်းကန့်ကို ဒီစနစ်ဖြင့် အစမပျိုးခင်၊ (စာဝှက်ထားသော သို့မစုတ် စာဝှက်မထားသော) အခြား drive (သို့) စာဝှက်မထားသော OS စနစ်၌ ထည့်သွင်းထာသော OS စနစ်ကို သင် ပြန်ဖွင့်ရန် လိုအပ်သည်။</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <string lang="my" key="PREV">&lt; &amp;နောက်သို့</string>
     <string lang="my" key="RAWDEVICES">သင့် ကွန်ပျူတာစနစ်၌ ထည့်သွင်းထားသော devices များ အကြမ်းစာရင်းကို ထုတ်ပြန်၍ မရပါ။</string>
     <string lang="my" key="READONLYPROMPT">Volume '%hs' ရှိနေပြီး ၄င်းသည် ဖတ်ရှုရန်သက်သက် ဖြစ်သည်။ ၄င်းကို အစားထိုးရန် သေချာသလား?</string>
@@ -703,11 +741,18 @@
     <string lang="my" key="FOR_MORE_INFO_ON_PARTITIONS">အခန်းကန့်များ ဖန်တီးနည်းနှင် စီမံခန့်ခွဲနည်း အကြောင်း အချက်အလက်​များကို သင့် OS စနစ်နှင့် ပါလာသော အသုံးပြုနည်း လက်စွဲ၌ လေ့လာပါ (သို့) သင့် ကွန်ပျူတာ ရောင်းချပေးသူ၏ နည်းပညာဆိုင်ရာ ထောက်ပံ့ရေး အဖွဲ့ထံမှ အကူအညီ တောင်းခံနိုင်သည်။</string>
     <string lang="my" key="SYSTEM_PARTITION_NOT_ACTIVE">ချို့ယွင်းချက် - လက်ရှိ သုံးစွဲနေသော OS စနစ်သည် boot အခန်းကန့် (ပထမ သုံးစွဲနေသော အခန်းကန့်) တွင် မထည့်သွင်းထားပါ။ ဤအရာကို ထောက်ပံ့ မထားပါ။</string>
     <string lang="my" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">သင်သည် ဤ VeraCrypt volume ထဲ၌ 4 GB ထက် ပိုကြီးသော ဖိုင်များကို သိမ်းဆည်းရန် ရည်ရွယ်ထားပုံရသည်။ သို့သော်၊ 4 GB ထက် ကြီးသော ဖိုင်များကို သိမ်းဆည်း၍ မရသည့် FAT ဖိုင်စနစ်ကို သင် ရွေးချယ်ထားသည်။\n\nသင်သည် volume ကို FAT အဖြစ် ဖော်မက်ချရန် သေချာပါသလား?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="my" key="CANT_ACCESS_VOL">ချို့ယွင်းချက် - Volume ကို မဖွင့်နိုင်ပါ!\n\nရွေးထားသော volume သည် အစပျိုးထားခြင်း ရှိမရှိ (သို့) ကွန်ပျူတာစနစ် သို့မဟုတ် အပ္ပလီကေးရှင်းမှ အသုံးပြုမပြု၊ volume သည် ​အရေး/အဖတ် ခွင့်ပြုချက် ရှိမရှိ၊ ရေးသား၍ မရအောင် ကာကွယ်ထားခြင်း ရှိမရှိကို စစ်ဆေးပါ။</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="my" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">ချို့ယွင်းချက် - Volume ကို ဖွင့်မရပါ/volume အကြောင်း အချက်အလက် မရနိုင်ပါ!\n\nရွေးထားသော volume ရှိမရှိ၊ ကွန်ပျူတာစနစ် သို့မဟုတ် အပ္ပလီကေးရှင်းမှ အသုံးပြုမပြု၊ volume သည် ​အရေး/အဖတ် ခွင့်ပြုချက် ရှိမရှိ၊ ရေးသား၍ မရအောင် ကာကွယ်ထားခြင်း ရှိမရှိကို စစ်ဆေးပါ။</string>
     <string lang="my" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">ချို့ယွင်းချက် - Volume ကို ဖွင့်မရပါ/volume အကြောင်း အချက်အလက် မရနိုင်ပါ! ရွေးထားသော volume ရှိမရှိ၊ ကွန်ပျူတာစနစ် သို့မဟုတ် အပ္ပလီကေးရှင်းမှ အသုံးပြုမပြု၊ volume သည် ​အရေး/အဖတ် ခွင့်ပြုချက် ရှိမရှိ၊ ရေးသား၍ မရအောင် ကာကွယ်ထားခြင်း ရှိမရှိကို စစ်ဆေးပါ။\n\nအကယ်၍ ပြဿနာ ဆက်ရှိနေပါက၊ အောက်ပါ အဆင့်များကို လိုက်နာခြင်းဖြင့် အ​ကူအညီ ရနိုင်သည်။</string>
     <string lang="my" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">ချို့ယွင်းချက် တစ်ခုသည် VeraCrypt ကို အခန်းကန့် စာဝှက်၍ မရနိုင်အောင် တားဆီးနေသည်။ ယခင်က သတင်း​ပို့ထားသော ပြဿနာများကို ပြင်ဆင်ပြီး ထပ်ကြိုးစားပါ။ အကယ်၍ ပြဿနာ ဆက်ရှိနေပါက၊ အောက်ပါ အဆင့်များကို လိုက်နာခြင်းဖြင့် အ​ကူအညီ ရနိုင်သည်။</string>
     <string lang="my" key="INPLACE_ENC_GENERIC_ERR_RESUME">ချို့ယွင်းချက် တစ်ခုသည် VeraCrypt ကို အခန်းကန့် စာဝှက်သည့် လုပ်ငန်းစဉ် ပြန်စ၍ မရနိုင်အောင် တားဆီးနေသည်။\n\nယခင်က သတင်း​ပို့ထားသော ပြဿနာများကို ပြင်ဆင်ပြီး လုပ်ငန်းစဉ်ကို ပြန်စပါ။ Volume ကို အပြည့်အ၀ စာဝှက်ခြင်း မပြီးမချင်း ၄င်းကို ​အစပျိုး၍ ရမည် မဟုတ်ပါ။</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="my" key="CANT_DISMOUNT_OUTER_VOL">ချို့ယွင်းချက် - ပြင်ပ volume ကို အဆုံးသတ်၍ မရပါ!\n\nVolume သည် ၄င်း၌ ပါသော ဖိုင်များ (သို့) ဖိုင်တွဲများကို ပရိုဂရမ် တစ်ခုခု (သို့) ကွန်ပျူတာစနစ် တစ်ခုခုက အသုံးပြုနေပါက အဆုံးသတ်၍ ရမည် မဟုတ်ပါ။\n\nVolume ထဲမှ ဖိုင်များ (သို့) ဖိုင်တွဲများကို သုံးစွဲနေသော ပရိုဂရမ်ကို ပိတ်ပြီး ထပ်ကြိုးစားပါ။</string>
     <string lang="my" key="CANT_GET_OUTER_VOL_INFO">ချို့ယွင်းချက် - ပြင်ပ volume နှင့်ပါတ်သက်သော အချက်အလက် မရနိုင်ပါ!\n\nVolume ကို ဆက်လက် မဖန်တီးနိုင်ပါ။</string>
     <string lang="my" key="CANT_ACCESS_OUTER_VOL">ချို့ယွင်းချက် - ပြင်ပ volume ကို မဖွင့်နိုင်ပါ! Volume ကို ဆက်လက် မဖန်တီးနိုင်ပါ။</string>
@@ -979,6 +1024,7 @@
     <string lang="my" key="CONFIRM_EXIT_UNIVERSAL">ထွက်မည်လား?</string>
     <string lang="my" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt ၌ စာဝှက်ခြင်း (သို့) စာဝှက်ဖြည်ခြင်း ပြုလုပ်ရန် ဆုံးဖြတ်ရမည့် အချက်အလက် အလုံ​အလောက် မရှိပါ။</string>
     <string lang="my" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt ၌ စာဝှက်ခြင်း (သို့) စာဝှက်ဖြည်ခြင်း ပြုလုပ်ရန် ဆုံးဖြတ်ရမည့် အချက်အလက် အလုံ​အလောက် မရှိပါ။\n\nမှတ်ချက် - အကယ်၍ သင်သည် ကွန်ပျူတာစနစ် အခန်းကန့်/drive ကို စက်မတင်မီ အခြေအနေ၌ စာဝှက်ခဲ့လျှင်၊ လုပ်ငန်းစဉ်ကို စာဝှက်ဖြည်ရန် ကို နှိပ်ခြင်းဖြင့် အပြီးသတ်ရန် လိုအပ်သည်။</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="my" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">အခန်းကန့်/volume စာဝှက်ခြင်း လုပ်ငန်းစဉ်ကို ဟန့်တားလိုသလား/ရပ်တန့်လိုသလား?\n\nမှတ်ချက် - Volume ကို အပြည့်အ၀ စာဝှက် မပြီးမချင်း အစပျိုး၍ မရပါ။ စာဝှက်ခြင်း လုပ်ငန်းစဉ်ကို ပြန်စရမည်ဖြစ်ပြီး ၄င်းကို ရပ်တန့်ထားသည့် နေရာမှ ပြန်ဆက်ရမည် ဖြစ်သည်။ ဤသို့ ပြုလုပ်ရန်၊ ဥပမာ အားဖြင့်၊ ပင်မ VeraCrypt ၀င်းဒိုးရှိ မီနူးဘားမှ 'Volumes များ' &gt; 'ဟန့်တားသည့် လုပ်ငန်းစဉ် ပြန်စရန်' ကို ရွေးချယ်ခြင်းဖြစ် လုပ်ဆောင်နိုင်သည်။</string>
     <string lang="my" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">အခန်းကန့်/volume စာဝှက်ခြင်း လုပ်ငန်းစဉ်ကို ဟန့်တားလိုသလား/ရပ်တန့်လိုသလား?\n\nမှတ်ချက် - လုပ်ငန်းစဉ်ကို သင် ပြန်စနိုင်မည် ဖြစ်ပြီး ၄င်းရပ်တန့်ထားသည့် နေရာမှ ပြန်ဆက်ရမည် ဖြစ်သည်။ ဤသို့ ပြုလုပ်ရန်၊ ဥပမာ အားဖြင့်၊ ပင်မ VeraCrypt ၀င်းဒိုးရှိ မီနူးဘားမှ 'Volumes များ' &gt; 'ဟန့်တားသည့် လုပ်ငန်းစဉ် ပြန်စရန်' ကို ရွေးချယ်ခြင်းဖြစ် လုပ်ဆောင်နိုင်သည်။ အကယ်၍ သင်သည် စာဝှက်ခြင်း လုပ်ငန်းစဉ်ကို အမြဲတမ်း အဆုံးသတ်လိုပါက (သို့) နောက်ကြောင်း ပြန်လှည့်လိုပါက၊ 'ကွန်ပျူတာ စနစ်' &gt; 'ကွန်ပျူတာစနစ် အခန်းကန့်/Drive အမြဲတမ်း စာဝှက်​ဖြည်ရန်' ကို ရွေးပါ။</string>
     <string lang="my" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">အခန်းကန့်/volume စာဝှက်ဖြည်ခြင်း လုပ်ငန်းစဉ်ကို ဟန့်တားလိုသလား/ရပ်တန့်လိုသလား?\n\nမှတ်ချက် - လုပ်ငန်းစဉ်ကို သင် ပြန်စနိုင်မည် ဖြစ်ပြီး ၄င်းရပ်တန့်ထားသည့် နေရာမှ ပြန်ဆက်ရမည် ဖြစ်သည်။ ဤသို့ ပြုလုပ်ရန်၊ ဥပမာ အားဖြင့်၊ ပင်မ VeraCrypt ၀င်းဒိုးရှိ မီနူးဘားမှ 'Volumes များ' &gt; 'ဟန့်တားသည့် လုပ်ငန်းစဉ် ပြန်စရန်' ကို ရွေးချယ်ခြင်းဖြစ် လုပ်ဆောင်နိုင်သည်။ အကယ်၍ သင်သည် စာဝှက်ဖြည်ခြင်း လုပ်ငန်းစဉ်ကို နောက်ကြောင်း ပြန်လှည့် (ပြီး စတင် စာဝှက်) လိုပါက၊ 'ကွန်ပျူတာ စနစ်' &gt; 'ကွန်ပျူတာစနစ် အခန်းကန့်/Drive စာဝှက်​ရန်' ကို ရွေးပါ။</string>
@@ -988,6 +1034,7 @@
     <string lang="my" key="FAILED_TO_START_WIPING">ချို့ယွင်းချက် - ရှင်းလင်းသည့် လုပ်ငန်းစဉ် စတင်ရန်မအောင်မြင်ပါ။</string>
     <string lang="my" key="INCONSISTENCY_RESOLVED">မကိုက်ညီသော ဖြေရှင်းချက်။\n\n\n(ဤအကြောင်းနှင့် ပါတ်သက်၍ ပရိုဂရမ် အမှား တစ်ခုကို သတင်းပို့မည် ဆိုလျှင်၊ ပရိုဂရမ် အမှား သတင်းပေးပို့ချက်၌ အောက်ပါ နည်းပညာဆိုင်ရာ အချက်အလက်များကို ထည့်သွင်းပါ -\n%hs)</string>
     <string lang="my" key="UNEXPECTED_STATE">ချို့ယွင်းချက် - မျော်လင့်မထားသော အ​ခြေအနေ။\n\n\n(ဤအကြောင်းနှင့် ပါတ်သက်၍ ပရိုဂရမ် အမှား တစ်ခုကို သတင်းပို့မည် ဆိုလျှင်၊ ပရိုဂရမ် အမှား သတင်းပေးပို့ချက်၌ အောက်ပါ နည်းပညာဆိုင်ရာ အချက်အလက်များကို ထည့်သွင်းပါ -\n%hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="my" key="NOTHING_TO_RESUME">ပြန်လည် လုပ်ဆောင်မည့် လုပ်ငန်းစဉ်/လုပ်ငန်း မရှိပါ။</string>
     <string lang="my" key="HIDVOL_PROT_BKG_TASK_WARNING">သတိပေးချက် - VeraCrypt နောက်ခံ လုပ်ဆောင်ချက်ကို ပိတ်ထားသည်။ VeraCrypt မှ ထွက်ပြီးပါက၊ လျှို့ဝှက် volume ထဲမှ ပျက်စီးမှုကို တားဆီးထားလျှင် သင့်ကို အချက်ပေးမည် မဟုတ်ပါ။\n\nမှတ်ချက် - VeraCrypt အမှိုက်ပုံး အိုင်ကွန်ကို ညာဖက် နှိပ်၊ 'ထွက်ရန်' ကို ရွေးပြီး နောက်ခံ လုပ်ဆောင်ချက်ကို သင် အချိန်မရွေး ပိတ်နိုင်သည်။\n\nVeraCrypt နောက်ခံ လုပ်ဆောင်ချက်ကို ဖွင့်လိုသလား?</string>
     <string lang="my" key="LANG_PACK_VERSION">ဘာသာစကား အထုပ် ဗားရှင်း - %s</string>
@@ -1015,6 +1062,7 @@
     <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>
     <string lang="my" key="ERROR_MBR_PROTECTED">MBR sector ကို ရေးသာ၍ မရပါ။\n\n သင့် BIOS သည် MBR sector ကို ကာကွယ်ရန် ပြုပြင်ထားပုံပေါ်သည်။  MBR/ဗိုင်းရပ်စ်သတ် ဆော့ဗ်ဝဲ အကာအကွယ်အတွက် သင့် BIOS ချိန်ညှိချက်များကို စစ်ဆေးပါ (စက်ဖွင့်နေစဉ် F2, Delete, သို့မဟုတ် Esc တစ်ခုခုကို နှိပ်ပါ)။</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="my" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">လိုအပ်သော VeraCrypt Boot Loader ဗားရှင်းကို လောလောဆယ် ထည့်သွင်းမထားပါ။ ဤအချက်ကြောင့် အခြား ချိန်ညှိချက်များ သိမ်းဆည်း၍ မရခြင်း ဖြစ်နိုင်သည်။</string>
     <string lang="my" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">မှတ်ချက် - တစ်ခါတစ်ရံ၊ သင့်ကို စောင့်ကြည့်နေသော ပုဂ္ဂိုလ် တစ်စုံတစ်ယောက်သည် သင် VeraCrypt သုံးစွဲနေသည်ကို မသိစေလိုသည့် အခြေအနေမျိုး ရှိလာနိုင်သည်။ အထက်ပါ ရွေးစရာ၌ VeraCrypt boot loader မျက်နှာပြင်ကို စိတ်ကြိုက်ဖန်တီးခြင်းဖြင့် ပြုလုပ်နိုင်သည်။ ပထမ ရွေးစရာကို သင် ဖွင့်ထားပါက၊ boot loader ၌ (စကားဝှက် အမှား ရေးထည့်သည်အခါ၌ပင်) မည်သည့် စာတမ်းမျှ ပေါ်လာမည် မဟုတ်ပါ။ သင့် စကားဝှက်ကို ရေးထည့်နေစဉ် ကွန်ပြူတာသည် "ရပ်တန့်နေ"သယောင် မြင်တွေ့ရမည် ဖြစ်သည်။ သည့်အပြင်၊ ရန်သူကို လမ်းကြောင်းလွှဲစေရန် စိတ်ကြိုက် ရေးထားသော စာတမ်း ပေါ်လာမည် ဖြစ်သည်။ဥပမာ အားဖြင့် - "Missing operating system" (၄င်းသည် Windows boot loader က Windows boot partition ကို မတွေ့သည့်အခါ ပုံမှန် ပြသနေသော စာတမ်းဖြစ်သည်။ သို့သော်၊ အကယ်၍ ရန်သူသည် hard drive ၌ ပါရှိသော အကြောင်းအရာကို စစ်ဆေးလာပါက၊ VeraCrypt boot loader ပါရှိနေသည်ကို သိရှိနိုင်ပါသည်။</string>
     <string lang="my" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">သတိပေးချက် - ဤရွေးစရာကို ဖွင့်ထားပါက၊ VeraCrypt boot loader သည် မည်သည့် စာတမ်း (စကားဝှက် အမှား ရေးထည့်လျှင်လည်း) ကိုမျှ ပြမည် မဟုတ်သည်ကို သတိပြုပါ။ စကားဝှက်ကို သင် ရေးထည့်ချိန်၌ ကွန်ပြူတာသည် "ရပ်တန့်"နေသကဲ့သို့ (တုံ့ပြန်မှုမရှိပဲ​) မြင်တွေ့ရမည် (cursor ရွှေ့လျားမည် မဟုတ်သကဲ့သို့ ကီးတစ်ခုခုကို နှိပ်သည့်အခါ ကြယ်ပွင့် တစ်ခုမျှ မြင်ရမည် မဟုတ်ပါ)။\n\n ဤရွေးစရာကို ဖွင့်ရန် သင် တကယ်အလိုရှိသလား?</string>
@@ -1036,8 +1084,11 @@
     <string lang="my" key="EXTRA_BOOT_PARTITION_REMOVAL_INSTRUCTIONS">\nအပို boot အခန်းကန့်ကို Windows မထည့်သွင်းမီ ဖယ်ရှားနိုင်သည်။ ထိုသို့ ပြုလုပ်ရန်၊ အောက်ပါ အဆင့်များကို လိုက်နာပါ -\n\n၁) Windows အခွေကို ဖွင့်ပါ။\n\n၂) Windows ထည့်သွင်းစနစ် မျက်နှာပြင်၌၊ 'Install now' &gt; 'Custom (advanced)' ကို နှိပ်ပါ။\n\n၃) 'Drive Options' ကို နှိပ်ပါ။\n\n၄) ပင်မ ကွန်ပျူတာစနစ် အခန်းကန့်ကို ရွေးပါ။ ၄င်းကို 'Delete' နှိပ်ပြီး 'OK' နှိပ်ပါ။\n\n၅)  'System Reserved' အခန်းကန့်ကို ရွေးပြီး၊ 'Extend' ကို နှိပ်ပါ။ OS စနစ် ထည့်သွင်းမည့် အခန်းကန့်​ အရွယ်အစားကို တိုးမြှင့်လိုက်ပါ။\n\n၆) 'Apply' နှင့် 'OK' ကို နှိပ်ပါ။\n\n၇) Windows ကို 'System Reserved' အခန်းကန့်၌ ထည့်သွင်းပါ။\n\n\nရန်သူက အပို boot အခန်းကန့်ကို ဖယ်ရှားရသည့် အကြောင်းရင်းကို မေးသည့်အခါ၊ သင့်အနေဖြင့် စာဝှက်မထားသော boot အခန်းကန့်ထဲ၌ ဒေတာ ယိုဖိတ်မှု မရှိစေရန် လုပ်ဆောင်ခြင်း ဖြစ်ကြောင်း ဖြေကြားနိုင်သည်။\n\nမှတ်ချက် - ဤစာတမ်းကို အောက်မှ 'Print' ခလုတ် နှိပ်ပြီး ပရင့်ထုတ်နိုင်သည်။ အကယ်၍ ဤစာတမ်းကို သိမ်းထားသည် ဖြစ်စေ၊ ပရင့်ထုတ်သည့် ဖြစ်စေ (သင့်ပရင်တာသည် ၄င်းပရင့်ထုတ်ထားသော မှတ်တမ်းမှတ်ရာများကို ၄င်း၏ အတွင်း drive ထဲ၌ သိမ်းဆည်းမထားပါက)၊ အပို boot အခန်းကန့် (အကယ်၍ ယင်းကော်ပီကို တွေ့ခဲ့လျှင်၊ ဤကွန်ပျူတာ၌ လျှို့ဝှက် OS စနစ် တစ်ခု ​ရှိနေကြောင်း ညွှန်ပြနေမည် ဖြစ်သည်) ကို ဖယ်ရှားပြီးသည့်အခါ ၄င်းကော်ပီးများကို ဖျက်ဆီးပစ်ရမည် ဖြစ်သည်။</string>
     <string lang="my" key="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">သတိပေးချက် - ကွန်ပျူတာစနစ် အခန်းကန့်နှင့် ပထမ အခန်းကန့်တို့ အကြား၌ မသတ်မှတ်ရသေးသော နေရာရှိသည်။ လျှို့ဝှက် OS စနစ်ကို ဖန်တီးပြီးသောအခါ၊ ယင်း မသတ်မှတ်ရသေးသော နေရာ၌ အခန်းကန့်အသစ် မဖန်တီးရ။ သို့မဟုတ်ပါက၊ (ယင်းကဲ့သို့ အသစ် ဖန်တီးလိုက်သော အခန်းကန့်များကို မဖျက်မချင်း) လျှို့ဝှက် OS စနစ်ကို ဖွင့်၍ မရ ဖြစ်သွားနိုင်သည်။</string>
     <string lang="my" 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="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="my" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">ကီးဖိုင်များသည် လောလောဆယ် ကွန်ပျူတာစနစ် စာဝှက်ခြင်းအတွက် ထောက်ပံ့မပေးပါ။​</string>
     <string lang="my" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">သတိပေးချက် - VeraCrypt သည် မူရင်း ​ကီးဘုတ် လေးအောက်ကို နဂိုအတိုင်း ပြန်မထားနိုင်ပါ။ ဤအချက်ကြောင့် စကားဝှက်ကို မှားယွင်းစွာ ရေးထည့်မိနိုင်သည်။</string>
     <string lang="my" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">ချို့ယွင်းချက် - VeraCrypt အတွက် ကီးဘုတ် လေးအောက်ကို standard US ကီးဘုတ် လေးအောက် အဖြစ် သတ်မှတ်၍ မရပါ။\n\n US စနစ် မဟုတ်သော ဝင်းဒိုး ကီးဘုတ် လေးအောက် မရနိုင်သည့် နေရာ၌ စက်မတက်ခင် အခြေအနေ (ကွန်ပျူတာ မတက်မီ) တွင် စကားဝှက်ကို ရေးထည့်ရန် လိုအပ်သည်။ ထို့ကြာင့်၊ စကားဝှက်ကို  ဝှက်စာကို standard US ကီးဘုတ် လေးအောက် သုံးပြီး အမြဲတမ်း ရေးထည့်ရမည်။</string>
@@ -1122,6 +1173,7 @@
     <string lang="my" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">အကြို စမ်းသပ်မှု အောင်မြင်စွာ ပြီးစီးသွားပြီ။\n\n သတိပေးချက် - လက်ရှိ ဒေတာများကို စနစ်တကျ စာဝှက်နေစဉ် ရုတ်တရက် မီးပျက်သွားပါက၊ (သို့) VeraCrypt သည် လက်ရှိ ဒေတာများကို အစီအစဉ်တကျ စာဝှက်နေစဉ် ကို ဆော့ဗ်ဝဲ အမှား (သို့) hardware ချို့ယွင်းချက် တစ်ခုခုကြောင့် OS စနစ် ပျက်သွားပါက ​​ဒေတာ တချို့သည် ​ပျက်သွားလိမ့်မည် (သို့) ပျောက်ဆုံးသွားလိမ့်မည်။ ထို့ကြောင့် စာဝှက်ခြင်းမပြုခင်၊ သင် စာဝှက်မည့် ဖိုင်များကို အရန်သင့် သိမ်းဆည်းရန် သတိပြုပါ။ အကယ်၍ မလုပ်ထားပါက၊ ဖိုင်များကို ယခု အရန်သင့် သိမ်းဆည်းလိုက်ပါ (Defer ကို နှိပ်ပြီး၊ ဖိုင်များကို အရန်သင့် သိမ်းဆည်းပါ၊ ထို့နောက် VeraCrypt ကို ထပ်ဖွင့်ပါ၊ စာဝှက်စနစ်ကို စတင်ရန် 'System' &gt; 'Resume Interrupted Process' ကို နှိပ်ပါ)။\n\nအဆင်သင့် ဖြစ်သည့်အခါ၊ စာဝှက်စနစ် စတင်ရန် စာဝှက်ရန် ကို နှိပ်ပါ။</string>
     <string lang="my" key="SYSENC_ENCRYPTION_PAGE_INFO">စာဝှက်ခြင်း (သို့) စာဝှက်ဖေါ်ခြင်း လုပ်ငန်းစဉ်ကို ရပ်တန်းရန် ခေတ္တရပ်နားရန် (သို့) ရွှေ့ဆိုင်းရန် ကို အချိန်မရွေး နှိပ်ပါ၊ ဤအညွှန်းမှ ထွက်ပြီး၊ သင့်ကွန်ပျူတာကို ပြန်ဖွင့်ပါ (သို့) စက်ပိတ်လိုက်ပါ။ ထို့နောက် လုပ်ငန်းစဉ်ကို ပြန်စပါ။ ယခင်က ရပ်တန့်ခဲ့သော နေရာမှ ပြန်စတင်မည် ဖြစ်သည်။ ကွန်ပျူတာစနစ် drive ထဲမှ ဒေတာများကို ရေးသားနေစဉ် (သို့) ဖတ်ရှုနေစဉ် ကွန်ပျူတာစနစ် (သို့) အ​ပ္ပလီကေးရှင်းများ နှေးကွေးမရှိစေရန်၊ VeraCrypt သည် ဒေတာများကို ရေးသားခြင်း (သို့) ဖတ်ရှုခြင်း (အထက်မှ အနေအထားကို ကြည့်ပါ) ပြီးစီးသည့်အခါ စောင့်​ဆိုင်းမည် ဖြစ်ပြီး၊ စာဝှက်ခြင်း (သို့) စာဝှက် ဖေါ်ခြင်းကို အလိုအလျောက် ဆက်လုပ်မည် ဖြစ်သည်။</string>
     <string lang="my" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\n စာဝှက်ခြင်း လုပ်ငန်းစဉ်ကို ရပ်တန့်ရန် ခေတ္တရပ်နားရန်၊ ရွှေ့ဆိုင်းရန် ကို သင် နှိပ်နိုင်သည်။ ဤအညွှန်းကို ပိတ်ပါ၊ သင့် ကွန်ပျူတာကို ပြန်ဖွင့်ပါ (သို့) စက်ပိတ်ပါ။ ထို့နောက် လုပ်ငန်းစဉ်ကို ​ပြန်စပါ။ ၄င်းသည် ယခင်က ရပ်နားထားသည့် နေရာမှ ပြန်စမည် ဖြစ်သည်။ volume ကို အပြည့်အ၀ စာဝှက် မပြီးမချင်း အစပျိုးနိုင်မည် မဟုတ်ပါ။</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="my" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">လျှို့ဝှက် ကွန်ပျူတာစနစ် စတင်နေပြီ</string>
     <string lang="my" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">မူလ ကွန်ပျူတာစနစ်</string>
     <string lang="my" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows သည် မှတ်တမ်းဖိုင်များ၊ ယာယီဖိုင်များ အမျိုးမျိုးကို (သင် မသိရှိပဲ) ကွန်ပျူတာစနစ် အခန်းကန့်ထဲ၌ ဖန်တီးလေ့ရှိသည်။ RAM ၌ ရှိသော အကြောင်းအရာကိုလည်း hibernation ပြုလုပ်ရာ၌ နေရာ သက်သာစေပြီး ကွန်ပျူတာစနစ် အခန်းကန့်၌ ရှိသော ဖိုင်များကို ဆက်သွယ်ပေးသည်။ ရန်သူ တစ်ဦးတစ်ယောက်သည် သင့် မူရင်း ကွန်ပျူတာစနစ် (မူပွားထားသော လျှို့ဝှက် ကွန်ပျူတာစနစ်ထဲ) ၌ တည်ရှိနေသော အခန်းကန့်ထဲ သိမ်းဆည်းခဲ့သော ဖိုင်များကို စစ်ဆေးပြီး သိရှိသွားနိုင်သည်။ ဥပမာ အားဖြင့်၊ VeraCrypt အညွှန်းကို hidden-system-creation စနစ်ဖြင့် သုံးစွဲနေမှု (ဤနည်းဖြင့် သင့်ကွန်ပျူတာ၌ လျှို့ဝှက် OS ရှိနေကြောင်း ညွှန်​ပြပေးနိုင်သည်)။\n\n ယင်းကဲ့သို့ ပြဿနာမျိုး မဖြစ်ပွားရန်၊ VeraCrypt သည်၊ နောက်တစ်ဆင့်၌၊ မူရင်း ကွန်ပျူတာစနစ် တည်ရှိသော အခန်းကန့်မှ အကြောင်းအရာ တစ်ခုလုံးကို ပယ်ရှင်းပစ်မည် ဖြစ်သည်။ ထို့နောက်၊ ငြင်းပယ်နိုင်မှုကို ​​ရရှိနိုင်ရန်၊ အခန်းကန့်ထဲ၌ ကွန်ပျူတာစနစ် အသစ်တစ်ခုကို သင် ထည့်သွင်းပြီး ၄င်းကို စာဝှက်ရန် လိုအပ်လိမ့်မည်။ ဤ​နည်းဖြင့်၊ မျက်လှည့် ကွန်ပျူတာစနစ်ကို ဖန်တီးပြီး လျှို့ဝှက် OS စနစ် ဖန်တီးမှု လုပ်ငန်းစဉ် ပြီးမြောက်သွားမည် ဖြစ်သည်။</string>
@@ -1161,7 +1213,7 @@
     <string lang="my" key="HIDDEN_OS_CREATION_PREINFO_HELP">နောက်အဆင့်များတွင်၊ VeraCrypt သည် ကွန်ပျူတာစနစ် အခန်းကန့်ထဲရှိ အကြောင်းအရာများကို လျှို့ဝှက် volume ထဲ ကော်ပီကူးခြင်းဖြင့် လျှို့ဝှက် OS စနစ်ကို ဖန်တီးသွားမည် ဖြစ်သည် (ကော်ပီးကူးနေသည့် ဒေတာများကို မျက်လှည့် OS စနစ်အတွက် အသုံးပြုမည့် ကီးနှင့် မတူသော စာဝှက်စနစ် ကီးတစ်ခုဖြင့် ချက်ခြင်း စာဝှက်ပေးမည် ဖြစ်သည်)။\n\nစက်မတက်မီ အခြေအနေ (Windows မဖွင့်မီ) တွင် လုပ်ငန်းစဉ်ကို လုပ်ဆောင်သွားမည် ဖြစ်ပြီး ပြီးစီးရန် (ကွန်ပျူတာ အခန်းကန့် အရွယ်အစားနှင့် စွမ်းဆောင်ရည်တို့အပေါ် မူတည်ပြီး) အ​ချိန်အတော်ကြာ ယူမည် ဖြစ်သည် - နာရီ အတော်ကြာ (သို့) ရက်အတန်ကြာ ဖြစ်နိုင်သည်။\n\nဤလုပ်ငန်းစဉ်ကို သင် ရပ်ဆိုင်းနိုင်သည်။ ကွန်ပျူတာကို စက်ပိတ်ထားနိုင်သည်။ OS စနစ်ကို စဖွင့်ပြီး လုပ်ငန်းစဉ်ကို ပြန်စနိုင်သည်။ သို့သော်၊ ၄င်းကို ရပ်ဆိုင်းလိုက်ပါက၊ ကွန်ပျူတာစနစ် ကော်ပီ လုပ်ခြင်း လုပ်ငန်းစဉ် တစ်ခုလုံးကို အစမှ ပြန်လည် စတင်ရမည် ဖြစ်သည် (အဘယ်ကြောင့် ဆိုသော် ကွန်ပျူတာစနစ် အခန်းကန့်ရှိ အကြောင်းအရာသည် ကိုယ်ပွား ပြုလုပ်နေစဉ် ပြောင်းလဲမည် မဟုတ်သောကြောင့် ဖြစ်သည်)</string>
     <string lang="my" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">လျှို့ဝှက် OS စနစ် ဖန်တီးမှု လုပ်ငန်းစဉ် တစ်ခုလုံးကို ဖျက်သိမ်းရန် အလိုရှိသလား?\n\nမှတ်ချက် - အကယ်၍ ၄င်းကို ယခု ဖျက်သိမ်းပါက လုပ်ငန်းစဉ်ကို ပြန်စနိုင်မည် မဟုတ်ပါ။</string>
     <string lang="my" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">ကွန်ပျူတာစနစ် စာဝှက်ခြင်း အကြို စမ်းသပ်ချက်ကို ဖျက်သိမ်းလိုသလား?</string>
-    <string lang="my" key="BOOT_PRETEST_FAILED_RETRY">VeraCrypt စနစ် စာဝှက်ခြင်း အကြို စမ်းသပ်ချက် မအောင်မြင်ပါ။ သင် ထပ်မံ ကြိုးစားလိုသလား?\n\nအကယ်၍ 'မဟုတ်ပါ' ကို ရွေးချယ်ပါက၊ စက်မတင်မီ စစ်ဆေးအတည်ပြုချက် အစိတ်အပိုင်းကို ဖယ်ထုတ်သွားမည် ဖြစ်သည်။\n\nမှတ်ချက်များ - \n\n- အကယ်၍ Windows မတက်မီ VeraCrypt Boot Loader က စကားဝှက် ရေးထည့်ရန် မတောင်းပါက၊ သင့် OS စနစ်သည် ၄င်းကို ထည့်သွင်းထားသော drive မှ boot မတက်၍ ဖြစ်မည်။ ဤအချက်အတွက် ပံ့ပိုးမထားပါ။\n\n- အကယ်၍ သင်သည် AES ကို မသုံးပဲ စာဝှက်စနစ် အယ်လဂိုရီသမ် တစ်ခုကို အသုံးပြုပြီး အကြို စမ်းသပ်ချက် မအောင်မြင်ပါက (စကားဝှက် ရေးထည့်သော်လည်း)၊ စနစ်တကျ စီမံရေးသားခြင်း မပြုသော ဒရိုင်ဘာ တစ်ခုကြောင့် ဖြစ်နိုင်သည်။ 'မဟုတ်ပါ' ကို ရွေးပြီး၊ ကွန်ပျူတာစနစ် အခန်းကန့်/drive ကို ထပ်မံ စာဝှက်ကြည့်ပါ၊ သို့သော် AES စာဝှက်စနစ် အယ်လဂိုရီသမ်ကို အသုံးပြုပါ (၄င်း၌ မှတ်ဉာဏ် လုပ်အပ်ချက် အနိမ့်ဆုံး ရှိသည်)။\n\nဖြစ်နိုင်ချေ အကြောင်းရင်းများနှင့် ဖြေရှင်းချက်များအတွက်၊ http://www.veracrypt.org/docs/?s=troubleshooting ကို လေ့လာပါ။</string>
+    <string lang="my" key="BOOT_PRETEST_FAILED_RETRY">VeraCrypt စနစ် စာဝှက်ခြင်း အကြို စမ်းသပ်ချက် မအောင်မြင်ပါ။ သင် ထပ်မံ ကြိုးစားလိုသလား?\n\nအကယ်၍ 'မဟုတ်ပါ' ကို ရွေးချယ်ပါက၊ စက်မတင်မီ စစ်ဆေးအတည်ပြုချက် အစိတ်အပိုင်းကို ဖယ်ထုတ်သွားမည် ဖြစ်သည်။\n\nမှတ်ချက်များ - \n\n- အကယ်၍ Windows မတက်မီ VeraCrypt Boot Loader က စကားဝှက် ရေးထည့်ရန် မတောင်းပါက၊ သင့် OS စနစ်သည် ၄င်းကို ထည့်သွင်းထားသော drive မှ boot မတက်၍ ဖြစ်မည်။ ဤအချက်အတွက် ပံ့ပိုးမထားပါ။\n\n- အကယ်၍ သင်သည် AES ကို မသုံးပဲ စာဝှက်စနစ် အယ်လဂိုရီသမ် တစ်ခုကို အသုံးပြုပြီး အကြို စမ်းသပ်ချက် မအောင်မြင်ပါက (စကားဝှက် ရေးထည့်သော်လည်း)၊ စနစ်တကျ စီမံရေးသားခြင်း မပြုသော ဒရိုင်ဘာ တစ်ခုကြောင့် ဖြစ်နိုင်သည်။ 'မဟုတ်ပါ' ကို ရွေးပြီး၊ ကွန်ပျူတာစနစ် အခန်းကန့်/drive ကို ထပ်မံ စာဝှက်ကြည့်ပါ၊ သို့သော် AES စာဝှက်စနစ် အယ်လဂိုရီသမ်ကို အသုံးပြုပါ (၄င်း၌ မှတ်ဉာဏ် လုပ်အပ်ချက် အနိမ့်ဆုံး ရှိသည်)။\n\nဖြစ်နိုင်ချေ အကြောင်းရင်းများနှင့် ဖြေရှင်းချက်များအတွက်၊ https://veracrypt.codeplex.com/wikipage?title=Troubleshooting ကို လေ့လာပါ။</string>
     <string lang="my" key="SYS_DRIVE_NOT_ENCRYPTED">ကွန်ပျူတာစနစ် အခန်းကန့်/drive သည် (တစ်၀က်တစ်ပိုင်း ဖြစ်စေ၊ အပြည့်အ၀ ဖြစ်စေ) စာဝှက်ထားပုံ မပေါ်ပါ။</string>
     <string lang="my" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">ကွန်ပျူတာစနစ် အခန်းကန့်/drive ကို (တစ်၀က်တစ်ပိုင်း ဖြစ်စေ၊ အပြည့်အ၀ ဖြစ်စေ) စာဝှက်ထားသည်။\n\nဆက်လက် မလုပ်ဆောင်မီ ကွန်ပျူတာစနစ် အခန်းကန့်/drive ကို စာဝှက်ဖြည်ပါ။ ထိုသို့ ပြုလုပ်ရန်၊ ပင်မ VeraCrypt ၀င်းဒိုးရှိ မီနူးဘားမှ 'System' &gt; 'Permanently Decrypt System Partition/Drive' ကို ရွေးပါ။</string>
     <string lang="my" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">ကွန်ပျူတာစနစ် အခန်းကန့်/drive ကို (တစ်၀က်တစ်ပိုင်း ဖြစ်စေ၊ အပြည့်အ၀ ဖြစ်စေ) စာဝှက်ပြီးသည့်အခါ၊ VeraCrypt (သို့ရာတွင် ၄င်းကို အဆင့်မြှင့်နိုင်ပြီး အလားတူ ဗားရှင်းကို ပြန်လည် ထည့်သွင်းနိုင်သည်) ကို အဆင့်လျှော့၍ မရပါ။</string>
@@ -1178,6 +1230,8 @@
     <string lang="my" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">သင်သည် ကွန်ပျူတာစနစ် အခန်းကန့်/drive (သို့မဟုတ် boot အခန်းကန့်) ကို ရွေးချယ်ခဲ့သည်၊ သို့သော် သင်ရွေးချယ်ခဲ့သော အညွှန်းစနစ်သည် ကွန်ပျူတာစနစ် မဟုတ်သော အခန်းကန့်များ/drives အတွက်သာ သင့်လျှော်သည်။\n\nစက်မတက်မီ စစ်ဆေးအတည်ပြုချက်ကို သင် သတ်မှတ်လိုသလား (ဆိုလိုသည်မှာ Windows boot မတက်မီ/စဖွင့်မီ သင့်စကားဝှက်ကို အကြိမ်တိုင်း ရေးထည့်ရန် လိုအပ်လာမည် ဖြစ်သည်) ထို့နောက် ကွန်ပျူတာစနစ် အခန်းကန့်/drive ကို စာဝှက်လိုသလား?</string>
     <string lang="my" key="CONFIRM_DECRYPT_SYS_DEVICE">ကွန်ပျူတာစနစ် အခန်းကန့်/drive ကို အမြဲတမ်း စာဝှက်ဖြည်လိုသလား?</string>
     <string lang="my" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">သတိပေးချက် - အကယ်၍ ကွန်ပျူတာစနစ် အခန်းကန့်/drive ကို အမြဲတမ်း စာဝှက်ဖြည်ပါက၊ စာဝှက်မထားသော ဒေတာများကို ၄င်းအထဲ၌ ရေးသားလိမ့်မည် ဖြစ်သည်။\n\nကွန်ပျူတာစနစ် အခန်းကန့်/drive ကို သင် အမြဲတမ်း စာဝှက်ဖြည်လိုသလား?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
     <string lang="my" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">သတိပေးချက် - အကယ်၍ သင်သည် ကွန်ပျူတာစနစ် စာဝှက်ရန်အတွက် ဝှက်စာ အဆင့်ဆင့်ကို အသုံးပြုပါက၊ အောက်ပါ ပြဿနာများကို သင် ရင်ဆိုင်ရနိုင်သည် - \n\n၁) VeraCrypt Boot Loader သည် ပုံမှန်ထက် ပိုကြီးသည်။ ထို့ကြောင့်၊ VeraCrypt Boot Loader ၏ အရန်သင့် သိမ်းဆည်းမှု တစ်ခုအတွက် drive track ထဲ၌ နေရာ အလုံအလောက် မရှိပါ။ ထို့ကြောင့်၊ ၄င်းပျက်စီးသွားသည့်အခါတိုင်း (အချို့ ပရိုဂရမ်များအတွက် မူပိုင်ခွင့် တားဆီးရေး activation လုပ်ငန်းစဉ်ကို စနစ်တကျ စီစဉ်ရေးသားခြင်း မလုပ်​သည့်အချိန်အတွင်း)၊ VeraCrypt Boot Loader ကို boot တက်ရန် (သို့) ပြုပြင်ရန် VeraCrypt ဆယ်တင်ရေး အခွေကို သင် သုံးစွဲရမည် ဖြစ်သည်။\n\n၂) အချို့ ကွန်ပျူတာများ၌ Hibernation မှ ပြန်စရန် အချိန် အတော်ကြာတတ်သည်။\n\nထိုကဲ့သို့ ဖြစ်နိုင်ချေ ပြဿနာများကို အဆင့်ဆင့် မဟုတ်သည့် စာဝှက်စနစ် အယ်လဂိုရီသမ်ကို ရွေးခြင်းဖြင့် တားဆီးနိုင်သည် (ဥပမာ - AES)။\n\nသင်သည် ဝှက်စာ အဆင့်ဆင့်ကို အသုံးပြုမည်လား?</string>
     <string lang="my" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">အကယ်၍ ယခင်က ဖေါ်ပြခဲ့သော ပြဿနာများ အချို့ကို သင် တွေ့ကြုံရပါက၊ အခန်းကန့်/drive ကို စာဝှက်ပြီး အဆင့်ဆင့်မဟုတ်သော စာဝှက်စနစ် အယ်လဂိုရီသမ်ကို သုံးကာ ထပ်မံ စာဝှက်ကြည့်ပါ (ဥပမာ - AES)။</string>
     <string lang="my" key="UPDATE_TC_IN_DECOY_OS_FIRST">သတိပေးချက် - လုံခြုံစိတ်ချရန်အတွက်၊ VeraCrypt ကို လျှို့ဝှက် OS စနစ်၌ မွမ်းမံခြင်း မပြုမီ မျက်လှည့် OS ၌ ၄င်းကို မွမ်းမံထားရမည်။\n\nထိုသို့ ပြုလုပ်ရန်၊ မျက်လှည့် ကွန်ပျူတာစနစ်ကို boot တက်ပြီး ၄င်းအထဲမှ VeraCrypt ဆော့ဗ်ဝဲ ထည့်သွင်းစနစ်ကို ဖွင့်ပါ။ လျှို့ဝှက် ကွန်ပျူတာစနစ်ကို boot တက်ပြီး ၄င်းအထဲမှ ဆော့ဗ်ဝဲ ထည့်သွင်းစနစ်ကို ဖွင့်ပါ။\n\nမှတ်ချက် - မျက်လှည့် ကွန်ပျူတာစနစ်နှင့် လျှို့ဝှက် ကွန်ပျူတာစနစ် တို့သည် boot loader တစ်ခုတည်းကို မျှဝေ သုံးစွဲနေကြသည်။ အကယ်၍ VeraCrypt ကို လျှို့ဝှက် ကွန်ပျူတာစနစ်ထဲ၌သာ အဆင့်မြှင့်ပါက ()၊ မျက်လှည့် ကွန်ပျူတာစနစ်ထဲ VeraCrypt ဒရိုင်ဘာ တစ်ခုနှင့် VeraCrypt အ​ပ္ပလီကေးရှင်းများ ပါရှိမည် ဖြစ်သည်။ ၄င်းတို့၏ဗားရှင်း နံပါတ်များသည် VeraCrypt Boot Loader ၏ ဗားရှင်း နံပါတ်နှင့် ကွာခြားနေမည် ဖြစ်သည်။ ထိုကဲ့သို့ ကွဲပြားခြားနားမှု​ကြောင့် ဤကွန်ပျူတာ၌ လျှို့ဝှက် OS စနစ် တစ်ခု ရှိနေကြောင်း ညွှန်ပြနေနိုင်သည်။\n\nဆက်လက် လုပ်ဆောင်မည်လား?</string>
@@ -1193,6 +1247,7 @@
     <string lang="my" key="ENABLE_BAD_SECTOR_ZEROING">ချို့ယွင်းချက် - Disk ၌ ရှိသော sectors များ၏ အကြောင်းအရာကို မဖတ်နိုင်ပါ (စက်ပိုင်းဆိုင်ရာ ပျက်စီးမှုကြောင့် ဖြစ်သည်)။\n\nSectors များကို ဖတ်ရှုနိုင်အောင် လုပ်ဆောင်သည့်အခါမှသာ အစီအစဉ်တကျ စာဝှက်ခြင်း လုပ်ငန်းစဉ်ကို လုပ်ဆောင်နိုင်သည်။ Sectors ထဲ၌ သုညများကို ရေးသားခြင်းဖြင့် VeraCrypt သည် ယင်း sectors များကို ဖတ်ရှုနိုင်အောင် လုပ်ဆောင်နိုင်သည် (နောက်ဆက်တွဲ​အနေဖြင့်၊ ယင်းသုည blocks များ အားလုံးကို စာဝှက်နိုင်မည် ဖြစ်သည်)။ သို့သော်၊ ဖတ်မရသော sectors ၌ ရှိသည့် ဒေတာအားလုံး ပျောက်ဆုံးသွားမည် ဖြစ်သည်။ အကယ်၍ ၄င်းကို ရှောင်ရှားလိုပါက၊ သင့်လျှော်သော အခြား ကိရိယာများကို သုံးပြီး ပျက်စီးသွားသော ​ဒေတာ အချို့ကို ပြန်လည် ဆယ်တင်ရန် ကြိုးစားနိုင်သည်။\n\nမှတ်ချက် - ရုပ်ပိုင်းဆိုင်ရာ ပျက်စီးသွားသည့် sectors များနှင့် ပါတ်သက်၍ (ဒေတာ ပျက်စီးခြင်းနှင့် checksum ချို့ယွင်းချက်များနှင့် မတူပဲ) သိုလှောင်ရေး devices အမျိုးအစား အများစုသည် ၄င်းတို့ အထဲတွင် (ပျက်စီးသွားသော sectors များထဲ၌ ရှိသော လက်ရှိ ဒေတာများသည် drive အထဲ၌ စာမဝှက်ပဲ ဆက်လက် တည်ရှိနိုင်ရန်) ဒေတာများကို ရေးသားသည့်အခါ sectors များကို နေရာ ပြောင်းရွှေ့ပေးသည်။\n\nVeraCrypt သည် ဖတ်မရသော sectors များ၌ သုညများ ရေးသားစေလိုသလား?</string>
     <string lang="my" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">ျို့ယွင်းချက် - Disk ၌ ရှိသော sectors များ၏ အကြောင်းအရာကို မဖတ်နိုင်ပါ (စက်ပိုင်းဆိုင်ရာ ပျက်စီးမှုကြောင့် ဖြစ်သည်)။\n\nစာဝှက်သည့် လုပ်ငန်းစဉ်ကို ဆက်လုပ်နိုင်ရန်၊ VeraCrypt သည် ဖတ်မရသော sectors များ၏ အကြောင်းအရာများကို စွန့်ပစ်ရမည် ဖြစ်သည် (အကြောင်းအရာများကို pseudorandom ဒေတာများဖြင့် အ​စားထိုးသွားမည် ဖြစ်သည်။ ဆက်လက် မ​လုပ်ဆောင်မီ၊ သင့်လျှော်သော အခြား ကိရိယာများကို သုံးပြီး ပျက်စီးသွားသော ဒေတာ တချို့ကို ပြန်လည် ဆယ်တင်ရန် သင် ကြိုးစားနိုင်သည်။\n\nဖတ်၍ မရသော sectors များရှိ ဒေတာများကို VeraCrypt ကို သုံးပြီး စွန့်ပစ်လိုသလား?ဖတ်၍ မရသော sectors များ၌ VeraCrypt ဖြင့် သုညများကို ရေးသားလိုသလား?</string>
     <string lang="my" key="ZEROED_BAD_SECTOR_COUNT">မှတ်ချက် - VeraCrypt သည် %I64d ဖတ်မရသော sectors (%s) ရှိ ​အကြောင်းအရာများကို စာဝှက်ထားသော all-zero စသား block များနှင့် အစားထိုးလိုက်သည်။</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="my" key="ENTER_TOKEN_PASSWORD">တိုကင် '%s' အတွက် စကားဝှက်/PIN နံပါတ် ရေးထည့်ပါ -</string>
     <string lang="my" key="PKCS11_LIB_LOCATION_HELP">VeraCrypt သည် လုံခြုံရေး တိုကင် (သို့) စမတ်ကတ်ကို သုံးစွဲနိုင်ရန်၊ တိုကင် (သို့) စမတ်ကတ် အတွက် ပထမဦးဆုံး PKCS #11 ဆော့ဗ်ဝဲ လိုင်ဘရာရီ တစ်ခုကို ထည့်သွင်း ရမည်ဖြစ်သည်။ ယင်းလိုင်ဘရာရီမျိုးကို device ထဲ၌ ပါလာနိုင်သည် (သို့) ဆော့ဗ်ဝဲ ရောင်းချသော သူ၏ ကွန်ရက် စာမျက်နှာ သို့မဟုတ် အခြား နေရာများမှ ဒေါင်းလုဒ်ဆွဲယူ နိုင်မည် ဖြစ်သည်။\n\nစက်ထဲ လိုင်ဘရာရီကို ထည့်သွင်းပြီးနောက်၊ 'Select Library' ကို နှိပ်ခြင်းဖြင့် ၄င်းကို ကိုယ်တိုင် ရွေးနိုင်သည် (သို့)  VeraCrypt ကို ​ရှာစေနိုင်ပြီး 'Auto-Detect Library' (Windows စနစ် ဖိုင်တွဲထဲ၌သာ ​ရှာဖွေမည် ဖြစ်သည်) ကို နှိပ်ပြီး အလိုအလျောက် ရွေးချယ်နိုင်သည်။</string>
     <string lang="my" key="SELECT_PKCS11_MODULE_HELP">မှတ်ချက် - သင့် လုံခြုံရေး တိုကင် (သို့) စမတ်ကတ် အတွက် ထည့်သွင်းခဲ့သော PKCS #11 လိုင်ဘရာရီ၏ ဖိုင်အမည်နှင့် တည်နေရာအတွက်၊ တိုကင်၊ ကတ်၊ သို့မဟုတ် အခြား ဆော့ဗ်ဝဲနှင့် အတူပါလာသော အသုံးပြုနည်း လက်စွဲကို လေ့လာပါ။\n\nဖိုင် လမ်းကြောင်းနှင့် ဖိုင်အမည်များကို ရွေးချယ်ရန် 'ကောင်းပြီ' ခလုတ်ကို နှိပ်ပါ။</string>

Translations/Language.nl.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="nl" name="Nederlands" en-name="Dutch" version="0.1.0" translators="Jan van der Wal" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <control lang="nl" key="IDC_KEY_FILES">&amp;Sleutelbestanden</control>
     <control lang="nl" key="IDC_LINK_HASH_INFO">Informatie over hash algoritmes</control>
     <control lang="nl" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Meer informatie</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="nl" key="IDC_MB">&amp;MB</control>
     <control lang="nl" key="IDC_MORE_INFO_ON_CONTAINERS">Meer informatie</control>
     <control lang="nl" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">Meer informatie over systeem codering</control>
@@ -57,6 +58,7 @@
     <control lang="nl" key="IDC_NO_HISTORY">Nooit &amp;geschiedenis opslaan</control>
     <control lang="nl" key="IDC_OPEN_OUTER_VOLUME">Buiten-volume</control>
     <control lang="nl" key="IDC_PAUSE">&amp;Pauze</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
     <control lang="nl" key="IDC_QUICKFORMAT">Snel Formatteren</control>
     <control lang="nl" key="IDC_SHOW_PASSWORD">&amp;Laat wachtwoord zien</control>
     <control lang="nl" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Toon wachtwoord</control>
@@ -72,6 +74,7 @@
     <control lang="nl" key="IDT_COLLECTING_RANDOM_DATA_NOTE">BELANGRIJK: Beweeg de muis zo willekeurig mogelijk binnen dit scherm. Hoe langer u hem beweegt, hoe beter. Dit verbetert significant de cryptografische sterkte van de codeersleutels. Klik vervolgens op Volgende om door te gaan.</control>
     <control lang="nl" key="IDT_CONFIRM">&amp;Bevestig:</control>
     <control lang="nl" key="IDT_DONE">Klaar </control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="nl" key="IDT_ENCRYPTION_ALGO">Codering Algoritme</control>
     <control lang="nl" key="IDT_FILESYSTEM">Filesysteem </control>
     <control lang="nl" key="IDT_FILE_CONTAINER">Maakt een virtueel gecodeerde schijf aan binnen een bestand. Aanbevolen voor onervaren gebruikers.</control>
@@ -85,6 +88,8 @@
     <control lang="nl" key="IDT_PARTIAL_POOL_CONTENTS">Huidige pool inhoud (gedeelte)</control>
     <control lang="nl" key="IDT_PASS">OK</control>
     <control lang="nl" key="IDT_PASSWORD">Wachtwoord:</control>
+    <control lang="en" key="IDT_PIM">Volume PIM:</control>
+    <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
     <control lang="nl" key="IDT_PROGRESS">Voortgang:</control>
     <control lang="nl" key="IDT_RANDOM_POOL">Random Pool: </control>
     <control lang="nl" key="IDT_SINGLE_BOOT">Selecteer deze optie als er maar één operating systeem geïnstalleerd is op deze computer (ook als de computer meerdere gebruikers telt).</control>
@@ -142,6 +147,8 @@
     <control lang="nl" key="IDC_MOUNT_OPTIONS">&amp;Koppel Opties</control>
     <control lang="nl" key="IDC_MOUNT_READONLY">Koppel volume als alleen-&amp;lezen</control>
     <control lang="nl" key="IDC_NEW_KEYFILES">Sleutelbestanden</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="nl" key="IDC_PREF_BKG_TASK_ENABLE">Geactiveerd</control>
     <control lang="nl" key="IDC_PREF_CACHE_PASSWORDS">Cache wachtwoorden in geheugen</control>
     <control lang="nl" key="IDC_PREF_DISMOUNT_INACTIVE">Auto-ontkoppeling volume als geen data gelezen/geschreven gedurende</control>
@@ -155,6 +162,7 @@
     <control lang="nl" key="IDC_PREF_MOUNT_READONLY">Koppel volumes als alleen-lezen</control>
     <control lang="nl" key="IDC_PREF_MOUNT_REMOVABLE">Koppel volumes als verwijderbare media</control>
     <control lang="nl" key="IDC_PREF_OPEN_EXPLORER">Open Explorer venster voor succesvol gekoppeld volume</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</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="nl" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Wis wachtwoorden in de cache bij auto-ontkoppeling</control>
     <control lang="nl" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Wis wachtwoorden in de cache bij afsluiten</control>
@@ -167,11 +175,12 @@
     <control lang="nl" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Toon wachtwoord</control>
     <control lang="nl" key="IDC_TRAVEL_OPEN_EXPLORER">Open &amp;Explorer venster voor gekoppeld volume</control>
     <control lang="nl" key="IDC_TRAV_CACHE_PASSWORDS">&amp;Cache wachtwoorden in programmageheugen</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="nl" key="IDC_UNMOUNTALL">O&amp;ntkoppel Alles</control>
     <control lang="nl" key="IDC_VOLUME_PROPERTIES">Volume &amp;Eigenschappen</control>
     <control lang="nl" key="IDC_VOLUME_TOOLS">Vol&amp;ume Tools</control>
     <control lang="nl" key="IDC_WIPE_CACHE">&amp;Wis Cache</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
     <control lang="nl" key="IDD_HOTKEYS_DLG">VeraCrypt - Sneltoetsen</control>
     <control lang="nl" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="nl" key="IDM_CREATE_HIDDEN_OS">Aanmaak Verborgen Operating Systeem</control>
     <control lang="nl" key="IDM_CREATE_RESCUE_DISK">Maak Reddingsschijf aan</control>
     <control lang="nl" key="IDM_CREATE_VOLUME">Volume Aanmaak Wizard</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="nl" key="IDM_DEFAULT_KEYFILES">Creëer Standaard Sleutelbestanden</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="nl" key="IDM_ENCRYPT_SYSTEM_DEVICE">Codeer Systeem Partitie/Schijf</control>
     <control lang="nl" key="IDM_FAQ">Veel Gestelde Vragen</control>
@@ -243,6 +254,7 @@
     <control lang="nl" key="IDM_UNMOUNT_VOLUME">Ontkoppel Volume</control>
     <control lang="nl" key="IDM_VERIFY_RESCUE_DISK">Controleer Reddingsschijf</control>
     <control lang="nl" key="IDM_VERSION_HISTORY">Versie Geschiedenis</control>
+    <control lang="en" key="IDM_VOLUME_EXPANDER">Volume Expander</control>
     <control lang="nl" key="IDM_VOLUME_PROPERTIES">Volume Eigenschappen</control>
     <control lang="nl" key="IDM_VOLUME_WIZARD">Volume Aanmaak Wizard</control>
     <control lang="nl" key="IDM_WEBSITE">VeraCrypt Website</control>
@@ -369,7 +381,7 @@
     <string lang="nl" key="ACCESS_DENIED">Fout: Toegang geweigerd.\n\nDe partitie die u probeert te bereiken is of 0 sectoren groot, of is uw opstart partitie.</string>
     <string lang="en" key="ADMINISTRATOR">Administrator</string>
     <string lang="nl" key="ADMIN_PRIVILEGES_DRIVER">Om de VeraCrypt driver te laden moet u zijn ingelogd met een account met administrator rechten.</string>
-    <string lang="nl" key="ADMIN_PRIVILEGES_WARN_DEVICES">Noot: om een apparaat/partitie te kunnen coderen/formatteren moet u ingelogd zijn met een beheersaccount, dus met administrator rechten.\n\nDit geldt niet voor het formatteren/coderen van volumes die zijn opgenomen in een Bestandscontainer.</string>
+    <string lang="nl" key="ADMIN_PRIVILEGES_WARN_DEVICES">Noot: om een apparaat/partitie te kunnen coderen/Decodeer/formatteren moet u ingelogd zijn met een beheersaccount, dus met administrator rechten.\n\nDit geldt niet voor het formatteren/coderen van volumes die zijn opgenomen in een Bestandscontainer.</string>
     <string lang="nl" key="ADMIN_PRIVILEGES_WARN_HIDVOL">Om een Verborgen Volume te kunnen maken moet u ingelogd zijn in een account met administrator rechten.\n\nDoorgaan?</string>
     <string lang="nl" key="ADMIN_PRIVILEGES_WARN_NTFS">Om het volume te kunen formatteren in NTFS formaat moet u ingelogd zijn in een account met administrator rechten.\n\nZonder administrator rechten kunt u het volume in FAT formaat formatteren.</string>
     <string lang="nl" key="AES_HELP">FIPS-goedgekeurde code (Rijndael, gepubliceerd 1998) die mag worden gebruikt door U.S. overheids departementen en agentschappen om geclassificeerde informatie  te beveiligen tot aan Top Secret level. 256-bit sleutel, 128-bit blok, 14 rondgangen (AES-256). Operatiemodus is XTS.</string>
@@ -485,7 +497,11 @@
     <string lang="nl" key="FORMAT_FINISHED_HELP">\n\nHet VeraCrypt Volume is succesvol aangemaakt en is klaar voor gebruik. Als u nog een VeraCrypt Volume wilt aanmaken, klik dan op Volgende. Anders op Sluiten klikken.</string>
     <string lang="nl" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nHet Verborgen VeraCrypt Volume is aangemaakt (het verborgen operating system zal zich in dit Verborgen Volume bevinden).\n\nKlik op Volgende om door te gaan.</string>
     <string lang="nl" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Volume Geheel Gecodeerd</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="nl" key="NONSYS_INPLACE_ENC_FINISHED_INFO">BELANGRIJK: OM TOEGANG TOT DIT NIEUW AANGEMAAKT VERACRYPT VOLUME TE KRIJGEN MOET HET EERST GEKOPPELD WORDEN, KLIK OP ‘Auto-Koppel Apparaten’ IN HET VERACRYPT HOOFDSCHERM. Na ingave van het wachtwoord (en/of indien de juiste sleutelbestanden op aanwezigheid zijn gecontroleerd) zal het Volume worden gekoppeld aan de stationsletter die u heeft geselecteerd in het hoofdscherm. Via deze stationsletter heeft u toegang tot de data op uw VeraCrypt Volume.\n\nONTHOUDT DEZE STAPPEN GOED WANT U MOET ZE IEDERE KEER WEER UITVOEREN OM BIJ DE DATA TE KUNNEN KOMEN DIE OP HET VOLUME GECODEERD ZIJN OPGESLAGEN. Als alternatief kunt u in het hoofdscherm klikken op ‘Selecteer Apparaat’, selecteer dan deze partitie/apparaat, klik een lege stationsletter aan in het hoofdscherm en klik op ‘Koppel’.\n\nDe partitie/apparaat is met succes gecodeerd, het bevat nu een volledig gecodeerd VeraCrypt Volume en is klaar voor gebruik.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="nl" key="FORMAT_FINISHED_INFO">Het VeraCrypt Volume is met succes aangemaakt.</string>
     <string lang="nl" key="FORMAT_FINISHED_TITLE">Volume Aangemaakt</string>
     <string lang="nl" key="FORMAT_HELP">BELANGRIJK: Beweeg de muis zo willekeurig als mogelijk binnen dit scherm. Hoe langer, hoe beter. Dit verbetert significant de cryptografische sterkte van de codeersleutels. Klik daarna op Formatteer om het volume aan te maken.</string>
@@ -523,6 +539,7 @@
     <string lang="nl" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Er trad een fout op tijdens een poging de systeem codeer status op te halen.</string>
     <string lang="nl" key="INIT_SYS_ENC">Applicatie componenten voor systeem codering kunnen niet geïnitialiseerd worden.</string>
     <string lang="nl" key="INIT_RAND">Het programma heeft de initialisatie van de random nummer generator niet kunnen voltooien!</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="nl" key="INIT_REGISTER">Het programma heeft de initialisatie niet kunnen voltooien. Het registreren van de 'Dialog Class' is mislukt.</string>
     <string lang="nl" key="INIT_RICHEDIT">Fout: Laden van Rich Edit systeem library mislukt.</string>
     <string lang="nl" key="INTRO_TITLE">VeraCrypt Volume Aanmaak Wizard</string>
@@ -535,6 +552,7 @@
     <string lang="nl" key="MOUNT_BUTTON">Koppe&amp;l</string>
     <string lang="nl" key="NEW_VERSION_REQUIRED">Een nieuwere versie van VeraCrypt is vereist om dit volume te kunnen koppelen.</string>
     <string lang="nl" key="VOL_CREATION_WIZARD_NOT_FOUND">Error: Volume Aanmaak Wizard niet gevonden.\n\nOvertuig u ervan dat het bestand 'VeraCrypt Format.exe' zich in de map bevindt waaruit ook 'VeraCrypt.exe' werd gestart. Als dit niet het geval is, herinstalleer dan VeraCrypt, of zoek 'VeraCrypt Format.exe' op uw schijf en start het.</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="nl" key="NEXT">Vol&amp;gende &gt;</string>
     <string lang="nl" key="FINALIZE">&amp;Beëindig</string>
     <string lang="nl" key="INSTALL">I&amp;nstalleer</string>
@@ -542,6 +560,7 @@
     <string lang="nl" key="NODRIVER">Kan geen verbinding maken met het VeraCrypt apparaat stuurprogramma. VeraCrypt kan niet werken als dit stuurprogramma niet gestart is.\n\nDoor de eigenschappen van Windows kan het nodig zijn uit te loggen of het systeem te herstarten voordat het apparaatstuurprogramma kan worden geladen.</string>
     <string lang="nl" key="NOFONT">Error ontstaan tijdens laden/voorbereiden lettertypes.</string>
     <string lang="nl" key="NOT_FOUND">De stations letter is niet gevonden of er is geen stations letter opgegeven.</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="nl" key="DRIVE_LETTER_UNAVAILABLE">Geen stations letter beschikbaar.</string>
     <string lang="nl" key="NO_FILE_SELECTED">Geen bestand geselecteerd!</string>
     <string lang="nl" key="NO_FREE_DRIVES">Geen Stations letters beschikbaar.</string>
@@ -561,15 +580,18 @@
     <string lang="nl" key="OVERWRITEPROMPT">WAARSCHUWING: Het bestand '%hs' bestaat reeds!\n\nBELANGRIJK: VERACRYPT ZAL DIT BESTAND NIET CODEREN MAAR VERWIJDEREN. Bent u er zeker van dat u het bestand wilt verwijderen en vervangen door een nieuwe VeraCrypt bestandscontainer?</string>
     <string lang="nl" key="OVERWRITEPROMPT_DEVICE">VOORZICHTIG: ALLE BESTANDEN DIE MOMENTEEL AANWEZIG ZIJN OP DE GESELECTEERDE %s '%hs'%s ZULLEN WORDEN GEWIST EN ZIJN VERLOREN (ZIJ ZULLEN NIET GECODEERD WORDEN)!\n\nBent u er zeker van dat u door wilt gaan met formatteren?</string>
     <string lang="nl" key="NONSYS_INPLACE_ENC_CONFIRM">LET OP: U kunt het volume niet koppelen en hebt dus geen toegang tot de bestanden totdat het coderen klaar is.\n\nWilt u starten met coderen van het geslecteerde %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 '%hs'%s?</string>
     <string lang="nl" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">LET OP: Indien de spanning onderbroken wordt, of het operating systeem loopt onverhoopt vast door een soft/hardware fout tijdens de Op-De-Plaats Codering, dan kan hierdoor data verminkt raken of verloren gaan! Wij raden u daarom aan alvorens het coderen te starten, een deugdelijke back-up van de te coderen data te maken.\n\nHeeft u een back-up gemaakt?</string>
     <string lang="nl" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">VOORZICHTIG: ALLE BESTANDEN OP DE PARTITIE '%hs'%s (DE EERSTE PARTITIE ACHTER DE SYSTEEM PARTITIE) WORDEN GEWIST (ZE WORDEN NIET GECODEERD)!\n\nBent u er zeker van dat u wilt formatteren?</string>
     <string lang="nl" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">WAARSCHUWING! DE GESELECTEERDE PARTITIE BEVAT VEEL DATA! Alle bestanden op deze partitie zullen worden gewist (ze worden NIET gecodeerd)!</string>
     <string lang="nl" key="ERASE_FILES_BY_CREATING_VOLUME">Wis alle bestanden op de partitie door er een VeraCrypt Volume aan te maken</string>
     <string lang="nl" key="PASSWORD">Wachtwoord</string>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="nl" key="IDD_PCDM_CHANGE_PKCS5_PRF">Creëer Header Key Afwijkingsalgoritme</string>
     <string lang="nl" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Toevoegen/Verwijderen Sleutelbestanden aan/van Volume</string>
     <string lang="nl" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Verwijder Alle Sleutelbestanden van Volume</string>
-    <string lang="en" key="PASSWORD_CHANGED">Password and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</string>
+    <string lang="en" key="PASSWORD_CHANGED">Password, PIM and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</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="nl" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">BELANGRIJK: Als u uw VeraCrypt Reddingsschijf nog heeft, kan uw systeempartitie/schijf nog gedecodeerd worden met het oude wachtwoord (door op te starten met deze Reddingsschijf en het oude wachtwoord in te geven.) U dient een nieuwe Reddingsschijf aan te maken en dan de oude te vernietigen.\n\nWilt u een nieuwe Reddingsschijf maken?</string>
     <string lang="nl" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Merk op dat uw VeraCrypt Reddingsschijf nog steeds het vorige algoritme gebruikt. Als u het vorige algoritme als onveilig beschouwt, maak dan een nieuwe VeraCrypt Reddingsschijf aan en vernietig daarna de oude.\n\nWilt u een nieuwe VeraCrypt Reddingsschijf aanmaken?</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,6 +600,7 @@
     <string lang="nl" key="PKCS5_PRF_CHANGED">Header Key Afleidingsalgoritme met succes gecreëerd.</string>
     <string lang="nl" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">Geef a.u.b. wachtwoord en/of sleutelbestand(en) voor het niet-systeem volume waarvan u de Op-De-Plaats coderings wilt hervatten.\n\nNadat u op Volgende heeft gedrukt, zal VeraCrypt proberen alle niet-systeemvolumes te vinden waarvan de codering is onderbroken en waarop het verstrekte wachtwoord en/of de sleutelbestand(en) van toepassing zijn. Indien meer dan één zo’n volume wordt gevonden, dient u het juiste in de volgende stap te selecteren.</string>
     <string lang="nl" key="NONSYS_INPLACE_ENC_RESUME_VOL_SELECT_HELP">Selecteer a.u.b. een van de getoonde volumes. De lijst bevat ieder toegankelijk niet-syteem volume waarvan de codering is onderbroken en waarop het verstrekte wachtwoord en/of sleutelbestand(en) van toepassing zijn.</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="nl" key="PASSWORD_HELP">Het is erg belangrijk dat u een goed wachtwoord kiest. U dient een wachtwoord te vermijden dat bestaat uit een of meerdere woorden die kunnen worden teruggevonden in een woordenboek. Ook moeten eigennamen en geboortedata vermeden worden, evenmin mag het makkelijk te raden zijn. We raden u dringend een willekeurige combinatie van hoofd- en kleine letters, nummers en speciale karakters (zoals @ ^ = $ * +) aan. Het is heel belangrijk dat het meer dan 20 karakters telt (hoe langer hoe beter). The maximaal mogelijke lengte is 64 karakters.</string>
     <string lang="nl" key="PASSWORD_HIDDENVOL_HELP">Kies een wachtwoord voor het Verborgen Volume. </string>
     <string lang="nl" key="PASSWORD_HIDDEN_OS_HELP">Kies een wachtwoord voor het verborgen operating systeem (d.w.z. verborgen volume).</string>
@@ -597,11 +620,26 @@
     <string lang="nl" key="PASSWORD_WRONG_AUTOMOUNT">Verkeerd wachtwoord of geen VeraCrypt volume gevonden.</string>
     <string lang="nl" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Incorrect Sleutelbestand(en)/wachtwoord of geen VeraCrypt volume gevonden.</string>
     <string lang="nl" key="PASSWORD_WRONG_CAPSLOCK_ON">\n\nWaarschuwing: Caps Lock staat aan. Dit kan er de oorzaak van zijn dat u het wachtwoord verkeerd ingeeft.</string>
+    <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
+    <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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="nl" key="HIDDEN_VOL_PROT_PASSWORD_US_KEYB_LAYOUT">Indien u de bescherming instelt voor een verborgen volume met daarin een verborgen system, gebruik dan de standaard US toetsenbord layout bij het typen van het wachtwoord voor het verborgen volume. Dit is noodzakelijk omdat het wachtwoord in de pre boot omgeving (voordat Windows start) moet worden ingegeven waar niet-US toetsenbord layouts NIET beschikbaar zijn.</string>
     <string lang="nl" key="FOUND_NO_PARTITION_W_DEFERRED_INPLACE_ENC">VeraCrypt vond geen volume waarop niet-systeem codering werd onderbroken en waarop het verstrekte wachtwoord en/of sleutelbestanden(en) van toepassing zijn.\n\nControleer of het ingegeven wachtwoord en/of sleutelbestand(en) juist zijn en of de partitie/volume niet gebruikt wordt door het systeem of programma’s (bijv. een antivirus programma).</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="nl" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nNoot: Als u probeert een partitie te koppelen die is gelegen op een systeem schijf zonder pre-boot authenticatie of probeert de gecodeerde system partitie te koppelen van een operating systeem dat niet draait, dan doet u dit door te selecteren 'Systeem' &gt; 'Koppel Zonder Pre-Boot Authenticatie'.</string>
     <string lang="nl" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">In deze modus kunt u geen partitie koppelen die aanwezig is op een schijf die momenteel actief gecodeerd wordt.\n\nVoordat u deze partitie kunt koppelen in deze modus, dient u op te starten met een operating systeem vanaf een andere schijf (gecodeerd of ongecodeerd) òf op te starten met een ongecodeerd operating systeem.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <string lang="nl" key="PREV">&lt; &amp;Terug</string>
     <string lang="nl" key="RAWDEVICES">Niet in staat om een lijst te maken van de ongebruikte stukken harddisk (raw devices) op uw systeem!</string>
     <string lang="nl" key="READONLYPROMPT">Het volume '%hs' bestaat, en is geregistreerd voor alleen-lezen. Bent u er zeker van dat u het wilt vervangen?</string>
@@ -701,11 +739,18 @@
     <string lang="nl" key="FOR_MORE_INFO_ON_PARTITIONS">Voor informatie over het maken en beheren van een partitie kunt u zich wenden tot de documentatie bij uw operating systeem of neem contact op met de technische helpdesk van uw computerverkoper.</string>
     <string lang="nl" key="SYSTEM_PARTITION_NOT_ACTIVE">Fout: Het nu actieve operating systeem staat niet op de boot partitie (eerste Actieve partitie). Dit wordt niet ondersteund.</string>
     <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="nl" key="CANT_ACCESS_VOL">Fout: Toegang tot volume niet mogelijk!\n\nControleer of het geselecteerde volume bestaat, dat het niet is gekoppeld of wordt gebruikt door het systeem of een ander programma, dat er lees en schrijfbevoegdheid aanwezig is voor het volume, en dat het niet beschermd is tegen schrijven.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="nl" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Fout: Het is onmogelijk toegang tot het volume te krijgen of er informatie over te verkrijgen.\n\nOvertuig u ervan dat dit volume bestaat, dat het niet wordt gebruikt door het systeem of programma’s, dat u lees/schrijf toegang ertoe hebt en dat het niet schrijf beveiligd is.</string>
     <string lang="nl" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Fout: Het is onmogelijk toegang tot het volume te krijgen of er informatie over te verkrijgen.\n\nOvertuig u ervan dat dit volume bestaat, dat het niet wordt gebruikt door het systeem of programma’s, dat u lees/schrijf toegang ertoe hebt en dat het niet schrijf beveiligd is.\n\nIndien dit probleem blijft bestaan, volg evt. de volgende stappen.</string>
     <string lang="nl" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">Een fout verhinderde VeraCrypt de partitie te coderen. Los evt. eerder gerapporteerde fouten op en probeer het dan opnieuw. Als het probleem blijft bestaan probeer dan de volgende stappen.</string>
     <string lang="nl" key="INPLACE_ENC_GENERIC_ERR_RESUME">Een fout verhinderde VeraCrypt het codering proces van de partitie te hervatten.\n\nLos evt. eerder gerapporteerde fouten op en probeer het proces dan te hervatten. Noot: het volume kan niet gekoppeld worden tenzij het volledig gecodeerd is.</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="nl" key="CANT_DISMOUNT_OUTER_VOL">Fout: Het Buiten Volume kan niet ontkoppeld worden!\n\nEen volume kan niet ontkoppeld worden als het bestanden of mappen bevat die worden gebruikt door een programma of het systeem.\n\nSluit u alstublieft ieder programma dat bestanden of mappen zou kunnen gebruiken op het volume en klik op Opnieuw.</string>
     <string lang="nl" key="CANT_GET_OUTER_VOL_INFO">Fout: Kan geen informatie verkrijgen over het Buiten Volume! Volume aanmaak kan niet doorgaan.</string>
     <string lang="nl" key="CANT_ACCESS_OUTER_VOL">Fout: Het Buiten Volume kan niet bereikt worden! Volume aanmaak kan geen doorgang vinden.</string>
@@ -790,7 +835,7 @@
     <string lang="nl" key="TC_INSTALLER_IS_RUNNING">De VeraCrypt Installer verzorgt op dit systeem op dit moment een installatie of update van VeraCrypt. Alvorens verder te gaan, wacht totdat deze is beëindigd of afgesloten. Indien afsluiten niet lukt, herstart dan de computer alvorens verder te gaan.</string>
     <string lang="nl" key="INSTALL_FAILED">Installatie mislukt.</string>
     <string lang="nl" key="UNINSTALL_FAILED">Deïnstallatie mislukt.</string>
-    <string lang="nl" key="DIST_PACKAGE_CORRUPTED">Dit installatiebestand is beschadigd. Wilt u het a.u.b. opnieuw downloaden (bij voorkeur van de officiële VeraCrypt website op www.veracrypt.org).</string>
+    <string lang="nl" key="DIST_PACKAGE_CORRUPTED">Dit installatiebestand is beschadigd. Wilt u het a.u.b. opnieuw downloaden (bij voorkeur van de officiële VeraCrypt website op https://veracrypt.codeplex.com).</string>
     <string lang="nl" key="CANNOT_WRITE_FILE_X">Kan niet schrijven bestand %hs</string>
     <string lang="nl" key="EXTRACTING_VERB">Uitpakken</string>
     <string lang="nl" key="CANNOT_READ_FROM_PACKAGE">Kan geen data lezen in het installatiebestand.</string>
@@ -977,6 +1022,7 @@
     <string lang="nl" key="CONFIRM_EXIT_UNIVERSAL">Sluiten?</string>
     <string lang="nl" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt heeft niet voldoende informatie om te kunnen bepalen of het moet coderen of decoderen.</string>
     <string lang="nl" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt heeft onvoldoende informatie om te bepalen of het moet coderen of decoderen.\n\nNoot: Als u de systeem partitie/schijf in de pre-boot omgeving decodeerde, zou het nodig kunnen zijn het proces af te maken door te klikken op Decodeer.</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="nl" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">Wilt u de codering van de partitie/volume onderbreken en tot een latere tijd uitstellen?\n\nNoot:Onthoud dat het volume niet kan worden gekoppeld totdat het geheel is gecodeerd. U kunt het proces hervatten, dit zal dan starten op de plaats waar u het stopte. U kunt dit zelf doen bijv. door 'Volumes' &gt; 'Hervat Onderbroken Proces' te kiezen uit het menu van het hoofdscherm van VeraCrypt.</string>
     <string lang="nl" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Wilt u het coderen van de systeem partitie/schijf onderbreken en uitstellen?\n\nNoot: U zult het proces kunnen hervatten vanaf het punt waar het onderbroken was. U kunt dit bijv. doen door te kiezen voor 'Systeem' &gt; 'Hervat Onderbroken Proces' uit het systeemmenu van het hoofdscherm van VeraCrypt. Indien u het coderen helemaal wilt terugdraaien of beëindigen, selecteer 'Systeem' &gt; 'Permanent Decoderen Systeem Partitie/Schijf'.</string>
     <string lang="nl" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Wilt u het decoderen van de systeem partitie/schijf onderbreken en uitstellen?\n\nNoot: U zult het proces kunnen hervatten vanaf het punt waar het onderbroken was. U kunt dit bijv. doen door te kiezen voor 'Systeem' &gt; 'Hervat Onderbroken Proces' uit het systeemmenu van het hoofdscherm van VeraCrypt. Indien u het decoderen helemaal wilt terugdraaien (en met coderen starten), selecteer 'Systeem' &gt; 'Codeer Systeem Partitie/Schijf'.</string>
@@ -986,6 +1032,7 @@
     <string lang="nl" key="FAILED_TO_START_WIPING">Fout: Starten van het wissen is mislukt.</string>
     <string lang="nl" key="INCONSISTENCY_RESOLVED">Inconsistentie opgelost.\n\n\n(Indien u een programmafout in relatie hiermee wilt rapporteren, wilt u dan de volgende technische informatie meesturen in het bug rapport: %hs)</string>
     <string lang="nl" key="UNEXPECTED_STATE">Fout: Niet verwachte toestand.\n\n\n(Indien u deze fout rapporteert hiermee, neem dan a.u.b. de volgende technische informatie mee in de fout rapportage: %hs</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="nl" key="NOTHING_TO_RESUME">Er is geen proces/taak die hervat moet worden.</string>
     <string lang="nl" key="HIDVOL_PROT_BKG_TASK_WARNING">WAARSCHUWING: De VeraCrypt Achtergrond Taak is uitgeschakeld. Nadat VeraCrypt is beëindigd, zal niet worden gemeld indien schade aan een Verborgen Volume is voorkomen.\n\nNoot: U kunt op ieder moment de VeraCrypt Achtergrond Taak beëindigen door het VeraCrypt Systeem Tray Icoon rechts aan te klikken en te kiezen voor 'Sluiten'.\n\nWilt u dat de VeraCrypt Achtergrond Taak ingeschakeld wordt?</string>
     <string lang="nl" key="LANG_PACK_VERSION">Vertaling versie:  %s</string>
@@ -1013,6 +1060,7 @@
     <string lang="nl" key="SYS_LOADER_RESTORE_FAILED">Fout in herstellen van de originele systeemlader.\n\nGebruik aub uw VeraCrypt reddingsschijf ('Repair Options' &gt; 'Restore original system loader') of Windows installatie medium om de VeraCrypt Boot Lader te vervangen door de Windows systeem lader.</string>
     <string lang="nl" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">De originele systeem lader zal niet opgeslagen worden op de Reddingsschijf (waarschijnlijke oorzaak: ontbrekende backup).</string>
     <string lang="nl" key="ERROR_MBR_PROTECTED">Kon de MBR sector niet schrijven.\n\nUw BIOS zou ingesteld kunnen zijn om de MBR sector te beschermen. Controleer uw BIOS (druk op F2, Delete, or Esc, tijdens het eerste opstartscherm van uw computer) voor MBR/antivirus protectie instellingen.</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="nl" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">De juiste versie van de VeraCrypt Boot Lader is niet geïnstalleerd. Hierdoor kunnen enkele instellingen evt. niet worden opgeslagen.</string>
     <string lang="nl" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">In sommige situaties zult u willen voorkomen dat iemand die u de computer ziet starten (een vijand) erachter komt dat VeraCrypt aanwezig is op de computer. De bovenstaande optie stelt u in staat het VeraCrypt Boot Lader scherm aan te passen. Als u de eerste optie kiest zal geen enkele tekst worden weergegeven door de boot lader (zelfs niet als u een verkeerd wachtwoord ingeeft). De computer zal “bevroren” lijken terwijl u uw wachtwoord intypt. Als extra kan er een zelfgemaakte boodschap worden weergegeven om de vijand te misleiden. Bijv. “Ontbrekend Operating Systeem” (wat normaal wordt weergegeven door de Windows Boot Lader als deze geen boot partitie vindt.) Het is echter belangrijk dat u zich realiseert dat, als de vijand in staat is de inhoud van de harde schijf te analyseren, hij erachter kan komen dat er een VeraCrypt Boot Lader aanwezig is.</string>
     <string lang="nl" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">WAARSCHUWING: Na selectie van deze optie zal de VeraCrypt Boot Lader geen enkele tekst laten zien (zelfs niet bij ingave van een verkeerd wachtwoord). De computer zal “bevroren” lijken terwijl u uw wachtwoord kunt ingeven (de cursor zal NIET bewegen en geen sterretjes worden zichtbaar bij intypen).\n\nBent u er zeker van dat u deze optie wilt selecteren?</string>
@@ -1034,8 +1082,11 @@
     <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="nl" key="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">WAARSCHUWING: Er is niet-toegewezen ruimte aanwezig tussen de systeem partitie en de eerste partitie daar achter. Na aanmaken van het verborgen operating systeem (OS) mag u geen partitie meer maken in deze ruimte, anders zal het verborgen OS systeem niet meer te starten zijn (totdat u deze partitie weer verwijdert).</string>
     <string lang="nl" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Dit algoritme wordt momenteel niet ondersteund voor systeem codering.</string>
-	<string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="nl" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Sleutelbestanden zijn niet ondersteund bij systeemcodering.</string>
     <string lang="nl" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Waarschuwing: VeraCrypt kon de originele toetsenbord lay-out niet terugzetten. Dit zou ertoe kunnen leiden dat u een wachtwoord verkeerd ingeeft.</string>
     <string lang="nl" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Fout: Kan de toetsenbord indeling voor VeraCrypt niet instellen op de standaard (US) toetsenbord indeling.\n\nMerk op dat het wachtwoord ingetypt moet worden in de pre-boot omgeving (voor Windows start) waar niet-standaard (US) Windows toetsenbord indelingen niet beschikbaar zijn. Daarom moet het wachtwoord altijd worden ingetypt met gebruik van de standaard (US) toetsenbord indeling.</string>
@@ -1120,6 +1171,7 @@
     <string lang="nl" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">De pre-test is met succes voltooid.\n\nWaarschuwing: Indien de stroomtoevoer onderbroken wordt of het operating systeem crasht door een fout, tijdens het Op-De-Plaats coderen van data, kunnen er gegevens verloren gaan of verminkt raken. Maak daarom een back-up van de te coderen bestanden. Indien u dit nog niet heeft gedaan, doe dit nu door op 'Pauzeer' te klikken en dan de back-up te maken. Start daarna VeraCrypt  en selecteer 'Systeem' &gt; 'Hervat Onderbroken Proces' om het decoderen te hervatten.\n\nIndien u klaar bent, klik op 'Codeer' om het Coderingsproces te starten.</string>
     <string lang="en" key="SYSENC_ENCRYPTION_PAGE_INFO">You can click Pause or Defer anytime to interrupt the process of encryption or decryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. To prevent slowdown when the system or applications write or read data from the system drive, VeraCrypt automatically waits until the data is written or read (see Status above) and then automatically continues encrypting or decrypting.</string>
     <string lang="nl" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nU kunt op Pauzeer drukken wanneer u het coderingsproces wilt stoppen, deze wizard beëindigen en de computer afsluiten. Na herstart van de computer en van dit proces zal het verdergaan op het punt van onderbreking. Het volume kan niet gekoppeld worden totdat het volledig gecodeerd is.</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="nl" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Hidden System Started</string>
     <string lang="nl" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Origineel Systeem</string>
     <string lang="nl" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows maakt (zonder uw medeweten) log-bestanden en tijdelijke bestanden aan op de syteempartitie. Ook de inhoud van RAM wordt opgeslagen in de slaap- en wisselbestanden op de systeem partitie. Indien een afperser bestanden op de partitie waar het originele operating systeem (OS) staat zou analyseren (waarvan het verborgen systeem een kloon is), zou hij bijv. kunnen achterhalen dat u de VeraCrypt wizard gebruikte om een verborgen OS aan te maken (hetgeen een sterke aanwijzing is voor het bestaan van een verborgen OS op uw computer).\n\nOm dit te voorkomen zal in de volgende stappen de gehele inhoud van de partitie waar het originele OS staat veilig worden gewist. Daarna, t.b.v. de aannemelijke ontkenbaarheid, moet u een nieuw OS installeren op deze partitie en dit coderen. Daarmee maakt u een lokvogel OS waarna het proces van aanmaak van een verborgen OS afgerond zal zijn.</string>
@@ -1159,7 +1211,7 @@
     <string lang="nl" key="HIDDEN_OS_CREATION_PREINFO_HELP">In de volgende stappen zal VeraCrypt het verborgen operating systeem aanmaken door de inhoud van de system partitie naar het verborgen volume te kopiëren (de te kopiëren data worden on-the-fly gecodeerd met een andere codering sleutel dan die van het lokvogel operating systeem)\n\nMerk op dat dit proces wordt uitgevoerd in de pre-boot omgeving (dus voordat Windows start) en dat voltooiing lang kan duren: meerder uren of zelfs dagen (afhankelijk van de grootte van de systeem partitie en van de performance van uw computer).\n\nU kunt het proces onderbreken, de computer afsluiten, en weer hervatten na aanzetten van de  computer. Echter, na onderbreking zal het proces van het kopiëren en coderen van de systeem partitie altijd weer van voren af aan beginnen omdat de inhoud van deze partitie tijdens het klonen niet gewijzigd mag worden.</string>
     <string lang="nl" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Wilt u het gehele proces tot aanmaak van een verborgen operating systeem stoppen?\n\nNoot: U zult het proces NIET kunnen hervatten als u nu stopt.</string>
     <string lang="nl" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Wilt u de systeem codering pre-test annuleren?</string>
-    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="nl" key="SYS_DRIVE_NOT_ENCRYPTED">De systeem partitie/schijf blijkt niet gecodeerd te zijn (ook niet gedeeltelijk).</string>
     <string lang="nl" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">Uw systeem partitie/schijf is gecodeerd (volledig of geheel).\n\nDecodeer a.u.b. uw systeem partitie/schijf geheel alvorens verder te gaan. Om dit te doen, selecteer 'Systeem' &gt; 'Permanent Decoderen Systeem Partitie/Schijf' uit het menu van het hoofdscherm van VeraCrypt.</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">When the system partition/drive is encrypted (partially or fully), you cannot downgrade VeraCrypt (but you can upgrade it or reinstall the same version).</string>
@@ -1176,6 +1228,8 @@
     <string lang="en" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">You have selected the system partition/drive (or the boot partition), but the wizard mode you selected is suitable only for non-system partitions/drives.\n\nDo you want to set up pre-boot authentication (which means that you will need to enter your password each time before Windows boots/starts) and encrypt the system partition/drive?</string>
     <string lang="nl" key="CONFIRM_DECRYPT_SYS_DEVICE">Bent u er zeker van dat u de systeem partitie/schijf permanent wilt decoderen?</string>
     <string lang="nl" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">VOORZICHTIG: Als u de systeem partitie/schijf permanent decodeert, worden er ongecodeerde data naar geschreven.\n\nBent u er zeker van dat u de systeem partitie/schijf permanent wilt decoderen?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
     <string lang="nl" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Waarschuwing: als u codes in cascade gebruikt voor system codering, kunt u de volgende problemen tegenkomen:\n\n)1 De VeraCrypt Boot Lader is dan groter dan normaal waardoor er niet genoeg ruimte zou kunnen zijn op de eerste track van de schijf voor een backup van deze Boot Lader. Als de Boot Lader beschadigd raakt, hetgeen nogal eens gebeurt (bijv. door slecht ontworpen anti-piraterij activatieprocedures van bepaalde programma’s), heeft u de VeraCrypt Reddingsschijf nodig om op te starten of om de Boot Lader te repareren.\n\n2) Op sommige computers neemt het herstarten uit de slaapstand meer tijd in beslag.\n\nDeze mogelijke problemen kunt u vermijden door een niet-cascade coderingsalgoritme (bijv. AES) te kiezen.\n\nBent u er zeker van dat u codes in cascade wilt gebruiken?</string>
     <string lang="nl" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">Als u enige van de hiervoor beschreven problemen tegenkomt, decodeer de partitie/schijf (als het is gecodeerd) en codeer het daarna opnieuw met gebruik van een niet-cascade-code (bijv. 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>
@@ -1191,6 +1245,7 @@
     <string lang="nl" key="ENABLE_BAD_SECTOR_ZEROING">Fout: De inhoud van een of meerdere sectoren van de schijf kon niet gelezen worden, waarschijnlijk ten gevolge van een fysieke fout.\n\nDe Op-De-Plaats codering kan alleen maar voortgang vinden als deze sectoren weer leesbaar gemaakt zijn. VeraCrypt kan proberen deze sectoren weer leesbaar te maken door er nullen in te schrijven, waarna al deze nullen gecodeerd zullen worden. Merk echter op dat ten gevolge van deze oplossing alle (onleesbare) data die in deze sectoren liggen opgeslagen verloren zullen zijn. Indien u dit wilt vermijden kunt u proberen stukken van de betreffende data te herstellen met toepasselijke software van derden.\n\nNoot: Indien de sectoren fysiek beschadigd zijn (dus tegengesteld aan data corruptie en checksum fouten) zullen de meeste typen opslag media deze sectoren intern doorverwijzen naar andere goed functionerende sectoren wanneer geprobeerd wordt data er naartoe te schrijven. In dit geval kunnen de bestaande data op de beschadigde sectoren ongecodeerd op de schijf achterblijven).\n\nWilt u dat VeraCrypt nullen schrijft naar de onleesbare sectoren?</string>
     <string lang="nl" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Fout: De inhoud van een of meer sectoren op de schijf kan niet worden gelezen (waarschijnlijk ten gevolgen van een fysieke fout).\n\nTeneinde door te kunnen gaan met de codering dient VeraCrypt de inhoud van de onleesbare sectoren te wissen (deze worden dan gevuld met pseudo-random data). Merk op dat u, alvorens verder te gaan, de inhoud van deze sectoren kunt proberen te herstellen middels software van derden.\n\nWilt u dat VeraCrypt de data in de onleesbare sectoren nu wist?</string>
     <string lang="nl" key="ZEROED_BAD_SECTOR_COUNT">Noot: VeraCrypt heeft de inhoud van %I64d onleesbare sectoren (%s) vervangen door gecodeerde nullen in platte tekst blokken.</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="nl" key="ENTER_TOKEN_PASSWORD">Geef wachtwoord/PIN voor token '%s':</string>
     <string lang="nl" key="PKCS11_LIB_LOCATION_HELP">Voordat VeraCrypt toegang kan krijgen tot een security token of smartcard, moet u eerst een PKCS #11 software library voor het token of smartcard installeren. Deze library kan meegeleverd zijn met het apparaat of kan op de website van de verkoper of van derden te vinden zijn.\n\nNa installatie van de library kunt u deze selecteren door te klikken op 'Selecteer Library' of u kunt VeraCrypt de bibliotheek automatisch laten vinden en selecteren door te klikken op 'Auto-Detect Library' (er wordt dan alleen in de Windows systeem mappen gezocht).</string>
     <string lang="nl" key="SELECT_PKCS11_MODULE_HELP">Noot: Raadpleeg voor de bestandsnaam en plaats van de PKCS #11 library van uw security token of smartcard de documentaie van het token, smartcard of software van derden.\n\nKlik op 'OK' om het pad en bestandsnaam te selecteren.</string>

Translations/Language.nn.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="nn" name="Norsk Nynorsk" en-name="Norwegian (Nynorsk)" version="0.1.0" translators="Kjell Rune Helland" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <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">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>
@@ -57,6 +58,7 @@
     <control lang="nn" key="IDC_NO_HISTORY">Aldri lagra historie</control>
     <control lang="nn" key="IDC_OPEN_OUTER_VOLUME">Opne Ytre Volum</control>
     <control lang="en" key="IDC_PAUSE">&amp;Pause</control>
+    <control lang="en" key="IDC_PIM_ENABLE">Use PIM</control>
     <control lang="nn" key="IDC_QUICKFORMAT">Rask Formatering</control>
     <control lang="nn" key="IDC_SHOW_PASSWORD">&amp;Vis passord</control>
     <control lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Display password</control>
@@ -72,6 +74,7 @@
     <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="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>
     <control lang="en" key="IDT_FILE_CONTAINER">Creates a virtual encrypted disk within a file. Recommended for inexperienced users.</control>
@@ -85,6 +88,8 @@
     <control lang="en" key="IDT_PARTIAL_POOL_CONTENTS">Current pool content (partial)</control>
     <control lang="en" key="IDT_PASS">Pass</control>
     <control lang="nn" key="IDT_PASSWORD">Passord:</control>
+    <control lang="en" key="IDT_PIM">Volume PIM:</control>
+    <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
     <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>
@@ -142,6 +147,8 @@
     <control lang="nn" key="IDC_MOUNT_OPTIONS">Alternativ...</control>
     <control lang="nn" key="IDC_MOUNT_READONLY">Monter volum som skriveverna</control>
     <control lang="nn" key="IDC_NEW_KEYFILES">Nøkkelfiler...</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="nn" key="IDC_PREF_BKG_TASK_ENABLE">Aktivert</control>
     <control lang="nn" key="IDC_PREF_CACHE_PASSWORDS">Snøgglagra passord i drivar minne</control>
     <control lang="nn" key="IDC_PREF_DISMOUNT_INACTIVE">Auto avmonter volum vist det ikkje er skrive/lese data til det på</control>
@@ -155,6 +162,7 @@
     <control lang="nn" key="IDC_PREF_MOUNT_READONLY">Monter volum som skriveverna</control>
     <control lang="nn" key="IDC_PREF_MOUNT_REMOVABLE">Monter volum som fjernbart medium</control>
     <control lang="nn" key="IDC_PREF_OPEN_EXPLORER">Opne Utforskar vindauga for vellykka monterte volum</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</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="nn" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Slett snøgglagra passord ved automatisk avmontering</control>
     <control lang="nn" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Slett snøgglagra passord ved avslutning</control>
@@ -167,11 +175,12 @@
     <control lang="nn" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Vis passord</control>
     <control lang="nn" key="IDC_TRAVEL_OPEN_EXPLORER">Opne Utforskar vindauga for montert volum</control>
     <control lang="nn" key="IDC_TRAV_CACHE_PASSWORDS">&amp;snøgglagra passord i drivar minne</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="nn" key="IDC_UNMOUNTALL">Avmonter Alle</control>
     <control lang="nn" key="IDC_VOLUME_PROPERTIES">&amp;Volum Eigenskapar...</control>
     <control lang="nn" key="IDC_VOLUME_TOOLS">Volum Verktøy...</control>
     <control lang="nn" key="IDC_WIPE_CACHE">&amp;Slett Snøgglager</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
     <control lang="nn" key="IDD_HOTKEYS_DLG">VeraCrypt - System snøgg tastar</control>
     <control lang="nn" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="en" key="IDM_CREATE_HIDDEN_OS">Create Hidden Operating System...</control>
     <control lang="en" key="IDM_CREATE_RESCUE_DISK">Create Rescue Disk...</control>
     <control lang="nn" key="IDM_CREATE_VOLUME">Lag nytt Volum...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="nn" key="IDM_DEFAULT_KEYFILES">Standard Nøkkelfiler...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="en" key="IDM_ENCRYPT_SYSTEM_DEVICE">Encrypt System Partition/Drive...</control>
     <control lang="nn" key="IDM_FAQ">Ofte Stilte Spørsmål</control>
@@ -243,6 +254,7 @@
     <control lang="nn" key="IDM_UNMOUNT_VOLUME">Avmonter Volum</control>
     <control lang="en" key="IDM_VERIFY_RESCUE_DISK">Verify Rescue Disk</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>
     <control lang="nn" key="IDM_VOLUME_WIZARD">Volum Oppretting Vegvisar</control>
     <control lang="nn" key="IDM_WEBSITE">VeraCrypt Heimeside</control>
@@ -485,7 +497,11 @@
     <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>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Volume Fully Encrypted</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_INFO">IMPORTANT: TO MOUNT THIS NEWLY CREATED VERACRYPT VOLUME AND TO ACCESS DATA STORED IN IT, CLICK 'Auto-Mount Devices' IN THE MAIN VERACRYPT WINDOW. After you enter the correct password (and/or supply correct keyfiles), the volume will be mounted to the drive letter you select from the list in the main VeraCrypt window (and you will be able to access the encrypted data via the selected drive letter).\n\nPLEASE REMEMBER OR WRITE DOWN THE ABOVE STEPS. YOU MUST FOLLOW THEM WHENEVER YOU WANT TO MOUNT THE VOLUME AND ACCESS DATA STORED IN IT. Alternatively, in the main VeraCrypt window, click 'Select Device', then select this partition/volume, and click 'Mount'.\n\nThe partition/volume has been successfully encrypted (it contains a fully encrypted VeraCrypt volume now) and is ready for use.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="nn" key="FORMAT_FINISHED_INFO">VeraCrypt volum har vorte oppretta utan feil.</string>
     <string lang="nn" key="FORMAT_FINISHED_TITLE">Volum Oppretta</string>
     <string lang="en" key="FORMAT_HELP">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 Format to create the volume.</string>
@@ -523,6 +539,7 @@
     <string lang="en" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">An error occurred when obtaining the system encryption status.</string>
     <string lang="en" key="INIT_SYS_ENC">Cannot initialize application components for system encryption.</string>
     <string lang="nn" key="INIT_RAND">Klarte ikkje å initialisera den tilfeldige nummer generatoren!</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="nn" key="INIT_REGISTER">Kunne ikkje initialisera programmet. Klarte ikkje å registrera Dialog klassen.</string>
     <string lang="en" key="INIT_RICHEDIT">Error: Failed to load the Rich Edit system library.</string>
     <string lang="nn" key="INTRO_TITLE">VeraCrypt Volum Opprettings Vegvisar</string>
@@ -535,6 +552,7 @@
     <string lang="nn" key="MOUNT_BUTTON">Monter</string>
     <string lang="nn" key="NEW_VERSION_REQUIRED">Ein nyare versjon av VeraCrypt er nødvendig for å montera dette volumet.</string>
     <string lang="nn" key="VOL_CREATION_WIZARD_NOT_FOUND">Feil: Volum Opprettings Vegvisar vart ikkje funnen.\n\nSjekk att fila 'VeraCrypt Format.exe' er i same mappe som 'VeraCrypt.exe' vart starta i. Viss den ikkje er der, må du ominstallera VeraCrypt eller finna 'VeraCrypt Format.exe' på hardisken din</string>
+    <string lang="en" key="VOL_EXPANDER_NOT_FOUND">Error: Volume Expander not found.\n\nPlease make sure that the file 'VeraCryptExpander.exe' is in the folder from which 'VeraCrypt.exe' was launched. If it is not, please reinstall VeraCrypt, or locate 'VeraCryptExpander.exe' on your disk and run it.</string>
     <string lang="nn" key="NEXT">&amp;Neste &gt;</string>
     <string lang="nn" key="FINALIZE">&amp;Avslutting</string>
     <string lang="en" key="INSTALL">&amp;Install</string>
@@ -542,6 +560,7 @@
     <string lang="en" key="NODRIVER">Unable to connect to the VeraCrypt device driver. VeraCrypt cannot work if the device driver is not running.\n\nPlease note that, due to a Windows issue, it may be necessary to log off or restart the system before the device driver can be loaded.</string>
     <string lang="nn" key="NOFONT">Feil ved lasting/klargjering av skrifttypar.</string>
     <string lang="en" key="NOT_FOUND">The drive letter was not found or no drive letter was specified.</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="nn" key="DRIVE_LETTER_UNAVAILABLE">Stasjons bokstav ikkje tiljengeleg.</string>
     <string lang="nn" key="NO_FILE_SELECTED">Ingen filer Valt!</string>
     <string lang="nn" key="NO_FREE_DRIVES">Ingen stasjons bokstavar tilgjengeleg.</string>
@@ -561,15 +580,18 @@
     <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_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="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_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt.\n\nDo you have such a backup?</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_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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="nn" key="IDD_PCDM_CHANGE_PKCS5_PRF">Set Header Nøkkel Derivasjon Algorytme</string>
     <string lang="nn" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Legg til/Fjern Nøkkelfiler til/frå Volum</string>
     <string lang="nn" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Fjern alle Nøkkelfiler frå Volum</string>
-    <string lang="en" key="PASSWORD_CHANGED">Password and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</string>
+    <string lang="en" key="PASSWORD_CHANGED">Password, PIM and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</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="en" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">IMPORTANT: If you did not destroy your VeraCrypt Rescue Disk, your system partition/drive can still be decrypted using the old password (by booting the VeraCrypt Rescue Disk and entering the old password). You should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</string>
     <string lang="en" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Note that your VeraCrypt Rescue Disk still uses the previous algorithm. If you consider the previous algorithm insecure, you should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,7 +600,8 @@
     <string lang="nn" key="PKCS5_PRF_CHANGED">Hovud nøkkel derivasjons algorytme vellykka sett.</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">Please enter the password and/or keyfile(s) for the non-system volume where you want to resume the process of in-place encryption.\n\n\nRemark: After you click Next, VeraCrypt will attempt to find all non-system volumes where the process of encryption has been interrupted and where the VeraCrypt volume header can be decrypted using the supplied password and/or keyfile(s). If more than one such volume is found, you 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="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 more than 20 characters (the longer, the better). The maximum possible length is 64 characters.</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="nn" key="PASSWORD_HIDDENVOL_HELP">Vel eit passord for det skjulte volumet. </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_HELP">Please choose a password for the hidden operating system (i.e. for the hidden volume). </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_NOTE">IMPORTANT: The password that you choose for the hidden operating system in this step must be substantially different from the other two passwords (i.e. from the password for the outer volume and from the password for the decoy operating system).</string>
@@ -597,11 +620,26 @@
     <string lang="nn" key="PASSWORD_WRONG_AUTOMOUNT">Feil passord eller ingen VeraCrypt volum funne.</string>
     <string lang="nn" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Feil nøkkelfil(er)/passord eller ingen VeraCrypt volum funnet.</string>
     <string lang="nn" key="PASSWORD_WRONG_CAPSLOCK_ON">\n\nAdvarsel: Caps Lock er på. Dette kan føra til att du skriv inn passordet feil.</string>
+    <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
+    <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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_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>
+    <string lang="en" key="SELECTED_PARTITION_NOT_INPLACE_ENC">The selected partition/device is not using in-place encryption.\nHeader Flags = 0x%.8X</string>
     <string lang="en" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nNote: If you are attempting to mount a partition located on an encrypted system drive without pre-boot authentication or to mount the encrypted system partition of an operating system that is not running, you can do so by selecting 'System' &gt; 'Mount Without Pre-Boot Authentication'.</string>
     <string lang="en" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">In this mode, you cannot mount a partition located on a drive whose portion is within the key scope of active system encryption.\n\nBefore you can mount this partition in this mode, you need to either boot an operating system installed on a different drive (encrypted or unencrypted) or boot an unencrypted operating system.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <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>
@@ -701,11 +739,18 @@
     <string lang="en" key="FOR_MORE_INFO_ON_PARTITIONS">For information on how to create and manage partitions, please refer to the documentation supplied with your operating system or contact your computer vendor's technical support team for assistance.</string>
     <string lang="en" key="SYSTEM_PARTITION_NOT_ACTIVE">Error: The currently running operating system is not installed on the boot partition (first Active partition). This is not supported.</string>
     <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="nn" key="CANT_ACCESS_VOL">Feil: Cannot access the volume!\n\nMake sure that the selected volume exists, that it is not mounted or being used by the system or an application, that you have read/write permission for the volume, and that it is not write-protected.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Error: Cannot access the volume and/or obtain information about the volume.\n\nMake sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Error: Cannot access the volume and/or obtain information about the volume. Make sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.\n\nIf the problem persists, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">An error prevented VeraCrypt from encrypting the partition. Please try fixing any previously reported problems and then try again. If the problems persist, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_RESUME">An error prevented VeraCrypt from resuming the process of encryption of the partition.\n\nPlease try fixing any previously reported problems and then try resuming the process again. Note that the volume cannot be mounted until it has been fully encrypted.</string>
+    <string lang="en" key="INPLACE_DEC_GENERIC_ERR">An error prevented VeraCrypt from decrypting the volume. Please try fixing any previously reported problems and then try again if possible.</string>
     <string lang="nn" key="CANT_DISMOUNT_OUTER_VOL">Feil: Kan ikkje demontera det ytre volumet!\n\nVolumet kan ikkje demonterast vist det inneheld filer eller mapper som er i bruk at eit program eller systemet.\n\nVer gild å steng alle program som kan bruka filer eller mapper på volumet og trykk Prøv på nytt.</string>
     <string lang="en" key="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>
@@ -790,7 +835,7 @@
     <string lang="en" key="TC_INSTALLER_IS_RUNNING">VeraCrypt Installer is currently running on this system and performing or preparing installation or update of VeraCrypt. Before you proceed, please wait for it to finish or close it. If you cannot close it, please restart your computer before proceeding.</string>
     <string lang="en" key="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 www.veracrypt.org).</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="EXTRACTING_VERB">Extracting</string>
     <string lang="en" key="CANNOT_READ_FROM_PACKAGE">Cannot read data from the package.</string>
@@ -977,6 +1022,7 @@
     <string lang="en" key="CONFIRM_EXIT_UNIVERSAL">Exit?</string>
     <string lang="en" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt does not have sufficient information to determine whether to encrypt or decrypt.</string>
     <string lang="en" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt does not have sufficient information to determine whether to encrypt or decrypt.\n\nNote: If you decrypted the system partition/drive in the pre-boot environment, you may need to finalize the process by clicking Decrypt.</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_REVERSE_INFO">Note: When you are encrypting a non-system partition/volume in place and an error persistently prevents you from finishing the process, you will not be able to mount the volume (and access data stored on it) until you entirely DECRYPT the volume (i.e. reverse the process).\n\nIf you need to do so, follow these steps:\n1) Exit this wizard.\n2) In the main VeraCrypt window, select 'Volumes' &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="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Do you want to interrupt and postpone the process of encryption of the system partition/drive?\n\nNote: You will be able to resume the process and it will continue from the point it was stopped. You can do so, for example, by selecting 'System' &gt; 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window. If you want to permanently terminate or reverse the encryption process, select 'System' &gt; 'Permanently Decrypt System Partition/Drive'.</string>
     <string lang="en" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Do you want to interrupt and postpone the process of decryption of the system partition/drive?\n\nNote: You will be able to resume the process and it will continue from the point it was stopped. You can do so, for example, by selecting 'System' &gt; 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window. If you want to reverse the decryption process (and start encrypting), select 'System' &gt; 'Encrypt System Partition/Drive'.</string>
@@ -986,6 +1032,7 @@
     <string lang="en" key="FAILED_TO_START_WIPING">Error: Failed to start the process of wiping.</string>
     <string lang="en" key="INCONSISTENCY_RESOLVED">Inconsistency resolved.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="en" key="NOTHING_TO_RESUME">There is no process/task to resume.</string>
     <string lang="nn" key="HIDVOL_PROT_BKG_TASK_WARNING">ADVARSEL: VeraCrypt Bakgrunns oppgåve er deaktivert. Etter att du avsluttar VeraCrypt, vil du ikkje lenger få melding om skade på skjult volum er ungått.\n\nMerk: Du kan og slå av bakgrunns oppgåva kor tid som helst ved å høgre klikka på VeraCrypt systemstatus felt ikonet og vel 'Avslutt'.\n\n\nAktivera VeraCrypt bakgrunns oppgåve?</string>
     <string lang="nn" key="LANG_PACK_VERSION">Språk pakke versjon:  %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="en" key="ERROR_MBR_PROTECTED">Failed to write the MBR sector.\n\nYour BIOS may be configured to protect the MBR sector. Check your BIOS settings (press F2, Delete, or Esc, after powering on your computer) for MBR/antivirus protection.</string>
+    <string lang="en" key="BOOT_LOADER_FINGERPRINT_CHECK_FAILED">WARNING: The verification of VeraCrypt bootloader fingerprint failed!\nYour disk may have been tampered with by an attacker ("Evil Maid" attack).\n\nThis warning can also be triggered if you restored VeraCrypt boot loader using an Rescue Disk generated using a different VeraCrypt version.\n\nYou are advised to change your password immediately which will also restore the correct VeraCrypt bootloader. It is recommended to reinstall VeraCrypt and to take measures to avoid access to this machine by untrusted entities.</string>
     <string lang="en" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">The required version of the VeraCrypt Boot Loader is currently not installed. This may prevent some of the settings from being saved.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Note: In some situations, you may wish to prevent a person (adversary) that is watching you start the computer from knowing that you use VeraCrypt. The above options allow you to do that by customizing the VeraCrypt boot loader screen. If you enable the first option, no texts will be displayed by the boot loader (not even when you enter the wrong password). The computer will appear to be "frozen" while you can type your password. In addition, a custom message can be displayed to mislead the adversary. For example, fake error messages such as "Missing operating system" (which is normally displayed by the Windows boot loader if it finds no Windows boot partition). It is, however, important to note that if the adversary can analyze the content of the hard drive, he can still find out that it contains the VeraCrypt boot loader.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">WARNING: Please keep in mind that if you enable this option, the VeraCrypt boot loader will not display any texts (not even when you enter the wrong password). The computer will appear to be "frozen" (unresponsive) while you can type your password (the cursor will NOT move and no asterisk will be displayed when you press a key).\n\nAre you sure you want to enable this option?</string>
@@ -1034,8 +1082,11 @@
     <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="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">Warning: There is unallocated space between the system partition and the first partition behind it. After you create the hidden operating system, you must not create any new partitions in that unallocated space. Otherwise, the hidden operating system will be impossible to boot (until you delete such newly created partitions).</string>
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">This algorithm is currently not supported for system encryption.</string>
-	<string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</string>
     <string lang="en" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Error: Cannot set the keyboard layout for VeraCrypt to the standard US keyboard layout.\n\nNote that the password needs to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout.</string>
@@ -1120,6 +1171,7 @@
     <string lang="en" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">The pretest has been successfully completed.\n\nWARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt. If you do not, please back up the files now (you can click Defer, back up the files, then run VeraCrypt again anytime, and select 'System' &gt; 'Resume Interrupted Process' to start encrypting).\n\nWhen ready, click Encrypt to start encrypting.</string>
     <string lang="en" key="SYSENC_ENCRYPTION_PAGE_INFO">You can click Pause or Defer anytime to interrupt the process of encryption or decryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. To prevent slowdown when the system or applications write or read data from the system drive, VeraCrypt automatically waits until the data is written or read (see Status above) and then automatically continues encrypting or decrypting.</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nYou can click Pause or Defer anytime to interrupt the process of encryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. Note that the volume cannot be mounted until it has been fully encrypted.</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="en" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Hidden System Started</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Original System</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows creates (typically, without your knowledge or consent) various log files, temporary files, etc., on the system partition. It also saves the content of RAM to hibernation and paging files located on the system partition. Therefore, if an adversary analyzed files stored on the partition where the original system (of which the hidden system is a clone) resides, he might find out, for example, that you used the VeraCrypt wizard in the hidden-system-creation mode (which might indicate the existence of a hidden operating system on your computer).\n\nTo prevent such issues, VeraCrypt will, in the next steps, securely erase the entire content of the partition where the original system resides. Afterwards, in order to achieve plausible deniability, you will need to install a new system on the partition and encrypt it. Thus you will create the decoy system and the whole process of creation of the hidden operating system will be completed.</string>
@@ -1159,7 +1211,7 @@
     <string lang="en" key="HIDDEN_OS_CREATION_PREINFO_HELP">In the next steps, VeraCrypt will create the hidden operating system by copying the content of the system partition to the hidden volume (data being copied will be encrypted on the fly with an encryption key different from the one that will be used for the decoy operating system).\n\nPlease note that the process will be performed in the pre-boot environment (before Windows starts) and it may take a long time to complete; several hours or even several days (depending on the size of the system partition and on the performance of your computer).\n\nYou will be able to interrupt the process, shut down your computer, start the operating system and then resume the process. However, if you interrupt it, the entire process of copying the system will have to start from the beginning (because the content of the system partition must not change during cloning).</string>
     <string lang="en" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Do you want to cancel the entire process of creation of the hidden operating system?\n\nNote: You will NOT be able to resume the process if you cancel it now.</string>
     <string lang="en" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Do you want to cancel the system encryption pretest?</string>
-    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="en" key="SYS_DRIVE_NOT_ENCRYPTED">The system partition/drive does not appear to be encrypted (neither partially nor fully).</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">Your system partition/drive is encrypted (partially or fully).\n\nPlease decrypt your system partition/drive entirely before proceeding. To do so, select 'System' &gt; 'Permanently Decrypt System Partition/Drive' from the menu bar of the main VeraCrypt window.</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">When the system partition/drive is encrypted (partially or fully), you cannot downgrade VeraCrypt (but you can upgrade it or reinstall the same version).</string>
@@ -1176,6 +1228,8 @@
     <string lang="en" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">You have selected the system partition/drive (or the boot partition), but the wizard mode you selected is suitable only for non-system partitions/drives.\n\nDo you want to set up pre-boot authentication (which means that you will need to enter your password each time before Windows boots/starts) and encrypt the system partition/drive?</string>
     <string lang="en" key="CONFIRM_DECRYPT_SYS_DEVICE">Are you sure you want to permanently decrypt the system partition/drive?</string>
     <string lang="en" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the system partition/drive, unencrypted data will be written to it.\n\nAre you really sure you want to permanently decrypt the system partition/drive?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
     <string lang="en" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Warning: If you use a cascade of ciphers for system encryption, you may encounter the following issues:\n\n1) The VeraCrypt Boot Loader is larger than normal and, therefore, there is not enough space in the first drive track for a backup of the VeraCrypt Boot Loader. Hence, whenever it gets damaged (which often happens, for example, during inappropriately designed anti-piracy activation procedures of certain programs), you will need to use the VeraCrypt Rescue Disk to boot or to repair the VeraCrypt Boot Loader.\n\n2) On some computers, resuming from hibernation takes longer.\n\nThese potential issues can be prevented by choosing a non-cascade encryption algorithm (e.g. AES).\n\nAre you sure you want to use a cascade of ciphers?</string>
     <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>
@@ -1191,6 +1245,7 @@
     <string lang="en" key="ENABLE_BAD_SECTOR_ZEROING">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nThe process of in-place encryption can continue only when the sectors have been made readable again. VeraCrypt can attempt to make these sectors readable by writing zeros to the sectors (subsequently such all-zero blocks would be encrypted). However, note that any data stored in the unreadable sectors will be lost. If you want to avoid that, you can attempt to recover portions of the corrupted data using appropriate third-party tools.\n\nNote: In case of physically damaged sectors (as opposed to mere data corruption and checksum errors) most types of storage devices internally reallocate the sectors when data is attempted to be written to them (so the existing data in the damaged sectors may remain unencrypted on the drive).\n\nDo you want VeraCrypt to write zeroes to unreadable sectors?</string>
     <string lang="en" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nTo be able to proceed with decryption, VeraCrypt will have to discard the content of the unreadable sectors (the content will be replaced with pseudorandom data). Please note that, before proceeding, you can attempt to recover portions of any corrupted data using appropriate third-party tools.\n\nDo you want VeraCrypt to discard data in the unreadable sectors now?</string>
     <string lang="en" key="ZEROED_BAD_SECTOR_COUNT">Note: VeraCrypt has replaced the content of %I64d unreadable sectors (%s) with encrypted all-zero plaintext blocks.</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="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>

Translations/Language.pt-br.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- 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 -->
@@ -48,6 +48,7 @@
     <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>
     <control lang="pt-br" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Mais Informações</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="pt-br" key="IDC_MB">&amp;MB</control>
     <control lang="pt-br" key="IDC_MORE_INFO_ON_CONTAINERS">Mais informações</control>
     <control lang="pt-br" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">Mais informações sobre criptografia do sistema</control>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <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_FILE_CONTAINER">Cria um disco virtual criptografado em um arquivo. Recomendado para usuários inexperientes.</control>
@@ -85,6 +88,8 @@
     <control lang="pt-br" key="IDT_PARTIAL_POOL_CONTENTS">Conteúdo atual do pool (parcial)</control>
     <control lang="pt-br" key="IDT_PASS">Passar</control>
     <control lang="pt-br" key="IDT_PASSWORD">Senha:</control>
+    <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_SINGLE_BOOT">Selecione esta opção se houver apenas um sistema operacional instalado neste computador(mesmo se ele tiver vários usuários).</control>
@@ -142,6 +147,8 @@
     <control lang="pt-br" key="IDC_MOUNT_OPTIONS">Mais &amp;Opções...</control>
     <control lang="pt-br" key="IDC_MOUNT_READONLY">Montar v&amp;olume apenas para leitura</control>
     <control lang="pt-br" key="IDC_NEW_KEYFILES">Arquivos-chave...</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="pt-br" key="IDC_PREF_BKG_TASK_ENABLE">Ativado</control>
     <control lang="pt-br" key="IDC_PREF_CACHE_PASSWORDS">Manter as senhas na memória do driver</control>
     <control lang="pt-br" key="IDC_PREF_DISMOUNT_INACTIVE">Desmontar volume automaticamente se nenhum dado for lido/escrito por</control>
@@ -155,6 +162,7 @@
     <control lang="pt-br" key="IDC_PREF_MOUNT_READONLY">Montar volumes apenas para leitura</control>
     <control lang="pt-br" key="IDC_PREF_MOUNT_REMOVABLE">Montar volumes como mídia removível</control>
     <control lang="pt-br" key="IDC_PREF_OPEN_EXPLORER">Abrir janela do Explorer para volumes montados com sucesso</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</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="pt-br" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Apagar senhas ao desmontar automaticamente</control>
     <control lang="pt-br" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Apagar senhas ao sair</control>
@@ -167,11 +175,12 @@
     <control lang="pt-br" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Mostrar senha</control>
     <control lang="pt-br" key="IDC_TRAVEL_OPEN_EXPLORER">Abrir janela do &amp;Explorer para os volumes montados</control>
     <control lang="pt-br" key="IDC_TRAV_CACHE_PASSWORDS">Armazenar as senhas na memória da unidade</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="pt-br" key="IDC_UNMOUNTALL">De&amp;smontar Todos</control>
     <control lang="pt-br" key="IDC_VOLUME_PROPERTIES">Propriedades do &amp;Volume</control>
     <control lang="pt-br" key="IDC_VOLUME_TOOLS">Ferramen&amp;tas do Volume</control>
     <control lang="pt-br" key="IDC_WIPE_CACHE">&amp;Limpar Cache</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
     <control lang="pt-br" key="IDD_HOTKEYS_DLG">VeraCrypt - Atalhos</control>
     <control lang="pt-br" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="pt-br" key="IDM_CREATE_HIDDEN_OS">Criar Sistema Operacional Oculto ...</control>
     <control lang="pt-br" key="IDM_CREATE_RESCUE_DISK">Criar Disco de Emergência...</control>
     <control lang="pt-br" key="IDM_CREATE_VOLUME">Criar Novo Volume...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="pt-br" key="IDM_DEFAULT_KEYFILES">Arquivos-chave padrão...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <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>
@@ -243,6 +254,7 @@
     <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="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>
     <control lang="pt-br" key="IDM_VOLUME_WIZARD">Assistente de Criação de Volume</control>
     <control lang="pt-br" key="IDM_WEBSITE">Website do VeraCrypt</control>
@@ -369,7 +381,7 @@
     <string lang="pt-br" key="ACCESS_DENIED">Erro: Acesso negado.\n\nA partição que você está tentando acessar tem 0 setores ou é o dispositivo de sistema.</string>
     <string lang="en" key="ADMINISTRATOR">Administrator</string>
     <string lang="pt-br" key="ADMIN_PRIVILEGES_DRIVER">Para carregar o driver do VeraCrypt, você deve estar logado em uma conta com privilégio de administrador.</string>
-    <string lang="pt-br" key="ADMIN_PRIVILEGES_WARN_DEVICES">Para criptografar/formatar uma partição/dispositivo você deve estar logado em uma conta com privilégios de administrador.\n\nIsto não se aplica a volumes armazenados em arquivos.</string>
+    <string lang="pt-br" key="ADMIN_PRIVILEGES_WARN_DEVICES">Para criptografar/Descriptografar/formatar uma partição/dispositivo você deve estar logado em uma conta com privilégios de administrador.\n\nIsto não se aplica a volumes armazenados em arquivos.</string>
     <string lang="pt-br" key="ADMIN_PRIVILEGES_WARN_HIDVOL">Para criar um disco oculto, você deve estar logado em uma conta com privilégios de administrador.\n\nDeseja continuar?</string>
     <string lang="pt-br" key="ADMIN_PRIVILEGES_WARN_NTFS">Para formatar o disco como NTFS você precisa estar logado em uma conta com privilégios de administrador.\n\nSem estes privilégios, você pode formatar o disco como FAT.</string>
     <string lang="pt-br" key="AES_HELP">Cifra aprovada pela FIPS (Rijndael, publicada em 1998) para ser usada pelos departamentos e agências do governo dos EUA para proteger as informações mais confidenciais. Chave de 256 bits, bloco de 128 bits, 14 ciclos (AES-256). Modo de operação XTS.</string>
@@ -485,7 +497,11 @@
     <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>
     <string lang="pt-br" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Volume Totalmente Criptografado</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="pt-br" key="NONSYS_INPLACE_ENC_FINISHED_INFO">IMPORTANTE: PARA MONTAR ESTE RECÉM-CRIADO VOLUME VERACRYPT E ACESSAR OS DADOS ARMAZENADOS NELE, CLIQUE EM 'AUTO-MONTAR DISPOSITIVOS' NO JANELA PRINCIPAL DO VERACRYPT. Depois de digitar a senha correta (e/ou fornecer os arquivos-chave corretos), o volume será montado para a letra de unidade selecionada a partir da lista na janela principal do VeraCrypt (e você poderá acessar os dados criptografados por meio da letra de unidade selecionada).\n\nPOR FAVOR, LEMBRE-SE OU ANOTE OS PASSOS ACIMA. VOCÊ DEVE SEGUÍ-LOS, SEMPRE QUE DESEJAR MONTAR O VOLUME E ACESSAR OS DADOS ARMAZENADOS NELE. Alternativamente, na janela principal do VeraCrypt, clique em 'Selecionar dispositivo', selecione esta partição/volume e clique em 'Montar'.\n\nA partição/volume foi criptografada(o) com sucesso (agora ela contém um volume VeraCrypt totalmente criptografado) e está pronto para uso.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="pt-br" key="FORMAT_FINISHED_INFO">O volume VeraCrypt foi criado com sucesso.</string>
     <string lang="pt-br" key="FORMAT_FINISHED_TITLE">Disco Criado com Sucesso</string>
     <string lang="pt-br" key="FORMAT_HELP">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 Formatar para continuar.</string>
@@ -523,6 +539,7 @@
     <string lang="pt-br" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Ocorreu um erro ao obter o estado de criptografia do sistema.</string>
     <string lang="pt-br" key="INIT_SYS_ENC">Não foi possível iniciar componentes do programa de criptografia do sistema.</string>
     <string lang="pt-br" key="INIT_RAND">Falha ao iniciar o gerador de números aleatórios!</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="pt-br" key="INIT_REGISTER">Não foi possível iniciar a aplicação. Falha ao registrar a classe 'Dialog'.</string>
     <string lang="pt-br" key="INIT_RICHEDIT">Erro: Falha ao carregar a biblioteca de sistema Rich Edit.</string>
     <string lang="pt-br" key="INTRO_TITLE">Criação de Volume VeraCrypt</string>
@@ -535,6 +552,7 @@
     <string lang="pt-br" key="MOUNT_BUTTON">&amp;Montar</string>
     <string lang="pt-br" key="NEW_VERSION_REQUIRED">Uma versão mais recente do VeraCrypt é necessária para montar este disco.</string>
     <string lang="pt-br" key="VOL_CREATION_WIZARD_NOT_FOUND">Erro: O Assistente de Criação de Disco não foi encontrado.\n\nFavor certifique-se de que o arquivo 'VeraCrypt Format.exe' está na pasta de onde o VeraCrypt foi executado. Caso contrário, reinstale o VeraCrypt ou localize o arquivo 'VeraCrypt Format.exe' no seu sistema e execute-o.</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="pt-br" key="NEXT">&amp;Avançar &gt;</string>
     <string lang="pt-br" key="FINALIZE">&amp;Concluir</string>
     <string lang="pt-br" key="INSTALL">&amp;Instalar</string>
@@ -542,6 +560,7 @@
     <string lang="pt-br" key="NODRIVER">Não foi possível conectar ao driver de dispositivo do VeraCrypt. O VeraCrypt não pode funcionar sem o seu driver de dispositivo executando.\n\nObserve que, devido a características do Windows, pode ser necessário fazer log off ou reiniciar o sistema operacional antes de executar o driver de dispositivo.</string>
     <string lang="pt-br" key="NOFONT">Um erro ocorreu quando da carga/preparação das fontes.</string>
     <string lang="pt-br" key="NOT_FOUND">A letra de unidade não foi encontrada ou não foi especificada.</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="pt-br" key="DRIVE_LETTER_UNAVAILABLE">Letra de Unidade não disponível.</string>
     <string lang="pt-br" key="NO_FILE_SELECTED">Nenhum arquivo foi selecionado!</string>
     <string lang="pt-br" key="NO_FREE_DRIVES">Nenhuma letra de drive está disponível.</string>
@@ -561,15 +580,18 @@
     <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_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="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="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="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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="pt-br" key="IDD_PCDM_CHANGE_PKCS5_PRF">Definir Algoritmo de Derivação da Chave de Cabeçalho</string>
     <string lang="pt-br" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Adicionar/Remover Arquivo-chave do disco</string>
     <string lang="pt-br" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Remover Todos os Arquivos-chave do disco</string>
-    <string lang="en" key="PASSWORD_CHANGED">Password and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</string>
+    <string lang="en" key="PASSWORD_CHANGED">Password, PIM and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</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="pt-br" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">IMPORTANTE: Se você não destruir o seu VeraCrypt Rescue Disk, sua partição de sistema / unidade ainda pode ser descriptografado usando a senha antiga (por arrancar o VeraCrypt Rescue Disk e inserir a senha antiga). Você deve criar um novo VeraCrypt Rescue Disk e, em seguida, destruir o velho um .\n\nVocê deseja criar um novo VeraCrypt Rescue Disk?</string>
     <string lang="pt-br" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Lembre que o Disco de Emergência VeraCrypt ainda usa o algoritmo anterior. Se você considera o algoritmo anterior inseguro, você deve criar um novo Disco de Emergência VeraCrypt e destruir o antigo.\n\nVocê deseja criar um novo disco de emergência VeraCrypt?</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,6 +600,7 @@
     <string lang="pt-br" key="PKCS5_PRF_CHANGED">Algoritmo de derivação da chave ajustado com sucesso.</string>
     <string lang="pt-br" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">Digite a senha e/ou arquivo(s)-chave para o volume não-sistema em que pretende retomar o processo de criptografia no local.\n\n\nObservação: Após clicar em Avançar, o VeraCrypt tentará encontrar todos os volumes não-sistema onde o processo de criptografia tenha sido interrompido e onde o cabeçalho do volume VeraCrypt pode ser descriptografado usando a senha e/ou arquivo(s)-chave fornecidos. Se mais de um volume assim for encontrado, você terá que escolher um deles na próxima etapa.</string>
     <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_HIDDEN_OS_HELP">Por favor, escolha uma senha para o sistema operacional oculto (ou seja, para o volume oculto).</string>
@@ -597,11 +620,26 @@
     <string lang="pt-br" key="PASSWORD_WRONG_AUTOMOUNT">Senha incorreta ou nenhum volume VeraCrypt encontrado.</string>
     <string lang="pt-br" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Senha e/ou arquivo-chave incorretos ou nenhum volume VeraCrypt encontrado.</string>
     <string lang="pt-br" key="PASSWORD_WRONG_CAPSLOCK_ON">\n\nAVISO: A função Caps Lock está ligada. Isto pode levar a uma digitação incorreta da senha.</string>
+    <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
+    <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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="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>
+    <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="pt-br" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nDica: Se você está tentando montar uma partição localizada em um disco de sistema criptografado sem usar a autenticação pré-inicialização ou uma partição criptografada de um sistema operacional que não está sendo executado, você pode fazê-lo clicando em 'Sistema' &gt; 'Moutar sem Autenticação Pré-Inicialização'.</string>
     <string lang="pt-br" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">Neste modo, você não pode montar uma partição localizada em uma unidade cuja porção está dentro do alcance de aplicação da criptografia de sistema ativa.\n\nAntes que você possa montar esta partição neste modo, você precisa inicializar um sistema operacional instalado em uma unidade diferente (criptografado ou não), ou inicializar um sistema operacional não-criptografado.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <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>
@@ -701,11 +739,18 @@
     <string lang="pt-br" key="FOR_MORE_INFO_ON_PARTITIONS">Para informações sobre como criar e gerir partições, por favor, consulte a documentação fornecida com seu sistema operacional ou entre em contato com o suporte técnico do fornecedor do computador para assistência.</string>
     <string lang="pt-br" key="SYSTEM_PARTITION_NOT_ACTIVE">Erro: O sistema operacional atualmente em execução não está instalado na partição de inicialização (primeira partição ativa). Isto não é suportado.</string>
     <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="pt-br" key="CANT_ACCESS_VOL">Erro: Não foi possível acessar o volume!\n\nCertifique-se de que o volume selecionado realmente existe, que ele não está montado ou sendo usado pelo sistema ou outro programa, que você tem permissão para ler/gravar nesse volume e que ele não está protegido contra gravação.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="pt-br" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Erro: Não foi possível acessar o volume e/ou obter informações sobre o volume.\n\nCertifique-se que o volume selecionado existe, que não está sendo usado pelo sistema ou aplicativos, que você tem privilégio de leitura/escrita no volume, e que ele não está protegido contra gravação.</string>
     <string lang="pt-br" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Erro: Não foi possível acessar o volume e/ou obter informações sobre o volume.\n\nCertifique-se que o volume selecionado existe, que não está sendo usado pelo sistema ou aplicativos, que você tem privilégio de leitura/escrita no volume, e que ele não está protegido contra gravação.\n\nSe o problema persistir, os passos abaixo podem ajudar.</string>
     <string lang="pt-br" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">Um erro impediu o VeraCrypt de criptografar a partição. Tente corrigir quaisquer problemas reportados anteriormente e, em seguida, tente novamente. Se os problemas persistirem, as etapas abaixo pode ajudar.</string>
     <string lang="pt-br" key="INPLACE_ENC_GENERIC_ERR_RESUME">Um erro impediu o VeraCrypt de retomar o processo de criptografia da partição.\n\nPor favor, tente corrigir quaisquer problemas reportados anteriormente e, em seguida, tentar retomar o processo novamente. Note que o volume não pode ser montado até que tenha sido totalmente criptografado.</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="pt-br" key="CANT_DISMOUNT_OUTER_VOL">Erro: Não foi possível desmontar o volume externo!\n\nUm disco não pode ser desmontado se contiver arquivos ou pastas que estiverem sendo usadas por algum programa ou pelo sistema.\n\nFavor fechar qualquer programa que possa estar usando estes arquivos ou diretórios do disco e clique em "Repetir".</string>
     <string lang="pt-br" key="CANT_GET_OUTER_VOL_INFO">Erro: Não foi possível obter informações sobre o volume externo!  a Criação do volume não pode continuar.</string>
     <string lang="pt-br" key="CANT_ACCESS_OUTER_VOL">Erro: Não foi possível acessar o volume externo! A criação do volume não pode continuar.</string>
@@ -790,7 +835,7 @@
     <string lang="pt-br" key="TC_INSTALLER_IS_RUNNING">O instalador do VeraCrypt está atualmente em execução, realizando ou preparando uma instalação ou atualização do VeraCrypt. Antes de continuar, por favor, aguarde o seu término ou feche-o. Se você não puder fechá-lo, por favor, reinicie o computador antes de prosseguir.</string>
     <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 www.veracrypt.org).</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="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>
@@ -977,6 +1022,7 @@
     <string lang="pt-br" key="CONFIRM_EXIT_UNIVERSAL">Encerrar o VeraCrypt?</string>
     <string lang="pt-br" key="CHOOSE_ENCRYPT_OR_DECRYPT">O VeraCrypt não possui informações suficientes para determinar se criptografa ou descriptografa.</string>
     <string lang="pt-br" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">O VeraCrypt não possui informação suficiente para determinar se deve criptografar ou descriptografar.\n\nNote: Se você descriptografou o dispositivo/partição de sistema no ambiente pré-inicialização, poderá ser necessário concluir o processo clicando em Descriptografar.</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="pt-br" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">Você deseja interromper e adiar o processo de criptografia da partição/volume?\n\nNota: Tenha em mente que o volume não pode ser montado até que ele tenha sido totalmente criptografado. Você poderá retomar o processo de criptografia e ele irá continuar a partir do ponto que foi parado. Você pode fazê-lo, por exemplo, escolhendo 'Volumes' &gt; ' Continuar Processo Interrompido' a partir da barra de menu da janela principal do VeraCrypt.</string>
     <string lang="pt-br" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Você deseja interromper e adiar o processo de criptografia do dispositivo/partição de sistema?\n\nLembre: Você poderá continuar o processo do ponto em que ele foi interrompido. Para isso, você pode, por exemplo, clicar em 'Sistema' &gt; 'Continuar Processo interrompido' na barra de menu da janela principal do VeraCrypt. Se você deseja reverter o processo de criptografia (e começar a descriptografar), Clique em 'Sistema' &gt; 'Descriptografar o Dispositivo/Partição de Sistema'.</string>
     <string lang="pt-br" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Você deseja interromper e adiar o processo de descriptografia do dispositivo/partição de sistema?\n\nLembre: Você poderá continuar o processo do ponto em que ele foi interrompido. Para isso, você pode, por exemplo, clicar em 'Sistema' &gt; 'Continuar Processo interrompido' na barra de menu da janela principal do VeraCrypt. Se você deseja reverter o processo de descriptografia (e começar a criptografar), Clique em 'Sistema' &gt; 'Criptografar o Dispositivo/Partição de Sistema'.</string>
@@ -986,6 +1032,7 @@
     <string lang="pt-br" key="FAILED_TO_START_WIPING">Erro: Falha ao iniciar o processo de limpeza.</string>
     <string lang="pt-br" key="INCONSISTENCY_RESOLVED">Inconsistência resolvida.\n\n\n(Se você relatar um bug devido a isso, favor incluir a seguinte informação técnica no relatório: %hs)</string>
     <string lang="pt-br" key="UNEXPECTED_STATE">Erro: Estado inesperado.\n\n\n(Se você relatar um bug relacionado a isto, por favor inclua as seguintes informações técnicas no relatório de erros: %hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="pt-br" key="NOTHING_TO_RESUME">Não há nenhum processo/tarefa a continuar.</string>
     <string lang="pt-br" key="HIDVOL_PROT_BKG_TASK_WARNING">AVISO: A tarefa em Background do VeraCrypt está desabilitada. Depois de sair do VeraCrypt, voce não será notificado se algum dano a um arquivo escondido for evitado.\n\nObs: Voce pode parar a tarefa em Background a qualquer momento clicando com o botão direito no ícone do VeraCrypt na bandeja do sistema e selecionando 'Sair'.\n\nHabilitar a execução do VeraCrypt em Segundo Plano?</string>
     <string lang="pt-br" key="LANG_PACK_VERSION">Versão da Tradução: %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="pt-br" key="ERROR_MBR_PROTECTED">Não foi possível gravar no setor da MBR.\n\nSua BIOS pode estar configurada para proteger o setor da MBR. Verifique "MBR/antivirus protection" nas configurações da sua BIOS (pressione F2, Delete ou Esc ao ligar o seu computador).</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="pt-br" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">A versão requerida do Gerenciador de Boot do VeraCrypt não está instalada no momento. Isto pode evitar que algumas configurações sejam salvas.</string>
     <string lang="pt-br" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Nota: Em algumas situações, você pode querer impedir uma pessoa (adversário) que está observando você iniciar o computador de saber que você usa o VeraCrypt. As opções acima permitem que você faça isso, personalizando a tela de inicialização do VeraCrypt. Se você ativar a primeira opção, nenhum texto será apresentado pelo gestor de inicialização (mesmo se você digitar a senha errada). O computador aparentará estar "congelado" enquanto você puder digitar sua senha. Além disso, uma mensagem personalizada pode ser exibida para enganar seu adversário. Por exemplo, mensagens de erro falsas como 'Sistema operacional ausente' (que normalmente é exibida pelo boot do Windows se ele não encontrar qualquer partição de inicialização do Windows). No entanto, é importante notar que, se o adversário puder analisar o conteúdo do disco rígido, ele ainda pode descobrir que ele contém o gestor de inicialização do VeraCrypt.</string>
     <string lang="pt-br" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">ATENÇÃO: Tenha em mente que se você ativar esta opção, o inicializador do VeraCrypt não exibirá quaisquer textos (mesmo se você digitar a senha errada). O computador aparentará estar "congelado" (sem resposta), enquanto você puder digitar sua senha (o cursor NÃO se moverá e nenhum asterisco será exibido quando você pressionar uma tecla).\n\nTem certeza de que deseja ativar essa opção?</string>
@@ -1034,8 +1082,11 @@
     <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="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>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="pt-br" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Arquivos-chave atualmente não são suportados para criptografia do sistema.</string>
     <string lang="pt-br" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Aviso: O VeraCrypt não conseguiu restaurar o layout original do teclado. Isto poderá fazê-lo digitar a senha incorretamente.</string>
     <string lang="pt-br" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Erro: Não foi possível configurar o layout do teclado para o VeraCrypt como layout Estados Unidos (Internacional).\n\nLembre que a senha precisa ser digitada em ambiente pré-boot (antes de o Windows iniciar) onde layouts não-Windows Estados Unidos (Internacional) não estão disponíveis. Por isso, a senha deve ser digitada sempre usando o layout Estados Unidos (Internacional).</string>
@@ -1120,6 +1171,7 @@
     <string lang="pt-br" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">O pré-teste foi concluído com êxito.\n\nATENÇÃO: Observe que, se fonte de energia for subitamente interrompida durante a criptografia dos dados existentes no local, ou quando o sistema operacional falhar devido a um erro de software ou hardware enquanto o VeraCrypt estiver criptografando os dados existentes no local, porções dos dados serão corrompidas ou perdidas. Portanto, antes de começar a codificação, por favor, certifique-se de que tem cópias de segurança dos arquivos que você deseja criptografar. Se não possuir, por favor faça backup dos arquivos agora (você pode clicar em Adiar, fazer backup dos arquivos e, em seguida, executar novamente o VeraCrypt a qualquer momento, e selecione 'Sistema' &gt; 'Continuar Processo Interrompido' para iniciar a criptografia).\n\nQuando estiver pronto, clique em Criptografar para iniciar.</string>
     <string lang="en" key="SYSENC_ENCRYPTION_PAGE_INFO">You can click Pause or Defer anytime to interrupt the process of encryption or decryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. To prevent slowdown when the system or applications write or read data from the system drive, VeraCrypt automatically waits until the data is written or read (see Status above) and then automatically continues encrypting or decrypting.</string>
     <string lang="pt-br" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nVocê pode clicar em Pausar ou Adiar a qualquer momento para interromper o processo de criptografia, sair deste assistente, reiniciar ou desligar seu computador e, em seguida, retomar o processo, que continuará a partir do ponto que foi parado. Note que o volume não pode ser montado até que tenha sido totalmente criptografado.</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="pt-br" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Sistema Oculto Iniciado</string>
     <string lang="pt-br" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Sistema Original</string>
     <string lang="pt-br" key="SYSENC_HIDDEN_OS_WIPE_INFO">O Windows cria (normalmente, sem o seu conhecimento ou consentimento) vários arquivos de registro, arquivos temporários, etc, na partição do sistema. Ele também salva o conteúdo da memória RAM para hibernação e arquivos de paginação localizados na partição do sistema. Portanto, se um adversário analisasse arquivos armazenados na partição onde reside o sistema original (do qual o sistema oculto é um clone), ele pode descobrir, por exemplo, que você usou o assistente do VeraCrypt no modo de criação de sistemas ocultos (que pode indicar a existência de um sistema operacional oculto no seu computador).\n\nPara evitar tais problemas, o VeraCrypt irá, nos próximos passos, apagar com segurança todo o conteúdo da partição onde o sistema original reside. Posteriormente, a fim de obter camuflagem de informações, será necessário instalar um novo sistema na partição e criptografá-lo. Assim você irá criar o sistema isca e todo o processo de criação do sistema operacional oculto será concluído.</string>
@@ -1159,7 +1211,7 @@
     <string lang="pt-br" key="HIDDEN_OS_CREATION_PREINFO_HELP">Nas próximas etapas, o VeraCrypt irá criar o sistema operacional oculto copiando o conteúdo da partição do sistema para o volume oculto (os dados a serem copiados serão criptografados on-the-fly com uma chave de criptografia diferente daquele que será utilizada para o sistema isca).\n\nPor favor note que o processo será realizado em ambiente pré-boot (antes do Windows iniciar) e pode levar um longo tempo para concluir; várias horas ou até vários dias (dependendo do tamanho da partição do sistema e do desempenho do seu computador).\n\nVocê poderá interromper o processo, desligar o computador, iniciar o sistema operacional e, em seguida, retomar o processo. No entanto, se você interrompê-lo, todo o processo de cópia do sistema terá que começar desde o início (porque o conteúdo da partição do sistema não deve mudar durante a clonagem).</string>
     <string lang="pt-br" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Deseja cancelar todo o processo de criação do sistema operacional oculto?\n\nNota: Você NÃO poderá retomar o processo se cancelá-lo agora.</string>
     <string lang="pt-br" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Você deseja cancelar o pré-teste de criptografia de sistema?</string>
-    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="pt-br" key="SYS_DRIVE_NOT_ENCRYPTED">O dispositivo/partição de sistema não parece estar criptografado (nem parcial nem completamente).</string>
     <string lang="pt-br" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">Seu dispositivo/partição de sistema está criptografado (parcial ou completamente).\n\nFavor descriptografar o dispositivo/partição de sistema completamente antes de continuar. Para isso, clique em 'Sistema' &gt; 'Descriptografar Dispositivo/Partição de Sistema Definitivamente' na barra de menu da janela principal do VeraCrypt.</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">When the system partition/drive is encrypted (partially or fully), you cannot downgrade VeraCrypt (but you can upgrade it or reinstall the same version).</string>
@@ -1176,6 +1228,8 @@
     <string lang="en" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">You have selected the system partition/drive (or the boot partition), but the wizard mode you selected is suitable only for non-system partitions/drives.\n\nDo you want to set up pre-boot authentication (which means that you will need to enter your password each time before Windows boots/starts) and encrypt the system partition/drive?</string>
     <string lang="pt-br" key="CONFIRM_DECRYPT_SYS_DEVICE">Você tem certeza de que deseja descriptografar o dispositivo/partição de sistema definitivamente?</string>
     <string lang="pt-br" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">CUIDADO: Se você descriptografar o dispositivo/partição de sistema definitivamente, os dados descriptografados serão gravados nele.\n\nVocê tem certeza de que deseja descriptografar o dispositivo/partição de sistema definitivamente?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
     <string lang="pt-br" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Aviso: Se você usar uma cascata de cifras para criptografia do sistema, você pode encontrar os seguintes problemas:\n\n1) O Gerenciador de Boot do VeraCrypt é maior do que o normal e, portanto, não há espaço suficiente na primeira faixa de uma unidade para backup do Gerenciador de Boot do VeraCrypt. Consequentemente, sempre que ele for danificado (o que muitas vezes acontece, por exemplo, durante procedimentos de ativação anti-pirataria concebidos inadequadamente em certos programas), você precisará usar o Disco de Emergência VeraCrypt para iniciar ou reparar o Gerenciador de Boot do VeraCrypt.\n\n2) Alguns computadores demoram mais para retomar da hibernação.\n\nEstes problemas potenciais podem ser evitados pela escolha de um algoritmo de criptografia não-cascata (AES, por exemplo).\n\nTem certeza que pretende utilizar uma cascata de cifras?</string>
     <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>
@@ -1191,6 +1245,7 @@
     <string lang="pt-br" key="ENABLE_BAD_SECTOR_ZEROING">Erro: O conteúdo de um ou mais setores do disco não pode ser lido (provavelmente por algum defeito físico).\n\nO processo de criptografia no local só pode continuar quando os setores forem tornados legíveis novamente. O VeraCrypt pode tentar fazer estes setores legíveis gravando zeros nos setores (subseqüentemente todos esses blocos de zero seriam criptografados). No entanto, note que todos os dados armazenados nos setores ilegíveis serão perdidos. Se quiser evitar isso, você pode tentar recuperar parcelas dos dados corrompidos usando software de terceiros.\n\nNota: No caso de setores danificados fisicamente (em vez de mera corrupção de dados e erros de checksum), a maioria dos dispositivos de armazenamento realocam internamente os setores quando se tenta gravar dados neles (por isso, os dados existentes nos setores danificados podem permanecer não-criptografados na unidade).\n\nVocê quer que o VeraCrypt grave zeros nos setores ilegíveis?</string>
     <string lang="pt-br" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Erro: O conteúdo de um ou mais setores do disco não pode(m) ser lido(s) (provavelmente devido a um defeito físico).\n\nPara prosseguir com a descriptografia, o VeraCrypt terá que descartar o conteúdo de tais setores (o conteúdo será substituído por dados pseudo-aleatórios). Por favor note que, antes de continuar, você pode tentar recuperar porções dos dados corrompidos usando software apropriado de terceiros.\n\nDeseja que o VeraCrypt descarte os dados nos setores ilegíveis agora?</string>
     <string lang="pt-br" key="ZEROED_BAD_SECTOR_COUNT">Nota: O VeraCrypt substituiu o conteúdo de %I64d setores ilegíveis (%s) com blocos criptografados de texto formatado com zeros.</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="pt-br" key="ENTER_TOKEN_PASSWORD">Digite password/PIN para o token '%s':</string>
     <string lang="pt-br" key="PKCS11_LIB_LOCATION_HELP">\tA fim de permitir que o VeraCrypt acesse um token de segurança ou um smart card, você primeiro precisa instalar uma biblioteca de software PKCS #11 para o token ou smart card. Essa biblioteca pode ser fornecida com o dispositivo ou pode estar disponível para download no site do vendedor ou por terceiros. \tDepois de instalar a biblioteca, você pode selecioná-la manualmente, clicando em 'Selecionar Biblioteca' ou você pode deixar o VeraCrypt encontrá-la e selecioná-la automaticamente clicando em 'Auto-Detectar Biblioteca' (apenas o diretório de sistema do Windows vai ser pesquisado).</string>
     <string lang="pt-br" key="SELECT_PKCS11_MODULE_HELP">Nota: Para o nome do arquivo e a localização da biblioteca PKCS #11 instalada para seu token de segurança ou smart card, por favor consulte a documentação fornecida com o token, card, ou software de terceiros.\n\nClique em 'OK' para selecionar o caminho e o nome do arquivo.</string>

Translations/Language.ru.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="ru" name="Русский" en-name="Russian" version="1.0.0" translators="Dmitry Yerokhin" />
     <!-- Fonts -->
@@ -44,10 +44,11 @@
     <control lang="ru" key="IDC_HIDVOL_WIZ_MODE_FULL">Обычный режим</control>
     <control lang="ru" key="IDC_KB">&amp;КБ</control>
     <control lang="ru" key="IDC_KEYFILES_ENABLE">Кл&amp;юч. файлы</control>
-    <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
+    <control lang="ru" key="IDC_KEYFILES_RANDOM_SIZE">Случайный размер ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="ru" key="IDC_KEY_FILES">Клю&amp;ч. файлы...</control>
     <control lang="ru" key="IDC_LINK_HASH_INFO">Сведения о хеш-алгоритмах</control>
     <control lang="ru" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Подробнее</control>
+    <control lang="ru" key="IDC_LINK_PIM_INFO">Информация на PIM</control>
     <control lang="ru" key="IDC_MB">&amp;МБ</control>
     <control lang="ru" key="IDC_MORE_INFO_ON_CONTAINERS">Подробнее</control>
     <control lang="ru" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">Подробнее о шифровании системы</control>
@@ -57,6 +58,7 @@
     <control lang="ru" key="IDC_NO_HISTORY">&amp;Не сохранять историю</control>
     <control lang="ru" key="IDC_OPEN_OUTER_VOLUME">Открыть внешний том</control>
     <control lang="ru" key="IDC_PAUSE">&amp;Пауза</control>
+    <control lang="ru" key="IDC_PIM_ENABLE">Использовать PIM</control>
     <control lang="ru" key="IDC_QUICKFORMAT">Быстрое форматир.</control>
     <control lang="ru" key="IDC_SHOW_PASSWORD">&amp;Показ пароля</control>
     <control lang="ru" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Показ пароля</control>
@@ -72,6 +74,7 @@
     <control lang="ru" key="IDT_COLLECTING_RANDOM_DATA_NOTE">ВАЖНО: Хаотично перемещайте мышь внутри этого окна (чем дольше, тем лучше) - это значительно увеличит криптостойкость ключей шифрования. Затем нажмите 'Далее' для продолжения.</control>
     <control lang="ru" key="IDT_CONFIRM">&amp;Подтвердите:</control>
     <control lang="ru" key="IDT_DONE">Уже</control>
+    <control lang="ru" key="IDT_DRIVE_LETTER">Буква диска:</control>
     <control lang="ru" key="IDT_ENCRYPTION_ALGO">Алгоритм шифрования</control>
     <control lang="ru" key="IDT_FILESYSTEM">Файл.сист.</control>
     <control lang="ru" key="IDT_FILE_CONTAINER">Создать виртуальный зашифрованный диск внутри файла. Рекомендуется неопытным пользователям.</control>
@@ -85,6 +88,8 @@
     <control lang="ru" key="IDT_PARTIAL_POOL_CONTENTS">Текущее содержимое пула (часть)</control>
     <control lang="ru" key="IDT_PASS">Пароль</control>
     <control lang="ru" key="IDT_PASSWORD">Пароль:</control>
+    <control lang="ru" key="IDT_PIM">PIM тома:</control>
+    <control lang="ru" key="IDT_OLD_PIM">PIM тома:</control>
     <control lang="ru" key="IDT_PROGRESS">Ход операции:</control>
     <control lang="ru" key="IDT_RANDOM_POOL">Случайн. пул: </control>
     <control lang="ru" key="IDT_SINGLE_BOOT">Выберите эту опцию, если в ПК установлена только одна ОС (даже если она с несколькими пользователями).</control>
@@ -142,11 +147,13 @@
     <control lang="ru" key="IDC_MOUNT_OPTIONS">Параметр&amp;ы...</control>
     <control lang="ru" key="IDC_MOUNT_READONLY">Монтировать как том только для &amp;чтения</control>
     <control lang="ru" key="IDC_NEW_KEYFILES">Ключ.файлы...</control>
+    <control lang="ru" key="IDC_OLD_PIM_HELP">(Пустой или 0 для итераций по умолчанию)</control>
+    <control lang="ru" key="IDC_PIM_HELP">(Пустой или 0 для итераций по умолчанию)</control>	
     <control lang="ru" key="IDC_PREF_BKG_TASK_ENABLE">Включено</control>
     <control lang="ru" key="IDC_PREF_CACHE_PASSWORDS">Кэшировать пароли в памяти драйвера</control>
     <control lang="ru" key="IDC_PREF_DISMOUNT_INACTIVE">Автоматически размонтировать тома при неактивности в течение</control>
     <control lang="ru" key="IDC_PREF_DISMOUNT_LOGOFF">завершении сеансов</control>
-    <control lang="en" key="IDC_PREF_DISMOUNT_SESSION_LOCKED">User session locked</control>
+    <control lang="ru" key="IDC_PREF_DISMOUNT_SESSION_LOCKED">Сессия пользователя заблокирована</control>
     <control lang="ru" key="IDC_PREF_DISMOUNT_POWERSAVING">входе в энергосбережение</control>
     <control lang="ru" key="IDC_PREF_DISMOUNT_SCREENSAVER">старте экранной заставки</control>
     <control lang="ru" key="IDC_PREF_FORCE_AUTO_DISMOUNT">Автоматически размонтировать тома даже при открытых файлах/папках</control>
@@ -155,6 +162,7 @@
     <control lang="ru" key="IDC_PREF_MOUNT_READONLY">Монтировать как тома\nтолько для чтения</control>
     <control lang="ru" key="IDC_PREF_MOUNT_REMOVABLE">Монтировать тома как сменные носители</control>
     <control lang="ru" key="IDC_PREF_OPEN_EXPLORER">Открывать окно Проводника для успешно смонтированного тома</control>
+    <control lang="ru" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Временный пароль кэша в течение операций "Смонтировать избранные тома"</control>
     <control lang="ru" key="IDC_PREF_USE_DIFF_TRAY_ICON_IF_VOL_MOUNTED">Другой значок в системном лотке, если есть смонтированные тома</control>
     <control lang="ru" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Очищать кэш паролей при авторазмонтировании</control>
     <control lang="ru" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Очищать кэш паролей при выходе</control>
@@ -167,11 +175,12 @@
     <control lang="ru" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Показ пароля</control>
     <control lang="ru" key="IDC_TRAVEL_OPEN_EXPLORER">&amp;Открыть смонтированный том в окне Проводника</control>
     <control lang="ru" key="IDC_TRAV_CACHE_PASSWORDS">&amp;Кэшировать пароль в памяти драйвера</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="ru" key="IDC_TRUECRYPT_MODE">Режим TrueCrypt</control>
     <control lang="ru" key="IDC_UNMOUNTALL">&amp;Размонтировать все</control>
     <control lang="ru" key="IDC_VOLUME_PROPERTIES">Сво&amp;йства тома...</control>
     <control lang="ru" key="IDC_VOLUME_TOOLS">О&amp;перации с томами</control>
     <control lang="ru" key="IDC_WIPE_CACHE">О&amp;чистить кэш</control>
+    <control lang="ru" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Параметры Монтирования</control>
     <control lang="ru" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Избранные тома</control>
     <control lang="ru" key="IDD_HOTKEYS_DLG">VeraCrypt - Общесистемные горячие клавиши</control>
     <control lang="ru" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="ru" key="IDM_CREATE_HIDDEN_OS">Создать скрытую ОС...</control>
     <control lang="ru" key="IDM_CREATE_RESCUE_DISK">Создать диск восстановления...</control>
     <control lang="ru" key="IDM_CREATE_VOLUME">Создать новый том...</control>
+    <control lang="ru" key="IDM_DECRYPT_NONSYS_VOL">Постоянно Расшифровывать...</control>
     <control lang="ru" key="IDM_DEFAULT_KEYFILES">Ключевые файлы по умолчанию...</control>
+    <control lang="ru" key="IDM_DEFAULT_MOUNT_PARAMETERS">Параметры Монтирования по-умолчанию...</control>
     <control lang="ru" key="IDM_DONATE">Помочь...</control>
     <control lang="ru" key="IDM_ENCRYPT_SYSTEM_DEVICE">Зашифровать системный раздел/диск...</control>
     <control lang="ru" key="IDM_FAQ">Часто задаваемые вопросы</control>
@@ -243,6 +254,7 @@
     <control lang="ru" key="IDM_UNMOUNT_VOLUME">Размонтировать том</control>
     <control lang="ru" key="IDM_VERIFY_RESCUE_DISK">Проверить диск восстановления</control>
     <control lang="ru" key="IDM_VERSION_HISTORY">История версий</control>
+    <control lang="ru" key="IDM_VOLUME_EXPANDER">Расширитель Томов</control>
     <control lang="ru" key="IDM_VOLUME_PROPERTIES">Свойства тома</control>
     <control lang="ru" key="IDM_VOLUME_WIZARD">Мастер создания томов</control>
     <control lang="ru" key="IDM_WEBSITE">Сайт VeraCrypt</control>
@@ -335,9 +347,9 @@
     <control lang="ru" key="IDT_KEYFILE_GENERATOR_NOTE">ВАЖНО: Хаотично перемещайте мышь внутри этого окна (чем дольше, тем лучше). Это значительно увеличит криптостойкость ключевого файла.</control>
     <control lang="ru" key="IDT_KEYFILE_WARNING">!!! При утере ключевого файла или повреждении его первых 1024 килобайт монтирование использующих этот файл томов невозможно!</control>
     <control lang="ru" key="IDT_KEY_UNIT">бит</control>
-    <control lang="en" key="IDT_NUMBER_KEYFILES">Number of keyfiles:</control>
-    <control lang="en" key="IDT_KEYFILES_SIZE">Keyfiles size (in Bytes):</control>
-    <control lang="en" key="IDT_KEYFILES_BASE_NAME">Keyfiles base name:</control>
+    <control lang="ru" key="IDT_NUMBER_KEYFILES">Число ключевых файлов:</control>
+    <control lang="ru" key="IDT_KEYFILES_SIZE">Размер ключевых файлов (в Байтах):</control>
+    <control lang="ru" key="IDT_KEYFILES_BASE_NAME">Имя ключевых файлов:</control>
     <control lang="ru" key="IDT_LANGPACK_AUTHORS">Автор перевода:</control>
     <control lang="ru" key="IDT_PLAINTEXT">Размер:</control>
     <control lang="ru" key="IDT_PLAINTEXT_SIZE_UNIT">бит</control>
@@ -348,7 +360,7 @@
     <control lang="ru" key="IDT_SECURITY_TOKEN">Токен:</control>
     <control lang="ru" key="IDT_SORT_METHOD">Сортировка:</control>
     <control lang="ru" 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="ru" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Пожалуйста, подождите...\nЭтот процесс может занять долгое время и может перестать реагировать на запросы.</control>
     <control lang="ru" key="IDT_TEST_BLOCK_NUMBER">Число блоков:</control>
     <control lang="ru" key="IDT_TEST_CIPHERTEXT">Зашифрованный текст (16-ричное)</control>
     <control lang="ru" key="IDT_TEST_DATA_UNIT_NUMBER">Число единиц с данными (64-бит 16-ричное, размер единицы с данными - 512 байт)</control>
@@ -369,7 +381,7 @@
     <string lang="ru" key="ACCESS_DENIED">Ошибка! Нет доступа.\n\nРаздел, к которому вы пытаетесь получить доступ, имеет длину 0 секторов, либо это загрузочное устройство.</string>
     <string lang="ru" key="ADMINISTRATOR">Администратор</string>
     <string lang="ru" key="ADMIN_PRIVILEGES_DRIVER">Чтобы можно было загрузить драйвер VeraCrypt, вы должны войти в систему с правами Администратора.</string>
-    <string lang="ru" key="ADMIN_PRIVILEGES_WARN_DEVICES">Чтобы можно было шифровать/форматировать раздел/устройство, вы должны войти в систему с правами Администратора.\n\nК томам на основе файлов это не относится.</string>
+    <string lang="ru" key="ADMIN_PRIVILEGES_WARN_DEVICES">Чтобы можно было шифровать/Дешифрация/форматировать раздел/устройство, вы должны войти в систему с правами Администратора.\n\nК томам на основе файлов это не относится.</string>
     <string lang="ru" key="ADMIN_PRIVILEGES_WARN_HIDVOL">Чтобы можно было создать скрытый том, вы должны войти в систему с правами Администратора.\n\nПродолжить?</string>
     <string lang="ru" key="ADMIN_PRIVILEGES_WARN_NTFS">Чтобы можно было форматировать тома как NTFS, вы должны войти в систему с правами Администратора.\n\nБез привилегий Администратора можно форматировать тома только как FAT.</string>
     <string lang="ru" key="AES_HELP">Утверждённый FIPS (США) алгоритм шифрования (Rijndael, опубликован в 1998 г.), разрешён к применению в федеральных структурах США для защиты важнейшей информации. 256-бит ключ, 128-бит блок, 14 раундов (AES-256). Режим работы: XTS.</string>
@@ -485,7 +497,11 @@
     <string lang="ru" key="FORMAT_FINISHED_HELP">\n\nТом VeraCrypt создан и готов к использованию.\n\nЕсли вы хотите создать ещё один том VeraCrypt, нажмите кнопку 'Далее'. Иначе нажмите 'Выход'.</string>
     <string lang="ru" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nСкрытый том VeraCrypt успешно создан (внутри него будет находиться скрытая операционная система).\n\nНажмите 'Далее' для продолжения.</string>
     <string lang="ru" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Том полностью зашифрован</string>
+    <string lang="ru" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Том полностью расшифрован</string>
     <string lang="ru" key="NONSYS_INPLACE_ENC_FINISHED_INFO">ВАЖНО: ДЛЯ МОНТИРОВАНИЯ ЭТОГО ТОМА VERACRYPT И ДОСТУПА К СОДЕРЖАЩИМСЯ В НЁМ ДАННЫМ НАЖМИТЕ 'Автомонтирование' В ГЛАВНОМ ОКНЕ VERACRYPT. После ввода правильного пароля (и/или ключевых файлов) том будет смонтирован на букву диска, выбранную вами в главном окне VeraCrypt (доступ к зашифрованным данным будет по этой букве диска).\n\nЗАПОМНИТЕ ИЛИ ЗАПИШИТЕ ЭТАПЫ ВЫШЕ. ВЫ ДОЛЖНЫ ИМ СЛЕДОВАТЬ ДЛЯ МОНТИРОВАНИЯ ТОМА И ДОСТУПА К ЕГО ДАННЫМ. Другой способ: нажмите кнопку 'Устройство' в главном окне VeraCrypt, выберите этот раздел/том и нажмите 'Смонтировать'.\n\nРаздел/том успешно зашифрован (сейчас он содержит полностью зашифрованный том VeraCrypt) и готов к использованию.</string>
+    <string lang="ru" key="NONSYS_INPLACE_DEC_FINISHED_INFO">Том Veracrypt был успешно расшифрован.</string>
+    <string lang="ru" 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="ru" key="FORMAT_FINISHED_INFO">Том VeraCrypt успешно создан.</string>
     <string lang="ru" key="FORMAT_FINISHED_TITLE">Том создан</string>
     <string lang="ru" key="FORMAT_HELP">ВАЖНО: Хаотично перемещайте мышь внутри этого окна (чем дольше, тем лучше) - это значительно увеличит криптостойкость ключей шифрования.\nЗатем нажмите 'Разметить', чтобы создать том.</string>
@@ -523,6 +539,7 @@
     <string lang="ru" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Ошибка получения состояния системного шифрования.</string>
     <string lang="ru" key="INIT_SYS_ENC">Невозможно инициализировать компоненты приложения для системного шифрования.</string>
     <string lang="ru" key="INIT_RAND">Ошибка инициализации генератора случайных чисел.</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="ru" key="INIT_REGISTER">Ошибка инициализации приложения. Невозможно зарегистрировать класс Dialog.</string>
     <string lang="ru" key="INIT_RICHEDIT">Ошибка загрузки системной библиотеки Rich Edit.</string>
     <string lang="ru" key="INTRO_TITLE">Мастер создания томов VeraCrypt</string>
@@ -535,6 +552,7 @@
     <string lang="ru" key="MOUNT_BUTTON">С&amp;монтировать</string>
     <string lang="ru" key="NEW_VERSION_REQUIRED">Для монтирования этого тома требуется более новая версия VeraCrypt.</string>
     <string lang="ru" 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="ru" key="NEXT">&amp;Далее &gt;</string>
     <string lang="ru" key="FINALIZE">&amp;Готово</string>
     <string lang="ru" key="INSTALL">&amp;Установить</string>
@@ -542,6 +560,7 @@
     <string lang="ru" key="NODRIVER">Не удалось подключиться к драйверу устройств VeraCrypt. Если драйвер не запущен, работа VeraCrypt невозможна.\n\nИз-за особенностей Windows, для загрузки драйвера сначала может потребоваться завершение сеанса или перезагрузка системы.</string>
     <string lang="ru" key="NOFONT">Ошибка загрузки/подготовки шрифтов.</string>
     <string lang="ru" 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="ru" key="DRIVE_LETTER_UNAVAILABLE">Буква диска недоступна.</string>
     <string lang="ru" key="NO_FILE_SELECTED">Не выбран файл.</string>
     <string lang="ru" key="NO_FREE_DRIVES">Нет доступных букв дисков.</string>
@@ -561,15 +580,18 @@
     <string lang="ru" key="OVERWRITEPROMPT">ВНИМАНИЕ: Файл '%hs' уже существует!\n\nВАЖНО: VERACRYPT НЕ БУДЕТ ШИФРОВАТЬ ЭТОТ ФАЙЛ, ОН ЕГО УДАЛИТ.\n\nВы действительно хотите удалить этот файл, заменив его новым контейнером VeraCrypt?</string>
     <string lang="ru" key="OVERWRITEPROMPT_DEVICE">ОСТОРОЖНО: ВСЕ ДАННЫЕ, КОТОРЫЕ СОДЕРЖИТ  %s '%hs'%s, БУДУТ УНИЧТОЖЕНЫ (А НЕ ЗАШИФРОВАНЫ)!\n\nВы настаиваете на форматировании?</string>
     <string lang="ru" key="NONSYS_INPLACE_ENC_CONFIRM">ВНИМАНИЕ: Монтирование тома и доступ к хранящимся в нём файлам невозможны, пока том не будет полностью зашифрован.\n\nВы действительно хотите приступить к шифрованию %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 '%hs'%s?</string>
     <string lang="ru" key="NONSYS_INPLACE_ENC_CONFIRM_BACKUP">ВНИМАНИЕ: Неожиданное пропадание электропитания во время шифрования имеющихся данных 'на месте' или сбой операционной системы из-за программной/аппаратной ошибки может привести к частичному повреждению или потере данных. Поэтому прежде чем приступить к шифрованию, сделайте резервную копию файлов, которые вы хотите зашифровать.\n\nВы сделали такую резервную копию?</string>
     <string lang="ru" key="OVERWRITEPROMPT_DEVICE_HIDDEN_OS_PARTITION">ОСТОРОЖНО: ВСЕ ФАЙЛЫ НА РАЗДЕЛЕ '%hs'%s (Т.Е. НА ПЕРВОМ РАЗДЕЛЕ ЗА СИСТЕМНЫМ) БУДУТ УНИЧТОЖЕНЫ (А НЕ ЗАШИФРОВАНЫ)!\n\nВы действительно настаиваете на форматировании?</string>
     <string lang="ru" key="OVERWRITEPROMPT_DEVICE_SECOND_WARNING_LOTS_OF_DATA">ВНИМАНИЕ: ВЫБРАННЫЙ РАЗДЕЛ СОДЕРЖИТ БОЛЬШОЙ ОБЪЁМ ДАННЫХ! Все файлы на этом разделе будут удалены (они НЕ будут зашифрованы)!</string>
     <string lang="ru" key="ERASE_FILES_BY_CREATING_VOLUME">Стереть файлы в разделе при создании внутри него тома VeraCrypt</string>
     <string lang="ru" key="PASSWORD">Пароль</string>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="ru" key="IDD_PCDM_CHANGE_PKCS5_PRF">Алгоритм деривации ключа заголовка</string>
     <string lang="ru" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Добавление/удаление ключевых файлов в/из том(а)</string>
     <string lang="ru" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Удаление всех ключевых файлов из тома</string>
     <string lang="ru" key="PASSWORD_CHANGED">Пароль и/или ключевые файлы успешно изменен(ы).\n\nВАЖНО: Обязательно прочтите раздел 'Изменение паролей и ключевых файлов'\nв главе 'Требования безопасности и меры предосторожности'\nв Руководстве пользователя VeraCrypt.</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="ru" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">ВАЖНО: Если вы не уничтожили свой диск восстановления VeraCrypt (Rescue Disk), ваш системный раздел/диск по-прежнему можно расшифровать с помощью старого пароля (загрузившись с диска восстановления VeraCrypt и введя старый пароль). Вам следует создать новый диск восстановления VeraCrypt, после чего уничтожить старый.\n\nХотите создать новый диск восстановления VeraCrypt?</string>
     <string lang="ru" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Обратите внимание, что ваш диск восстановления VeraCrypt (Rescue Disk) всё ещё использует прежний алгоритм. Если вы считаете этот алгоритм недостаточно надёжным, создайте новый диск восстановления VeraCrypt, после чего уничтожьте старый.\n\nХотите создать новый диск восстановления VeraCrypt?</string>
     <string lang="ru" key="KEYFILES_NOTE">В качестве ключевого можно использовать файл любого типа (например, .mp3, .jpg, .zip, .avi). Содержимое ключевого файла при этом не изменяется. Можно выбирать несколько ключевых файлов (порядок неважен). Если добавить папку, то ключевыми будут все не скрытые файлы внутри неё. Нажмите 'Токен-файлы', чтобы выбрать ключевые файлы на токенах безопасности или смарт-картах (или для импорта ключевых файлов с токена/смарт-карты).</string>
@@ -578,6 +600,7 @@
     <string lang="ru" key="PKCS5_PRF_CHANGED">Алгоритм деривации ключа заголовка успешно установлен.</string>
     <string lang="ru" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">Введите пароль и/или ключевые файлы для несистемного тома, где вы хотите возобновить шифрование 'на месте'.\n\n\nПримечание: после нажатия 'Далее' VeraCrypt попытается найти все несистемные тома, на которых был прерван процесс шифрования, и где можно расшифровать заголовок тома VeraCrypt с помощью указанного пароля и/или ключевых файлов. Если таких томов окажется несколько, на следующем этапе вам будет нужно выбрать один из них.</string>
     <string lang="ru" 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="ru" key="PASSWORD_HELP">Очень важно выбрать хороший пароль. Избегайте указывать пароли из одного или нескольких слов, которые можно найти в словаре (или комбинаций из 2, 3 или 4 таких слов). Пароль не должен содержать имён или дат рождения. Он должен быть труден для угадывания. Хороший пароль - случайная комбинация прописных и строчных букв, цифр и особых символов (@ ^ = $ * + и т.д.).\n\nРекомендуем выбирать пароли, состоящие более чем из 20 символов (чем длиннее, тем лучше). Макс. длина: 64 символа.</string>
     <string lang="ru" key="PASSWORD_HIDDENVOL_HELP">Выберите пароль для скрытого тома. </string>
     <string lang="ru" key="PASSWORD_HIDDEN_OS_HELP">Выберите пароль для скрытой операционной системы (т.е. для скрытого тома). </string>
@@ -597,18 +620,33 @@
     <string lang="ru" key="PASSWORD_WRONG_AUTOMOUNT">Неверный пароль или не найден том VeraCrypt.</string>
     <string lang="ru" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Неверные ключевые файлы/пароль, либо не найден том VeraCrypt.</string>
     <string lang="ru" key="PASSWORD_WRONG_CAPSLOCK_ON">\n\nВнимание! Нажата клавиша Caps Lock. Это может привести к неправильному вводу пароля.</string>
+    <string lang="ru" key="PIM_CHANGE_WARNING">Запомнить номер монтирования тома</string>
+    <string lang="ru" key="PIM_HIDVOL_HOST_TITLE">Внешний PIM тома</string>
+    <string lang="ru" key="PIM_HIDVOL_TITLE">Скрытый PIM тома</string>
+    <string lang="ru" 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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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="ru" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nВнимание! В пути поиска ключевых файлов обнаружены скрытые файлы. Скрытые файлы не могут быть ключевыми. Если вы хотите использовать их как ключевые, снимите у них атрибут 'Скрытый' (на каждом из них щёлкните правой кнопкой мыши, выберите 'Свойства', снимите флажок 'Скрытый' и нажмите OK). Учтите, что скрытые файлы видны только при соответствующей системной настройке (Компьютер &gt; Сервис &gt; Параметры папок (Свойства папки) &gt; Вид).</string>
     <string lang="ru" key="HIDDEN_VOL_PROT_PASSWORD_US_KEYB_LAYOUT">Если вы пытаетесь защитить скрытый том, содержащий скрытую систему, проверьте, чтобы при вводе пароля для скрытого тома была включена стандартная американская раскладка клавиатуры. Это необходимо, так как данный пароль запрашивается на этапе дозагрузочной аутентификации (до запуска Windows), когда иные раскладки клавиатуры недоступны.</string>
     <string lang="ru" 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>
+    <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="ru" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nПримечание: если вы пытаетесь смонтировать раздел, расположенный на зашифрованном системном диске без дозагрузочной аутентификации, или смонтировать зашифрованный системный раздел операционной системы, не выполняемой в данный момент, выберите 'Система' &gt; 'Смонтировать без дозагрузочной аутентификации'.</string>
     <string lang="ru" 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="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="ru" key="PREV">&lt; &amp;Назад</string>
     <string lang="ru" key="RAWDEVICES">Невозможно показать список установленных в системе raw-устройств.</string>
     <string lang="ru" key="READONLYPROMPT">Том '%hs' существует и предназначен только для чтения. Вы действительно хотите его заменить?</string>
     <string lang="ru" key="SELECT_DEST_DIR">Выберите папку назначения</string>
     <string lang="ru" key="SELECT_KEYFILE">Выберите ключевой файл</string>
     <string lang="ru" key="SELECT_KEYFILE_PATH">Выберите путь поиска ключевых файлов. ВНИМАНИЕ: Запоминается только путь, но не имена файлов.</string>
-    <string lang="en" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Select a directory where to store the keyfiles.</string>
+    <string lang="ru" key="SELECT_KEYFILE_GENERATION_DIRECTORY">Выбрать директорию хранения ключевых файлов.</string>
     <string lang="ru" key="SERPENT_HELP">Авторы: Ross Anderson, Eli Biham и Lars Knudsen. Опубликован в 1998 г. 256-бит ключ, 128-бит блок. Режим работы: XTS. Алгоритм Serpent - один из финалистов AES.</string>
     <string lang="ru" key="SIZE_HELP">Укажите размер создаваемого контейнера.\n\nПри создании динамического ('растягивающегося' по мере заполнения) контейнера, этот параметр определяет его максимальный размер.\n\nМинимальный объём для тома FAT: 292 КБ, для тома NTFS: 3792 КБ.</string>
     <string lang="ru" key="SIZE_HELP_HIDDEN_HOST_VOL">Укажите размер нового внешнего тома (сначала создаётся внешний том, а затем внутри него - скрытый). Минимально возможный размер тома, предназначенного для создания скрытого тома, составляет 340 КБ.</string>
@@ -701,11 +739,18 @@
     <string lang="ru" key="FOR_MORE_INFO_ON_PARTITIONS">Информацию о создании и управлении разделами см. в документации к вашей операционной системе, либо проконсультируйтесь в службе техподдержки поставщика своего компьютера.</string>
     <string lang="ru" key="SYSTEM_PARTITION_NOT_ACTIVE">Ошибка! Выполняющаяся в данный момент операционная система установлена не в загрузочном разделе (первом разделе с пометкой 'Активный'). Это не поддерживается.</string>
     <string lang="ru" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">Вы указали, что собираетесь хранить в этом томе VeraCrypt файлы размером более 4 ГБ, но выбрали при этом файловую систему FAT, в которой сохранение файлов объёмом свыше 4 ГБ не поддерживается.\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="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="ru" key="CANT_ACCESS_VOL">Ошибка! Нет доступа к тому.\n\nПроверьте, существует ли этот том, не смонтирован ли он, не используется ли системой или какой-либо программой, которой вы дали права чтения/записи этого тома, и не защищён ли он от записи.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="ru" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Ошибка! Нет доступа к тому и/или невозможно получить сведения о томе.\n\nПроверьте, существует ли выбранный том, не используется ли он системой или приложениями, есть ли у вас права для чтения/записи этого тома, и не защищён ли том от записи.</string>
     <string lang="ru" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Ошибка! Нет доступа к тому и/или невозможно получить сведения о томе. Проверьте, существует ли выбранный том, не используется ли он системой или приложениями, есть ли у вас права для чтения/записи этого тома, и не защищён ли том от записи.\n\nЕсли проблема не решается, попробуйте предпринять шаги, указанные ниже.</string>
     <string lang="ru" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">Зашифровать раздел не удалось из-за ошибки. Попробуйте устранить все ранее указанные проблемы и повторить попытку. Если проблемы не решаются, попробуйте предпринять шаги, указанные ниже.</string>
     <string lang="ru" key="INPLACE_ENC_GENERIC_ERR_RESUME">Продолжить процесс шифровния раздела не удалось из-за ошибки.\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="ru" key="CANT_DISMOUNT_OUTER_VOL">Ошибка! Невозможно размонтировать внешний том.\n\nТом нельзя размонтировать, если он содержит файлы или папки, используемые какой-либо программой или системой.\n\nЗакройте все программы, которые могут использовать файлы и папки на этом томе, и нажмите 'Повтор'.</string>
     <string lang="ru" key="CANT_GET_OUTER_VOL_INFO">Ошибка! Невозможно получить информацию о внешнем томе. Создание тома прекращено.</string>
     <string lang="ru" key="CANT_ACCESS_OUTER_VOL">Ошибка! Нет доступа к внешнему тому. Продолжение создания тома невозможно.</string>
@@ -790,7 +835,7 @@
     <string lang="ru" key="TC_INSTALLER_IS_RUNNING">В этой системе сейчас запущен инсталлятор VeraCrypt. Он выполняет/готовит установку или обновление VeraCrypt. Дождитесь завершения его работы или закройте его. Если закрыть инсталлятор не получается, перезагрузите компьютер и лишь потом продолжите.</string>
     <string lang="ru" key="INSTALL_FAILED">Установка не выполнена.</string>
     <string lang="ru" key="UNINSTALL_FAILED">Удаление не выполнено.</string>
-    <string lang="ru" key="DIST_PACKAGE_CORRUPTED">Этот дистрибутивный пакет повреждён. Загрузите его снова (желательно с официального сайта VeraCrypt - www.veracrypt.org).</string>
+    <string lang="ru" key="DIST_PACKAGE_CORRUPTED">Этот дистрибутивный пакет повреждён. Загрузите его снова (желательно с официального сайта VeraCrypt - https://veracrypt.codeplex.com).</string>
     <string lang="ru" key="CANNOT_WRITE_FILE_X">Невозможно записать файл %hs</string>
     <string lang="ru" key="EXTRACTING_VERB">Извлечение</string>
     <string lang="ru" key="CANNOT_READ_FROM_PACKAGE">Невозможно прочитать данные из дистрибутива.</string>
@@ -977,6 +1022,7 @@
     <string lang="ru" key="CONFIRM_EXIT_UNIVERSAL">Выход?</string>
     <string lang="ru" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt не обладает достаточной информацией, чтобы определить, шифрование выполнять или дешифрование.</string>
     <string lang="ru" 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="ru" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">Вы хотите прервать процесс шифрования раздела/тома, отложив его на будущее?\n\nПримечание: помните, что пока том не будет полностью зашифрован, его нельзя смонтировать. Позже процесс шифрования можно будет возобновить с той точки, где он был остановлен. Это можно сделать, например, выбрав команду 'Тома' &gt; 'Продолжить прерванный процесс' в меню главного окна VeraCrypt.</string>
     <string lang="ru" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Хотите прервать и отложить процесс шифрования системного раздела/диска?\n\nПримечание: позже процесс можно будет возобновить с той точки, где он был остановлен. Это можно сделать, например, выбрав в главном окне VeraCrypt меню 'Система' &gt; 'Продолжить прерванный процесс'. Если вы хотите окончательно прервать процесс или совсем отказаться от шифрования, выберите 'Система' &gt; 'Перманентно расшифровать системный раздел/диск'.</string>
     <string lang="ru" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Хотите прервать и отложить процесс дешифрования системного раздела/диска?\n\nПримечание: позже процесс можно будет возобновить с той точки, где он был остановлен. Это можно сделать, например, выбрав в главном окне VeraCrypt меню 'Система' &gt; 'Продолжить прерванный процесс'. Если вы хотите отказаться от дешифрования (и начать шифрование), выберите 'Система' &gt; 'Зашифровать системный раздел/диск'.</string>
@@ -986,6 +1032,7 @@
     <string lang="ru" key="FAILED_TO_START_WIPING">Ошибка! Невозможно начать процесс очистки (затирания данных).</string>
     <string lang="ru" key="INCONSISTENCY_RESOLVED">Несоответствие устранено.\n\n\n(Если вы сообщаете нам о связанной с этим ошибке, включите в свой отчёт следующую техническую информацию: %hs)</string>
     <string lang="ru" key="UNEXPECTED_STATE">Ошибка! Неизвестное состояние.\n\n\n(Если вы сообщаете нам о связанной с этим ошибке, включите в свой отчёт следующую техническую информацию: %hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="ru" key="NOTHING_TO_RESUME">Нет процесса/задания для возобновления.</string>
     <string lang="ru" key="HIDVOL_PROT_BKG_TASK_WARNING">ВНИМАНИЕ: Фоновый процесс VeraCrypt отключён. При выходе из VeraCrypt вы не будете извещены о предотвращении повреждения скрытого тома.\n\nПримечание: фоновый процесс можно закрыть в любой момент, щёлкнув правой кнопкой мыши на значке VeraCrypt в системном лотке и выбрав 'Выход'.\n\nВключить фоновый процесс VeraCrypt?</string>
     <string lang="ru" key="LANG_PACK_VERSION">Версия языкового модуля: %s</string>
@@ -1013,6 +1060,7 @@
     <string lang="ru" key="SYS_LOADER_RESTORE_FAILED">Ошибка восстановления исходного загрузчика системы.\n\nИспользуйте диск восстановления VeraCrypt ('Repair Options' &gt; 'Restore original system loader') или установочный диск Windows, чтобы заменить загрузчик VeraCrypt системным загрузчиком Windows.</string>
     <string lang="ru" key="SYS_LOADER_UNAVAILABLE_FOR_RESCUE_DISK">Исходный системный загрузчик не будет сохранён на диске восстановления (возможная причина: нет файла с резервной копией).</string>
     <string lang="ru" key="ERROR_MBR_PROTECTED">Ошибка записи сектора MBR.\n\nBIOS в вашем ПК может быть настроена на защиту сектора MBR. Проверьте в настройках BIOS (нажмите клавишу F2, Delete или Esc сразу после включения компьютера), не включена ли антивирусная/MBR защита.</string>
+    <string lang="ru" key="BOOT_LOADER_FINGERPRINT_CHECK_FAILED">ВНИМАНИЕ:Ошибка проверки контрольной суммы загрузчика Veracrypt!\nВозможно, была попытка подделки информации на вашем диске ("Evil Maid" атака).\n\nЭто предупреждение также может появиться, если вы восстановили загрузчик VeraCrypt, с помощью Rescue Disk (диска восстановления), сгенерированный другой версией Veracrypt.\n\nРекомендуем немедленно изменить пароль, что одновременно восстановит нормальный загрузчик Veracrypt. Также стоит переустановить VeraCrypt и принять меры ограничения доступа к этой машине нежелательных лиц.</string>
     <string lang="ru" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">Загрузчик VeraCrypt (Boot Loader) нужной версии сейчас не установлен. Это может препятствовать сохранению ряда установок.</string>
     <string lang="ru" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Примечание: иногда бывает нужно, чтобы посторонний (неприятель), наблюдающий за стартом ПК, не знал, что вы пользуетесь VeraCrypt. Эти параметры позволяют изменить экран загрузки VeraCrypt. Если включить первую опцию, экран загрузчика будет пустым (даже при вводе неправильного пароля). При вводе пароля ПК будет выглядеть "зависшим". Кроме того, чтобы ввести неприятеля в заблуждение, можно включить вывод своего сообщения. Например, отображать ложные сообщения об ошибках вроде "Missing operating system" (обычно это выводит загрузчик Windows, когда не может найти загрузочный раздел Windows). Важно, однако, помнить, что если неприятель сможет проанализировать содержимое жёсткого диска, то он сумеет найти на нём загрузчик VeraCrypt.</string>
     <string lang="ru" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">ВНИМАНИЕ: Если вы включите эту опцию, загрузчик VeraCrypt не будет выводить на экран никаких сообщений (даже если вы укажете неправильный пароль). При вводе пароля компьютер будет выглядеть "зависшим" (не реагирующим), курсор НЕ будет перемещаться, а нажатия клавиш НЕ будут сопровождаться показом звёздочек.\n\nВы действительно хотите включить эту опцию?</string>
@@ -1034,8 +1082,11 @@
     <string lang="ru" key="EXTRA_BOOT_PARTITION_REMOVAL_INSTRUCTIONS">\nДополнительный загрузочный раздел можно удалить до установки Windows. Для этого выполните следующие действия:\n\n1) Загрузите Windows с инсталляционного компакт-диска.\n\n2) На экране установки Windows нажмите 'Install now' &gt; 'Custom (advanced)'.\n\n3) Нажмите 'Drive Options'.\n\n4) Выберите основной системный раздел и удалите его, нажав 'Delete' и 'OK'.\n\n5) Выберите раздел 'System Reserved', нажмите 'Extend' и увеличьте его размер в соответствии с устанавливаемой ОС.\n\n6) Нажмите 'Apply' и 'OK'.\n\n7) Установите Windows в раздел 'System Reserved'.\n\n\nЕсли неприятель спросит вас, зачем вы удалили дополнительный загрузочный раздел, вы можете ответить, что хотели предотвратить возможность утечки данных в незашифрованный загрузочный раздел.\n\n!!! Чтобы распечатать этот текст, нажмите кнопку 'Печать' ниже. Если вы сохраните или распечатаете копию этого текста (это настоятельно рекомендуется сделать, если только ваш принтер не хранит копии заданий на своём внутреннем накопителе), то после удаления дополнительного загрузочного раздела все копии данного текста следует уничтожить (иначе если такую копию обнаружат, это может навести на мысль о наличии в ПК скрытой ОС).</string>
     <string lang="ru" key="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">Внимание! Между системным разделом и первым разделом за ним имеется нераспределённое место. После создания скрытой операционной системы вы не должны создавать в этой нераспределённой области никаких новых разделов. В противном случае скрытая ОС не сможет загрузиться (до тех пор, пока не будут удалены такие вновь созданные разделы).</string>
     <string lang="ru" 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="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="ru" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">В настоящий момент ключевые файлы для шифрования системы не поддерживаются.</string>
     <string lang="ru" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Внимание! VeraCrypt не может восстановить первоначальную раскладку клавиатуры. Это может привести к неправильному вводу пароля.</string>
     <string lang="ru" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Ошибка! Невозможно установить раскладку клавиатуры для VeraCrypt в стандартную американскую (US).\n\nОбратите внимание, что пароль вводится ДО загрузки Windows, когда любые раскладки клавиатуры, отличающиеся от американской, ещё недоступны. Поэтому пароль всегда должен вводиться при стандартной американской раскладке.</string>
@@ -1120,6 +1171,7 @@
     <string lang="ru" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">Пре-тест успешно завершён.\n\nВНИМАНИЕ: Если во время шифрования произойдёт сбой питания или из-за программной/аппаратной ошибки зависнет операционная система, в то время, как VeraCrypt шифрует имеющиеся данные 'на месте', некоторые данные почти наверняка окажутся повреждёнными или утерянными. Поэтому прежде чем начать шифрование, убедитесь, что сделали резервную копию файлов, которые собираетесь зашифровать. Если нет, то сделайте это сейчас (нажмите 'Отложить', скопируйте файлы, затем в любое время снова запустите VeraCrypt, выберите 'Система' &gt; 'Возобновить прерванный процесс', чтобы начать шифрование).\n\nКогда будете готовы, нажмите 'Шифрация', чтобы приступить к шифрованию.</string>
     <string lang="ru" key="SYSENC_ENCRYPTION_PAGE_INFO">Вы можете в любой момент нажать 'Пауза' или 'Отложить', прервав (де)шифрование, выйти из этого мастера, перезагрузить или выключить ПК, а затем продолжить процесс (он возобновится с той точки, где был приостановлен). Для предотвращения замедления, когда система или приложения выполняют чтение или запись на системном диске, VeraCrypt ждёт, пока данные будут записаны или прочтены (см. Статус выше), а затем продолжает (де)шифрование.</string>
     <string lang="ru" 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="ru" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Скрытая система запущена</string>
     <string lang="ru" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Исходная система</string>
     <string lang="ru" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows создаёт (обычно без вашего ведома или согласия) различные файлы отчётов, временные файлы и т.п. на системном разделе. Кроме того, там же она сохраняет содержимое ОЗУ для сна/гибернации и файлы подкачки. Поэтому если неприятель проанализирует файлы на разделе с исходной системой (клоном которой является скрытая ОС), он может узнать, например, что вы пользовались мастером VeraCrypt в режиме создания скрытой системы (и заподозрить наличие скрытой ОС в вашем ПК).\n\nЧтобы это предотвратить, на следующих этапах VeraCrypt надёжно сотрёт всё содержимое раздела, где находится исходная система. Затем для правдоподобности отрицания причастности вам потребуется установить в раздел новую систему и зашифровать её. Таким образом, вы создадите обманную ОС, и на этом процесс создания скрытой ОС будет завершён.</string>
@@ -1159,7 +1211,7 @@
     <string lang="ru" key="HIDDEN_OS_CREATION_PREINFO_HELP">На следующих этапах VeraCrypt создаст скрытую ОС, скопировав содержимое системного раздела в скрытый том (копируемые данные шифруются 'на лету' с ключом, отличным от используемого для обманной ОС).\n\nУчтите, что процесс выполняется на дозагрузочной стадии (до запуска Windows) и может занять много времени (несколько часов или даже дней, в зависимости от размера системного раздела и быстродействия ПК).\n\nВы сможете прервать этот процесс, выключить ПК, запустить ОС и затем возобновить его. Однако в случае прерывания, копирование системы придётся начать сначала (так как при клонировании содержимое системного раздела не должно изменяться).</string>
     <string lang="ru" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Вы хотите отменить весь процесс создания скрытой операционной системы?\n\nПримечание: в случае отмены вы НЕ сможете возобновить процесс.</string>
     <string lang="ru" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Вы хотите отменить пре-тест шифрования системы?</string>
-    <string lang="ru" key="BOOT_PRETEST_FAILED_RETRY">Пре-тест шифрования системы не пройден. Хотите повторить попытку?\n\nПри выборе 'Нет' компонент дозагрузочной аутентификации будет удалён.\n\nПримечания:\n\n- Если загрузчик VeraCrypt не просил вас ввести пароль перед стартом Windows, возможно, ваша ОС загружается не с того диска, на котором она установлена. Такая конфигурация не поддерживается.\n\n- Если вы используете отличный от AES алгоритм шифрования, и пре-тест выдаёт ошибку (и вы ввели пароль), это может быть вызвано некорректным драйвером. Выберите 'Нет' и попробуйте снова зашифровать системный раздел/диск, но с использованием алгоритма AES (он предъявляет наименьшие требования к памяти).\n\n- С другими причинами и решениями вы можете ознакомиться здесь: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="ru" key="BOOT_PRETEST_FAILED_RETRY">Пре-тест шифрования системы не пройден. Хотите повторить попытку?\n\nПри выборе 'Нет' компонент дозагрузочной аутентификации будет удалён.\n\nПримечания:\n\n- Если загрузчик VeraCrypt не просил вас ввести пароль перед стартом Windows, возможно, ваша ОС загружается не с того диска, на котором она установлена. Такая конфигурация не поддерживается.\n\n- Если вы используете отличный от AES алгоритм шифрования, и пре-тест выдаёт ошибку (и вы ввели пароль), это может быть вызвано некорректным драйвером. Выберите 'Нет' и попробуйте снова зашифровать системный раздел/диск, но с использованием алгоритма AES (он предъявляет наименьшие требования к памяти).\n\n- С другими причинами и решениями вы можете ознакомиться здесь: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="ru" key="SYS_DRIVE_NOT_ENCRYPTED">Судя по всему, системный раздел/диск не зашифрован (ни частично, ни полностью).</string>
     <string lang="ru" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">Системный раздел/диск зашифрован (частично или полностью).\n\nПрежде чем продолжить, полностью дешифруйте системный раздел/диск. Чтобы это сделать, выберите в главном окне VeraCrypt меню 'Система' &gt; 'Перманентно расшифровать системный раздел/диск'.</string>
     <string lang="ru" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">Если системный раздел/диск зашифрован (частично или полностью), устанавливать VeraCrypt более старой версии нельзя (но можно устанавливать более новую или ту же версию).</string>
@@ -1176,6 +1228,8 @@
     <string lang="ru" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">Вы указали системный раздел/диск (или загрузочный раздел), но выбранный режим мастера подходит только для несистемных разделов/дисков.\n\nХотите установить дозагрузочную аутентификацию (т.е. вам нужно будет вводить пароль перед каждым запуском Windows) и зашифровать систему/раздел?</string>
     <string lang="ru" key="CONFIRM_DECRYPT_SYS_DEVICE">Вы действительно хотите перманентно расшифровать системный раздел/диск?</string>
     <string lang="ru" 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="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="ru" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">ВНИМАНИЕ: В случае использования каскада шифров при шифровании системы возможны следующие затруднения:\n\n1) Так как загрузчик VeraCrypt больше стандартного, на первой дорожке диска недостаточно места для резервирования его копии. Поэтому если загрузчик VeraCrypt окажется повреждён (что часто случается, например, при активации некоторых некорректно написанных программ), потребуется диск восстановления (VeraCrypt Rescue Disk), чтобы загрузиться с него или исправить загрузчик VeraCrypt.\n\n2) На некоторых компьютерах восстановление из состояния сна/гибернации происходит дольше обычного.\n\nЭтих потенциальных проблем можно избежать, если выбрать некаскадный алгоритм шифрования (например, AES).\n\nВы настаиваете на использовании каскадного шифрования?</string>
     <string lang="ru" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">Если вы столкнулись с любой из ранее описанных проблем, дешифруйте раздел/диск (если он зашифрован), после чего попробуйте зашифровать его снова, используя не-каскадный алгоритм шифрования (например, AES).</string>
     <string lang="ru" key="UPDATE_TC_IN_DECOY_OS_FIRST">ВНИМАНИЕ: В целях безопасности и надёжности, вам следует обновить VeraCrypt в обманной операционной системе, прежде чем вы обновите его в скрытой ОС.\n\nЧтобы это сделать, загрузите обманную ОС и запустите в ней инсталлятор VeraCrypt. Затем загрузите скрытую систему и также запустите инсталлятор ещё и оттуда.\n\nПримечание: обманная и скрытая системы используют один и тот же загрузчик. Если вы обновите VeraCrypt только на скрытой системе (но не на обманной), в обманной системе могут остаться драйвер и приложения VeraCrypt, чьи версии будут отличаться от версии загрузчика VeraCrypt. Такое различие может свидетельствовать о присутствии в данном ПК скрытой операционной системы.\n\n\nХотите продолжить?</string>
@@ -1191,6 +1245,7 @@
     <string lang="ru" key="ENABLE_BAD_SECTOR_ZEROING">ОШИБКА: Не удаётся прочитать один или несколько секторов на диске (вероятно, из-за физического дефекта).\n\nШифрование 'на месте' может быть продолжено, только когда секторы снова будут доступны для чтения. VeraCrypt может попытаться сделать эти сектора читабельными путём записи в них нулей (впоследствии такие содержащие одни нули блоки будут зашифрованы). Данные в нечитаемых секторах при этом будут утеряны. Если вы хотите этого избежать, попробуйте хотя бы частично восстановить повреждённые данные с помощью соответствующих программ сторонних фирм.\n\nПримечание: если секторы повреждены физически (в отличие от простой порчи данных и ошибок контрольных сумм), большинство устройств хранения информации внутренне перераспределяют секторы при попытке записать в них данные (поэтому имеющиеся данные в повреждённых секторах могут оставаться на диске незашифрованными).\n\nХотите, чтобы VeraCrypt заполнил нулями нечитаемые секторы?</string>
     <string lang="ru" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">ОШИБКА: Невозможно прочитать содержимое одного или нескольких секторов диска (вероятно, из-за физического дефекта).\n\nЧтобы продолжить шифрование, VeraCrypt отбросит содержимое нечитаемых секторов (оно будет заменено псевдослучайными данными). Прежде чем продолжить, вы можете попытаться хотя бы частично восстановить повреждённые данные с помощью соответствующих программ сторонних фирм.\n\nХотите, чтобы VeraCrypt отверг сейчас данные в нечитаемых секторах?</string>
     <string lang="ru" key="ZEROED_BAD_SECTOR_COUNT">Примечание: VeraCrypt заменил содержимое %I64d нечитаемых секторов (%s) зашифрованными блоками с обычным нулевым текстом.</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="ru" key="ENTER_TOKEN_PASSWORD">Введите пароль/PIN для токена '%s':</string>
     <string lang="ru" key="PKCS11_LIB_LOCATION_HELP">Чтобы обеспечить VeraCrypt доступ к токену безопасности или смарт-карте,\nсначала нужно установить программную библиотеку PKCS #11 для токена или смарт-карты.\nЭта библиотека может поставляться вместе с устройством либо она имеется на сайте поставщика или сторонней фирмы.\nУстановив библиотеку, вы можете либо выбрать её вручную, нажав  'Библиотека', либо позволить VeraCrypt найти её автоматически, нажав 'Автоопределение библиотеки' (поиск выполняется только в системной папке Windows).</string>
     <string lang="ru" key="SELECT_PKCS11_MODULE_HELP">Примечание: имя и расположение файла библиотеки PKCS #11 для токена или\nсмарт-карты см. в документации к токену, смарт-карте или ПО сторонних фирм.\n\nНажмите 'OK', чтобы выбрать путь и имя файла.</string>

Translations/Language.sk.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="sk" name="Slovenčina" en-name="Slovak" version="0.1.0" translators="Kamil David" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <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>
     <control lang="sk" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Viac informácií</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="sk" 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>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <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="sk" key="IDT_CONFIRM">&amp;Potvrdiť:</control>
     <control lang="sk" key="IDT_DONE">Hotovo </control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="sk" key="IDT_ENCRYPTION_ALGO">Šifrovací algoritmus</control>
     <control lang="sk" key="IDT_FILESYSTEM">Systém súborov </control>
     <control lang="en" key="IDT_FILE_CONTAINER">Creates a virtual encrypted disk within a file. Recommended for inexperienced users.</control>
@@ -85,6 +88,8 @@
     <control lang="en" key="IDT_PARTIAL_POOL_CONTENTS">Current pool content (partial)</control>
     <control lang="en" key="IDT_PASS">Pass</control>
     <control lang="sk" key="IDT_PASSWORD">Heslo:</control>
+    <control lang="en" key="IDT_PIM">Volume PIM:</control>
+    <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
     <control lang="en" key="IDT_PROGRESS">Progress:</control>
     <control lang="sk" key="IDT_RANDOM_POOL">Náhodný výber: </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>
@@ -142,6 +147,8 @@
     <control lang="sk" key="IDC_MOUNT_OPTIONS">Možnosti pripojenia</control>
     <control lang="sk" key="IDC_MOUNT_READONLY">Pripojiť zväzok len &amp;na čítanie</control>
     <control lang="sk" key="IDC_NEW_KEYFILES">Súbor. kľúče...</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="sk" key="IDC_PREF_BKG_TASK_ENABLE">Povolené</control>
     <control lang="sk" key="IDC_PREF_CACHE_PASSWORDS">Ukladať hesla do pamäti ovládača</control>
     <control lang="sk" key="IDC_PREF_DISMOUNT_INACTIVE">Autom. odpojiť zväzok pokiaľ z/do neho nebolo čítané/zapisované</control>
@@ -155,6 +162,7 @@
     <control lang="sk" key="IDC_PREF_MOUNT_READONLY">Pripojiť zväzky len na čítanie</control>
     <control lang="sk" key="IDC_PREF_MOUNT_REMOVABLE">Pripojiť zväzky ako vymeniteľné média</control>
     <control lang="sk" key="IDC_PREF_OPEN_EXPLORER">Otvoriť okno Prieskumníka pre úspešne pripojený zväzok</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</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="sk" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Odstrániť hesla z medzipamäte a automaticky odpojiť</control>
     <control lang="sk" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Odstrániť hesla z medzipamäte pri skončenie</control>
@@ -167,11 +175,12 @@
     <control lang="sk" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Zobraziť heslo</control>
     <control lang="sk" key="IDC_TRAVEL_OPEN_EXPLORER">Otvoriť okno &amp;Prieskumníka pre pripojený zväzok</control>
     <control lang="sk" key="IDC_TRAV_CACHE_PASSWORDS">&amp;Ukladať hesla do medzipamäte</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="sk" key="IDC_UNMOUNTALL">O&amp;dpojiť všetko</control>
     <control lang="sk" key="IDC_VOLUME_PROPERTIES">Vlastnos&amp;ti zväzku...</control>
     <control lang="sk" key="IDC_VOLUME_TOOLS">&amp;Nástroje zväzku...</control>
     <control lang="sk" key="IDC_WIPE_CACHE">Vyčistiť &amp;medzipamäť</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
     <control lang="sk" key="IDD_HOTKEYS_DLG">VeraCrypt - Systémové klávesové skratky</control>
     <control lang="sk" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="en" key="IDM_CREATE_HIDDEN_OS">Create Hidden Operating System...</control>
     <control lang="en" key="IDM_CREATE_RESCUE_DISK">Create Rescue Disk...</control>
     <control lang="sk" key="IDM_CREATE_VOLUME">Vytvoriť nový zväzok...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="sk" key="IDM_DEFAULT_KEYFILES">Pôvodné (default) súborové kľúče...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="en" key="IDM_ENCRYPT_SYSTEM_DEVICE">Encrypt System Partition/Drive...</control>
     <control lang="sk" key="IDM_FAQ">Často kladené otázky</control>
@@ -243,6 +254,7 @@
     <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="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>
     <control lang="sk" key="IDM_VOLUME_WIZARD">Sprievodca vytvorením zväzku</control>
     <control lang="sk" key="IDM_WEBSITE">Domovská stránka VeraCrypt</control>
@@ -369,7 +381,7 @@
     <string lang="sk" key="ACCESS_DENIED">Chyba: Prístup zamietnutý.\n\nOddiel, na ktorý sa snažíte pristúpiť má buď 0 sektorov alebo je to zavádzacie zariadenie.</string>
     <string lang="en" key="ADMINISTRATOR">Administrator</string>
     <string lang="sk" key="ADMIN_PRIVILEGES_DRIVER">Pre nahratie ovládača VeraCrypt musíte byť prihlásený ako administrátor.</string>
-    <string lang="sk" key="ADMIN_PRIVILEGES_WARN_DEVICES">Pre šifrovanie/formátovanie oddielu/zariadenia musíte byť prihlásený s administrátorskými právami.\n\nToto sa netýka zväzkov, ktoré sú vytvorené zo súborov.</string>
+    <string lang="sk" key="ADMIN_PRIVILEGES_WARN_DEVICES">Pre šifrovanie/Dešifrovanie/formátovanie oddielu/zariadenia musíte byť prihlásený s administrátorskými právami.\n\nToto sa netýka zväzkov, ktoré sú vytvorené zo súborov.</string>
     <string lang="sk" key="ADMIN_PRIVILEGES_WARN_HIDVOL">Pre vytvorenie skrytého zväzku musíte byť prihlásený s administrátorskými právami.\n\nPokračovať?</string>
     <string lang="sk" key="ADMIN_PRIVILEGES_WARN_NTFS">Pre sformátovanie zväzku systémom NTFS musíte byť prihlásený s administrátorskými právami.\n\nBez administrátorských práv môžete zväzok sformátovať systémom súborov FAT.</string>
     <string lang="en" key="AES_HELP">FIPS-approved cipher (Rijndael, published in 1998) that may be used by U.S. government departments and agencies to protect classified information up to the Top Secret level. 256-bit key, 128-bit block, 14 rounds (AES-256). Mode of operation is XTS.</string>
@@ -485,7 +497,11 @@
     <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>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Volume Fully Encrypted</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_INFO">IMPORTANT: TO MOUNT THIS NEWLY CREATED VERACRYPT VOLUME AND TO ACCESS DATA STORED IN IT, CLICK 'Auto-Mount Devices' IN THE MAIN VERACRYPT WINDOW. After you enter the correct password (and/or supply correct keyfiles), the volume will be mounted to the drive letter you select from the list in the main VeraCrypt window (and you will be able to access the encrypted data via the selected drive letter).\n\nPLEASE REMEMBER OR WRITE DOWN THE ABOVE STEPS. YOU MUST FOLLOW THEM WHENEVER YOU WANT TO MOUNT THE VOLUME AND ACCESS DATA STORED IN IT. Alternatively, in the main VeraCrypt window, click 'Select Device', then select this partition/volume, and click 'Mount'.\n\nThe partition/volume has been successfully encrypted (it contains a fully encrypted VeraCrypt volume now) and is ready for use.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="sk" key="FORMAT_FINISHED_INFO">Zväzok VeraCrypt bol úspešne vytvorený.</string>
     <string lang="sk" key="FORMAT_FINISHED_TITLE">Zväzok bol vytvorený</string>
     <string lang="en" key="FORMAT_HELP">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 Format to create the volume.</string>
@@ -523,6 +539,7 @@
     <string lang="en" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">An error occurred when obtaining the system encryption status.</string>
     <string lang="en" key="INIT_SYS_ENC">Cannot initialize application components for system encryption.</string>
     <string lang="sk" key="INIT_RAND">Zlyhala inicializácia generátora náhodných čísel!</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="sk" key="INIT_REGISTER">Aplikácia nemohla byť inicializovaná. Zlyhala registrácia dialógovej triedy.</string>
     <string lang="en" key="INIT_RICHEDIT">Error: Failed to load the Rich Edit system library.</string>
     <string lang="sk" key="INTRO_TITLE">Sprievodca vytvorením zväzku VeraCrypt</string>
@@ -535,6 +552,7 @@
     <string lang="sk" key="MOUNT_BUTTON">&amp;Pripojiť</string>
     <string lang="sk" key="NEW_VERSION_REQUIRED">Pre pripojenia tohto oddielu je potrebné novšia verzia programu VeraCrypt.</string>
     <string lang="sk" key="VOL_CREATION_WIZARD_NOT_FOUND">Chyba: Sprievodca vytvorením zväzku nebol nájdený.\n\nUbezpečte sa prosím, že  súbor 'VeraCrypt Format.exe' je v zložke, z ktorého bol 'VeraCrypt.exe' spustený. Pokiaľ nie je, preinštalujte prosím VeraCrypt alebo nájdite 'VeraCrypt Format.exe' na Vašom disku a spustite ho.</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="sk" key="NEXT">&amp;Ďalší &gt;</string>
     <string lang="sk" key="FINALIZE">&amp;Dokončiť</string>
     <string lang="en" key="INSTALL">&amp;Install</string>
@@ -542,6 +560,7 @@
     <string lang="en" key="NODRIVER">Unable to connect to the VeraCrypt device driver. VeraCrypt cannot work if the device driver is not running.\n\nPlease note that, due to a Windows issue, it may be necessary to log off or restart the system before the device driver can be loaded.</string>
     <string lang="sk" key="NOFONT">Nastala chyba pri nahrávaní/príprave fontov.</string>
     <string lang="en" key="NOT_FOUND">The drive letter was not found or no drive letter was specified.</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="sk" key="DRIVE_LETTER_UNAVAILABLE">Písmeno jednotky nie je k dispozícií.</string>
     <string lang="sk" key="NO_FILE_SELECTED">Nebol vybratý žiaden súbor!</string>
     <string lang="sk" key="NO_FREE_DRIVES">Žiadne písmeno disku nie je k dispozícií.</string>
@@ -561,15 +580,18 @@
     <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_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="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_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt.\n\nDo you have such a backup?</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_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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="sk" key="IDD_PCDM_CHANGE_PKCS5_PRF">Zadajte derivačný algoritmus pre kľúč hlavičky</string>
     <string lang="sk" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Pridať/Odobrať súborové kľúče do/zo zväzku</string>
     <string lang="sk" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Odstrániť všetky súborové kľúče zo zväzku</string>
-    <string lang="en" key="PASSWORD_CHANGED">Password and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</string>
+    <string lang="en" key="PASSWORD_CHANGED">Password, PIM and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</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="en" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">IMPORTANT: If you did not destroy your VeraCrypt Rescue Disk, your system partition/drive can still be decrypted using the old password (by booting the VeraCrypt Rescue Disk and entering the old password). You should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</string>
     <string lang="en" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Note that your VeraCrypt Rescue Disk still uses the previous algorithm. If you consider the previous algorithm insecure, you should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,7 +600,8 @@
     <string lang="sk" key="PKCS5_PRF_CHANGED">Kľúč hlavičky derivačného algoritmu bol úspešne zadaný.</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_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="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 more than 20 characters (the longer, the better). The maximum possible length is 64 characters.</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="sk" key="PASSWORD_HIDDENVOL_HELP">Zadajte heslo pre skrytý zväzok. </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_HELP">Please choose a password for the hidden operating system (i.e. for the hidden volume). </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_NOTE">IMPORTANT: The password that you choose for the hidden operating system in this step must be substantially different from the other two passwords (i.e. from the password for the outer volume and from the password for the decoy operating system).</string>
@@ -597,11 +620,26 @@
     <string lang="sk" key="PASSWORD_WRONG_AUTOMOUNT">Nesprávne heslo alebo nebol nájdený žiaden zväzok VeraCrypt.</string>
     <string lang="sk" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Nesprávny súborový kľúč/heslo alebo nebol nájdený žiaden zväzok VeraCrypt.</string>
     <string lang="sk" key="PASSWORD_WRONG_CAPSLOCK_ON">\n\nUpozornenie: Caps Lock je zapnutý. Tým môžete nesprávne zadať heslo.</string>
+    <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
+    <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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_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>
+    <string lang="en" key="SELECTED_PARTITION_NOT_INPLACE_ENC">The selected partition/device is not using in-place encryption.\nHeader Flags = 0x%.8X</string>
     <string lang="en" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nNote: If you are attempting to mount a partition located on an encrypted system drive without pre-boot authentication or to mount the encrypted system partition of an operating system that is not running, you can do so by selecting 'System' &gt; 'Mount Without Pre-Boot Authentication'.</string>
     <string lang="en" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">In this mode, you cannot mount a partition located on a drive whose portion is within the key scope of active system encryption.\n\nBefore you can mount this partition in this mode, you need to either boot an operating system installed on a different drive (encrypted or unencrypted) or boot an unencrypted operating system.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <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>
@@ -701,11 +739,18 @@
     <string lang="en" key="FOR_MORE_INFO_ON_PARTITIONS">For information on how to create and manage partitions, please refer to the documentation supplied with your operating system or contact your computer vendor's technical support team for assistance.</string>
     <string lang="en" key="SYSTEM_PARTITION_NOT_ACTIVE">Error: The currently running operating system is not installed on the boot partition (first Active partition). This is not supported.</string>
     <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="sk" key="CANT_ACCESS_VOL">Chyba: Ku zväzku nie je možné pristúpiť!\n\nUbezpečte sa, že vybraný zväzok existuje, že nie je pripojený používaný systémom alebo aplikáciou, že máte práva na čítanie/zápis zväzku a že zväzok nie je chránený proti zápisu.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Error: Cannot access the volume and/or obtain information about the volume.\n\nMake sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Error: Cannot access the volume and/or obtain information about the volume. Make sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.\n\nIf the problem persists, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">An error prevented VeraCrypt from encrypting the partition. Please try fixing any previously reported problems and then try again. If the problems persist, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_RESUME">An error prevented VeraCrypt from resuming the process of encryption of the partition.\n\nPlease try fixing any previously reported problems and then try resuming the process again. Note that the volume cannot be mounted until it has been fully encrypted.</string>
+    <string lang="en" key="INPLACE_DEC_GENERIC_ERR">An error prevented VeraCrypt from decrypting the volume. Please try fixing any previously reported problems and then try again if possible.</string>
     <string lang="sk" key="CANT_DISMOUNT_OUTER_VOL">Chyba: externý zväzok nie je možné odpojiť!\n\nZväzok nemôže byť odpojený pokiaľ obsahuje súbory alebo zložky používané programom alebo systémom.\n\nZatvorte prosím akýkoľvek program, ktorý by mohol súbory alebo adresáre na zväzku používať a kliknite znova.</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="sk" key="CANT_ACCESS_OUTER_VOL">Chyba: nie je možné pristúpiť na externý zväzok! Vytvorenie zväzku nie je možné dokončiť.</string>
@@ -790,7 +835,7 @@
     <string lang="en" key="TC_INSTALLER_IS_RUNNING">VeraCrypt Installer is currently running on this system and performing or preparing installation or update of VeraCrypt. Before you proceed, please wait for it to finish or close it. If you cannot close it, please restart your computer before proceeding.</string>
     <string lang="en" key="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 www.veracrypt.org).</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="EXTRACTING_VERB">Extracting</string>
     <string lang="en" key="CANNOT_READ_FROM_PACKAGE">Cannot read data from the package.</string>
@@ -977,6 +1022,7 @@
     <string lang="en" key="CONFIRM_EXIT_UNIVERSAL">Exit?</string>
     <string lang="en" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt does not have sufficient information to determine whether to encrypt or decrypt.</string>
     <string lang="en" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt does not have sufficient information to determine whether to encrypt or decrypt.\n\nNote: If you decrypted the system partition/drive in the pre-boot environment, you may need to finalize the process by clicking Decrypt.</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_REVERSE_INFO">Note: When you are encrypting a non-system partition/volume in place and an error persistently prevents you from finishing the process, you will not be able to mount the volume (and access data stored on it) until you entirely DECRYPT the volume (i.e. reverse the process).\n\nIf you need to do so, follow these steps:\n1) Exit this wizard.\n2) In the main VeraCrypt window, select 'Volumes' &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="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Do you want to interrupt and postpone the process of encryption of the system partition/drive?\n\nNote: You will be able to resume the process and it will continue from the point it was stopped. You can do so, for example, by selecting 'System' &gt; 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window. If you want to permanently terminate or reverse the encryption process, select 'System' &gt; 'Permanently Decrypt System Partition/Drive'.</string>
     <string lang="en" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Do you want to interrupt and postpone the process of decryption of the system partition/drive?\n\nNote: You will be able to resume the process and it will continue from the point it was stopped. You can do so, for example, by selecting 'System' &gt; 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window. If you want to reverse the decryption process (and start encrypting), select 'System' &gt; 'Encrypt System Partition/Drive'.</string>
@@ -986,6 +1032,7 @@
     <string lang="en" key="FAILED_TO_START_WIPING">Error: Failed to start the process of wiping.</string>
     <string lang="en" key="INCONSISTENCY_RESOLVED">Inconsistency resolved.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="en" key="NOTHING_TO_RESUME">There is no process/task to resume.</string>
     <string lang="sk" key="HIDVOL_PROT_BKG_TASK_WARNING">UPOZORNENIE: VeraCrypt možnosť úloha na pozadí je vypnutá. Po skončení programu VeraCrypt, či je zabránené poškodenie skrytého zväzku.\n\nPozn.: úlohu na pozadí môžete kedykoľvek zatvoriť kliknutím pravého tlačidla myši na ikonu programu VeraCrypt v pravom dolnom rohu a vyberte 'Koniec'.\n\nPovoliť VeraCrypt úlohu na pozadí?</string>
     <string lang="sk" key="LANG_PACK_VERSION">Verzia jazykového balíčka:  %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="en" key="ERROR_MBR_PROTECTED">Failed to write the MBR sector.\n\nYour BIOS may be configured to protect the MBR sector. Check your BIOS settings (press F2, Delete, or Esc, after powering on your computer) for MBR/antivirus protection.</string>
+    <string lang="en" key="BOOT_LOADER_FINGERPRINT_CHECK_FAILED">WARNING: The verification of VeraCrypt bootloader fingerprint failed!\nYour disk may have been tampered with by an attacker ("Evil Maid" attack).\n\nThis warning can also be triggered if you restored VeraCrypt boot loader using an Rescue Disk generated using a different VeraCrypt version.\n\nYou are advised to change your password immediately which will also restore the correct VeraCrypt bootloader. It is recommended to reinstall VeraCrypt and to take measures to avoid access to this machine by untrusted entities.</string>
     <string lang="en" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">The required version of the VeraCrypt Boot Loader is currently not installed. This may prevent some of the settings from being saved.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Note: In some situations, you may wish to prevent a person (adversary) that is watching you start the computer from knowing that you use VeraCrypt. The above options allow you to do that by customizing the VeraCrypt boot loader screen. If you enable the first option, no texts will be displayed by the boot loader (not even when you enter the wrong password). The computer will appear to be "frozen" while you can type your password. In addition, a custom message can be displayed to mislead the adversary. For example, fake error messages such as "Missing operating system" (which is normally displayed by the Windows boot loader if it finds no Windows boot partition). It is, however, important to note that if the adversary can analyze the content of the hard drive, he can still find out that it contains the VeraCrypt boot loader.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">WARNING: Please keep in mind that if you enable this option, the VeraCrypt boot loader will not display any texts (not even when you enter the wrong password). The computer will appear to be "frozen" (unresponsive) while you can type your password (the cursor will NOT move and no asterisk will be displayed when you press a key).\n\nAre you sure you want to enable this option?</string>
@@ -1034,8 +1082,11 @@
     <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="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">Warning: There is unallocated space between the system partition and the first partition behind it. After you create the hidden operating system, you must not create any new partitions in that unallocated space. Otherwise, the hidden operating system will be impossible to boot (until you delete such newly created partitions).</string>
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">This algorithm is currently not supported for system encryption.</string>
-	<string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</string>
     <string lang="en" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Error: Cannot set the keyboard layout for VeraCrypt to the standard US keyboard layout.\n\nNote that the password needs to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout.</string>
@@ -1120,6 +1171,7 @@
     <string lang="en" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">The pretest has been successfully completed.\n\nWARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt. If you do not, please back up the files now (you can click Defer, back up the files, then run VeraCrypt again anytime, and select 'System' &gt; 'Resume Interrupted Process' to start encrypting).\n\nWhen ready, click Encrypt to start encrypting.</string>
     <string lang="en" key="SYSENC_ENCRYPTION_PAGE_INFO">You can click Pause or Defer anytime to interrupt the process of encryption or decryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. To prevent slowdown when the system or applications write or read data from the system drive, VeraCrypt automatically waits until the data is written or read (see Status above) and then automatically continues encrypting or decrypting.</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nYou can click Pause or Defer anytime to interrupt the process of encryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. Note that the volume cannot be mounted until it has been fully encrypted.</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="en" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Hidden System Started</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Original System</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows creates (typically, without your knowledge or consent) various log files, temporary files, etc., on the system partition. It also saves the content of RAM to hibernation and paging files located on the system partition. Therefore, if an adversary analyzed files stored on the partition where the original system (of which the hidden system is a clone) resides, he might find out, for example, that you used the VeraCrypt wizard in the hidden-system-creation mode (which might indicate the existence of a hidden operating system on your computer).\n\nTo prevent such issues, VeraCrypt will, in the next steps, securely erase the entire content of the partition where the original system resides. Afterwards, in order to achieve plausible deniability, you will need to install a new system on the partition and encrypt it. Thus you will create the decoy system and the whole process of creation of the hidden operating system will be completed.</string>
@@ -1159,7 +1211,7 @@
     <string lang="en" key="HIDDEN_OS_CREATION_PREINFO_HELP">In the next steps, VeraCrypt will create the hidden operating system by copying the content of the system partition to the hidden volume (data being copied will be encrypted on the fly with an encryption key different from the one that will be used for the decoy operating system).\n\nPlease note that the process will be performed in the pre-boot environment (before Windows starts) and it may take a long time to complete; several hours or even several days (depending on the size of the system partition and on the performance of your computer).\n\nYou will be able to interrupt the process, shut down your computer, start the operating system and then resume the process. However, if you interrupt it, the entire process of copying the system will have to start from the beginning (because the content of the system partition must not change during cloning).</string>
     <string lang="en" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Do you want to cancel the entire process of creation of the hidden operating system?\n\nNote: You will NOT be able to resume the process if you cancel it now.</string>
     <string lang="en" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Do you want to cancel the system encryption pretest?</string>
-    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="en" key="SYS_DRIVE_NOT_ENCRYPTED">The system partition/drive does not appear to be encrypted (neither partially nor fully).</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">Your system partition/drive is encrypted (partially or fully).\n\nPlease decrypt your system partition/drive entirely before proceeding. To do so, select 'System' &gt; 'Permanently Decrypt System Partition/Drive' from the menu bar of the main VeraCrypt window.</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">When the system partition/drive is encrypted (partially or fully), you cannot downgrade VeraCrypt (but you can upgrade it or reinstall the same version).</string>
@@ -1176,6 +1228,8 @@
     <string lang="en" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">You have selected the system partition/drive (or the boot partition), but the wizard mode you selected is suitable only for non-system partitions/drives.\n\nDo you want to set up pre-boot authentication (which means that you will need to enter your password each time before Windows boots/starts) and encrypt the system partition/drive?</string>
     <string lang="en" key="CONFIRM_DECRYPT_SYS_DEVICE">Are you sure you want to permanently decrypt the system partition/drive?</string>
     <string lang="en" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the system partition/drive, unencrypted data will be written to it.\n\nAre you really sure you want to permanently decrypt the system partition/drive?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
     <string lang="en" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Warning: If you use a cascade of ciphers for system encryption, you may encounter the following issues:\n\n1) The VeraCrypt Boot Loader is larger than normal and, therefore, there is not enough space in the first drive track for a backup of the VeraCrypt Boot Loader. Hence, whenever it gets damaged (which often happens, for example, during inappropriately designed anti-piracy activation procedures of certain programs), you will need to use the VeraCrypt Rescue Disk to boot or to repair the VeraCrypt Boot Loader.\n\n2) On some computers, resuming from hibernation takes longer.\n\nThese potential issues can be prevented by choosing a non-cascade encryption algorithm (e.g. AES).\n\nAre you sure you want to use a cascade of ciphers?</string>
     <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>
@@ -1191,6 +1245,7 @@
     <string lang="en" key="ENABLE_BAD_SECTOR_ZEROING">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nThe process of in-place encryption can continue only when the sectors have been made readable again. VeraCrypt can attempt to make these sectors readable by writing zeros to the sectors (subsequently such all-zero blocks would be encrypted). However, note that any data stored in the unreadable sectors will be lost. If you want to avoid that, you can attempt to recover portions of the corrupted data using appropriate third-party tools.\n\nNote: In case of physically damaged sectors (as opposed to mere data corruption and checksum errors) most types of storage devices internally reallocate the sectors when data is attempted to be written to them (so the existing data in the damaged sectors may remain unencrypted on the drive).\n\nDo you want VeraCrypt to write zeroes to unreadable sectors?</string>
     <string lang="en" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nTo be able to proceed with decryption, VeraCrypt will have to discard the content of the unreadable sectors (the content will be replaced with pseudorandom data). Please note that, before proceeding, you can attempt to recover portions of any corrupted data using appropriate third-party tools.\n\nDo you want VeraCrypt to discard data in the unreadable sectors now?</string>
     <string lang="en" key="ZEROED_BAD_SECTOR_COUNT">Note: VeraCrypt has replaced the content of %I64d unreadable sectors (%s) with encrypted all-zero plaintext blocks.</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="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>

Translations/Language.sl.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="sl" name="Slovenščina" en-name="Slovenian" version="0.1.0" translators="Erik David Salam" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <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>
     <control lang="sl" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Več informacij</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="en" key="IDC_MB">&amp;MB</control>
     <control lang="sl" key="IDC_MORE_INFO_ON_CONTAINERS">Več informacij</control>
     <control lang="sl" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">Več informacij o šifriranju sistema</control>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <control lang="sl" key="IDT_COLLECTING_RANDOM_DATA_NOTE">POMEMBNO: Premikajte Vašo miško kolikor se da naključno znotraj tega okna. Dalj časa ko jo boste premikali, bolje bo. Slednje namreč znatno povečuje kriptografsko moč šifrirnih ključev. Nato kliknite 'Naprej' za nadaljevanje.</control>
     <control lang="sl" key="IDT_CONFIRM">&amp;Potrdi:</control>
     <control lang="sl" key="IDT_DONE">Opravl.</control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="sl" key="IDT_ENCRYPTION_ALGO">Šifrirni algoritem</control>
     <control lang="sl" key="IDT_FILESYSTEM">Dat. sistem </control>
     <control lang="sl" key="IDT_FILE_CONTAINER">Ustvari navidezen šifriran disk znotraj datoteke. Priporočeno za neizkušene uporabnike.</control>
@@ -85,6 +88,8 @@
     <control lang="sl" key="IDT_PARTIAL_POOL_CONTENTS">Trenutna vsebina bazena (delno)</control>
     <control lang="en" key="IDT_PASS">Pass</control>
     <control lang="sl" key="IDT_PASSWORD">Geslo:</control>
+    <control lang="en" key="IDT_PIM">Volume PIM:</control>
+    <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
     <control lang="sl" key="IDT_PROGRESS">Napredek:</control>
     <control lang="sl" key="IDT_RANDOM_POOL">Naklj. bazen: </control>
     <control lang="sl" key="IDT_SINGLE_BOOT">Izberite to možnost če je na tem računalniku naložen samo eden operacijski sistem (četudi ima mnogo uporabnikov).</control>
@@ -142,6 +147,8 @@
     <control lang="sl" key="IDC_MOUNT_OPTIONS">&amp;Možnosti prikl. ...</control>
     <control lang="sl" key="IDC_MOUNT_READONLY">&amp;Priklopi zbirnik samo za branje</control>
     <control lang="sl" key="IDC_NEW_KEYFILES">Ključne dat. ...</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="sl" key="IDC_PREF_BKG_TASK_ENABLE">Omogočeno</control>
     <control lang="sl" key="IDC_PREF_CACHE_PASSWORDS">Shranjuj gesla v pomnilnik gonilnika</control>
     <control lang="sl" key="IDC_PREF_DISMOUNT_INACTIVE">Samoizkl. zbirnik, ko iz njega ni bilo prebr./zapis. nobenih podat. že</control>
@@ -155,6 +162,7 @@
     <control lang="sl" key="IDC_PREF_MOUNT_READONLY">Priklopi zbirnike samo za branje</control>
     <control lang="sl" key="IDC_PREF_MOUNT_REMOVABLE">Priklopi zbirnike kot zamenljiv medij</control>
     <control lang="sl" key="IDC_PREF_OPEN_EXPLORER">Odpri okno Raziskovalca za uspešno priklopljeni zbirnik</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</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="sl" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Pobriši gesla shranjena v predpomnilniku ob samodejnem odklopu</control>
     <control lang="sl" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Pobriši gesla v predpomnilniku ob izhodu</control>
@@ -167,11 +175,12 @@
     <control lang="sl" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Prikaži geslo</control>
     <control lang="sl" key="IDC_TRAVEL_OPEN_EXPLORER">&amp;Odpri okno Raziskovalca za priklopljeni zbirnik</control>
     <control lang="sl" key="IDC_TRAV_CACHE_PASSWORDS">&amp;Shrani geslo v pomnilnik gonilnika</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="sl" key="IDC_UNMOUNTALL">&amp;Odklopi vse</control>
     <control lang="sl" key="IDC_VOLUME_PROPERTIES">&amp;Lastnosti zbirnika...</control>
     <control lang="sl" key="IDC_VOLUME_TOOLS">&amp;Orodja za zbirnik...</control>
     <control lang="sl" key="IDC_WIPE_CACHE">&amp;Izbriši predpomnilnik</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
     <control lang="sl" key="IDD_HOTKEYS_DLG">VeraCrypt - Širše sistemske vroče tipke</control>
     <control lang="en" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="sl" key="IDM_CREATE_HIDDEN_OS">Ustvari skrivni operacijski sistem...</control>
     <control lang="sl" key="IDM_CREATE_RESCUE_DISK">Ustvari rešilni disk...</control>
     <control lang="sl" key="IDM_CREATE_VOLUME">Ustvari nov zbirnik...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="sl" key="IDM_DEFAULT_KEYFILES">Privzete ključne datoteke...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="sl" key="IDM_ENCRYPT_SYSTEM_DEVICE">Šifriraj sistemski razdelek/pogon...</control>
     <control lang="sl" key="IDM_FAQ">Pogosto zastavljena vprašanja</control>
@@ -243,6 +254,7 @@
     <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="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>
     <control lang="sl" key="IDM_VOLUME_WIZARD">Čarovnik za ustvarjanje zbirnikov</control>
     <control lang="sl" key="IDM_WEBSITE">VeraCrypt-ova spletna stran</control>
@@ -369,7 +381,7 @@
     <string lang="en" key="ACCESS_DENIED">Error: Access denied.\n\nThe partition you are trying to access is either 0 sectors long, or it is the boot device.</string>
     <string lang="en" key="ADMINISTRATOR">Administrator</string>
     <string lang="en" key="ADMIN_PRIVILEGES_DRIVER">In order to load the VeraCrypt driver, you need to be logged into an account with administrator privileges.</string>
-    <string lang="en" key="ADMIN_PRIVILEGES_WARN_DEVICES">Please note that in order to encrypt/format a partition/device you need to be logged into an account with administrator privileges.\n\nThis does not apply to file-hosted volumes.</string>
+    <string lang="en" key="ADMIN_PRIVILEGES_WARN_DEVICES">Please note that in order to encrypt, decrypt or format a partition/device you need to be logged into an account with administrator privileges.\n\nThis does not apply to file-hosted volumes.</string>
     <string lang="en" key="ADMIN_PRIVILEGES_WARN_HIDVOL">In order to create a hidden volume you need to be logged into an account with administrator privileges.\n\nContinue?</string>
     <string lang="en" key="ADMIN_PRIVILEGES_WARN_NTFS">Please note that in order to format the volume as NTFS you need to be logged into an account with administrator privileges.\n\nWithout administrator privileges, you can format the volume as FAT.</string>
     <string lang="sl" key="AES_HELP">Šifra, ki je bila oddobrena s strani FIPS (Rijndael, objavljen leta 1998) in se lahko uporablja v ameriških vladnih oddelkih ter agencij, z namenom zaščite zaupnih informacij do nivoja Najbolj zaupno. V uporabi je 256-bitni ključ, 128-bitni blok, 14 rund (AES-256). Način delovanja je XTS.</string>
@@ -485,7 +497,11 @@
     <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>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Volume Fully Encrypted</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_INFO">IMPORTANT: TO MOUNT THIS NEWLY CREATED VERACRYPT VOLUME AND TO ACCESS DATA STORED IN IT, CLICK 'Auto-Mount Devices' IN THE MAIN VERACRYPT WINDOW. After you enter the correct password (and/or supply correct keyfiles), the volume will be mounted to the drive letter you select from the list in the main VeraCrypt window (and you will be able to access the encrypted data via the selected drive letter).\n\nPLEASE REMEMBER OR WRITE DOWN THE ABOVE STEPS. YOU MUST FOLLOW THEM WHENEVER YOU WANT TO MOUNT THE VOLUME AND ACCESS DATA STORED IN IT. Alternatively, in the main VeraCrypt window, click 'Select Device', then select this partition/volume, and click 'Mount'.\n\nThe partition/volume has been successfully encrypted (it contains a fully encrypted VeraCrypt volume now) and is ready for use.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="sl" key="FORMAT_FINISHED_INFO">VeraCrypt-ov zbirnik je bil uspešno ustvarjen.</string>
     <string lang="sl" key="FORMAT_FINISHED_TITLE">Zbirnik ustvarjen</string>
     <string lang="sl" key="FORMAT_HELP">POMEMBNO: Premikajte Vašo miško kolikor se da naključno znotraj tega okna. Dalj časa ko jo boste premikali, bolje bo. Slednje namreč znatno povečuje kriptografsko moč šifrirnih ključev. Nato kliknite Formatiraj, da ustvarite zbirnik.</string>
@@ -522,7 +538,8 @@
     <string lang="en" key="CONFIRM_RESTART">Your computer must be restarted.\n\nDo you want to restart it now?</string>
     <string lang="en" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">An error occurred when obtaining the system encryption status.</string>
     <string lang="en" key="INIT_SYS_ENC">Cannot initialize application components for system encryption.</string>
-    <string lang="en" key="INIT_RAND">Failed to initialize the random number generator!</string>
+    <string lang="en" key="INIT_RAND">Failed to initialize the random number generator!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="en" key="INIT_REGISTER">Unable to initialize the application. Failed to register the Dialog class.</string>
     <string lang="en" key="INIT_RICHEDIT">Error: Failed to load the Rich Edit system library.</string>
     <string lang="sl" key="INTRO_TITLE">VeraCrypt-ov čarovnik za ustvar. zbirnika</string>
@@ -535,6 +552,7 @@
     <string lang="sl" key="MOUNT_BUTTON">&amp;Priklopi</string>
     <string lang="sl" key="NEW_VERSION_REQUIRED">Novejša različica programa VeraCrypt je potrebna, da lahko priklopite ta zbirnik.</string>
     <string lang="en" key="VOL_CREATION_WIZARD_NOT_FOUND">Error: Volume Creation Wizard not found.\n\nPlease make sure that the file 'VeraCrypt Format.exe' is in the folder from which 'VeraCrypt.exe' was launched. If it is not, please reinstall VeraCrypt, or locate 'VeraCrypt Format.exe' on your disk and run it.</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="sl" key="NEXT">&amp;Naprej &gt;</string>
     <string lang="en" key="FINALIZE">&amp;Finish</string>
     <string lang="en" key="INSTALL">&amp;Install</string>
@@ -542,6 +560,7 @@
     <string lang="en" key="NODRIVER">Unable to connect to the VeraCrypt device driver. VeraCrypt cannot work if the device driver is not running.\n\nPlease note that, due to a Windows issue, it may be necessary to log off or restart the system before the device driver can be loaded.</string>
     <string lang="en" key="NOFONT">Error occurred when loading/preparing fonts.</string>
     <string lang="en" key="NOT_FOUND">The drive letter was not found or no drive letter was specified.</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="en" key="DRIVE_LETTER_UNAVAILABLE">Drive letter not available.</string>
     <string lang="en" key="NO_FILE_SELECTED">No file selected!</string>
     <string lang="en" key="NO_FREE_DRIVES">No drive letters available.</string>
@@ -561,15 +580,18 @@
     <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="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="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_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt.\n\nDo you have such a backup?</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_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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="sl" key="IDD_PCDM_CHANGE_PKCS5_PRF">Nastavi izpeljani algoritem iz ključa glave</string>
     <string lang="en" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Add/Remove Keyfiles to/from Volume</string>
     <string lang="en" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Remove All Keyfiles from Volume</string>
-    <string lang="en" key="PASSWORD_CHANGED">Password and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</string>
+    <string lang="en" key="PASSWORD_CHANGED">Password, PIM and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</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="en" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">IMPORTANT: If you did not destroy your VeraCrypt Rescue Disk, your system partition/drive can still be decrypted using the old password (by booting the VeraCrypt Rescue Disk and entering the old password). You should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</string>
     <string lang="en" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Note that your VeraCrypt Rescue Disk still uses the previous algorithm. If you consider the previous algorithm insecure, you should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,6 +600,7 @@
     <string lang="en" key="PKCS5_PRF_CHANGED">Header key derivation algorithm successfully set.</string>
     <string lang="sl" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">Prosim, da vnesete geslo in/ali ključno datoteko(e) za nesistemski zbirnik kjer želite nadaljevati proces šifriranja na mestu.\n\n\nOpomba: Potem ko kliknete Naprej bo VeraCrypt poizkusil najti vse nesistemske zbirnike kjer je bil proces šifriranja prekinjen in kjer je lahko glava VeraCrypt-ovega zbirnika dešifrirana z uporabo priloženega gesla in/ali ključne(ih) datotek(e). Če je najden več kot eden tovrsten zbirnik, potem boste morali izbrati enega izmed teh v naslednjem koraku.</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_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="sl" key="PASSWORD_HELP">Zelo pomembno je, da si izberete dobro geslo. Izogibajte se izbire gesla, ki vsebuje samo eno besedo in slednjo se da najti v slovarju (ali kombinacijo dveh, treh ali štirih tovrstnih besed). Naj tudi ne vsebuje kakršnihkoli imen ali datumov rojstva. Geslo naj ne bo lahko za uganjevanje. Dobro geslo je naključna kombinacija črk z veliko in malo začetnico, številk in posebnih znakov, kot @ ^ = $ * + itn. Pri izbiri gesla priporočamo sestavo le-tega iz več kot 20 znakov (daljše kot je, bolje je). Najvišja možna dolžina je 64 znakov. </string>
     <string lang="sl" key="PASSWORD_HIDDENVOL_HELP">Prosim, da si izberete geslo za skriti zbirnik. </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_HELP">Please choose a password for the hidden operating system (i.e. for the hidden volume). </string>
@@ -597,11 +620,26 @@
     <string lang="en" key="PASSWORD_WRONG_AUTOMOUNT">Incorrect password or no VeraCrypt volume found.</string>
     <string lang="en" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Incorrect keyfile(s)/password or no VeraCrypt volume found.</string>
     <string lang="en" key="PASSWORD_WRONG_CAPSLOCK_ON">\n\nWarning: Caps Lock is on. This may cause you to enter your password incorrectly.</string>
+    <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
+    <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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_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>
+    <string lang="en" key="SELECTED_PARTITION_NOT_INPLACE_ENC">The selected partition/device is not using in-place encryption.\nHeader Flags = 0x%.8X</string>
     <string lang="en" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nNote: If you are attempting to mount a partition located on an encrypted system drive without pre-boot authentication or to mount the encrypted system partition of an operating system that is not running, you can do so by selecting 'System' &gt; 'Mount Without Pre-Boot Authentication'.</string>
     <string lang="en" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">In this mode, you cannot mount a partition located on a drive whose portion is within the key scope of active system encryption.\n\nBefore you can mount this partition in this mode, you need to either boot an operating system installed on a different drive (encrypted or unencrypted) or boot an unencrypted operating system.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <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>
@@ -701,11 +739,18 @@
     <string lang="en" key="FOR_MORE_INFO_ON_PARTITIONS">For information on how to create and manage partitions, please refer to the documentation supplied with your operating system or contact your computer vendor's technical support team for assistance.</string>
     <string lang="en" key="SYSTEM_PARTITION_NOT_ACTIVE">Error: The currently running operating system is not installed on the boot partition (first Active partition). This is not supported.</string>
     <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="en" key="CANT_ACCESS_VOL">Error: Cannot access the volume!\n\nMake sure that the selected volume exists, that it is not mounted or being used by the system or an application, that you have read/write permission for the volume, and that it is not write-protected.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Error: Cannot access the volume and/or obtain information about the volume.\n\nMake sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Error: Cannot access the volume and/or obtain information about the volume. Make sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.\n\nIf the problem persists, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">An error prevented VeraCrypt from encrypting the partition. Please try fixing any previously reported problems and then try again. If the problems persist, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_RESUME">An error prevented VeraCrypt from resuming the process of encryption of the partition.\n\nPlease try fixing any previously reported problems and then try resuming the process again. Note that the volume cannot be mounted until it has been fully encrypted.</string>
+    <string lang="en" key="INPLACE_DEC_GENERIC_ERR">An error prevented VeraCrypt from decrypting the volume. Please try fixing any previously reported problems and then try again if possible.</string>
     <string lang="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="en" key="CANT_ACCESS_OUTER_VOL">Error: Cannot access the outer volume! Volume creation cannot continue.</string>
@@ -790,7 +835,7 @@
     <string lang="en" key="TC_INSTALLER_IS_RUNNING">VeraCrypt Installer is currently running on this system and performing or preparing installation or update of VeraCrypt. Before you proceed, please wait for it to finish or close it. If you cannot close it, please restart your computer before proceeding.</string>
     <string lang="en" key="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 www.veracrypt.org).</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="EXTRACTING_VERB">Extracting</string>
     <string lang="en" key="CANNOT_READ_FROM_PACKAGE">Cannot read data from the package.</string>
@@ -977,6 +1022,7 @@
     <string lang="en" key="CONFIRM_EXIT_UNIVERSAL">Exit?</string>
     <string lang="en" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt does not have sufficient information to determine whether to encrypt or decrypt.</string>
     <string lang="en" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt does not have sufficient information to determine whether to encrypt or decrypt.\n\nNote: If you decrypted the system partition/drive in the pre-boot environment, you may need to finalize the process by clicking Decrypt.</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_REVERSE_INFO">Note: When you are encrypting a non-system partition/volume in place and an error persistently prevents you from finishing the process, you will not be able to mount the volume (and access data stored on it) until you entirely DECRYPT the volume (i.e. reverse the process).\n\nIf you need to do so, follow these steps:\n1) Exit this wizard.\n2) In the main VeraCrypt window, select 'Volumes' &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="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Do you want to interrupt and postpone the process of encryption of the system partition/drive?\n\nNote: You will be able to resume the process and it will continue from the point it was stopped. You can do so, for example, by selecting 'System' &gt; 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window. If you want to permanently terminate or reverse the encryption process, select 'System' &gt; 'Permanently Decrypt System Partition/Drive'.</string>
     <string lang="en" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Do you want to interrupt and postpone the process of decryption of the system partition/drive?\n\nNote: You will be able to resume the process and it will continue from the point it was stopped. You can do so, for example, by selecting 'System' &gt; 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window. If you want to reverse the decryption process (and start encrypting), select 'System' &gt; 'Encrypt System Partition/Drive'.</string>
@@ -986,6 +1032,7 @@
     <string lang="en" key="FAILED_TO_START_WIPING">Error: Failed to start the process of wiping.</string>
     <string lang="en" key="INCONSISTENCY_RESOLVED">Inconsistency resolved.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="sl" key="NOTHING_TO_RESUME">Ni nobenega procesa/opravila, ki bi (lahko) nadaljeval/i.</string>
     <string lang="en" key="HIDVOL_PROT_BKG_TASK_WARNING">WARNING: VeraCrypt Background Task is disabled. After you exit VeraCrypt, you will not be notified if damage to hidden volume is prevented.\n\nNote: You may shut down the Background Task anytime by right-clicking the VeraCrypt tray icon and selecting 'Exit'.\n\nEnable VeraCrypt Background Task?</string>
     <string lang="sl" key="LANG_PACK_VERSION">Različica jezikovnega paketa:  %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="en" key="ERROR_MBR_PROTECTED">Failed to write the MBR sector.\n\nYour BIOS may be configured to protect the MBR sector. Check your BIOS settings (press F2, Delete, or Esc, after powering on your computer) for MBR/antivirus protection.</string>
+    <string lang="en" key="BOOT_LOADER_FINGERPRINT_CHECK_FAILED">WARNING: The verification of VeraCrypt bootloader fingerprint failed!\nYour disk may have been tampered with by an attacker ("Evil Maid" attack).\n\nThis warning can also be triggered if you restored VeraCrypt boot loader using an Rescue Disk generated using a different VeraCrypt version.\n\nYou are advised to change your password immediately which will also restore the correct VeraCrypt bootloader. It is recommended to reinstall VeraCrypt and to take measures to avoid access to this machine by untrusted entities.</string>
     <string lang="en" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">The required version of the VeraCrypt Boot Loader is currently not installed. This may prevent some of the settings from being saved.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Note: In some situations, you may wish to prevent a person (adversary) that is watching you start the computer from knowing that you use VeraCrypt. The above options allow you to do that by customizing the VeraCrypt boot loader screen. If you enable the first option, no texts will be displayed by the boot loader (not even when you enter the wrong password). The computer will appear to be "frozen" while you can type your password. In addition, a custom message can be displayed to mislead the adversary. For example, fake error messages such as "Missing operating system" (which is normally displayed by the Windows boot loader if it finds no Windows boot partition). It is, however, important to note that if the adversary can analyze the content of the hard drive, he can still find out that it contains the VeraCrypt boot loader.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">WARNING: Please keep in mind that if you enable this option, the VeraCrypt boot loader will not display any texts (not even when you enter the wrong password). The computer will appear to be "frozen" (unresponsive) while you can type your password (the cursor will NOT move and no asterisk will be displayed when you press a key).\n\nAre you sure you want to enable this option?</string>
@@ -1034,8 +1082,11 @@
     <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="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">Warning: There is unallocated space between the system partition and the first partition behind it. After you create the hidden operating system, you must not create any new partitions in that unallocated space. Otherwise, the hidden operating system will be impossible to boot (until you delete such newly created partitions).</string>
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">This algorithm is currently not supported for system encryption.</string>
-	<string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</string>
     <string lang="en" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Error: Cannot set the keyboard layout for VeraCrypt to the standard US keyboard layout.\n\nNote that the password needs to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout.</string>
@@ -1120,6 +1171,7 @@
     <string lang="en" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">The pretest has been successfully completed.\n\nWARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt. If you do not, please back up the files now (you can click Defer, back up the files, then run VeraCrypt again anytime, and select 'System' &gt; 'Resume Interrupted Process' to start encrypting).\n\nWhen ready, click Encrypt to start encrypting.</string>
     <string lang="en" key="SYSENC_ENCRYPTION_PAGE_INFO">You can click Pause or Defer anytime to interrupt the process of encryption or decryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. To prevent slowdown when the system or applications write or read data from the system drive, VeraCrypt automatically waits until the data is written or read (see Status above) and then automatically continues encrypting or decrypting.</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nYou can click Pause or Defer anytime to interrupt the process of encryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. Note that the volume cannot be mounted until it has been fully encrypted.</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="en" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Hidden System Started</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Original System</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows creates (typically, without your knowledge or consent) various log files, temporary files, etc., on the system partition. It also saves the content of RAM to hibernation and paging files located on the system partition. Therefore, if an adversary analyzed files stored on the partition where the original system (of which the hidden system is a clone) resides, he might find out, for example, that you used the VeraCrypt wizard in the hidden-system-creation mode (which might indicate the existence of a hidden operating system on your computer).\n\nTo prevent such issues, VeraCrypt will, in the next steps, securely erase the entire content of the partition where the original system resides. Afterwards, in order to achieve plausible deniability, you will need to install a new system on the partition and encrypt it. Thus you will create the decoy system and the whole process of creation of the hidden operating system will be completed.</string>
@@ -1159,7 +1211,7 @@
     <string lang="en" key="HIDDEN_OS_CREATION_PREINFO_HELP">In the next steps, VeraCrypt will create the hidden operating system by copying the content of the system partition to the hidden volume (data being copied will be encrypted on the fly with an encryption key different from the one that will be used for the decoy operating system).\n\nPlease note that the process will be performed in the pre-boot environment (before Windows starts) and it may take a long time to complete; several hours or even several days (depending on the size of the system partition and on the performance of your computer).\n\nYou will be able to interrupt the process, shut down your computer, start the operating system and then resume the process. However, if you interrupt it, the entire process of copying the system will have to start from the beginning (because the content of the system partition must not change during cloning).</string>
     <string lang="en" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Do you want to cancel the entire process of creation of the hidden operating system?\n\nNote: You will NOT be able to resume the process if you cancel it now.</string>
     <string lang="en" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Do you want to cancel the system encryption pretest?</string>
-    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="sl" key="SYS_DRIVE_NOT_ENCRYPTED">Sistemski razdelek/pogon očitno ni šifriran (ne deloma ali v celoti).</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">Your system partition/drive is encrypted (partially or fully).\n\nPlease decrypt your system partition/drive entirely before proceeding. To do so, select 'System' &gt; 'Permanently Decrypt System Partition/Drive' from the menu bar of the main VeraCrypt window.</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">When the system partition/drive is encrypted (partially or fully), you cannot downgrade VeraCrypt (but you can upgrade it or reinstall the same version).</string>
@@ -1176,6 +1228,8 @@
     <string lang="en" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">You have selected the system partition/drive (or the boot partition), but the wizard mode you selected is suitable only for non-system partitions/drives.\n\nDo you want to set up pre-boot authentication (which means that you will need to enter your password each time before Windows boots/starts) and encrypt the system partition/drive?</string>
     <string lang="en" key="CONFIRM_DECRYPT_SYS_DEVICE">Are you sure you want to permanently decrypt the system partition/drive?</string>
     <string lang="en" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the system partition/drive, unencrypted data will be written to it.\n\nAre you really sure you want to permanently decrypt the system partition/drive?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
     <string lang="en" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Warning: If you use a cascade of ciphers for system encryption, you may encounter the following issues:\n\n1) The VeraCrypt Boot Loader is larger than normal and, therefore, there is not enough space in the first drive track for a backup of the VeraCrypt Boot Loader. Hence, whenever it gets damaged (which often happens, for example, during inappropriately designed anti-piracy activation procedures of certain programs), you will need to use the VeraCrypt Rescue Disk to boot or to repair the VeraCrypt Boot Loader.\n\n2) On some computers, resuming from hibernation takes longer.\n\nThese potential issues can be prevented by choosing a non-cascade encryption algorithm (e.g. AES).\n\nAre you sure you want to use a cascade of ciphers?</string>
     <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>
@@ -1191,6 +1245,7 @@
     <string lang="en" key="ENABLE_BAD_SECTOR_ZEROING">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nThe process of in-place encryption can continue only when the sectors have been made readable again. VeraCrypt can attempt to make these sectors readable by writing zeros to the sectors (subsequently such all-zero blocks would be encrypted). However, note that any data stored in the unreadable sectors will be lost. If you want to avoid that, you can attempt to recover portions of the corrupted data using appropriate third-party tools.\n\nNote: In case of physically damaged sectors (as opposed to mere data corruption and checksum errors) most types of storage devices internally reallocate the sectors when data is attempted to be written to them (so the existing data in the damaged sectors may remain unencrypted on the drive).\n\nDo you want VeraCrypt to write zeroes to unreadable sectors?</string>
     <string lang="en" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nTo be able to proceed with decryption, VeraCrypt will have to discard the content of the unreadable sectors (the content will be replaced with pseudorandom data). Please note that, before proceeding, you can attempt to recover portions of any corrupted data using appropriate third-party tools.\n\nDo you want VeraCrypt to discard data in the unreadable sectors now?</string>
     <string lang="en" key="ZEROED_BAD_SECTOR_COUNT">Note: VeraCrypt has replaced the content of %I64d unreadable sectors (%s) with encrypted all-zero plaintext blocks.</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="en" key="ENTER_TOKEN_PASSWORD">Enter password/PIN for token '%s':</string>
     <string lang="sl" key="PKCS11_LIB_LOCATION_HELP">Zato da lahko VeraCrypt-u omogočite dostop do varnostega žetona ali pametne kartice, morate prvo izbrati programsko knjižico PKCS#11 za varnostni žeton ali pametno kartico. Tovrstna knjižica je lahko priložena z napravo ali pa si jo je možno shraniti iz spletne strani proizvajalca ali drugih tretjih strani.\n\nPotem ko si naložite knjižico, jo lahko ali ročno izberete preko 'Izberi knjižico' ali pa dovolite VeraCrypt-u, da jo sam najde in samodejno izbere z klikom na 'Samodejno zaznaj knjižico' (samo sistemski direktorij Oken bo preiskan).</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>

Translations/Language.sv.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="sv" name="Svenska" en-name="Swedish" version="1.0.0" translators="Peter Runesson" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <control lang="sv" key="IDC_KEY_FILES">N&amp;yckelfiler …</control>
     <control lang="sv" key="IDC_LINK_HASH_INFO">Information om hashalgoritmer</control>
     <control lang="sv" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Ytterligare information</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="sv" key="IDC_MB">&amp;MB</control>
     <control lang="sv" key="IDC_MORE_INFO_ON_CONTAINERS">Ytterligare information</control>
     <control lang="sv" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">Ytterligare information om systemkryptering</control>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <control lang="sv" key="IDT_COLLECTING_RANDOM_DATA_NOTE">VIKTIGT: Flytta muspekaren så slumpmässigt som möjligt innanför detta fönsters gränser. Ju längre du flyttar den desto bättre. Detta förfarande ökar nyckelfilens kryptografiska styrka avsevärt. Klicka sedan på Nästa för att fortsätta.</control>
     <control lang="sv" key="IDT_CONFIRM">&amp;Bekräfta:</control>
     <control lang="sv" key="IDT_DONE">Klart</control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="sv" key="IDT_ENCRYPTION_ALGO">Krypteringsalgoritm</control>
     <control lang="sv" key="IDT_FILESYSTEM">Filsystem </control>
     <control lang="sv" key="IDT_FILE_CONTAINER">Skapar en virtuell krypterad disk inuti en fil. Rekommenderas för nybörjare.</control>
@@ -85,6 +88,8 @@
     <control lang="sv" key="IDT_PARTIAL_POOL_CONTENTS">Aktuellt poolinnehåll (ofullständigt)</control>
     <control lang="sv" key="IDT_PASS">Steg</control>
     <control lang="sv" key="IDT_PASSWORD">&amp;Lösenord:</control>
+    <control lang="en" key="IDT_PIM">Volume PIM:</control>
+    <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
     <control lang="sv" key="IDT_PROGRESS">Förlopp:</control>
     <control lang="sv" key="IDT_RANDOM_POOL">Slumpdatapool:</control>
     <control lang="sv" key="IDT_SINGLE_BOOT">Välj detta alternativ om det endast finns ett operativsystem installerat i datorn (även om den har flera användare).</control>
@@ -142,6 +147,8 @@
     <control lang="sv" key="IDC_MOUNT_OPTIONS">Al&amp;ternativ …</control>
     <control lang="sv" key="IDC_MOUNT_READONLY">Montera volym som &amp;skrivskyddad</control>
     <control lang="sv" key="IDC_NEW_KEYFILES">Ny&amp;ckelfiler …</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="sv" key="IDC_PREF_BKG_TASK_ENABLE">&amp;Aktiverad</control>
     <control lang="sv" key="IDC_PREF_CACHE_PASSWORDS">La&amp;gra lösenord i drivrutinens minnescache</control>
     <control lang="sv" key="IDC_PREF_DISMOUNT_INACTIVE">&amp;Demontera automatiskt volymer där inga data har skrivits eller lästs på</control>
@@ -155,6 +162,7 @@
     <control lang="sv" key="IDC_PREF_MOUNT_READONLY">Montera volymer som &amp;skrivskyddade</control>
     <control lang="sv" key="IDC_PREF_MOUNT_REMOVABLE">Montera volymer som &amp;flyttbara medier</control>
     <control lang="sv" key="IDC_PREF_OPEN_EXPLORER">&amp;Öppna Utforskaren vid montering av volymer</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</control>
     <control lang="sv" key="IDC_PREF_USE_DIFF_TRAY_ICON_IF_VOL_MOUNTED">Visa en alternativ ikon i Meddelandefältet när det finns volymer monterade</control>
     <control lang="sv" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Töm lösenords&amp;cache vid automatisk demontering</control>
     <control lang="sv" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Töm lösenordscac&amp;he vid avslut</control>
@@ -167,11 +175,12 @@
     <control lang="sv" key="IDC_SHOW_PASSWORD_CHPWD_ORI">&amp;Visa lösenord</control>
     <control lang="sv" key="IDC_TRAVEL_OPEN_EXPLORER">Öppna &amp;Utforskaren efter montering</control>
     <control lang="sv" key="IDC_TRAV_CACHE_PASSWORDS">Lagra lösenord i drivrutinens minnes&amp;cache</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="sv" key="IDC_UNMOUNTALL">Demontera &amp;allt</control>
     <control lang="sv" key="IDC_VOLUME_PROPERTIES">Volym&amp;egenskaper …</control>
     <control lang="sv" key="IDC_VOLUME_TOOLS">Volymverkty&amp;g …</control>
     <control lang="sv" key="IDC_WIPE_CACHE">Töm lösenords&amp;cache</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="sv" key="IDD_FAVORITE_VOLUMES">VeraCrypt – Volymfavoriter</control>
     <control lang="sv" key="IDD_HOTKEYS_DLG">VeraCrypt – Snabbtangenter</control>
     <control lang="sv" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="sv" key="IDM_CREATE_HIDDEN_OS">Skapa dolt operativsystem …</control>
     <control lang="sv" key="IDM_CREATE_RESCUE_DISK">Skapa återställningsskiva …</control>
     <control lang="sv" key="IDM_CREATE_VOLUME">Skapa ny volym …</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="sv" key="IDM_DEFAULT_KEYFILES">Standardnyckelfiler …</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="sv" key="IDM_DONATE">Donera nu …</control>
     <control lang="sv" key="IDM_ENCRYPT_SYSTEM_DEVICE">Kryptera systempartition eller -enhet …</control>
     <control lang="sv" key="IDM_FAQ">Vanliga frågor och svar (FAQ)</control>
@@ -243,6 +254,7 @@
     <control lang="sv" key="IDM_UNMOUNT_VOLUME">Demontera volym</control>
     <control lang="sv" key="IDM_VERIFY_RESCUE_DISK">Verifiera återställningsskiva</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>
     <control lang="sv" key="IDM_VOLUME_WIZARD">Guiden Skapa VeraCrypt-volym</control>
     <control lang="sv" key="IDM_WEBSITE">VeraCrypts webbplats</control>
@@ -369,7 +381,7 @@
     <string lang="sv" key="ACCESS_DENIED">Fel: Åtkomst nekad.\n\nPartitionen du försöker få åtkomst till är antingen 0 sektorer i storlek, eller så är det systemstartenheten.</string>
     <string lang="sv" key="ADMINISTRATOR">Administratör</string>
     <string lang="sv" key="ADMIN_PRIVILEGES_DRIVER">För att kunna ladda VeraCrypts drivrutin måste du vara inloggad med ett konto med administratörsbehörigheter.</string>
-    <string lang="sv" key="ADMIN_PRIVILEGES_WARN_DEVICES">Observera att du måste vara inloggad med ett konto med administratörsbehörigheter för att kunna kryptera eller formatera en partition eller enhet.\n\nDetta gäller inte volymer i volymbehållare.</string>
+    <string lang="sv" key="ADMIN_PRIVILEGES_WARN_DEVICES">Observera att du måste vara inloggad med ett konto med administratörsbehörigheter för att kunna kryptera/dekryptera eller formatera en partition eller enhet.\n\nDetta gäller inte volymer i volymbehållare.</string>
     <string lang="sv" key="ADMIN_PRIVILEGES_WARN_HIDVOL">Du måste vara inloggad med ett konto med administratörsbehörigheter för att kunna skapa en dold volym.\n\n Vill du fortsätta?</string>
     <string lang="sv" key="ADMIN_PRIVILEGES_WARN_NTFS">Observera att du måste vara inloggad med ett konto med administratörsbehörigheter för att kunna formatera volymen med NTFS.\n\nUtan administratörsbehörighet kan du formatera volymen med FAT.</string>
     <string lang="sv" key="AES_HELP">FIPS-godkänt krypteringsalgoritm (Rijndael, publicerad 1998) som får användas av amerikanska regeringens departement och myndigheter för att skydda hemligstämplad information upp till topphemlig nivå. 256-bitars nyckel, 128-bitars block, 14 steg (AES-256). Arbetsläget är XTS.</string>
@@ -485,7 +497,11 @@
     <string lang="sv" key="FORMAT_FINISHED_HELP">\n\nVeraCrypt-volymen har skapats och är klar att använda. Klicka på ”Nästa” om du vill skapa ytterligare en VeraCrypt-volym. Annars klickar du på ”Avsluta”.</string>
     <string lang="sv" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nDen dolda VeraCrypt-volymen har skapats utan fel. (Det dolda operativsystemet kommer att placeras inuti denna dolda volym.)\n\nKlicka på Nästa för att fortsätta.</string>
     <string lang="sv" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Volymen är fullständigt krypterad</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="sv" key="NONSYS_INPLACE_ENC_FINISHED_INFO">VIKTIGT: KLICKA PÅ ”Automontera enheter” I VERACRYPTS HUVUDFÖNSTER FÖR ATT MONTERA DENNA NYLIGEN SKAPADE VERACRYPT-VOLYM OCH FÖR ATT KOMMA ÅT DATA LAGRADE PÅ DEN. Efter att du angett rätt lösenord (och/eller rätt nyckelfiler), kommer volymen att monteras med den enhetsbeteckning du valt i listan i VeraCrypts huvudfönster, och du kan komma åt dina krypterade data via den valda enhetsbeteckningen.\n\nLÄGG OVANSTÅENDE STEG PÅ MINNET ELLER SKRIV NED DEM. DU MÅSTE FÖLJA DEM VARJE GÅNG DU VILL MONTERA VOLYMEN OCH KOMMA ÅT DATA LAGRADE PÅ DEN. Alternativt kan du klicka på ”Välj enhet” i VeraCrypts huvudfönster, välja denna partition eller volym och sedan klicka på ”Montera”.\n\nPartitionen eller enheten har krypterats utan fel och är klar för användning. (Den innehåller nu en färdigkrypterad VeraCrypt-volym.)</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="sv" key="FORMAT_FINISHED_INFO">VeraCrypt-volymen har skapats utan fel.</string>
     <string lang="sv" key="FORMAT_FINISHED_TITLE">Volym skapad</string>
     <string lang="sv" key="FORMAT_HELP">VIKTIGT: Flytta muspekaren så slumpmässigt som möjligt innanför detta fönsters gränser. Ju längre du flyttar den desto bättre. Detta förfarande ökar krypteringsnycklarnas kryptografiska styrka avsevärt. Klicka sedan på ”Formatera” för att skapa volymen.</string>
@@ -523,6 +539,7 @@
     <string lang="sv" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Ett fel inträffade när systemets krypteringsstatus skulle inhämtas.</string>
     <string lang="sv" key="INIT_SYS_ENC">Det går inte att initiera applikationskomponenter för systemkryptering.</string>
     <string lang="sv" key="INIT_RAND">Initieringen av slumptalsgeneratorn misslyckades!</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="sv" key="INIT_REGISTER">Det gick inte att initiera applikationen. Registreringen av dialogruteklassen misslyckades.</string>
     <string lang="sv" key="INIT_RICHEDIT">Fel: Det gick inte att ladda systembiblioteket för ”Rich Edit”.</string>
     <string lang="sv" key="INTRO_TITLE">Guiden Skapa VeraCrypt-volym</string>
@@ -535,6 +552,7 @@
     <string lang="sv" key="MOUNT_BUTTON">&amp;Montera</string>
     <string lang="sv" key="NEW_VERSION_REQUIRED">En nyare version av VeraCrypt krävs för att montera denna volym.</string>
     <string lang="sv" key="VOL_CREATION_WIZARD_NOT_FOUND">Fel: Det går inte att hitta guiden Skapa VeraCrypt-volym.\n\nKontrollera att filen ”VeraCrypt Format.exe” finns i den mapp från vilken ”VeraCrypt.exe” startades. Om filen inte finns där, ominstallera VeraCrypt eller leta upp filen ”VeraCrypt Format.exe” på din disk och kör den därifrån.</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="sv" key="NEXT">&amp;Nästa &gt;</string>
     <string lang="sv" key="FINALIZE">&amp;Slutför</string>
     <string lang="sv" key="INSTALL">&amp;Installera</string>
@@ -542,6 +560,7 @@
     <string lang="sv" key="NODRIVER">Det gick inte att ansluta till VeraCrypts drivrutin. VeraCrypt fungerar inte om drivrutinen inte körs.\n\nObservera att det, beroende på Windows, kan vara nödvändigt att logga ut eller starta om datorn innan drivrutinen kan laddas.</string>
     <string lang="sv" key="NOFONT">Ett fel inträffade när typsnitten laddades.</string>
     <string lang="sv" key="NOT_FOUND">Enhetsbeteckningen kunde inte hittas, eller så angavs ingen enhetsbeteckning.</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="sv" key="DRIVE_LETTER_UNAVAILABLE">Enhetsbeteckningen är inte tillgänglig.</string>
     <string lang="sv" key="NO_FILE_SELECTED">Ingen fil vald!</string>
     <string lang="sv" key="NO_FREE_DRIVES">Det finns inga tillgängliga enhetsbeteckningar.</string>
@@ -561,15 +580,18 @@
     <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_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="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="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="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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="sv" key="IDD_PCDM_CHANGE_PKCS5_PRF">Härledningsalgoritm för volymhuvudets nyckel</string>
     <string lang="sv" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Lägg till eller ta bort nyckelfiler från volymen</string>
     <string lang="sv" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Ta bort alla nyckelfiler från volymen</string>
-    <string lang="sv" key="PASSWORD_CHANGED">Lösenord och/eller nyckelfil(er) ändrades utan fel.\n\nVIKTIGT: Försäkra dig om att du har läst avsnittet ”Changing Passwords and Keyfiles” i kapitlet ”Security Requirements and Precautions” i VeraCrypts användarhandbok.</string>
+    <string lang="sv" key="PASSWORD_CHANGED">Lösenord, PIM och/eller nyckelfil(er) ändrades utan fel.\n\nVIKTIGT: Försäkra dig om att du har läst avsnittet ”Changing Passwords and Keyfiles” i kapitlet ”Security Requirements and Precautions” i VeraCrypts användarhandbok.</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="sv" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">VIKTIGT: Om du inte förstörde din återställningsskiva, kan din systempartition eller -enhet fortfarande dekrypteras med det gamla lösenordet genom att starta datorn med återställningsskivan och ange det gamla lösenordet. Du bör skapa en ny återställningsskiva och förstöra den gamla.\n\nVill du skapa en ny återställningsskiva?</string>
     <string lang="sv" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Observera att din återställningsdisk fortfarande använder den gamla algoritmen. Om du anser att den gamla algoritmen är osäker, bör du skapa en ny återställningsdisk och sedan förstöra den gamla.\n\nVill du skapa en ny återställningsskiva?</string>
     <string lang="sv" key="KEYFILES_NOTE">VeraCrypt kan använda vilken typ av fil som helst som nyckelfil (t.ex. .mp3, .jpg, .zip eller .avi). Observera att VeraCrypt aldrig ändrar en nyckelfils innehåll. Du kan fritt välja en eller flera nyckelfiler; deras inbördes ordning är oväsentlig. Om du lägger till en mapp, kommer alla synliga filer i den mappen att användas som nyckelfiler. Klicka på ”Lägg till token” för att lägga till nyckelfiler lagrade på säkerhetstoken eller smartkort eller för att importera nyckelfiler till dem.</string>
@@ -578,6 +600,7 @@
     <string lang="sv" key="PKCS5_PRF_CHANGED">Härledningsalgoritmen för volymhuvudets nyckel ändrades utan fel.</string>
     <string lang="sv" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">Ange lösenord och/eller nyckelfil(er) till den icke-systemvolym du vill återuppta på plats-krypteringsprocessen för.\n\n\nAnmärkning: Efter att du klickat på Nästa kommer VeraCrypt att försöka hitta alla icke-systemvolymer för vilka krypteringsprocessen har avbrutits och vars volymhuvuden kan dekrypteras med det lösenord och/eller de nyckelfiler du angett. Om fler än en sådan volym hittas, kommer du i nästa steg att få välja en av dem.</string>
     <string lang="sv" key="NONSYS_INPLACE_ENC_RESUME_VOL_SELECT_HELP">Välj en av följande volymer. Denna lista innehåller samtliga icke-systemvolymer vars krypteringsprocesser har avbrutits och vars volymhuvud inte kunde dekrypteras med det lösenord och/eller de nyckelfiler du angett.</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="sv" key="PASSWORD_HELP">Det är mycket viktigt att du väljer ett bra lösenord. Du bör undvika att välja ett som endast innehåller ett ord som kan finnas i en ordbok (eller en kombination av två, tre eller fyra sådana). Det bör inte innehålla några namn eller födelsedata. Det bör heller inte vara enkelt att gissa. Ett bra lösenord innehåller en kombination av versaler och gemener, siffror och specialtecken som exempelvis @ ^ = $ * + och liknande. Vi rekommenderar att du väljer ett lösenord som består av minst 20 tecken (ju längre desto bättre). Den största tillåtna längden är 64 tecken.</string>
     <string lang="sv" key="PASSWORD_HIDDENVOL_HELP">Ange ett lösenord för den dolda volymen. </string>
     <string lang="sv" key="PASSWORD_HIDDEN_OS_HELP">Ange ett lösenord för det dolda operativsystemet, d.v.s. för den dolda volymen. </string>
@@ -597,11 +620,26 @@
     <string lang="sv" key="PASSWORD_WRONG_AUTOMOUNT">Antingen är det angivna lösenordet fel, eller så hittades inte någon VeraCrypt-volym.</string>
     <string lang="sv" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Antingen har fel nyckelfil(er) och/eller fel lösenord angetts, eller så hittades inte någon VeraCrypt-volym.</string>
     <string lang="sv" key="PASSWORD_WRONG_CAPSLOCK_ON">\n\nVarning: Caps Lock är på. Detta kan orsaka att ditt lösenod blir felaktigt angett.</string>
+    <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
+    <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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="sv" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nVARNING: Det finns dolda filer i nyckelfilernas sökväg. Om du vill använda dessa filer som nyckelfiler, måste de först göras synliga för operativsystemet. Högerklicka på var och en av dem och välj ”Egenskaper” i snabbmenyn, inaktivera kryssrutan ”Dold” och klicka på ”OK”). Observera: Dolda filer är endast synliga om alternativet ”Visa dolda filer, mappar och enheter” under fliken ”Visning”, som nås via ”Ordna” och menyalternativet ”Mapp- och sökalternativ” i Utforskaren, är aktiverat.</string>
     <string lang="sv" key="HIDDEN_VOL_PROT_PASSWORD_US_KEYB_LAYOUT">Om du försöker skydda en dold volym som innehåller ett dolt operativsystem, måste du se till att du använder amerikansk tangentbordslayout när du anger lösenordet för den dolda volymen. Detta beror på att lösenordet måste anges i förstartsmiljön (innan Windows startas), där inga andra tangentbordslayouter än den amerikanska finns tillgängliga.</string>
     <string lang="sv" key="FOUND_NO_PARTITION_W_DEFERRED_INPLACE_ENC">VeraCrypt har inte hittat någon icke-systemvolym för vilken krypteringsprocessen har avbrutits och vars volymhuvud kan dekrypteras med hjälp av det lösenord och/eller de nyckelfiler du angett.\n\nKontrollera att lösenordet och/eller nyckelfilerna är korrekta och att partitionen eller volymen inte används av operativsystemet eller ett annat program (inklusive antivirusprogramvaror).</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="sv" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nObservera: Om du försöker montera en partition belägen på en krypterad systemenhet utan förstartsautentisering eller en krypterad systempartition tillhörande ett operativsystem som inte körs, kan du göra det genom att välja ”Montera utan förstartsautentisering” under ”System” i VeraCrypts rullgardinsmeny.</string>
     <string lang="sv" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">Det går inte att montera en partition belägen på en aktiv krypterad systemenhet.\n\nInnan du kan montera denna partition, måste du antingen starta ett okrypterat operativsystem eller ett operativsystem som är installerat på en annan enhet (krypterad eller okrypterad).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <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>
@@ -701,11 +739,18 @@
     <string lang="sv" key="FOR_MORE_INFO_ON_PARTITIONS">Läs dokumentationen som följde med ditt operativsystem eller kontakta din datorleverantörs tekniska support för information om hur man skapar och hanterar partitioner.</string>
     <string lang="sv" key="SYSTEM_PARTITION_NOT_ACTIVE">Fel: Det aktuella operativsystemet är inte installerat på startpartitionen (den första aktiva partitionen), vilket inte stöds av VeraCrypt.</string>
     <string lang="sv" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">Du antydde att du avser lagra filer större än 4 GB i denna VeraCrypt-volym. Dock valde du att använda ett FAT-filsystem, i vilket filer större än 4 GB inte kan lagras.\n\nÄr du säker på att du vill formatera volymen med ett FAT-filsystem?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="sv" key="CANT_ACCESS_VOL">Fel: Det går inte att komma åt volymen!\n\nKontrollera att den valda volymen existerar, att den inte är monterad eller används av operativsystemet eller en applikation, att du har skriv- och läsrättigheter på den och att den inte är skrivskyddad.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="sv" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Fel: Det går inte att komma åt volymen och/eller inhämta information om den.\n\nKontrollera att den valda volymen existerar, att den inte är monterad eller används av operativsystemet eller en applikation, att du har skriv- och läsrättigheter på den och att den inte är skrivskyddad.</string>
     <string lang="sv" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Fel: Det går inte att komma åt volymen och/eller inhämta information om den. Kontrollera att den valda volymen existerar, att den inte är monterad eller används av operativsystemet eller en applikation, att du har skriv- och läsrättigheter på den och att den inte är skrivskyddad.\n\nOm problemet kvarstår, kan det hjälpa att följa stegen nedan.</string>
     <string lang="sv" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">Ett fel hindrade VeraCrypt från att kryptera partitionen. Försök rätta till eventuella tidigare rapporterade problem och försök sedan igen. Om problemen kvarstår, kan det hjälpa att följa stegen nedan.</string>
     <string lang="sv" key="INPLACE_ENC_GENERIC_ERR_RESUME">Ett fel hindrade VeraCrypt från att återuppta krypteringsprocessen för partitionen.\n\nFörsök rätta till eventuella tidigare rapporterade problem och försök sedan återuppta processen igen. Observera att volymen inte kan monteras förrän den har blivit fullständigt krypterad.</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="sv" key="CANT_DISMOUNT_OUTER_VOL">Fel: Det går inte att demontera den yttre volymen!\n\nVolymen kan inte demonteras om den innehåller filer eller mappar som används av operativsystemet eller ett program.\n\nStäng alla program som kan tänkas använda filer eller mappar på volymen och klicka på ”Försök igen”.</string>
     <string lang="sv" key="CANT_GET_OUTER_VOL_INFO">Fel: Det går inte att läsa in information om den yttre volymen!\nSkapandet av volymen kan inte fortsätta.</string>
     <string lang="sv" key="CANT_ACCESS_OUTER_VOL">Fel: Det går inte att komma åt den yttre volymen! Skapandet av volymen kan inte fortsätta.</string>
@@ -790,7 +835,7 @@
     <string lang="sv" key="TC_INSTALLER_IS_RUNNING">VeraCrypts installationsprogram körs för närvarande och genomför eller förbereder en installation av VeraCrypt. Vänta på att installationsprogrammet slutförts eller stäng det innan du fortsätter. Starta om datorn, om programmet inte går att avsluta.</string>
     <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, www.veracrypt.org).</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="EXTRACTING_VERB">Packar upp</string>
     <string lang="sv" key="CANNOT_READ_FROM_PACKAGE">Det går inte att läsa från installationspaketet.</string>
@@ -977,6 +1022,7 @@
     <string lang="sv" key="CONFIRM_EXIT_UNIVERSAL">Vill du avsluta?</string>
     <string lang="sv" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt har inte tillräckligt med information för att avgöra om en kryptering eller dekryptering ska genomföras.</string>
     <string lang="sv" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt har inte tillräckligt med information för att avgöra om en kryptering eller dekryptering ska genomföras.\n\nObservera: Om du dekrypterade systempartitionen eller -enheten i förstartsmiljön, kan du eventuellt behöva slutföra processen genom att klicka på Dekryptera.</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="sv" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">Vill du avbryta och skjuta upp krypteringen av partitionen eller enheten?\n\nObservera: Kom ihåg att volymen inte kan monteras förrän krypteringen slutförts. Du kommer att kunna återuppta krypteringsprocessen, som då kommer att fortsätta från den punkt där den avbröts. Detta gör du exempelvis genom att välja alternativet ”Återuppta avbruten process” under ”Volymer” i VeraCrypts rullgardinsmeny.</string>
     <string lang="sv" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Vill du avbryta och skjuta upp krypteringen av systempartitionen eller -enheten?\n\nObservera: Du kommer att kunna återuppta krypteringsprocessen, som då kommer att fortsätta från den punkt där den avbröts. Detta gör du exempelvis genom att välja alternativet ”Återuppta avbruten process” under ”System” i VeraCrypts rullgardinsmeny. Välj ”Permanent dekryptering av systempartition eller -enhet” under ”System” i rullgardinsmenyn om du vill avbryta eller ångra krypteringsprocessen.</string>
     <string lang="sv" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Vill du avbryta och skjuta upp dekrypteringen av systempartitionen eller -enheten?\n\nObservera: Du kommer att kunna återuppta dekrypteringsprocessen, som då kommer att fortsätta från den punkt där den avbröts. Detta gör du exempelvis genom att välja alternativet ”Återuppta avbruten process” under ”System” i VeraCrypts rullgardinsmeny. Välj ”Kryptera systempartition eller -enhet” under ”System” i rullgardinsmenyn om du vill ångra dekrypteringsprocessen och börja kryptera igen.</string>
@@ -986,6 +1032,7 @@
     <string lang="sv" key="FAILED_TO_START_WIPING">Fel: Det gick inte att starta överskrivningsprocessen.</string>
     <string lang="sv" key="INCONSISTENCY_RESOLVED">En inkonsekvens har lösts.\n\n\n(Om du i samband med detta rapporterar ett fel, se till att felrapporten innehåller följande tekniska information:\n%hs)</string>
     <string lang="sv" key="UNEXPECTED_STATE">Fel: Oväntat tillstånd.\n\n\n(Om du i samband med detta skickar en felrapport, inkludera då följande tekniska information i rapporten:\n%hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="sv" key="NOTHING_TO_RESUME">Det finns ingen process eller uppgift att återuppta.</string>
     <string lang="sv" key="HIDVOL_PROT_BKG_TASK_WARNING">VARNING: VeraCrypts bakgrundsaktivitet är inaktiverad. Efter att du avslutat VeraCrypt kommer du inte att bli meddelad om en skada av en dold volym förhindrats.\n\nObservera: Du kan stänga av bakgrundsaktiviteten när som helst genom att högerklicka på VeraCrypts meddelandefältsikon och välja ”Avsluta”.\n\nVill du aktivera VeraCrypts bakgrundsaktivitet?</string>
     <string lang="sv" key="LANG_PACK_VERSION">Språkpaketsversion: %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="sv" key="ERROR_MBR_PROTECTED">Det gick inte att skriva till MBR-sektorn.\n\nDatorns BIOS kan vara konfigurerat att skydda MBR-sektorn. Sök igenom dina BIOS-inställningar (tryck på F2, F10, Delete eller Esc efter att du startat din dator) efter MBR- eller antivirusskydd.</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="sv" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">Den version av VeraCrypt som krävs är för närvarande inte installerad. Detta kan förhindra att vissa inställningar sparas.</string>
     <string lang="sv" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Observera: I vissa situationer kan du vilja förhindra att någon som ser dig starta datorn får reda på att du använder VeraCrypt. Ovanstående alternativ gör detta möjligt genom en anpassning av startinläsarens skärm. Om du aktiverar det första alternativet kommer ingen text att visas av startinläsaren (inte ens om du anger fel lösenord). Datorn ger intrycket av att ha hängt sig medan du anger ditt lösenord. Dessutom kan obehöriga vilseledas av ett anpassat meddelande, exempelvis ett falskt felmeddelande som ”Operativsystem saknas” (vilket normalt visas av Windows startinläsare om ingen startpartition hittas). Det är emellertid viktigt att observera att någon fortfarande kan lista ut att hårddisken innehåller VeraCrypts startinläsare, om han eller hon får möjlighet att analysera hårddiskens innehåll.</string>
     <string lang="sv" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">VARNING: Kom ihåg att ingen text kommer att visas av VeraCrypts startinläsare (inte ens om du anger fel lösenord). Datorn ger intrycket av att ha hängt sig medan du anger ditt lösenord. (Markören kommer inte att flytta på sig, och ingen asterisk kommer att visas när du trycker på en tangent.)\n\nÄr du säker på att du vill aktivera detta alternativ?</string>
@@ -1034,8 +1082,11 @@
     <string lang="sv" key="EXTRA_BOOT_PARTITION_REMOVAL_INSTRUCTIONS">\nDen extra startpartitionen kan tas bort innan Windows installeras. Följ nedanstående steg för att göra det:\n\n1) Starta Windows installationsskiva.\n\n2) I Windows installationsprogram väljer du alternativen ”Installera nu” följt av ”Anpassad (avancerat)”.\n\n3) Klicka på ”Enhetsalternativ (avancerat)”.\n\n4) Markera systempartitionen och ta bort den genom att klicka på ”Ta bort” och bekräfta med ”OK”.\n\n5) Välj partitionen markerad ”Reserverad av systemet”, klicka på ”Utöka” och öka dess storlek så att operativsystemet kan installeras på den.\n\n6) Klicka på ”Verkställ” och ”OK”.\n\n7) Installera Windows på partitionen markerad ”Reserverad av systemet”.\n\n\nOm någon frågar dig varför du tagit bort den extra startpartitionen, kan du svara att du ville förhindra dataläckage till den okrypterade startpartitionen.\n\nObservera: Du kan skriva ut denna text genom att klicka på knappen ”Skriv ut” nedan. Om du sparar en kopia av denna text eller skriver ut den (vilket rekommenderas, såvida inte skrivaren lagrar kopior av dokument den skriver ut på en intern enhet), bör du förstöra alla kopior av den efter att du tagit bort den extra startpartitionen. (Annars riskerar en sådan kopia avslöja existensen av ett dolt operativsystem i datorn.)</string>
     <string lang="sv" key="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">Varning: Det finns oallokerat utrymme mellan systempartitionen och den första partitionen efter den. Efter att du skapat det dolda operativsystemet, får du inte skapa några nya partitioner i det oallokerade utrymmet. I så fall kommer det dolda operativsystemet att vara omöjligt att starta (tills du tar bort de nyskapade partitionerna).</string>
     <string lang="sv" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Denna algoritm stöds för närvarande inte vid systemkryptering.</string>
-	<string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="sv" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Nyckelfiler stöds för närvarande inte vid systemkryptering.</string>
     <string lang="sv" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Varning: VeraCrypt kunde inte återställa den ursprungliga tangentbordslayouten. Detta kan orsaka att du anger ett felaktigt lösenord.</string>
     <string lang="sv" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Fel: Det går inte att ange amerikansk tangentbordslayout som tangentbordslayout för VeraCrypt.\n\nObservera att lösenordet måste anges i förstartsmiljön (innan Windows startas), där inga andra tangentbordslayouter än den amerikanska finns tillgängliga. Därför måste amerikansk tangentbordslayout alltid användas när du anger lösenordet.</string>
@@ -1120,6 +1171,7 @@
     <string lang="sv" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">Det förberedande testet har slutförts utan fel.\n\nVARNING: 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. Säkerhetskopiera annars filerna nu (genom att klicka på Skjut upp, säkerhetskopiera filerna, sedan köra VeraCrypt igen när som helst och välja ”Återuppta avbruten process” under ”System” i rullgardinsmenyn).\n\nKlicka på Kryptera för att börja kryptera.</string>
     <string lang="sv" key="SYSENC_ENCRYPTION_PAGE_INFO">Du kan när som helst klicka på Pausa eller Skjut upp för att avbryta krypterings- eller dekrypteringsprocessen, avsluta denna guide, starta om eller stänga av din dator och sedan återuppta processen, som kommer att fortsätta från den punkt där den avbröts. För att prestandan inte ska bli lidande när andra applikationer skriver till eller läser data från systemenheten, väntar VeraCrypt tills data skrivits eller lästs och fortsätter sedan krypteringen eller dekrypteringen.</string>
     <string lang="sv" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nDu kan när som helst klicka på Pausa eller Skjut upp för att avbryta krypteringsprocessen, avsluta denna guide, starta om eller stänga av din dator och sedan återuppta processen, som kommer att fortsätta från den punkt där den avbröts. Observera att volymen inte kan monteras förrän krypteringen slutförts.</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="sv" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Dolt operativsystem startat</string>
     <string lang="sv" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Ursprungligt operativsystem</string>
     <string lang="sv" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows skapar (normalt sett utan vare sig din vetskap eller ditt medgivande) olika loggfiler, tillfälliga filer och liknande på systempartitionen. Windows sparar också primärminnets innehåll i viloläges- och växlingsfiler på systempartitionen. Därför skulle obehöriga, om de analyserade filer lagrade på partitionen som innehåller det ursprungliga operativsystemet (av vilket det dolda operativsystemet är en kloning), kunna lista ut att du t.ex. körde VeraCrypts guide för att skapa ett dolt operativsystem (vilket i sin tur kan indikera att ett dolt operativsystem existerar i datorn).\n\nFör att förhindra detta kommer VeraCrypt att skriva över hela innehållet på partitionen där det ursprungliga operativsystemet finns. Efteråt, för att få ett förnekande att verka trovärdigt, kommer du att behöva installera ett nytt operativsystem på partitionen och kryptera det. På så sätt skapar du ett skenoperativsystem, och hela processen för att skapa ett dolt operativsystem kommer att slutföras.</string>
@@ -1159,7 +1211,7 @@
     <string lang="sv" key="HIDDEN_OS_CREATION_PREINFO_HELP">I följande steg kommer VeraCrypt att skapa det dolda operativsystemet genom att kopiera systempartitionens innehåll till den dolda volymen. (Data som kopieras krypteras i realtid med en krypteringsnyckel skild från den som används för skenoperativsystemet.)\n\nObservera att kopieringen kommer att genomföras i förstartsmiljön (innan Windows startas) och kan ta lång tid att slutföra, allt från flera timmar till flera dagar (beroende på systempartitionens storlek och din dators prestanda).\n\nDu kan avbryta kloningsprocessen, stänga av din dator, starta operativsystemet igen och sedan återuppta processen. Hela kloningsprocessen kommer, om du avbryter den, emellertid att behöva börja om från början, eftersom systempartitionens innehåll inte får ändras under processens gång.</string>
     <string lang="sv" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Vill du avbryta hela processen för att skapa ett dolt operativsystem?\n\nObservera: Du kommer INTE att kunna återuppta processen om du avbryter den nu.</string>
     <string lang="sv" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Vill du avbryta det förberedande testet inför systemkrypteringen?</string>
-    <string lang="sv" key="BOOT_PRETEST_FAILED_RETRY">VeraCrypts förberedande test inför systemkrypteringen misslyckades. Vill du försöka igen?\n\nOm du väljer ”Nej”, kommer komponenten för förstartsautentiseringen att avinstalleras.\n\nObservera:\n\n· Om VeraCrypts startinläsare inte bad dig att ange lösenordet innan Windows startades, är det möjligt att ditt operativsystem inte startade från den enhet på vilket det är installerat. Detta förfarande stöds inte.\n\n· Om du använde en annan krypteringsalgoritm än AES och det förberedande testet misslyckades (och du dessutom angav rätt lösenord), kan det ha orsakats av en dåligt anpassad drivrutin. Välj ”Nej” och försök att kryptera systempartitionen eller -enheten igen, men använd AES som krypteringsalgoritm, då den är minst minneskrävande.\n\n· För fler möjliga orsaker och lösningar, gå till sidan http://www.veracrypt.org/docs/?s=troubleshooting.</string>
+    <string lang="sv" key="BOOT_PRETEST_FAILED_RETRY">VeraCrypts förberedande test inför systemkrypteringen misslyckades. Vill du försöka igen?\n\nOm du väljer ”Nej”, kommer komponenten för förstartsautentiseringen att avinstalleras.\n\nObservera:\n\n· Om VeraCrypts startinläsare inte bad dig att ange lösenordet innan Windows startades, är det möjligt att ditt operativsystem inte startade från den enhet på vilket det är installerat. Detta förfarande stöds inte.\n\n· Om du använde en annan krypteringsalgoritm än AES och det förberedande testet misslyckades (och du dessutom angav rätt lösenord), kan det ha orsakats av en dåligt anpassad drivrutin. Välj ”Nej” och försök att kryptera systempartitionen eller -enheten igen, men använd AES som krypteringsalgoritm, då den är minst minneskrävande.\n\n· För fler möjliga orsaker och lösningar, gå till sidan https://veracrypt.codeplex.com/wikipage?title=Troubleshooting.</string>
     <string lang="sv" key="SYS_DRIVE_NOT_ENCRYPTED">Systempartitionen eller -enheten verkar inte vara krypterad (varken helt eller delvis).</string>
     <string lang="sv" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">Din systempartition eller -enhet är krypterad (delvis eller fullständigt).\n\nDu måste dekryptera din systempartition eller -volym innan du fortsätter. Välj ”Permanent dekryptering av systempartition eller -enhet” under ”System” i rullgardinsmenyn.</string>
     <string lang="sv" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">Du kan inte nedgradera VeraCrypt när systempartitionen eller -enheten är krypterad (helt eller delvis). Du kan däremot uppgradera eller ominstallera samma version.</string>
@@ -1176,6 +1228,8 @@
     <string lang="sv" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">Du har valt systempartitionen eller -enheten (eller startpartitionen), men det guideläge du valde är endast giltigt för icke-systempartitioner eller -enheter.\n\nVill du konfigurera förstartsautentisering (vilket innebär att du måste ange ditt lösenord varje gång innan Windows startas) och kryptera systempartitionen eller -enheten?</string>
     <string lang="sv" key="CONFIRM_DECRYPT_SYS_DEVICE">Är du säker på att du vill utföra en permanent dekryptering av systempartitionen eller -enheten?</string>
     <string lang="sv" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">VARNING: Om du väljer att utföra en permanent dekryptering av systempartitionen eller -enheten kommer okrypterade data att skrivas till den.\n\nÄr du verkligen säker på att du vill utföra en permanent dekryptering av systempartitionen eller -enheten?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
     <string lang="sv" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Varning: Om du använder nästade krypteringsalgoritmer vid systemkryptering kan du drabbas av följande problem:\n\n1) VeraCrypts startinläsare blir så stort att utrymmet på enhetens startspår inte räcker till för att rymma en säkerhetskopia av startinläsaren. När det skadas (vilket ofta händer, exempelvis vid dåligt konstruerade produktaktiveringsprocesser som ska förhindra piratkopiering), måste du använda återställningsskivan för att starta eller reparera VeraCrypts startinläsare.\n\n2) På vissa datorer kan det ta längre tid att aktivera datorn från viloläge.\n\nDessa potentiella problem kan förhindras genom att välja en icke-nästad krypteringsalgoritm (t.ex. AES).\n\nÄr du säker på att du vill använda nästade krypteringsalgoritmer?</string>
     <string lang="sv" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">Om du upplever något av tidigare beskrivna problem, dekryptera partitionen eller enheten (om den är krypterad) och försök sedan kryptera den igen med hjälp av en krypteringsalgoritm som inte är nästad (t.ex. AES).</string>
     <string lang="sv" key="UPDATE_TC_IN_DECOY_OS_FIRST">VARNING: Av säkerhetsskäl bör du uppdatera VeraCrypt i skenoperativsystemet innan du uppdaterar VeraCrypt i det dolda operativsystemet.\n\nStarta skenoperativsystemet och kör VeraCrypts installationsprogram därifrån. Starta sedan det dolda operativsystemet och kör VeraCrypts installationsprogram även därifrån.\n\nObservera: Skenoperativsystemet och det dolda operativsystemet delar en gemensam startinläsare. Om du endast uppgraderar VeraCrypt i det dolda operativsystemet, kommer skenoperativsystemet att innehålla en VeraCrypt-drivrutin och VeraCrypt-applikationer vars versionsnummer skiljer sig från versionsnumret på VeraCrypts startinläsare. En sådan avvikelse kan indikera att ett dolt operativsystem finns installerat i datorn.\n\n\nVill du fortsätta?</string>
@@ -1191,6 +1245,7 @@
     <string lang="sv" key="ENABLE_BAD_SECTOR_ZEROING">Fel: Innehållet i en eller flera sektorer på disken kan inte läsas (troligen beroende på ett fysiskt fel).\n\nPå plats-krypteringsprocessen kan endast fortsätta efter att sektorerna har gjorts läsbara igen. VeraCrypt kan försöka att göra dessa sektorer läsbara genom att skriva nollor i dem. (Därefter kommer alla sådana nollfyllda block att krypteras.) Observera emellertid att alla data lagrade i de oläsbara sektorerna kommer att gå förlorade. Om du vill undvika detta, kan du försöka återskapa delar av informationen i de skadade sektorerna med hjälp av lämpliga programvaror från tredje part.\n\nObservera: Vid fysiska skador på sektorer – i motsats till rena datafel och kontrollsummefel – allokerar de flesta typer av lagringsenheter om sektorerna internt, när försök att skriva data till dem görs. Existerande data i de skadade sektorerna kan därför finnas kvar på enheten okrypterade.\n\nVill du att VeraCrypt ska skriva nollor i oläsbara sektorer?</string>
     <string lang="sv" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Fel: Innehållet i en eller flera sektorer på disken kan inte läsas (troligen beroende på ett fysiskt fel).\n\nFör att kunna gå vidare med dekrypteringen måste VeraCrypt hoppa över innehållet i de oläsbara sektorerna. (Innehåller kommer att ersättas med pseudoslumpmässiga data.) Observera att du, innan du fortsätter, kan försöka återställa delar av innehållet i de skadade sektorerna med hjälp av lämpliga programvaror från tredje part.\n\nVill du att VeraCrypt hoppar över innehållet i de oläsbara sektorerna och går vidare nu?</string>
     <string lang="sv" key="ZEROED_BAD_SECTOR_COUNT">Observera: VeraCrypt har ersatt innehållet i %I64d oläsbara sektorer (%s) med krypterade klartextblock fyllda med nollor.</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="sv" key="ENTER_TOKEN_PASSWORD">Ange lösenord eller PIN för tokenet ”%s”:</string>
     <string lang="sv" key="PKCS11_LIB_LOCATION_HELP">För att ge VeraCrypt åtkomst till ett säkerhetstoken eller ett smartkort, måste du först installera ett PKCS #11-programvarubibliotek för tokenet eller smartkortet. Ett sådant bibliotek kan följa med enheten eller vara tillgängligt för nedladdning från tillverkarens webbplats eller tredje part.\n\nEfter att du installerat biblioteket, kan du antingen välja det manuellt genom att klicka på ”Välj bibliotek” eller så kan du låta VeraCrypt hitta och välja det automatiskt genom att klicka på ”Identifiera bibliotek automatiskt” (endast Windows systemmapp genomsöks).</string>
     <string lang="sv" key="SELECT_PKCS11_MODULE_HELP">Observera: PKCS #11-bibliotekets filnamn och sökväg bör vara angivna i dokumentationen som följde med säkerhetstokenet, smartkortet eller programvaran från tredje part.\n\nKlicka på ”OK” för att välja sökväg och filnamn.</string>

Translations/Language.tr.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="tr" name="Türkçe" en-name="Turkish" version="0.1.0" translators="Ali İskender Turan, Zeynel Abidin Öztürk" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <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>
     <control lang="tr" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Daha fazla bilgi</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="tr" 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>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <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="tr" key="IDT_CONFIRM">&amp;Onayla:</control>
     <control lang="tr" key="IDT_DONE">Bitti </control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="tr" key="IDT_ENCRYPTION_ALGO">Şifreleme Algoritması</control>
     <control lang="tr" key="IDT_FILESYSTEM">Dosya Sis.</control>
     <control lang="en" key="IDT_FILE_CONTAINER">Creates a virtual encrypted disk within a file. Recommended for inexperienced users.</control>
@@ -85,6 +88,8 @@
     <control lang="en" key="IDT_PARTIAL_POOL_CONTENTS">Current pool content (partial)</control>
     <control lang="en" key="IDT_PASS">Pass</control>
     <control lang="tr" key="IDT_PASSWORD">Parola:</control>
+    <control lang="en" key="IDT_PIM">Volume PIM:</control>
+    <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
     <control lang="en" key="IDT_PROGRESS">Progress:</control>
     <control lang="tr" key="IDT_RANDOM_POOL">Rasgele Havuz:</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>
@@ -142,6 +147,8 @@
     <control lang="tr" key="IDC_MOUNT_OPTIONS">Bağlama A&amp;yarları..</control>
     <control lang="tr" key="IDC_MOUNT_READONLY">Birimi &amp;salt okunur olarak bağla</control>
     <control lang="tr" key="IDC_NEW_KEYFILES">Anahtar Dosyalar</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="tr" key="IDC_PREF_BKG_TASK_ENABLE">Etkin</control>
     <control lang="tr" key="IDC_PREF_CACHE_PASSWORDS">Parolaları sürücü belleğinde önbelleğe al</control>
     <control lang="tr" key="IDC_PREF_DISMOUNT_INACTIVE">Birimden bu sürede veri okunmaz/yazılmazsa bağlantısını otomatik kes:</control>
@@ -154,7 +161,8 @@
     <control lang="en" key="IDC_PREF_LOGON_START">Start VeraCrypt Background Task</control>
     <control lang="tr" key="IDC_PREF_MOUNT_READONLY">Birimleri salt okunur olarak bağla</control>
     <control lang="tr" key="IDC_PREF_MOUNT_REMOVABLE">Birimleri çıkartılabilir ortam olarak bağla</control>
-    <control lang="tr" key="IDC_PREF_OPEN_EXPLORER">Başarıyla bağlanan birim için Gezgin penceresini aç</control>
+    <control lang="tr" key="IDC_PREF_OPEN_EXPLORER">Başarıyla bağlanan birim için Gezgin penceresini aç</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</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="tr" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Önbellekteki parolaları otomatik bağlantı keserken temizle</control>
     <control lang="tr" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Önbellekteki parolaları çıkışta temizle</control>
@@ -167,11 +175,12 @@
     <control lang="tr" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Parolayı göster</control>
     <control lang="tr" key="IDC_TRAVEL_OPEN_EXPLORER">Bağlanan &amp;birim için Gezgin penceresini aç</control>
     <control lang="tr" key="IDC_TRAV_CACHE_PASSWORDS">&amp;Parolayı aygıt belleğinde önbelleğe al</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="tr" key="IDC_UNMOUNTALL">H&amp;epsinin Bağlantısını Kes</control>
     <control lang="tr" key="IDC_VOLUME_PROPERTIES">Birim Ö&amp;zellikleri...</control>
     <control lang="tr" key="IDC_VOLUME_TOOLS">Biri&amp;m Araçları...</control>
     <control lang="tr" key="IDC_WIPE_CACHE">Ö&amp;nbelleği Temizle</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
     <control lang="tr" key="IDD_HOTKEYS_DLG">VeraCrypt - Sistem çapında kısayol tuşları</control>
     <control lang="tr" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="en" key="IDM_CREATE_HIDDEN_OS">Create Hidden Operating System...</control>
     <control lang="en" key="IDM_CREATE_RESCUE_DISK">Create Rescue Disk...</control>
     <control lang="tr" key="IDM_CREATE_VOLUME">Yeni Birim Oluştur...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="tr" key="IDM_DEFAULT_KEYFILES">Varsayılan Anahtar Dosyaları...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="en" key="IDM_ENCRYPT_SYSTEM_DEVICE">Encrypt System Partition/Drive...</control>
     <control lang="tr" key="IDM_FAQ">Sık Sorulan Sorular</control>
@@ -243,6 +254,7 @@
     <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="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>
     <control lang="tr" key="IDM_VOLUME_WIZARD">Birim Oluşturma Sihirbazı</control>
     <control lang="tr" key="IDM_WEBSITE">VeraCrypt Web Sayfası</control>
@@ -369,7 +381,7 @@
     <string lang="tr" key="ACCESS_DENIED">Hata: Erişim engellendi.\n\nErişmeye çalıştığınız aygıt ya 0 bayt uzunluğunda ya da önyükleme aygıtı.</string>
     <string lang="en" key="ADMINISTRATOR">Administrator</string>
     <string lang="tr" key="ADMIN_PRIVILEGES_DRIVER">VeraCrypt sürücüsünü yüklemek için, yönetici haklarına sahip bir hesaba oturum açmış olmalısınız.</string>
-    <string lang="tr" key="ADMIN_PRIVILEGES_WARN_DEVICES">Bir bölümü/aygıtı şifrelemek/biçimlendirmek için yönetici haklarına sahip bir hesaba oturum açmanız gerektiğine lütfen dikkat edin.\n\nBu koşul dosyada barındırılan birimler için geçerli değildir.</string>
+    <string lang="tr" key="ADMIN_PRIVILEGES_WARN_DEVICES">Bir bölümü/aygıtı şifrelemek/Şifre Çözmek/biçimlendirmek için yönetici haklarına sahip bir hesaba oturum açmanız gerektiğine lütfen dikkat edin.\n\nBu koşul dosyada barındırılan birimler için geçerli değildir.</string>
     <string lang="tr" key="ADMIN_PRIVILEGES_WARN_HIDVOL">Gizli bir birim oluşturmak için yönetici haklarına sahip bir hesaba oturum açmanız gereklidir.\n\nDevam edilsin mi?</string>
     <string lang="tr" key="ADMIN_PRIVILEGES_WARN_NTFS">Birimi NTFS olarak biçimlendirebilmek için yönetim haklarına sahip bir hesaba oturum açmanız gerektiğine dikkat edin.\n\nBirimi yönetim hakları olmadan FAT olarak biçimlendirebilirsiniz.</string>
     <string lang="en" key="AES_HELP">FIPS-approved cipher (Rijndael, published in 1998) that may be used by U.S. government departments and agencies to protect classified information up to the Top Secret level. 256-bit key, 128-bit block, 14 rounds (AES-256). Mode of operation is XTS.</string>
@@ -485,7 +497,11 @@
     <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>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Volume Fully Encrypted</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_INFO">IMPORTANT: TO MOUNT THIS NEWLY CREATED VERACRYPT VOLUME AND TO ACCESS DATA STORED IN IT, CLICK 'Auto-Mount Devices' IN THE MAIN VERACRYPT WINDOW. After you enter the correct password (and/or supply correct keyfiles), the volume will be mounted to the drive letter you select from the list in the main VeraCrypt window (and you will be able to access the encrypted data via the selected drive letter).\n\nPLEASE REMEMBER OR WRITE DOWN THE ABOVE STEPS. YOU MUST FOLLOW THEM WHENEVER YOU WANT TO MOUNT THE VOLUME AND ACCESS DATA STORED IN IT. Alternatively, in the main VeraCrypt window, click 'Select Device', then select this partition/volume, and click 'Mount'.\n\nThe partition/volume has been successfully encrypted (it contains a fully encrypted VeraCrypt volume now) and is ready for use.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="tr" key="FORMAT_FINISHED_INFO">VeraCrypt birimi başarıyla oluşturuldu.</string>
     <string lang="tr" key="FORMAT_FINISHED_TITLE">Birim Oluşturuldu</string>
     <string lang="en" key="FORMAT_HELP">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 Format to create the volume.</string>
@@ -523,6 +539,7 @@
     <string lang="en" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">An error occurred when obtaining the system encryption status.</string>
     <string lang="en" key="INIT_SYS_ENC">Cannot initialize application components for system encryption.</string>
     <string lang="tr" key="INIT_RAND">Rasgele sayı oluşturucusunu başlatma başarısız!</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="tr" key="INIT_REGISTER">Uygulamayı başlatma başarısız. Dialog sınıfını kayıt etme başarısız.</string>
     <string lang="en" key="INIT_RICHEDIT">Error: Failed to load the Rich Edit system library.</string>
     <string lang="tr" key="INTRO_TITLE">VeraCrypt Birim Oluşturma Sihirbazı</string>
@@ -535,6 +552,7 @@
     <string lang="tr" key="MOUNT_BUTTON">Bağ&amp;la</string>
     <string lang="tr" key="NEW_VERSION_REQUIRED">Bu birimi bağlamak için VeraCrypt'in daha yeni bir sürümü gerekiyor.</string>
     <string lang="tr" key="VOL_CREATION_WIZARD_NOT_FOUND">Hata: Birim Oluşturma Sihirbazı bulunamadı.\n\nLütfen 'VeraCrypt Format.exe' dosyasının 'VeraCrypt.exe' uygulamasının başlatıldığı konumda olduğundan emin olun. Eğer burada yoksa, lütfen VeraCrypt'i yeniden yükleyin veya diskiniz üzerinde 'VeraCrypt Format.exe' dosyasını bulun ve çalıştırın.</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="tr" key="NEXT">S&amp;onraki &gt;</string>
     <string lang="tr" key="FINALIZE">&amp;Bitir</string>
     <string lang="en" key="INSTALL">&amp;Install</string>
@@ -542,6 +560,7 @@
     <string lang="en" key="NODRIVER">Unable to connect to the VeraCrypt device driver. VeraCrypt cannot work if the device driver is not running.\n\nPlease note that, due to a Windows issue, it may be necessary to log off or restart the system before the device driver can be loaded.</string>
     <string lang="tr" key="NOFONT">Yazı tiplerini yüklerken/hazırlarken hata oluştu.</string>
     <string lang="en" key="NOT_FOUND">The drive letter was not found or no drive letter was specified.</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="tr" key="DRIVE_LETTER_UNAVAILABLE">Sürücü harfi kullanılabilir değil.</string>
     <string lang="tr" key="NO_FILE_SELECTED">Dosya seçilmedi!</string>
     <string lang="tr" key="NO_FREE_DRIVES">Hiçbir sürücü harfi mevcut değil.</string>
@@ -561,15 +580,18 @@
     <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_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="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_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt.\n\nDo you have such a backup?</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_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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="tr" key="IDD_PCDM_CHANGE_PKCS5_PRF">Üstbilgi Anahtarı Türetme Algoritmasını Ayarla</string>
     <string lang="tr" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Birime/Birimden Anahtar Dosyası Ekle/Kaldır</string>
     <string lang="tr" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Birimden Tüm Anahtar Dosyalarını Kaldır</string>
-    <string lang="en" key="PASSWORD_CHANGED">Password and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</string>
+    <string lang="en" key="PASSWORD_CHANGED">Password, PIM and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</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="en" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">IMPORTANT: If you did not destroy your VeraCrypt Rescue Disk, your system partition/drive can still be decrypted using the old password (by booting the VeraCrypt Rescue Disk and entering the old password). You should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</string>
     <string lang="en" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Note that your VeraCrypt Rescue Disk still uses the previous algorithm. If you consider the previous algorithm insecure, you should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,7 +600,8 @@
     <string lang="tr" key="PKCS5_PRF_CHANGED">Üstbilgi anahtarı türetme algoritması başarıyla ayarlandı.</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_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="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 more than 20 characters (the longer, the better). The maximum possible length is 64 characters.</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="tr" key="PASSWORD_HIDDENVOL_HELP">Lütfen gizli birim için bir parola seçin. </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_HELP">Please choose a password for the hidden operating system (i.e. for the hidden volume). </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_NOTE">IMPORTANT: The password that you choose for the hidden operating system in this step must be substantially different from the other two passwords (i.e. from the password for the outer volume and from the password for the decoy operating system).</string>
@@ -597,11 +620,26 @@
     <string lang="tr" key="PASSWORD_WRONG_AUTOMOUNT">Yanlış parola veya hiçbir VeraCrypt birimi bulunamadı.</string>
     <string lang="tr" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Yanlış anahtar dosyaları/parola veya hiçbir VeraCrypt birimi bulunamadı.</string>
     <string lang="tr" key="PASSWORD_WRONG_CAPSLOCK_ON">\n\nUyarı: Caps Lock açık. Bu, parolanızı hatalı girmenize neden olabilir.</string>
+    <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
+    <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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_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>
+    <string lang="en" key="SELECTED_PARTITION_NOT_INPLACE_ENC">The selected partition/device is not using in-place encryption.\nHeader Flags = 0x%.8X</string>
     <string lang="en" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nNote: If you are attempting to mount a partition located on an encrypted system drive without pre-boot authentication or to mount the encrypted system partition of an operating system that is not running, you can do so by selecting 'System' &gt; 'Mount Without Pre-Boot Authentication'.</string>
     <string lang="en" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">In this mode, you cannot mount a partition located on a drive whose portion is within the key scope of active system encryption.\n\nBefore you can mount this partition in this mode, you need to either boot an operating system installed on a different drive (encrypted or unencrypted) or boot an unencrypted operating system.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <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>
@@ -701,11 +739,18 @@
     <string lang="en" key="FOR_MORE_INFO_ON_PARTITIONS">For information on how to create and manage partitions, please refer to the documentation supplied with your operating system or contact your computer vendor's technical support team for assistance.</string>
     <string lang="en" key="SYSTEM_PARTITION_NOT_ACTIVE">Error: The currently running operating system is not installed on the boot partition (first Active partition). This is not supported.</string>
     <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="tr" key="CANT_ACCESS_VOL">Hata: Birime erişilemiyor!\n\nSeçili birimin var olduğundan, bağlı olmadığından veya sistem veya bir uygulama tarafından kullanımda olmadığından, birim için okuma/yazma izinlerine sahip olduğunuzdan ve bunun yazma korumalı olmadığından emin olun.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Error: Cannot access the volume and/or obtain information about the volume.\n\nMake sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Error: Cannot access the volume and/or obtain information about the volume. Make sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.\n\nIf the problem persists, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">An error prevented VeraCrypt from encrypting the partition. Please try fixing any previously reported problems and then try again. If the problems persist, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_RESUME">An error prevented VeraCrypt from resuming the process of encryption of the partition.\n\nPlease try fixing any previously reported problems and then try resuming the process again. Note that the volume cannot be mounted until it has been fully encrypted.</string>
+    <string lang="en" key="INPLACE_DEC_GENERIC_ERR">An error prevented VeraCrypt from decrypting the volume. Please try fixing any previously reported problems and then try again if possible.</string>
     <string lang="tr" key="CANT_DISMOUNT_OUTER_VOL">Hata: Dış birimin bağlantısı kesilemiyor!\n\nBirim bağlantısı, birim bir program veya sistem tarafından kullanılan dosya veya klasörler içerdiğinde kesilemez.\n\nLütfen birim üzerindeki dosyaları veya dizinleri kullanabilecek tüm programları kapatın ve Yeniden Dene'ye tıklayın.</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="tr" key="CANT_ACCESS_OUTER_VOL">Hata: Dış birime erişilemiyor! Birim oluşturma devam edemiyor.</string>
@@ -790,7 +835,7 @@
     <string lang="en" key="TC_INSTALLER_IS_RUNNING">VeraCrypt Installer is currently running on this system and performing or preparing installation or update of VeraCrypt. Before you proceed, please wait for it to finish or close it. If you cannot close it, please restart your computer before proceeding.</string>
     <string lang="en" key="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 www.veracrypt.org).</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="EXTRACTING_VERB">Extracting</string>
     <string lang="en" key="CANNOT_READ_FROM_PACKAGE">Cannot read data from the package.</string>
@@ -977,6 +1022,7 @@
     <string lang="en" key="CONFIRM_EXIT_UNIVERSAL">Exit?</string>
     <string lang="en" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt does not have sufficient information to determine whether to encrypt or decrypt.</string>
     <string lang="en" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt does not have sufficient information to determine whether to encrypt or decrypt.\n\nNote: If you decrypted the system partition/drive in the pre-boot environment, you may need to finalize the process by clicking Decrypt.</string>
+    <string lang="en" key="NONSYS_INPLACE_ENC_REVERSE_INFO">Note: When you are encrypting a non-system partition/volume in place and an error persistently prevents you from finishing the process, you will not be able to mount the volume (and access data stored on it) until you entirely DECRYPT the volume (i.e. reverse the process).\n\nIf you need to do so, follow these steps:\n1) Exit this wizard.\n2) In the main VeraCrypt window, select 'Volumes' &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="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Do you want to interrupt and postpone the process of encryption of the system partition/drive?\n\nNote: You will be able to resume the process and it will continue from the point it was stopped. You can do so, for example, by selecting 'System' &gt; 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window. If you want to permanently terminate or reverse the encryption process, select 'System' &gt; 'Permanently Decrypt System Partition/Drive'.</string>
     <string lang="en" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Do you want to interrupt and postpone the process of decryption of the system partition/drive?\n\nNote: You will be able to resume the process and it will continue from the point it was stopped. You can do so, for example, by selecting 'System' &gt; 'Resume Interrupted Process' from the menu bar of the main VeraCrypt window. If you want to reverse the decryption process (and start encrypting), select 'System' &gt; 'Encrypt System Partition/Drive'.</string>
@@ -986,6 +1032,7 @@
     <string lang="en" key="FAILED_TO_START_WIPING">Error: Failed to start the process of wiping.</string>
     <string lang="en" key="INCONSISTENCY_RESOLVED">Inconsistency resolved.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="en" key="NOTHING_TO_RESUME">There is no process/task to resume.</string>
     <string lang="tr" key="HIDVOL_PROT_BKG_TASK_WARNING">UYARI: VeraCrypt Arkaplan Görevi devre dışı. VeraCrypt'ten çıktıktan sonra, gizli birimin hasardan korunduğuna dair uyarılmayacaksınız.\n\nUyarı: Arkaplan Görevini istediğiniz zaman sistem uyarı alanındaki VeraCrypt simgesine sağ tıklayıp, 'Çıkış'ı seçerek kapatabilirsiniz.\n\nVeraCrypt Arkaplan Görevi etkinleştirilsin mi?</string>
     <string lang="tr" key="LANG_PACK_VERSION">Dil paketi versiyonu:  %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="en" key="ERROR_MBR_PROTECTED">Failed to write the MBR sector.\n\nYour BIOS may be configured to protect the MBR sector. Check your BIOS settings (press F2, Delete, or Esc, after powering on your computer) for MBR/antivirus protection.</string>
+    <string lang="en" key="BOOT_LOADER_FINGERPRINT_CHECK_FAILED">WARNING: The verification of VeraCrypt bootloader fingerprint failed!\nYour disk may have been tampered with by an attacker ("Evil Maid" attack).\n\nThis warning can also be triggered if you restored VeraCrypt boot loader using an Rescue Disk generated using a different VeraCrypt version.\n\nYou are advised to change your password immediately which will also restore the correct VeraCrypt bootloader. It is recommended to reinstall VeraCrypt and to take measures to avoid access to this machine by untrusted entities.</string>
     <string lang="en" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">The required version of the VeraCrypt Boot Loader is currently not installed. This may prevent some of the settings from being saved.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Note: In some situations, you may wish to prevent a person (adversary) that is watching you start the computer from knowing that you use VeraCrypt. The above options allow you to do that by customizing the VeraCrypt boot loader screen. If you enable the first option, no texts will be displayed by the boot loader (not even when you enter the wrong password). The computer will appear to be "frozen" while you can type your password. In addition, a custom message can be displayed to mislead the adversary. For example, fake error messages such as "Missing operating system" (which is normally displayed by the Windows boot loader if it finds no Windows boot partition). It is, however, important to note that if the adversary can analyze the content of the hard drive, he can still find out that it contains the VeraCrypt boot loader.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">WARNING: Please keep in mind that if you enable this option, the VeraCrypt boot loader will not display any texts (not even when you enter the wrong password). The computer will appear to be "frozen" (unresponsive) while you can type your password (the cursor will NOT move and no asterisk will be displayed when you press a key).\n\nAre you sure you want to enable this option?</string>
@@ -1034,8 +1082,11 @@
     <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="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">Warning: There is unallocated space between the system partition and the first partition behind it. After you create the hidden operating system, you must not create any new partitions in that unallocated space. Otherwise, the hidden operating system will be impossible to boot (until you delete such newly created partitions).</string>
     <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">This algorithm is currently not supported for system encryption.</string>
-	<string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</string>
     <string lang="en" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Error: Cannot set the keyboard layout for VeraCrypt to the standard US keyboard layout.\n\nNote that the password needs to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout.</string>
@@ -1120,6 +1171,7 @@
     <string lang="en" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">The pretest has been successfully completed.\n\nWARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt. If you do not, please back up the files now (you can click Defer, back up the files, then run VeraCrypt again anytime, and select 'System' &gt; 'Resume Interrupted Process' to start encrypting).\n\nWhen ready, click Encrypt to start encrypting.</string>
     <string lang="en" key="SYSENC_ENCRYPTION_PAGE_INFO">You can click Pause or Defer anytime to interrupt the process of encryption or decryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. To prevent slowdown when the system or applications write or read data from the system drive, VeraCrypt automatically waits until the data is written or read (see Status above) and then automatically continues encrypting or decrypting.</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nYou can click Pause or Defer anytime to interrupt the process of encryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. Note that the volume cannot be mounted until it has been fully encrypted.</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="en" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Hidden System Started</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Original System</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows creates (typically, without your knowledge or consent) various log files, temporary files, etc., on the system partition. It also saves the content of RAM to hibernation and paging files located on the system partition. Therefore, if an adversary analyzed files stored on the partition where the original system (of which the hidden system is a clone) resides, he might find out, for example, that you used the VeraCrypt wizard in the hidden-system-creation mode (which might indicate the existence of a hidden operating system on your computer).\n\nTo prevent such issues, VeraCrypt will, in the next steps, securely erase the entire content of the partition where the original system resides. Afterwards, in order to achieve plausible deniability, you will need to install a new system on the partition and encrypt it. Thus you will create the decoy system and the whole process of creation of the hidden operating system will be completed.</string>
@@ -1159,7 +1211,7 @@
     <string lang="en" key="HIDDEN_OS_CREATION_PREINFO_HELP">In the next steps, VeraCrypt will create the hidden operating system by copying the content of the system partition to the hidden volume (data being copied will be encrypted on the fly with an encryption key different from the one that will be used for the decoy operating system).\n\nPlease note that the process will be performed in the pre-boot environment (before Windows starts) and it may take a long time to complete; several hours or even several days (depending on the size of the system partition and on the performance of your computer).\n\nYou will be able to interrupt the process, shut down your computer, start the operating system and then resume the process. However, if you interrupt it, the entire process of copying the system will have to start from the beginning (because the content of the system partition must not change during cloning).</string>
     <string lang="en" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Do you want to cancel the entire process of creation of the hidden operating system?\n\nNote: You will NOT be able to resume the process if you cancel it now.</string>
     <string lang="en" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Do you want to cancel the system encryption pretest?</string>
-    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="en" key="SYS_DRIVE_NOT_ENCRYPTED">The system partition/drive does not appear to be encrypted (neither partially nor fully).</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">Your system partition/drive is encrypted (partially or fully).\n\nPlease decrypt your system partition/drive entirely before proceeding. To do so, select 'System' &gt; 'Permanently Decrypt System Partition/Drive' from the menu bar of the main VeraCrypt window.</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">When the system partition/drive is encrypted (partially or fully), you cannot downgrade VeraCrypt (but you can upgrade it or reinstall the same version).</string>
@@ -1176,6 +1228,8 @@
     <string lang="en" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">You have selected the system partition/drive (or the boot partition), but the wizard mode you selected is suitable only for non-system partitions/drives.\n\nDo you want to set up pre-boot authentication (which means that you will need to enter your password each time before Windows boots/starts) and encrypt the system partition/drive?</string>
     <string lang="en" key="CONFIRM_DECRYPT_SYS_DEVICE">Are you sure you want to permanently decrypt the system partition/drive?</string>
     <string lang="en" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the system partition/drive, unencrypted data will be written to it.\n\nAre you really sure you want to permanently decrypt the system partition/drive?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
     <string lang="en" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Warning: If you use a cascade of ciphers for system encryption, you may encounter the following issues:\n\n1) The VeraCrypt Boot Loader is larger than normal and, therefore, there is not enough space in the first drive track for a backup of the VeraCrypt Boot Loader. Hence, whenever it gets damaged (which often happens, for example, during inappropriately designed anti-piracy activation procedures of certain programs), you will need to use the VeraCrypt Rescue Disk to boot or to repair the VeraCrypt Boot Loader.\n\n2) On some computers, resuming from hibernation takes longer.\n\nThese potential issues can be prevented by choosing a non-cascade encryption algorithm (e.g. AES).\n\nAre you sure you want to use a cascade of ciphers?</string>
     <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>
@@ -1191,6 +1245,7 @@
     <string lang="en" key="ENABLE_BAD_SECTOR_ZEROING">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nThe process of in-place encryption can continue only when the sectors have been made readable again. VeraCrypt can attempt to make these sectors readable by writing zeros to the sectors (subsequently such all-zero blocks would be encrypted). However, note that any data stored in the unreadable sectors will be lost. If you want to avoid that, you can attempt to recover portions of the corrupted data using appropriate third-party tools.\n\nNote: In case of physically damaged sectors (as opposed to mere data corruption and checksum errors) most types of storage devices internally reallocate the sectors when data is attempted to be written to them (so the existing data in the damaged sectors may remain unencrypted on the drive).\n\nDo you want VeraCrypt to write zeroes to unreadable sectors?</string>
     <string lang="en" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nTo be able to proceed with decryption, VeraCrypt will have to discard the content of the unreadable sectors (the content will be replaced with pseudorandom data). Please note that, before proceeding, you can attempt to recover portions of any corrupted data using appropriate third-party tools.\n\nDo you want VeraCrypt to discard data in the unreadable sectors now?</string>
     <string lang="en" key="ZEROED_BAD_SECTOR_COUNT">Note: VeraCrypt has replaced the content of %I64d unreadable sectors (%s) with encrypted all-zero plaintext blocks.</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="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>

Translations/Language.uk.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="uk" name="Українська" en-name="Ukrainian" version="1.0.0" translators="Kravchuk Olexandr, Babchuk Volodymyr" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <control lang="uk" key="IDC_KEY_FILES">Клю&amp;ч. файли...</control>
     <control lang="uk" key="IDC_LINK_HASH_INFO">Свідчення про хеш-алгоритмах</control>
     <control lang="uk" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Детальніше</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="uk" key="IDC_MB">&amp;Мб</control>
     <control lang="uk" key="IDC_MORE_INFO_ON_CONTAINERS">Детальніше</control>
     <control lang="uk" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">Детальніше про шифрування системи</control>
@@ -57,6 +58,7 @@
     <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="uk" key="IDC_QUICKFORMAT">Швидке форматування.</control>
     <control lang="uk" key="IDC_SHOW_PASSWORD">&amp;Показ пароля</control>
     <control lang="uk" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Показ пароля</control>
@@ -72,6 +74,7 @@
     <control lang="uk" key="IDT_COLLECTING_RANDOM_DATA_NOTE">ВАЖНО: Хаотично переміщуйте миш всередині цього вікна. Чим довше тим ліпше. Це значно збільшить криптостійкість ключів шифрування. Потім натисніть 'Далі' для продовження.</control>
     <control lang="uk" key="IDT_CONFIRM">&amp;Підтвердіть:</control>
     <control lang="uk" key="IDT_DONE">Готово </control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="uk" key="IDT_ENCRYPTION_ALGO">Алгоритм шифрування</control>
     <control lang="uk" key="IDT_FILESYSTEM">Файл.сист.</control>
     <control lang="uk" key="IDT_FILE_CONTAINER">Створити віртуальний зашифрованний диск всередині файла. Рекомендується недосвідченим користувачам.</control>
@@ -85,6 +88,8 @@
     <control lang="uk" key="IDT_PARTIAL_POOL_CONTENTS">Поточний вміст пула (часть)</control>
     <control lang="uk" key="IDT_PASS">Пароль</control>
     <control lang="uk" 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="uk" key="IDT_PROGRESS">Хід операції:</control>
     <control lang="uk" key="IDT_RANDOM_POOL">Випадково: </control>
     <control lang="uk" key="IDT_SINGLE_BOOT">Выберіть цю опцію, якщо в ПК встановлена тілько одна ОС (навіть якщо вона з кількома користувачами).</control>
@@ -142,6 +147,8 @@
     <control lang="uk" key="IDC_MOUNT_OPTIONS">Параметр&amp;и...</control>
     <control lang="uk" key="IDC_MOUNT_READONLY">Монтувати том тільки для &amp;читання</control>
     <control lang="uk" key="IDC_NEW_KEYFILES">Ключ.файли...</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="uk" key="IDC_PREF_BKG_TASK_ENABLE">Включено</control>
     <control lang="uk" key="IDC_PREF_CACHE_PASSWORDS">Кешувати пароль в памяті</control>
     <control lang="uk" key="IDC_PREF_DISMOUNT_INACTIVE">Автоматично розмонтувати томи при неактивності протягом</control>
@@ -155,6 +162,7 @@
     <control lang="uk" key="IDC_PREF_MOUNT_READONLY">Монтувати як том тільки для читання</control>
     <control lang="uk" key="IDC_PREF_MOUNT_REMOVABLE">Монтувати як змінні носії</control>
     <control lang="uk" 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="uk" key="IDC_PREF_USE_DIFF_TRAY_ICON_IF_VOL_MOUNTED">Використовувати інший значок панелі завдань, коли є підключені томи</control>
     <control lang="uk" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Очищати кеш паролів при авторозмонтуванні</control>
     <control lang="uk" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Очищати кеш паролів при виході</control>
@@ -167,11 +175,12 @@
     <control lang="uk" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Показати пароль</control>
     <control lang="uk" key="IDC_TRAVEL_OPEN_EXPLORER">&amp;Відкрити змонтований том в вікні Провідника</control>
     <control lang="uk" key="IDC_TRAV_CACHE_PASSWORDS">&amp;Кешувати пароль в памяті драйвера</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="uk" key="IDC_UNMOUNTALL">&amp;Розмонтувати всі</control>
     <control lang="uk" key="IDC_VOLUME_PROPERTIES">Власт&amp;ивості тома...</control>
     <control lang="uk" key="IDC_VOLUME_TOOLS">О&amp;перації...</control>
     <control lang="uk" key="IDC_WIPE_CACHE">О&amp;чистити кеш</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="uk" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Обрані томи</control>
     <control lang="uk" key="IDD_HOTKEYS_DLG">VeraCrypt - Загальноистемні гарячі клавіші</control>
     <control lang="uk" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="uk" key="IDM_CREATE_HIDDEN_OS">Створити приховану ОС...</control>
     <control lang="uk" key="IDM_CREATE_RESCUE_DISK">Створити диск відновлення...</control>
     <control lang="uk" key="IDM_CREATE_VOLUME">Створити новий том...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="uk" key="IDM_DEFAULT_KEYFILES">Типові ключові файли...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="uk" key="IDM_DONATE">допомога проекту...</control>
     <control lang="uk" key="IDM_ENCRYPT_SYSTEM_DEVICE">Зашифрувати системний розділ/диск...</control>
     <control lang="uk" key="IDM_FAQ">Часто задавані питання</control>
@@ -243,6 +254,7 @@
     <control lang="uk" key="IDM_UNMOUNT_VOLUME">Розмонтувати том</control>
     <control lang="uk" key="IDM_VERIFY_RESCUE_DISK">Провірити диск відновленння</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>
     <control lang="uk" key="IDM_VOLUME_WIZARD">Майстер створення томів</control>
     <control lang="uk" key="IDM_WEBSITE">Сайт VeraCrypt</control>
@@ -369,7 +381,7 @@
     <string lang="uk" key="ACCESS_DENIED">Помилка! Немає доступу.\n\nРозділ, до якого ви намагаєтесь дістати доступ, має довжину 0 секторів, або це заавнтажувальлний пристрій.</string>
     <string lang="uk" key="ADMINISTRATOR">Адміністратор</string>
     <string lang="uk" key="ADMIN_PRIVILEGES_DRIVER">Щоб завантажити драйвер VeraCrypt, ви повинні ввійти в систему з правами Адміністратора.</string>
-    <string lang="uk" key="ADMIN_PRIVILEGES_WARN_DEVICES">Щоб можна було шифрувати/форматувати розділ/пристрій, ви повинні ввійти в систему з правами Адміністратора.\n\nДо томів на основі файлів це не відноситься.</string>
+    <string lang="uk" key="ADMIN_PRIVILEGES_WARN_DEVICES">Щоб можна було шифрувати/Розшифрувати/форматувати розділ/пристрій, ви повинні ввійти в систему з правами Адміністратора.\n\nДо томів на основі файлів це не відноситься.</string>
     <string lang="uk" key="ADMIN_PRIVILEGES_WARN_HIDVOL">Щоб створити прихований том, ви повинні ввійти в систему з правами Адміністратора.\n\nПродовжити?</string>
     <string lang="uk" key="ADMIN_PRIVILEGES_WARN_NTFS">Щоб форматувати томи як NTFS, ви повинні увійти в систему з правами Адміністратора.\n\nБез привілегій Адміністратора можна форматувати томи тільки як FAT.</string>
     <string lang="uk" key="AES_HELP">Затверджений FIPS (США) алгоритм шифрування (Rijndael, опублікований в 1998 р.), дозволений до застосування в федеральних структурах США для захисту важливої інформації. 256-біт ключ, 128-біт блок, 14 циклів (AES-256). Режим роботи -- XTS.</string>
@@ -485,7 +497,11 @@
     <string lang="uk" key="FORMAT_FINISHED_HELP">\n\nТом VeraCrypt створений та готовий до використання. Якщо ви бажаєте створити ще один том VeraCrypt, натисніть 'Далі'. В іншому пипадку, натисніть 'Вихід'.</string>
     <string lang="uk" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\nПрихований том VeraCrypt успішно створений (всередині нього буде знаходитися прихована ОС).\n\nНатисніть 'Далі' для продовження.</string>
     <string lang="uk" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Том повністю зашифрований</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="uk" 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="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="uk" key="FORMAT_FINISHED_INFO">Том VeraCrypt успішно створено.</string>
     <string lang="uk" key="FORMAT_FINISHED_TITLE">Том створено</string>
     <string lang="uk" key="FORMAT_HELP">ВАЖЛИВО: як можна довільніше рухайте мишою всередині цього вікна. Чим довше - тим краще. Це значно збільшить криптографічну стійкість ключів шифрування. Потім натискайте 'Форматувати', щоб створити том.</string>
@@ -523,6 +539,7 @@
     <string lang="uk" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">При отриманні статусу системного шифрування виникла помилка.</string>
     <string lang="uk" key="INIT_SYS_ENC">Неможливо ініціалізувати компонент застосунку для системного шифрування.</string>
     <string lang="uk" key="INIT_RAND">Невдала ініціалізація генератора випадкових чисел!</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="uk" key="INIT_REGISTER">Неможливо ініціалізувати застосунок. Невдала реєстрація класу Dialog.</string>
     <string lang="uk" key="INIT_RICHEDIT">Помилка завантаження системної бібліотеки Rich Edit.</string>
     <string lang="uk" key="INTRO_TITLE">Майстер створення тому VeraCrypt</string>
@@ -535,6 +552,7 @@
     <string lang="uk" key="MOUNT_BUTTON">&amp;Монтувати</string>
     <string lang="uk" key="NEW_VERSION_REQUIRED">Для монтування цього тому потрібна більш нова версія VeraCrypt.</string>
     <string lang="uk" 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="uk" key="NEXT">&amp;Далі &gt;</string>
     <string lang="uk" key="FINALIZE">&amp;Завершити</string>
     <string lang="uk" key="INSTALL">&amp;Встановити</string>
@@ -542,6 +560,7 @@
     <string lang="uk" key="NODRIVER">Неможливо з'єднатись із драйвером пристрою VeraCrypt. VeraCrypt не може працювати, якщо не запущено драйвер пристрою.\n\nБудь ласка, пам'ятайте, в залежності від настроювань Windows, можливо прийдеться завершити сеанс або перезавантажити систему, щоб запустити драйвер пристрою.</string>
     <string lang="uk" key="NOFONT">Помилка завантаження/підготовки шрифтів.</string>
     <string lang="uk" 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="uk" key="DRIVE_LETTER_UNAVAILABLE">Літера диску не доступна.</string>
     <string lang="uk" key="NO_FILE_SELECTED">Не обрано файл!</string>
     <string lang="uk" key="NO_FREE_DRIVES">Немає доступних літер дисків.</string>
@@ -561,15 +580,18 @@
     <string lang="uk" key="OVERWRITEPROMPT">УВАГА: файл '%hs' вже існує!\n\nВАЖЛИВО: VERACRYPT НЕ БУДЕ ШИФРУВАТИ ЦЕЙ ФАЙЛ, А ЗНИЩИТЬ ЙОГО. Ви дійсно бажаєте видалити цей файл та замінити його новим контейнером VeraCrypt?</string>
     <string lang="uk" key="OVERWRITEPROMPT_DEVICE">ОБЕРЕЖНО: ВСІ ФАЙЛИ, ЩО МІСТЯТЬСЯ У %s '%hs'%s, БУДЕ ВИДАЛЕНО ТА ВТРАЧЕНО (ЇХ НЕ БУДЕ ЗАШИФРОВАНО)!\n\nВи наполягаєте на форматуванні?</string>
     <string lang="uk" key="NONSYS_INPLACE_ENC_CONFIRM">УВАГА: Монтування тома і доступ до файлів , що в ньому зберігаються неможливе, поки том не буде повністю зашифрований.\n\nВи дійсно бажаєте розпочати шифрування %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 '%hs'%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_SECOND_WARNING_LOTS_OF_DATA">УВАГА: ВИБРАНИЙ РОЗДІЛ МІСТИТЬ ВЕЛИКИЙ ОБЄМ ДАНИХ! Всі файли на цьому розділі будуть видалені (вони НЕ будуть зашифровані)!</string>
     <string lang="uk" key="ERASE_FILES_BY_CREATING_VOLUME">Стерти файли на розділі при створені тому VeraCrypt всередині нього</string>
     <string lang="uk" key="PASSWORD">Пароль</string>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="uk" key="IDD_PCDM_CHANGE_PKCS5_PRF">Встановити алгоритм походження ключа заголовка</string>
     <string lang="uk" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Додати/видалити файл-ключі до/з тому</string>
     <string lang="uk" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Видалити всі файл-ключі з тому</string>
-    <string lang="uk" key="PASSWORD_CHANGED">Пароль та/або файл-ключ успішно змінено.\n\nВАЖЛИВО: обов'язково прочитайте розділ 'Changing Passwords and Keyfiles' у главі 'Security Precautions' Посібника Користувача VeraCrypt.</string>
+    <string lang="uk" key="PASSWORD_CHANGED">Пароль, PIM та/або файл-ключ успішно змінено.\n\nВАЖЛИВО: обов'язково прочитайте розділ 'Changing Passwords and Keyfiles' у главі 'Security Precautions' Посібника Користувача VeraCrypt.</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="uk" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">ВФЖЛІВО: Якщо ви не знищили свій диск відновлення VeraCrypt (Rescue Disk), ваш системний розділ/диск можна розшифрувати з допомогою старого пароля (завантажившись з диска відновлення VeraCrypt і ввівши старий пароль). Вам потрібно створити новий диск відновлення VeraCrypt, після чого знищити прихований.\n\nБажаєте створити новий диск відновлення VeraCrypt?</string>
     <string lang="uk" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Пам'ятайте, ваш Диск Відновлення VeraCrypt ще використовує попередній алгоритм. Якщо стійкість попереднього алгоритму вас не задовільняє, вам слід створити новий Диск Відновлення VeraCrypt, а потім знищити старий.\n\nБажаєте створити новий диск відновлення VeraCrypt?</string>
     <string lang="uk" key="KEYFILES_NOTE">В якості ключового файлу VeraCrypt можна використовувати файл любого типу (наприклад, .mp3, .jpg, .zip, .avi). Зверніть увагу, що VeraCrypt не змінює вміст ключового файлу. Допускається вибрати більше одного ключового файлу (порядок вибору немає значення). Якщо додати теку, то всі файли всередині неї будуть використовуватися як ключові. Натисніть 'Добавити токен-файл', щоб вибрати ключові файли, що знаходяться на токенах безпеки або смарт-картах (або для імпортування кдючових файлів на токени/смарт-карти).</string>
@@ -578,6 +600,7 @@
     <string lang="uk" key="PKCS5_PRF_CHANGED">Алгоритм деривації ключа заголовку успішно встановлено.</string>
     <string lang="uk" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">Введіть пароль і/або ключові файли для несистемного тому, де ви хочете відновити шифрування 'на місці'.\n\n\nПримітка: після нетиснення 'Далі' VeraCrypt спробує знайти всі несистемні томи, на яких був перерваний процес шифрування, і де можна розшифрувати заголовок тома VeraCrypt з допомогою вказаного проля і/або ключових файлів. Якщо таких томів виявиться декілька, на наступному етапі вам буде потрібно вибрати один із них.</string>
     <string lang="uk" 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="uk" key="PASSWORD_HELP">Дуже важливо вибрати хороший пароль. Уникайте вказувати паролі з одного або декількох слів, які можна знайти в словнику (або комбінацій з 2, 3 або 4 таких слів). Пароль не повинен містити імен або дат народження. Він має бути важкий для вгадування. Хороший пароль -- випадкова комбінація прописних і рядкових букв, цифр і особливих символів (@ ^ = $ * + і так далі).\n\nРекомендуємо вибирати паролі, що складаються більш ніж з 20 знаків (чим довше, тим краще). Макс. довжина -- 64 символи.</string>
     <string lang="uk" key="PASSWORD_HIDDENVOL_HELP">Будь ласка, оберіть пароль для прихованого тому. </string>
     <string lang="uk" key="PASSWORD_HIDDEN_OS_HELP">Выберіть пароль для прихованої операційної системи (т.т. для прихованого тому). </string>
@@ -597,11 +620,26 @@
     <string lang="uk" key="PASSWORD_WRONG_AUTOMOUNT">Невірний пароль, або не знайдено том VeraCrypt.</string>
     <string lang="uk" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Невірні файл-ключі/пароль, або не знайдено том VeraCrypt.</string>
     <string lang="uk" 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="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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="uk" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nУвага! У шляху пошуку ключових файлів виявлені приховані файли. Приховані файли не можуть бути ключовими. Якщо ви бажаєте використовувати їх як ключові, зніміть у них атрибут 'Прихований' (на кожному з них правою кнопкою миші, виберіть 'Властивості', зніміть прапорець 'Прихований' і натисніть ГАРАЗД). Врахуйте, що приховані файли видно тільки при відповідному системному налаштуванні (Комп'ютер &gt; Сервіс &gt; Параметри тек (Властивості теки) &gt; Вигляд).</string>
     <string lang="uk" key="HIDDEN_VOL_PROT_PASSWORD_US_KEYB_LAYOUT">Якщо ви намагаєтеся захистити прихований том, що містить приховану систему, перевірте, щоб при введенні пароля для прихованого тому була увімкнена стандартна американська розкладка клавіатури. Це необхідно, тому що даний пароль запитується на етапі дозавантажувальної аутентифікації (до запуску Windows), коли інші розкладки клавіатури недоступні.</string>
     <string lang="uk" 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>
+    <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="uk" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nПам'ятайте: якщо ви намагаєтесь монтувати розділ, що розміщено на зашифрованому системному пристрої, без початкової аутентифікації або монтувати зашифрований системний розділ операційної системи, яка не запущена, ви можете зробити це обравши 'Система' &gt; 'Монтувати без початкової аутентифікації'.</string>
     <string lang="uk" 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="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>
@@ -701,11 +739,18 @@
     <string lang="uk" key="FOR_MORE_INFO_ON_PARTITIONS">Інформацію про створення і управління розділами дв. в документації до вашої операційної системи, або проконсольтуйтеся в службі техпідтримки постачальника вашого обладнання.</string>
     <string lang="uk" key="SYSTEM_PARTITION_NOT_ACTIVE">Помилка! Виконуюча в данний момент операційна система встановлена не в загрузочному розділі (першому розділі з поміткою 'Активний'). Це не підтримується.</string>
     <string lang="uk" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">Ви вказали, що збираєтеся зберігати в цьому томі VeraCrypt файли розміром більше 4 Гбайт, але при цьому вибрали файлову систему FAT, в якій збереження файлів обємом 4 Гбайт не підтримується.\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="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="uk" key="CANT_ACCESS_VOL">Помилка! Немає доступу до тому.\n\nПеревірте, чи існує цей том, чи не змонтований він, не використовіється системою або якоюсь програмою, якій ви дали права читання/запису цього тому, і чи не захищений він від запису.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="uk" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Помилка! Немає доступу до тому і/або неможливо получити відомості про том.\n\nПеревірте, чи існує вибраний том, чи не використовується він системою або додатками, чи є увас права для читання/запису цього тому, і чи не захищений том від запису.</string>
     <string lang="uk" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Помилка! Немає доступу до тому і/або неможливо отримати відомості про том. Перевірте, чи існує вибраний том, чи не використовується він системою або додатками, чи є увас права для читання/запису цього тому, і чи не захищений том від запису.\n\nЯкщо проблема не вирішується, попробуйте виконати кроки, вказані нижче.</string>
     <string lang="uk" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">Зашифрувати розділ не вдалося через помилку. Спробуйте вирішити всі вказані проблеми і повторіть спробу. Якщо проблеми не вирішуються, спробуйте виконати дії, вказані нижче.</string>
     <string lang="uk" key="INPLACE_ENC_GENERIC_ERR_RESUME">Продовжити процес шифрувння розділу не вдалося через помилку.\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="uk" key="CANT_DISMOUNT_OUTER_VOL">Помилка: неможливо розмонтувати зовнішній том.\n\nТом неможна розмонтувати, якщо він містить файли або теки, що використовуються будь-яким застосунком або системою.\n\nЗакрийте всі такі застосунки й натисніть 'Повторити'.</string>
     <string lang="uk" key="CANT_GET_OUTER_VOL_INFO">Помилка: неможливо отримати інформацю про зовнішній том! Створення тому не може бути продовжено.</string>
     <string lang="uk" key="CANT_ACCESS_OUTER_VOL">Помилка: немає доступу до зовнішнього тому. Продовження створення тому неможливе.</string>
@@ -790,7 +835,7 @@
     <string lang="uk" key="TC_INSTALLER_IS_RUNNING">В этой системе сейчас запущен инсталлятор VeraCrypt. Он выполняет/готовит установку или обновление VeraCrypt. Дождитесь завершения его работы или закройте его. Если закрыть инсталлятор не получается, перезагрузите комп'ютер и лишь потом продолжите.</string>
     <string lang="uk" key="INSTALL_FAILED">Невдале встановлювання.</string>
     <string lang="uk" key="UNINSTALL_FAILED">Невдале видалення.</string>
-    <string lang="uk" key="DIST_PACKAGE_CORRUPTED">Цей файл встановлення пошкоджено. Будь ласка, спробуйте завантажити його знову (рекомендовано з офіційної сторінки VeraCrypt на www.veracrypt.org).</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="EXTRACTING_VERB">Видобування</string>
     <string lang="uk" key="CANNOT_READ_FROM_PACKAGE">Неможливо прочитати дані з файлу встановлювання.</string>
@@ -977,6 +1022,7 @@
     <string lang="uk" key="CONFIRM_EXIT_UNIVERSAL">Завершити роботу?</string>
     <string lang="uk" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt не має достатньої інформації, щоб визначитись, чи зашифровувати, чи розшифровувати.</string>
     <string lang="uk" 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="uk" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">Ви хочете перерватиь процес шифрування розділу/тому, відклавши його на майбутє?\n\nПримітка: памятайте, що поки том не буде повністю зашифрований, його неможливо монтувати. пізніше процес шифрування можна буде поновити з того місця де він був зупинений. Це можна зробити, наприклад, вибравши команду 'Томи' &gt; 'Продщовжити перерваний процес' в меню головного вікна VeraCrypt.</string>
     <string lang="uk" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Ви бажаєте припинити та відкласти шифрування системного розділу/пристрою?\n\nПам'ятайте: ви можете припинити процес та продовжити з моменту зупинки. Зробити це можна, наприклад, обравши 'Система' &gt; 'Продовжити припинений процес' зі строки меню головного вікна VeraCrypt. Якщо ви бажаєте повністю зупинити або повернути процес шифрування, оберіть 'Система' &gt; 'Назавжди розшифрувати системний розділ/пристрій'.</string>
     <string lang="uk" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Ви бажаєте припинити та відкласти розшифрування системного розділу/пристрою?\n\nПам'ятайте: ви можете припинити процес та продовжити з моменту зупинки. Зробити це можна, наприклад, обравши 'Система' &gt; 'Продовжити припинений процес' зі строки меню головного вікна VeraCrypt. Якщо ви бажаєте повністю зупинити або повернути процес розшифрування, оберіть 'Система' &gt; 'Зашифрувати системний розділ/пристрій...'.</string>
@@ -986,6 +1032,7 @@
     <string lang="uk" key="FAILED_TO_START_WIPING">Помилка! Неможливо почати процес очищення (видалення даних).</string>
     <string lang="uk" key="INCONSISTENCY_RESOLVED">Несумісність рішення.\n\n\n(якщо ви повідомляєте про помилку, будь ласка, додайте наступну технічну інформацію до повідомлення про помилку: %hs)</string>
     <string lang="uk" key="UNEXPECTED_STATE">Помилка! Невідомий стан.\n\n\n(Якщо ви повідомите про помилку, будь ласка, додайте наступну технічну інформацію до повідомлення про помилку: %hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="uk" key="NOTHING_TO_RESUME">Немає призупинених процесів/завдань.</string>
     <string lang="uk" key="HIDVOL_PROT_BKG_TASK_WARNING">УВАГА: фоновий процес VeraCrypt вимкнений. При виході з VeraCrypt ви не будете попереджені про запобігання пошкодження прихованого тому.\n\nПам'ятайте: фоновий процес можна завершити у будь-який момент, натиснувши правою кнопкою миші на значок VeraCrypt у системному треї й обравши пункт 'Вихід'.\n\nВвімкнути фоновий процес VeraCrypt?</string>
     <string lang="uk" key="LANG_PACK_VERSION">Версія мовного модулю: %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="uk" key="ERROR_MBR_PROTECTED">Помилка записи сектора MBR.\n\nBIOS в вашем ПК может быть настроена на защиту сектора 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="uk" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">Завантажувач VeraCrypt (Boot Loader) потрібної версії зараз не встановлений. Це може перешкодити збереженню ряду налаштувань</string>
     <string lang="uk" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Примітка: в певних ситуаціях може знадобитися, щоб сторонній (ворог), спостерігали за стартом ПК, не знав, що ви користуєтесь VeraCrypt. Параметри вище дозволяють модифіковані екран завантаження VeraCrypt. Якщо Ви включите першу опцію, то на екрані завантажувача не буде відображатися ніякої текст (навіть якщо ви введете неправильний пароль). При введенні пароля комп'ютер буде виглядати "завислих". Крім того, щоб ввести супротивника в оману, можна включити висновок свого повідомлення. Наприклад, відображати помилкові повідомлення про помилки на кшталт "Missing operating system" (ця напис зазвичай виводиться завантажників Windows, якщо він не може знайти завантажувальний розділ Windows). Однак при цьому важливо пам'ятати, що якщо ворог зможе проаналізувати вміст жорсткого диска, то він зуміє знайти на ньому завантажувач VeraCrypt.</string>
     <string lang="uk" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">УВАГА: Будь ласка, майте на увазі, що якщо Ви включите цю опцію, VeraCrypt Завантажувач не буде відображати будь-які тексти (навіть коли ви вводите неправильний пароль). Комп'ютер виявиться "замороженим" (не працює), тоді як ви можете ввести свій пароль (курсор не буде рухатися і зірочки не буде відображатися при натисканні клавіш).\n\nВи дійсно хочете включити цю опцію?</string>
@@ -1034,8 +1082,11 @@
     <string lang="uk" key="EXTRA_BOOT_PARTITION_REMOVAL_INSTRUCTIONS">\nДодатковий завантажувальний розділ можна видалити до встановлення Windows. Для цього виконайте наступні дії:\n\n1) Завантажте Windows з інсталяційного компакт-диска.\n\n2) На екрані встановлення Windows натисніть 'Install now' &gt; 'Custom (advanced)'.\n\n3) Натисніть 'Drive Options'.\n\n4) Виберіть основний системний розділ і видаліть його, натиснувши 'Delete' та 'OK'.\n\n5) Виберіть розділ 'System Reserved', натисніть 'Extend' і збільшіть його розмір відповідно до встановлюваної ОС.\n\n6) Натисніть 'Apply' і 'OK'.\n\n7) Встановіть Windows у розділ 'System Reserved'.\n\n\nЯкщо ворог запитає вас, навіщо ви видалили додатковий завантажувальний розділ, ви можете відповісти, що хотіли запобігти можливості витоку даних у незашифрований завантажувальний розділ.\n\n!! Щоб роздрукувати цей текст, натисніть кнопку 'Друк' нижче. Якщо ви збережете або роздрукуєте копію цього тексту (це рекомендується зробити, якщо тільки ваш принтер не зберігає копії завдань на своєму внутрішньому накопичувачі), то після видалення додаткового завантажувального розділу всі копії цього тексту слід знищити (інакше якщо таку копію виявлять, це може навести на думку про наявність в ПК прихованої ОС).</string>
     <string lang="uk" key="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">Увага! Між системним розділом і першим розділом за ним є нерозподілене місце. Після створення прихованої операційної системи ви не повинні створювати в цій нерозподіленій області жодних нових розділів. В іншому випадку прихована ОС не зможе завантажитися (до тих пір, поки не будуть вилучені такі знову створені розділи).</string>
     <string lang="uk" 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="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="uk" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">В даний момент ключові файли для шифрування системи не підтримуються.</string>
     <string lang="uk" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Увага! VeraCrypt не може відновити первісну розкладку клавіатури. Це може призвести до неправильного введення пароля.</string>
     <string lang="uk" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Помилка! Неможливо встановити розкладку клавіатури для VeraCrypt в стандартну американську (US).\n\nЗверніть увагу, що пароль вводиться ДО завантаження Windows, коли будь-які розкладки клавіатури, що відрізняються від американської, ще недоступні. Тому пароль завжди повинен вводиться при стандартній американської розкладці.</string>
@@ -1120,6 +1171,7 @@
     <string lang="uk" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">Попередній тест успішно завершено.\n\nУВАГА: Якщо під час шифрування станеться збій живлення або з-за програмної/апаратної помилки зависне операційна система, в той час, як VeraCrypt шифрує наявні дані 'на місці', деякі дані майже напевно виявляться пошкодженими або загубленими. Тому, перш ніж почати шифрування, переконайтеся, що зробили резервну копію файлів, які збираєтеся зашифрувати. Якщо ні, то зробіть це зараз (натисніть 'Відкласти', скопіюйте файли, а потім у будь-який час знову запустіть VeraCrypt, виберіть 'Система' &gt; 'Відновити перерваний процес', щоб розпочати шифрування).\n\nКогда будете готові, натисніть 'шифрація', щоб приступити до шифрування.</string>
     <string lang="uk" key="SYSENC_ENCRYPTION_PAGE_INFO">Ви можете в будь-який момент натиснути 'Пауза' або 'Відкласти', перервавши (де) шифрування, вийти з цього майстра, перезавантажити або вимкнути ПК, а потім продовжити процес (він відновиться з тієї точки, де був призупинений). Для запобігання уповільнення, коли система або програми виконують читання або запис на системному диску, VeraCrypt чекає, поки дані будуть записані або прочитано (див. Статус вище), а потім продовжує (де) шифрування.</string>
     <string lang="uk" 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="uk" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Прихована система запущена</string>
     <string lang="uk" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Вихідна система</string>
     <string lang="uk" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows створює (зазвичай без вашого відома або згоди) різні файли звітів, тимчасові файли і т.п. на системному розділі. Крім того, там же вона зберігає вміст ОЗП для сну/гібернаціі та файли підкачки. Тому якщо ворог проаналізує файли на розділі з вихідною системою (клоном якої є прихована ОС), він може дізнатися, наприклад, що ви користувалися майстром VeraCrypt в режимі створення прихованої системи (і запідозрити наявність прихованої ОС у вашому ПК).\n\nЩоб це запобігти, на наступних етапах VeraCrypt надійно знищить всі вміст розділу, де знаходиться вихідна система. Потім для правдоподобно заперечення вам буде потрібно встановити в розділ нову систему і зашифрувати її. Таким чином ви створите обманним ОС, і на цьому процес створення прихованої ОС буде завершено.</string>
@@ -1176,6 +1228,8 @@
     <string lang="uk" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">Ви обрали системний розділ/пристрій, але обраний режим Майстра застосовується лише для несистемних пристроїв.\n\nВи бажаєте встановити початкову аутентифікацію (що означає необхідність введення паролю щоразу перед запуском Windows) та зашифрувати цей системний розділ/пристрій?</string>
     <string lang="uk" key="CONFIRM_DECRYPT_SYS_DEVICE">Ви дійсно бажаєте назавжди розшифрувати системний розділ/пристрій?</string>
     <string lang="uk" 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="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="uk" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">УВАГА! При використанні каскадних шифрів для шифрування системи ви можете зіткнутися з наступними проблемами:\n\n1) Завантажувач VeraCrypt більше, ніж стандартний, тому в першому циліндрі диска недостатньо місця для резервного копіювання завантажувача. Відповідно, якщо він буде пошкоджений (що часто трапляється, наприклад, при неякісно реалізованих анти-піратських процедурах активації деяких програм), для завантаження або ремонту завантажувача VeraCrypt вам знадобиться диск відновлення (VeraCrypt Rescue Disk).\n\n2) При підвищиних вимогах до памяті, на деяких комп'ютерах системний розділ/диск зашифрувати неможливо.\n\n3) Вихід із стану сну на деяких комп'ютерах триває довше ніж звичайно.\n\nЦих потенційних проблем можливо уникнути, якщо выбрати не-каскадний алгоритм шифрування (наприклад, AES).\n\nВи дійсно хочете використовувати каскадне шифрування?</string>
     <string lang="uk" key="NOTE_CASCADE_FOR_SYS_ENCRYPTION">Якщо вам трапилась якась проблема з попередньо згаданих, розшифруйте розділ/пристрій (якщо він зашифрований) та спробуйте зашифрувати його знову, використовуючи не-каскадний алгоритм шифрування (наприклад AES).</string>
     <string lang="uk" key="UPDATE_TC_IN_DECOY_OS_FIRST">УВАГА: В цілях безпеки і надійності, вам потрібно оновити VeraCrypt в підставній операційній системі, перед тимяк як ви оновите його в прихованій ОС.\n\nЩоб це зробити, заавнтажте підставну ОС і запустіть в ній інсталятор VeraCrypt. Потім завантажте приховану систему і знову запустіть інсталятор.\n\nПримітка: підставна і прихована системи використовують один і той самий завантажувач. Якщо ви оновите VeraCrypt тільки на прихованій системі (но не на підставній), в підставній системі можуть залишитися драйвер і додаток VeraCrypt, чиї версії будуть відрізнятися від версії завантажувача VeraCrypt. Така різниця може свідчити про присутність в даному ПК прихованої операційної системи.\n\n\nХочете продовжити? (Не рекомендується.)</string>
@@ -1191,6 +1245,7 @@
     <string lang="uk" key="ENABLE_BAD_SECTOR_ZEROING">Помилка: Не вдається прочитати один чи декілька секторів на диску.\n\nШифрування 'на місці' може бути продовжено, тільки коли сектори знову будуть доступні для чтитання. VeraCrypt може спробувати зробити ці сектори читаючими шляхом запису в них нулів (всі нулі блоки будуть зашифровані). При цьому, однак, дані в нечитаючих секторах будуть втрачені. Якщо ви хочете цього уникнути, попробуйте відновити пошкоджені данні (ігноруючи помилки контрольних сум) з допомогою відповідних програм сторонніх фірм.\n\nПримітка: якщо сектори пошкоджені фізично (в відмінності від простого порчення данних і помилок контрольних сум), більшість пристрої зберігання інформації внутрішньо перерозприділяють сектори при спробі записати в них дані (тому поточні дані в пошкоджених секторах можуть залишатися на диску незашифрованими).\n\nХочете, щоб VeraCrypt запвнив нулями нечитаючі сектори?</string>
     <string lang="uk" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">ПОМИЛКА: Неможливо прочитати вміст одного або декількох секторів диску (ймовірно, через фізичний дефект).\n\nПродовжити шифрування, VeraCrypt відкине вміст нечитаних секторів (воно буде замінено псевдовипадковими даними). Перш ніж продовжити, ви можете спробувати хоча б частково відновити пошкоджені дані за допомогою відповідних програм сторонніх розробників.\n\nБажаєте, щоб VeraCrypt відкинув зараз дані в нечитаних секторах?</string>
     <string lang="uk" key="ZEROED_BAD_SECTOR_COUNT">Примітка: VeraCrypt замінив вміст %I64d нечитаючих секторів (%s) зашифрованими блоками із звичайним нулювим текстом.</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="uk" key="ENTER_TOKEN_PASSWORD">Введіть пароль/PIN для токену '%s':</string>
     <string lang="uk" key="PKCS11_LIB_LOCATION_HELP">Щоб забезпечити VeraCrypt доступ до токена безпеки чи смарт-карті, зпочатку потрібно встановитв програмну бібліотеку PKCS #11 для токену або смарт-карти. Ця бібліотека може поставлятися разом з пристроєм або знаходиться на сайті постачальника або сторонньої фірми.\n\nВстановивше бібліотеку, ви можете або выбрати її вручну, нажавши  'Бібліотека', або дозволити VeraCrypt найти її автоматично, натиснувши 'Автовизначення бібліотеки' (пошук виконується тільки в системній теці Windows).</string>
     <string lang="uk" key="SELECT_PKCS11_MODULE_HELP">Примітка: ім'я і розташування файлу бібліотеки PKCS #11 для токена або смарт-карти див. в документації до токена, смарт-карти чи ПЗ сторонніх фірм.\n\nНатисніть 'OK', щоб вибрати шлях і ім'я файла.</string>

Translations/Language.uz.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="uz" name="Ўзбекча" en-name="Uzbek (Cyrillic)" version="0.1.0" translators="Abdurauf Azizov, Dmitry Yerokhin" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <control lang="uz" key="IDC_KEY_FILES">Ка&amp;лит. файллар...</control>
     <control lang="uz" key="IDC_LINK_HASH_INFO">Хэш-алгоритмлар буйича маълумотлар</control>
     <control lang="uz" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Тўлиқрок</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="uz" key="IDC_MB">&amp;Мб</control>
     <control lang="uz" key="IDC_MORE_INFO_ON_CONTAINERS">Тўлиқрок</control>
     <control lang="uz" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">Шифрлаш системаси буйича Тўлиқрок маълумот</control>
@@ -57,6 +58,7 @@
     <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="uz" key="IDC_QUICKFORMAT">Тезда форматлаш.</control>
     <control lang="uz" key="IDC_SHOW_PASSWORD">&amp;Паролни кўрсатишлик</control>
     <control lang="uz" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Паролни кўрсатишлик</control>
@@ -72,6 +74,7 @@
     <control lang="uz" key="IDT_COLLECTING_RANDOM_DATA_NOTE">ЗАРУР: Сискончани ушбу ойнада хар хил харакатлантиринг, канчалик куп сичконча жойи узгарса, шунчалик шифрлаш кучи ошади. Кейин 'Кейингисига' тугмасини босинг.</control>
     <control lang="uz" key="IDT_CONFIRM">&amp;Тасдиклаш:</control>
     <control lang="uz" key="IDT_DONE">Тайёр </control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="uz" key="IDT_ENCRYPTION_ALGO">Шифрлаш алгоритми</control>
     <control lang="uz" key="IDT_FILESYSTEM">Файл.сист.</control>
     <control lang="uz" key="IDT_FILE_CONTAINER">Файл ичида виртуал шифрланган диск яратиш. Тажрибасиз фойдаланувчиларга маслахат берилади.</control>
@@ -85,6 +88,8 @@
     <control lang="uz" key="IDT_PARTIAL_POOL_CONTENTS">Пуулнинг(бўлим) ҳозирги ҳолати</control>
     <control lang="uz" key="IDT_PASS">Пароль</control>
     <control lang="uz" 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="uz" key="IDT_PROGRESS">Операция ҳолати:</control>
     <control lang="uz" key="IDT_RANDOM_POOL">Тасодифий: </control>
     <control lang="uz" key="IDT_SINGLE_BOOT">Агар компьютерингизда битта ОС ўрнатилган бўлса шу опцияни танланг, гарчи фойдаланувчилар сони кўп бўлса ҳам.</control>
@@ -142,6 +147,8 @@
     <control lang="uz" key="IDC_MOUNT_OPTIONS">Параметр&amp;ы...</control>
     <control lang="uz" key="IDC_MOUNT_READONLY">Монтировать как том только для &amp;чтения</control>
     <control lang="uz" key="IDC_NEW_KEYFILES">Ключ.файлы...</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="uz" key="IDC_PREF_BKG_TASK_ENABLE">Включено</control>
     <control lang="uz" key="IDC_PREF_CACHE_PASSWORDS">Кэшировать пароли в памяти</control>
     <control lang="uz" key="IDC_PREF_DISMOUNT_INACTIVE">Авторазмонтировать тома при неактивности в течение</control>
@@ -155,6 +162,7 @@
     <control lang="uz" key="IDC_PREF_MOUNT_READONLY">Монтировать как тома только для чтения</control>
     <control lang="uz" key="IDC_PREF_MOUNT_REMOVABLE">Монтировать как сменные носители</control>
     <control lang="uz" 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="en" key="IDC_PREF_USE_DIFF_TRAY_ICON_IF_VOL_MOUNTED">Use a different taskbar icon when there are mounted volumes</control>
     <control lang="uz" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Очищать кэш паролей при авторазмонтировании</control>
     <control lang="uz" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Очищать кэш паролей при выходе</control>
@@ -167,11 +175,12 @@
     <control lang="uz" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Показ пароля</control>
     <control lang="uz" key="IDC_TRAVEL_OPEN_EXPLORER">&amp;Открыть смонтированный том в окне Проводника</control>
     <control lang="uz" key="IDC_TRAV_CACHE_PASSWORDS">&amp;Кэшировать пароль в памяти драйвера</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="uz" key="IDC_UNMOUNTALL">&amp;Уланишларни узиш</control>
     <control lang="uz" key="IDC_VOLUME_PROPERTIES">Сво&amp;йства тома...</control>
     <control lang="uz" key="IDC_VOLUME_TOOLS">О&amp;перациялар...</control>
     <control lang="uz" key="IDC_WIPE_CACHE">О&amp;чистить кэш</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
     <control lang="uz" key="IDD_HOTKEYS_DLG">VeraCrypt - Общесистемные горячие клавиши</control>
     <control lang="uz" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="uz" key="IDM_CREATE_HIDDEN_OS">Создать скрытую ОС...</control>
     <control lang="uz" key="IDM_CREATE_RESCUE_DISK">Создать диск восстановления...</control>
     <control lang="uz" key="IDM_CREATE_VOLUME">Создать новый том...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="uz" key="IDM_DEFAULT_KEYFILES">Ключевые файлы по умолчанию...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="uz" key="IDM_ENCRYPT_SYSTEM_DEVICE">Зашифровать системный раздел/диск...</control>
     <control lang="uz" key="IDM_FAQ">Часто задаваемые вопросы</control>
@@ -243,6 +254,7 @@
     <control lang="uz" key="IDM_UNMOUNT_VOLUME">Размонтировать том</control>
     <control lang="uz" key="IDM_VERIFY_RESCUE_DISK">Проверить диск восстановления</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>
     <control lang="uz" key="IDM_VOLUME_WIZARD">Мастер создания томов</control>
     <control lang="uz" key="IDM_WEBSITE">Сайт VeraCrypt</control>
@@ -369,7 +381,7 @@
     <string lang="uz" key="ACCESS_DENIED">Ошибка! Нет доступа.\n\nРаздел, к которому вы пытаетесь получить доступ, имеет длину 0 секторов, либо это загрузочное устройство.</string>
     <string lang="en" key="ADMINISTRATOR">Administrator</string>
     <string lang="uz" key="ADMIN_PRIVILEGES_DRIVER">Чтобы можно было загрузить драйвер VeraCrypt, вы должны войти в систему с правами Администратора.</string>
-    <string lang="uz" key="ADMIN_PRIVILEGES_WARN_DEVICES">Чтобы можно было шифровать/форматировать раздел/устройство, вы должны войти в систему с правами Администратора.\n\nК томам на основе файлов это не относится.</string>
+    <string lang="uz" key="ADMIN_PRIVILEGES_WARN_DEVICES">Чтобы можно было шифровать/Дешифрация/форматировать раздел/устройство, вы должны войти в систему с правами Администратора.\n\nК томам на основе файлов это не относится.</string>
     <string lang="uz" key="ADMIN_PRIVILEGES_WARN_HIDVOL">Чтобы можно было создать скрытый том, вы должны войти в систему с правами Администратора.\n\nПродолжить?</string>
     <string lang="uz" key="ADMIN_PRIVILEGES_WARN_NTFS">Чтобы можно было форматировать тома как NTFS, вы должны войти в систему с правами Администратора.\n\nБез привилегий Администратора можно форматировать тома только как FAT.</string>
     <string lang="uz" key="AES_HELP">Утверждённый FIPS (США) Шифрлаш алгоритми (Rijndael, опубликован в 1998 г.), разрешён к применению в федеральных структурах США для защиты важнейшей информации. 256-бит ключ, 128-бит блок, 14 циклов (AES-256). Режим работы -- XTS.</string>
@@ -485,7 +497,11 @@
     <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>
     <string lang="uz" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Том полностью зашифрован</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="uz" 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="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="uz" key="FORMAT_FINISHED_INFO">Том VeraCrypt успешно создан.</string>
     <string lang="uz" key="FORMAT_FINISHED_TITLE">Том создан</string>
     <string lang="uz" key="FORMAT_HELP">ВАЖНО: Хаотично перемещайте мышь внутри этого окна. Чем дольше, тем лучше. Это значительно увеличит криптостойкость ключей шифрования. Затем нажмите 'Разметить', чтобы создать том.</string>
@@ -523,6 +539,7 @@
     <string lang="uz" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Ошибка получения состояния системного шифрования.</string>
     <string lang="uz" key="INIT_SYS_ENC">Невозможно инициализировать компоненты приложения для системного шифрования.</string>
     <string lang="uz" key="INIT_RAND">Ошибка инициализации генератора случайных чисел.</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="uz" key="INIT_REGISTER">Ошибка инициализации приложения. Невозможно зарегистрировать класс Dialog.</string>
     <string lang="uz" key="INIT_RICHEDIT">Ошибка загрузки системной библиотеки Rich Edit.</string>
     <string lang="uz" key="INTRO_TITLE">Мастер создания томов VeraCrypt</string>
@@ -535,6 +552,7 @@
     <string lang="uz" key="MOUNT_BUTTON">У&amp;ламоқ</string>
     <string lang="uz" key="NEW_VERSION_REQUIRED">Для монтирования этого тома требуется более новая версия VeraCrypt.</string>
     <string lang="uz" 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="uz" key="NEXT">&amp;Далее &gt;</string>
     <string lang="uz" key="FINALIZE">&amp;Готово</string>
     <string lang="uz" key="INSTALL">&amp;Установить</string>
@@ -542,6 +560,7 @@
     <string lang="uz" key="NODRIVER">Не удалось подключиться к драйверу устройств VeraCrypt. Если драйвер не запущен, работа VeraCrypt невозможна.\n\nИз-за особенностей Windows, для загрузки драйвера сначала может потребоваться завершение сеанса или перезагрузка системы.</string>
     <string lang="uz" key="NOFONT">Ошибка загрузки/подготовки шрифтов.</string>
     <string lang="uz" 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="uz" key="DRIVE_LETTER_UNAVAILABLE">Буква диска недоступна.</string>
     <string lang="uz" key="NO_FILE_SELECTED">Не выбран файл.</string>
     <string lang="uz" key="NO_FREE_DRIVES">Нет доступных букв дисков.</string>
@@ -561,15 +580,18 @@
     <string lang="uz" key="OVERWRITEPROMPT">ВНИМАНИЕ: Файл '%hs' уже существует!\n\nВАЖНО: VERACRYPT НЕ БУДЕТ ШИФРОВАТЬ ЭТОТ ФАЙЛ, ОН ЕГО УДАЛИТ.\n\nВы действительно хотите удалить этот файл и заменить его новым контейнером VeraCrypt?</string>
     <string lang="uz" key="OVERWRITEPROMPT_DEVICE">ОСТОРОЖНО: ВСЕ ДАННЫЕ, КОТОРЫЕ СОДЕРЖИТ  %s '%hs'%s, БУДУТ УНИЧТОЖЕНЫ (А НЕ ЗАШИФРОВАНЫ)!\n\nВы настаиваете на форматировании?</string>
     <string lang="uz" key="NONSYS_INPLACE_ENC_CONFIRM">ВНИМАНИЕ: Монтирование тома и доступ к хранящимся на нём файлам невозможны, пока том не будет полностью зашифрован.\n\nВы действительно хотите приступить к шифрованию %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 '%hs'%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_SECOND_WARNING_LOTS_OF_DATA">ВНИМАНИЕ: ВЫБРАННЫЙ РАЗДЕЛ СОДЕРЖИТ БОЛЬШОЙ ОБЪЁМ ДАННЫХ! Все файлы на этом разделе будут удалены (они НЕ будут зашифрованы)!</string>
     <string lang="uz" key="ERASE_FILES_BY_CREATING_VOLUME">Стереть файлы на разделе при создании тома VeraCrypt внутри него</string>
     <string lang="uz" key="PASSWORD">Пароль</string>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="uz" key="IDD_PCDM_CHANGE_PKCS5_PRF">Алгоритм деривации ключа заголовка</string>
     <string lang="uz" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Добавление/удаление ключевых файлов в/из том(а)</string>
     <string lang="uz" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Удаление всех ключевых файлов из тома</string>
-    <string lang="en" key="PASSWORD_CHANGED">Password and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</string>
+    <string lang="en" key="PASSWORD_CHANGED">Password, PIM and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</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="uz" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">ВАЖНО: Если вы не уничтожили свой диск восстановления VeraCrypt (Rescue Disk), ваш системный раздел/диск по-прежнему можно расшифровать с помощью старого пароля (загрузившись с диска восстановления VeraCrypt и введя старый пароль). Вам следует создать новый диск восстановления VeraCrypt, после чего уничтожить старый.\n\nХотите создать новый диск восстановления VeraCrypt?</string>
     <string lang="uz" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Обратите внимание, что ваш диск восстановления VeraCrypt (Rescue Disk) всё ещё использует прежний алгоритм. Если вы считаете этот алгоритм недостаточно надёжным, создайте новый диск восстановления VeraCrypt, после чего уничтожьте старый.\n\nХотите создать новый диск восстановления VeraCrypt?</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,6 +600,7 @@
     <string lang="uz" key="PKCS5_PRF_CHANGED">Алгоритм деривации ключа заголовка успешно установлен.</string>
     <string lang="uz" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">Введите пароль и/или ключевые файлы для несистемного тома, где вы хотите возобновить шифрование 'на месте'.\n\n\nПримечание: после нажатия 'Далее' VeraCrypt попытается найти все несистемные тома, на которых был прерван процесс шифрования, и где можно расшифровать заголовок тома VeraCrypt с помощью указанного пароля и/или ключевых файлов. Если таких томов окажется несколько, на следующем этапе вам будет нужно выбрать один из них.</string>
     <string lang="uz" 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="uz" key="PASSWORD_HELP">Очень важно выбрать хороший пароль. Избегайте указывать пароли из одного или нескольких слов, которые можно найти в словаре (или комбинаций из 2, 3 или 4 таких слов). Пароль не должен содержать имён или дат рождения. Он должен быть труден для угадывания. Хороший пароль -- случайная комбинация прописных и строчных букв, цифр и особых символов (@ ^ = $ * + и т.д.).\n\nРекомендуем выбирать пароли, состоящие более чем из 20 знаков (чем длиннее, тем лучше). Макс. длина -- 64 символа.</string>
     <string lang="uz" key="PASSWORD_HIDDENVOL_HELP">Выберите пароль для скрытого тома. </string>
     <string lang="uz" key="PASSWORD_HIDDEN_OS_HELP">Выберите пароль для скрытой операционной системы (т.е. для скрытого тома). </string>
@@ -597,11 +620,26 @@
     <string lang="uz" key="PASSWORD_WRONG_AUTOMOUNT">Неверный пароль, либо не найден том VeraCrypt.</string>
     <string lang="uz" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Неверные ключевые файлы/пароль, либо не найден том VeraCrypt.</string>
     <string lang="uz" 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="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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_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>
+    <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="uz" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nПримечание: если вы пытаетесь смонтировать раздел, расположенный на зашифрованном системном диске без предзагрузочной авторизации, или смонтировать зашифрованный системный раздел операционной системы, не выполняемой в данный момент, выберите 'Система' &gt; 'Смонтировать без предзагрузочной авторизации'.</string>
     <string lang="uz" 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="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>
@@ -701,11 +739,18 @@
     <string lang="uz" key="FOR_MORE_INFO_ON_PARTITIONS">Информацию о создании и управлении разделами см. в документации к вашей операционной системе, либо проконсультируйтесь в службе техподдержки поставщика своего компьютера.</string>
     <string lang="uz" key="SYSTEM_PARTITION_NOT_ACTIVE">Ошибка! Выполняющаяся в данный момент операционная система установлена не в загрузочном разделе (первом разделе с пометкой 'Активный'). Это не поддерживается.</string>
     <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="uz" key="CANT_ACCESS_VOL">Ошибка! Нет доступа к тому.\n\nПроверьте, существует ли этот том, не смонтирован ли он, не используется ли системой или какой-либо программой, которой вы дали права чтения/записи этого тома, и не защищён ли он от записи.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="uz" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Ошибка! Нет доступа к тому и/или невозможно получить сведения о томе.\n\nПроверьте, существует ли выбранный том, не используется ли он системой или приложениями, есть ли у вас права для чтения/записи этого тома, и не защищён ли том от записи.</string>
     <string lang="uz" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Ошибка! Нет доступа к тому и/или невозможно получить сведения о томе. Проверьте, существует ли выбранный том, не используется ли он системой или приложениями, есть ли у вас права для чтения/записи этого тома, и не защищён ли том от записи.\n\nЕсли проблема не решается, попробуйте предпринять шаги, указанные ниже.</string>
     <string lang="uz" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">Зашифровать раздел не удалось из-за ошибки. Попробуйте устранить все ранее указанные проблемы и повторить попытку. Если проблемы не решаются, попробуйте предпринять шаги, указанные ниже.</string>
     <string lang="uz" key="INPLACE_ENC_GENERIC_ERR_RESUME">Продолжить процесс шифровния раздела не удалось из-за ошибки.\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="uz" key="CANT_DISMOUNT_OUTER_VOL">Ошибка! Невозможно размонтировать внешний том.\n\nТом нельзя размонтировать, если он содержит файлы или папки, используемые какой-либо программой или системой.\n\nЗакройте все программы, которые могут использовать файлы и папки на этом томе, и нажмите 'Повтор'.</string>
     <string lang="uz" key="CANT_GET_OUTER_VOL_INFO">Ошибка! Невозможно получить информацию о внешнем томе. Создание тома прекращено.</string>
     <string lang="uz" key="CANT_ACCESS_OUTER_VOL">Ошибка! Нет доступа к внешнему тому. Продолжение создания тома невозможно.</string>
@@ -790,7 +835,7 @@
     <string lang="uz" key="TC_INSTALLER_IS_RUNNING">В этой системе сейчас запущен инсталлятор VeraCrypt. Он выполняет/готовит установку или обновление VeraCrypt. Дождитесь завершения его работы или закройте его. Если закрыть инсталлятор не получается, перезагрузите компьютер и лишь потом продолжите.</string>
     <string lang="uz" key="INSTALL_FAILED">Установка не выполнена.</string>
     <string lang="uz" key="UNINSTALL_FAILED">Удаление не выполнено.</string>
-    <string lang="uz" key="DIST_PACKAGE_CORRUPTED">Этот дистрибутивный пакет повреждён. Загрузите его снова (желательно с официального сайта VeraCrypt - www.veracrypt.org).</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="EXTRACTING_VERB">Извлечение</string>
     <string lang="uz" key="CANNOT_READ_FROM_PACKAGE">Невозможно прочитать данные из дистрибутива.</string>
@@ -977,6 +1022,7 @@
     <string lang="uz" key="CONFIRM_EXIT_UNIVERSAL">Выход?</string>
     <string lang="uz" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt не обладает достаточной информацией, чтобы определить, шифрование выполнять или дешифрование.</string>
     <string lang="uz" 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="uz" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">Вы хотите прервать процесс шифрования раздела/тома, отложив его на будущее?\n\nПримечание: помните, что пока том не будет полностью зашифрован, его нельзя смонтировать. Позже процесс шифрования можно будет возобновить с той точки, где он был остановлен. Это можно сделать, например, выбрав команду 'Тома' &gt; 'Продолжить прерванный процесс' в меню главного окна VeraCrypt.</string>
     <string lang="uz" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Хотите прервать и отложить процесс шифрования системного раздела/диска?\n\nПримечание: позже процесс можно будет возобновить с той точки, где он был остановлен. Это можно сделать, например, выбрав в главном окне VeraCrypt меню 'Система' &gt; 'Продолжить прерванный процесс'. Если вы хотите окончательно прервать процесс или совсем отказаться от шифрования, выберите 'Система' &gt; 'Перманентно дешифровать системный раздел/диск'.</string>
     <string lang="uz" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Хотите прервать и отложить процесс дешифрования системного раздела/диска?\n\nПримечание: позже процесс можно будет возобновить с той точки, где он был остановлен. Это можно сделать, например, выбрав в главном окне VeraCrypt меню 'Система' &gt; 'Продолжить прерванный процесс'. Если вы хотите отказаться от дешифрования (и начать шифрование), выберите 'Система' &gt; 'Зашифровать системный раздел/диск'.</string>
@@ -986,6 +1032,7 @@
     <string lang="uz" key="FAILED_TO_START_WIPING">Ошибка! Невозможно начать процесс очистки (затирания данных).</string>
     <string lang="uz" key="INCONSISTENCY_RESOLVED">Несоответствие устранено.\n\n\n(Если вы сообщаете нам о связанной с этим ошибке, включите в свой отчёт следующую техническую информацию: %hs)</string>
     <string lang="uz" key="UNEXPECTED_STATE">Ошибка! Неизвестное состояние.\n\n\n(Если вы сообщаете нам о связанной с этим ошибке, включите в свой отчёт следующую техническую информацию: %hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="uz" key="NOTHING_TO_RESUME">Нет процесса/задания для возобновления.</string>
     <string lang="uz" key="HIDVOL_PROT_BKG_TASK_WARNING">ВНИМАНИЕ: Фоновый процесс VeraCrypt отключён. При выходе из VeraCrypt вы не будете извещены о предотвращении повреждения скрытого тома.\n\nПримечание: фоновый процесс можно закрыть в любой момент, щёлкнув правой кнопкой мыши на значке VeraCrypt в системном лотке и выбрав 'Выход'.\n\nВключить фоновый процесс VeraCrypt?</string>
     <string lang="uz" key="LANG_PACK_VERSION">Версия языкового модуля: %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="uz" key="ERROR_MBR_PROTECTED">Ошибка записи сектора MBR.\n\nBIOS в вашем ПК может быть настроена на защиту сектора 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="en" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">The required version of the VeraCrypt Boot Loader is currently not installed. This may prevent some of the settings from being saved.</string>
     <string lang="uz" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Примечание: в определённых ситуациях может потребоваться, чтобы посторонний (неприятель), наблюдающий за стартом ПК, не знал, что вы пользуетесь VeraCrypt. Параметры выше позволяют модифицировать экран загрузки VeraCrypt. Если вы включите первую опцию, то на экране загрузчика не будет отображаться никакой текст (даже если вы введёте неправильный пароль). При вводе пароля компьютер будет выглядеть "зависшим". Кроме того, чтобы ввести противника в заблуждение, можно включить вывод своего сообщения. Например, отображать ложные сообщения об ошибках вроде "Missing operating system" (эта надпись обычно выводится загрузчиком Windows, если он не может найти загрузочный раздел Windows). Однако при этом важно помнить, что если неприятель сможет проанализировать содержимое жёсткого диска, то он сумеет найти на нём загрузчик VeraCrypt.</string>
     <string lang="uz" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">ВНИМАНИЕ: Если вы включите эту опцию, загрузчик VeraCrypt не будет выводить на экран никаких сообщений (даже если вы укажете неправильный пароль). При вводе пароля компьютер будет выглядеть "зависшим" (не реагирующим), курсор НЕ будет перемещаться, а нажатия клавиш НЕ будут сопровождаться показом звёздочек.\n\nВы действительно хотите включить эту опцию?</string>
@@ -1034,8 +1082,11 @@
     <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="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>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="uz" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">В настоящий момент ключевые файлы для шифрования системы не поддерживаются.</string>
     <string lang="uz" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Внимание! VeraCrypt не может восстановить первоначальную раскладку клавиатуры. Это может привести к неправильному вводу пароля.</string>
     <string lang="uz" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Ошибка! Невозможно установить раскладку клавиатуры для VeraCrypt в стандартную американскую (US).\n\nОбратите внимание, что пароль вводится ДО загрузки Windows, когда любые раскладки клавиатуры, отличающиеся от американской, ещё недоступны. Поэтому пароль всегда должен вводиться при стандартной американской раскладке.</string>
@@ -1120,6 +1171,7 @@
     <string lang="uz" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">Пре-тест успешно завершён.\n\nВНИМАНИЕ: Если во время шифрования произойдёт сбой питания или из-за программной/аппаратной ошибки зависнет операционная система, в то время, как VeraCrypt шифрует имеющиеся данные 'на месте', некоторые данные почти наверняка окажутся повреждёнными или утерянными. Поэтому прежде чем начать шифрование, убедитесь, что сделали резервную копию файлов, которые собираетесь зашифровать. Если нет, то сделайте это сейчас (нажмите 'Отложить', скопируйте файлы, затем в любое время снова запустите VeraCrypt, выберите 'Система' &gt; 'Возобновить прерванный процесс', чтобы начать шифрование).\n\nКогда будете готовы, нажмите 'Шифрация', чтобы приступить к шифрованию.</string>
     <string lang="en" key="SYSENC_ENCRYPTION_PAGE_INFO">You can click Pause or Defer anytime to interrupt the process of encryption or decryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. To prevent slowdown when the system or applications write or read data from the system drive, VeraCrypt automatically waits until the data is written or read (see Status above) and then automatically continues encrypting or decrypting.</string>
     <string lang="uz" 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="uz" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Скрытая система запущена</string>
     <string lang="uz" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Исходная система</string>
     <string lang="uz" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows создаёт (обычно без вашего ведома или согласия) различные файлы отчётов, временные файлы и т.п. на системном разделе. Кроме того, там же она сохраняет содержимое ОЗУ для сна/гибернации и файлы подкачки. Поэтому если неприятель проанализирует файлы на разделе с исходной системой (клоном которой является скрытая ОС), он может узнать, например, что вы пользовались мастером VeraCrypt в режиме создания скрытой системы (и заподозрить наличие скрытой ОС в вашем ПК).\n\nЧтобы это предотвратить, на следующих этапах VeraCrypt надёжно сотрёт всё содержимое раздела, где находится исходная система. Затем для правдоподобности отрицания вам потребуется установить в раздел новую систему и зашифровать её. Таким образом вы создадите обманную ОС, и на этом процесс создания скрытой ОС будет завершён.</string>
@@ -1159,7 +1211,7 @@
     <string lang="uz" key="HIDDEN_OS_CREATION_PREINFO_HELP">Yf следующих этапах VeraCrypt создаст скрытую ОС, скопировав содержимое системного раздела в скрытый том (копируемые данные шифруются 'на лету' с ключом, отличным от используемого для обманной ОС).\n\nУчтите, что процесс выполняется на предзагрузочной стадии (до запуска Windows) и может занять много времени (несколько часов или даже дней, в зависимости от размера системного раздела и быстродействия ПК).\n\nВы сможете прервать этот процесс, выключить ПК, запустить ОС и затем возобновить его. Однако в случае прерывания, копирование системы придётся начать сначала (так как при клонировании содержимое системного раздела не должно изменяться).</string>
     <string lang="uz" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Вы хотите отменить весь процесс создания скрытой операционной системы?\n\nПримечание: в случае отмены вы НЕ сможете возобновить процесс.</string>
     <string lang="uz" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Вы хотите отменить пре-тест шифрования системы?</string>
-    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="uz" key="SYS_DRIVE_NOT_ENCRYPTED">Судя по всему, системный раздел/диск не зашифрован (ни частично, ни полностью).</string>
     <string lang="uz" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">Системный раздел/диск зашифрован (частично или полностью).\n\nПрежде чем продолжить, полностью дешифруйте системный раздел/диск. Чтобы это сделать, выберите в главном окне VeraCrypt меню 'Система' &gt; 'Permanently Decrypt System Partition/Drive'.</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">When the system partition/drive is encrypted (partially or fully), you cannot downgrade VeraCrypt (but you can upgrade it or reinstall the same version).</string>
@@ -1176,6 +1228,8 @@
     <string lang="en" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">You have selected the system partition/drive (or the boot partition), but the wizard mode you selected is suitable only for non-system partitions/drives.\n\nDo you want to set up pre-boot authentication (which means that you will need to enter your password each time before Windows boots/starts) and encrypt the system partition/drive?</string>
     <string lang="uz" key="CONFIRM_DECRYPT_SYS_DEVICE">Вы действительно хотите перманентно дешифровать системный раздел/диск?</string>
     <string lang="uz" 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="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="en" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Warning: If you use a cascade of ciphers for system encryption, you may encounter the following issues:\n\n1) The VeraCrypt Boot Loader is larger than normal and, therefore, there is not enough space in the first drive track for a backup of the VeraCrypt Boot Loader. Hence, whenever it gets damaged (which often happens, for example, during inappropriately designed anti-piracy activation procedures of certain programs), you will need to use the VeraCrypt Rescue Disk to boot or to repair the VeraCrypt Boot Loader.\n\n2) On some computers, resuming from hibernation takes longer.\n\nThese potential issues can be prevented by choosing a non-cascade encryption algorithm (e.g. AES).\n\nAre you sure you want to use a cascade of ciphers?</string>
     <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>
@@ -1191,6 +1245,7 @@
     <string lang="en" key="ENABLE_BAD_SECTOR_ZEROING">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nThe process of in-place encryption can continue only when the sectors have been made readable again. VeraCrypt can attempt to make these sectors readable by writing zeros to the sectors (subsequently such all-zero blocks would be encrypted). However, note that any data stored in the unreadable sectors will be lost. If you want to avoid that, you can attempt to recover portions of the corrupted data using appropriate third-party tools.\n\nNote: In case of physically damaged sectors (as opposed to mere data corruption and checksum errors) most types of storage devices internally reallocate the sectors when data is attempted to be written to them (so the existing data in the damaged sectors may remain unencrypted on the drive).\n\nDo you want VeraCrypt to write zeroes to unreadable sectors?</string>
     <string lang="en" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nTo be able to proceed with decryption, VeraCrypt will have to discard the content of the unreadable sectors (the content will be replaced with pseudorandom data). Please note that, before proceeding, you can attempt to recover portions of any corrupted data using appropriate third-party tools.\n\nDo you want VeraCrypt to discard data in the unreadable sectors now?</string>
     <string lang="uz" key="ZEROED_BAD_SECTOR_COUNT">Примечание: VeraCrypt заменил содержимое %I64d нечитаемых секторов (%s) зашифрованными блоками с обычным нулевым текстом.</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="uz" key="ENTER_TOKEN_PASSWORD">Введите пароль/PIN для токена '%s':</string>
     <string lang="uz" key="PKCS11_LIB_LOCATION_HELP">Чтобы обеспечить VeraCrypt доступ к токену безопасности или смарт-карте, сначала нужно установить программную библиотеку PKCS #11 для токена или смарт-карты. Эта библиотека может поставляться вместе с устройством либо имеется на сайте поставщика или сторонней фирмы.\n\nУстановив библиотеку, вы можете либо выбрать её вручную, нажав  'Библиотека', либо позволить VeraCrypt найти её автоматически, нажав 'Автоопределение библиотеки' (поиск выполняется только в системной папке Windows).</string>
     <string lang="uz" key="SELECT_PKCS11_MODULE_HELP">Примечание: имя и расположение файла библиотеки PKCS #11 для токена или смарт-карты см. в документации к токену, смарт-карте или ПО сторонних фирм.\n\nНажмите 'OK', чтобы выбрать путь и имя файла.</string>

Translations/Language.vi.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="vi" name="Tiếng Việt" en-name="Vietnamese" version="0.1.0" translators="Nguyễn Kim Huy" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <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>
     <control lang="vi" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Thêm thông tin về mật mã</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="vi" key="IDC_MB">&amp;MB</control>
     <control lang="vi" key="IDC_MORE_INFO_ON_CONTAINERS">Thêm thông tin về bộ chứa</control>
     <control lang="vi" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">Thêm thông tin về hệ thống mã hóa</control>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <control lang="vi" key="IDT_COLLECTING_RANDOM_DATA_NOTE">QUAN TRỌNG: Di chuyển con chuột của bạn càng ngẫu nhiên càng tốt trong cửa sổ này. Bạn di chuyển nó càng lâu càng tốt. Việc này gia tăng cường độ mật mã của các khóa mã hóa. Sau đó nhấn Kế tiếp để tiếp tục.</control>
     <control lang="vi" key="IDT_CONFIRM">&amp;Xác nhận:</control>
     <control lang="vi" key="IDT_DONE">Hoàn tất</control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="vi" key="IDT_ENCRYPTION_ALGO">Giải thuật mã hóa</control>
     <control lang="vi" key="IDT_FILESYSTEM">Hệ thống tập tin</control>
     <control lang="vi" key="IDT_FILE_CONTAINER">Cấu tạo một đĩa được mã hóa ảo bên trong một tập tin. Thích hợp cho người dùng không kinh nghiệm.</control>
@@ -85,6 +88,8 @@
     <control lang="vi" key="IDT_PARTIAL_POOL_CONTENTS">Nội dung gộp chung hiện tại (một phần)</control>
     <control lang="vi" key="IDT_PASS">Mật</control>
     <control lang="vi" key="IDT_PASSWORD">Mật mã:</control>
+    <control lang="en" key="IDT_PIM">Volume PIM:</control>
+    <control lang="en" key="IDT_OLD_PIM">Volume PIM:</control>
     <control lang="vi" key="IDT_PROGRESS">Tiến triển:</control>
     <control lang="vi" key="IDT_RANDOM_POOL">Gộp chung Ngẫu nhiên:</control>
     <control lang="vi" key="IDT_SINGLE_BOOT">Chọn tùy chọn này nếu chỉ có một hệ điều hành được cài đặt trong máy điện toán này (ngay cả nếu nó được dùng bởi nhiều người).</control>
@@ -142,6 +147,8 @@
     <control lang="vi" key="IDC_MOUNT_OPTIONS">Nạp Tùy &amp;chọn lên...</control>
     <control lang="vi" key="IDC_MOUNT_READONLY">Nạp tập đĩa kiểu chỉ-đọc lên</control>
     <control lang="vi" key="IDC_NEW_KEYFILES">Tập tin khóa...</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="vi" key="IDC_PREF_BKG_TASK_ENABLE">Được bật lên</control>
     <control lang="vi" key="IDC_PREF_CACHE_PASSWORDS">Tạm trữ mật mã trong bộ nhớ của trình điều khiển</control>
     <control lang="vi" key="IDC_PREF_DISMOUNT_INACTIVE">Tự-tháo tập đĩa xuống sau khi không có dữ liệu nào được đọc/viết vào nó trong</control>
@@ -155,6 +162,7 @@
     <control lang="vi" key="IDC_PREF_MOUNT_READONLY">Nạp các tập đĩa kiểu chỉ-đọc lên</control>
     <control lang="vi" key="IDC_PREF_MOUNT_REMOVABLE">Nạp các tập đĩa kiểu môi trường chứa rời được lên</control>
     <control lang="vi" key="IDC_PREF_OPEN_EXPLORER">Mở cửa sổ Explorer của tập đĩa được nạp lên thành công</control>
+    <control lang="en" key="IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT">Temporary Cache password during "Mount Favorite Volumes" operations</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="vi" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">Xóa mật mã được tạm trữ khi tự-tháo xuống</control>
     <control lang="vi" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Xóa mật mã được tạm trữ khi ra khỏi</control>
@@ -167,11 +175,12 @@
     <control lang="vi" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Hiển thị mật mã</control>
     <control lang="vi" key="IDC_TRAVEL_OPEN_EXPLORER">Mở cửa sổ &amp;Explorer cho tập đĩa được nạp lên</control>
     <control lang="vi" key="IDC_TRAV_CACHE_PASSWORDS">&amp;Tạm trữ mật mã trong bộ nhớ của trình điều khiển</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="vi" key="IDC_UNMOUNTALL">Th&amp;áo Tất cả xuống</control>
     <control lang="vi" key="IDC_VOLUME_PROPERTIES">Đặc tính của Tập đĩa...</control>
     <control lang="vi" key="IDC_VOLUME_TOOLS">Công cụ của Tập đĩa...</control>
     <control lang="vi" key="IDC_WIPE_CACHE">&amp;Tẩy Bộ tạm trữ</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
     <control lang="vi" key="IDD_HOTKEYS_DLG">VeraCrypt - Các khóa kích hoạt cho Nguyên cả Hệ thống</control>
     <control lang="vi" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="vi" key="IDM_CREATE_HIDDEN_OS">Cấu tạo Hệ điều hành Ẩn...</control>
     <control lang="vi" key="IDM_CREATE_RESCUE_DISK">Cấu tạo Đĩa Cứu hộ...</control>
     <control lang="vi" key="IDM_CREATE_VOLUME">Cấu tạo Tập đĩa mới...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="vi" key="IDM_DEFAULT_KEYFILES">Tập tin khóa Mặc định...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="vi" key="IDM_ENCRYPT_SYSTEM_DEVICE">Mã hóa Phân vùng Hệ thống/Ổ đĩa...</control>
     <control lang="vi" key="IDM_FAQ">Câu hỏi thông dụng</control>
@@ -243,6 +254,7 @@
     <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="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>
     <control lang="vi" key="IDM_VOLUME_WIZARD">Trợ giúp Cấu tạo Tập đĩa</control>
     <control lang="vi" key="IDM_WEBSITE">Trang Web của VeraCrypt</control>
@@ -369,7 +381,7 @@
     <string lang="vi" key="ACCESS_DENIED">Lỗi: Truy cập bị từ khước.\n\nPhân vùng mà bạn đang truy cập có chiều dài 0 khu vực, hoặc nó là thiết bị khởi động.</string>
     <string lang="vi" key="ADMINISTRATOR">Quản lý</string>
     <string lang="vi" key="ADMIN_PRIVILEGES_DRIVER">Để nạp trình điều khiển của VeraCrypt lên, bạn cần đăng nhập vào một trương mục có quyền quản lý.</string>
-    <string lang="vi" key="ADMIN_PRIVILEGES_WARN_DEVICES">Xin lưu ý là để mã hóa/định dạng một phân vùng/thiết bị thì bạn cần đăng nhập vào một trương mục có quyền quản lý.\n\nChuyện này không áp dụng với các tập đĩa có tập tin làm chủ.</string>
+    <string lang="vi" key="ADMIN_PRIVILEGES_WARN_DEVICES">Xin lưu ý là để mã hóa/Giải/định dạng một phân vùng/thiết bị thì bạn cần đăng nhập vào một trương mục có quyền quản lý.\n\nChuyện này không áp dụng với các tập đĩa có tập tin làm chủ.</string>
     <string lang="vi" key="ADMIN_PRIVILEGES_WARN_HIDVOL">Để cấu tạo một tập đĩa ẩn bạn cần đăng nhập vào một trương mục có quyền quản lý.\n\nTiếp tục không?</string>
     <string lang="vi" key="ADMIN_PRIVILEGES_WARN_NTFS">Xin lưu ý là để định dạng tập đĩa theo dạng NTFS bạn cần đăng nhập vào một trương mục có quyền quản lý.\n\nKhông thôi có quyền quản lý, bạn có thể định dạng tập đĩa theo dạng FAT.</string>
     <string lang="vi" key="AES_HELP">Mã hóa được chấp thuận bởi FIPS (Rijndael, phát hành năm 1998) có thể được sử dụng bởi các bộ và cơ quan Hoa Kỳ để bảo vệ những tin tức mật cho đến mức tối mật. 256-bit key, 128-bit block, 14 rounds (AES-256). Phương thức của thao tác là XTS.</string>
@@ -485,7 +497,11 @@
     <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>
     <string lang="vi" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Tập đĩa được Hoàn toàn Mã hóa</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="vi" key="NONSYS_INPLACE_ENC_FINISHED_INFO">QUAN TRỌNG: ĐỂ NẠP TẬP ĐĨA VERACRYPT MỚI ĐƯỢC CẤU TẠO NÀY LÊN VÀ ĐỂ TRUY CẬP DỮ LIỆU LƯU TRỮ TRONG NÓ, NHẤN 'Auto-Mount Devices' TRONF CỬA SỔ CHÍNH CỦA VERACRYPT. Sau khi bạn nhập đúng mật mã vào (và/hay cung cấp đúng các tập tin khóa), tập đĩa sẽ được nạp lên chữ hiệu ổ đĩa mà bạn chọn từ danh sách trong cửa sổ chính của VeraCrypt (và bạn sẽ có thể truy cập dữ liệu được mã hóa data qua chữ hiệu ổ đĩa được chọn).\n\nXIN NHỚ HOẶC GHI XUỐNG NHỮNG BƯỚC TRÊN. BẠN PHẢI THEO CHÚNG BẤT CỨ KHI NÀO BẠN MUỐN NẠP TẬP ĐĨA LÊN VÀ TRUY CẬP DỮ LIỆU LƯU GIỮ TRONG NÓ. Một cách khác, trong cửa sổ chính của VeraCrypt, nhấn 'Chọn Thiết bị', sau đó chọn phân vùng/tập đĩa này, và nhấn 'Mount'.\n\nPhân vùng/tập đĩa đã được mã hóa thành công (nó có chứa một tập đĩa VeraCrypt đã được mã hóa toàn bộ bây giờ) và sẵn sàng để dùng.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="vi" key="FORMAT_FINISHED_INFO">Tập đĩa VeraCrypt đã được cấu tạo thành công.</string>
     <string lang="vi" key="FORMAT_FINISHED_TITLE">Tập đĩa được Cấu tạo</string>
     <string lang="vi" key="FORMAT_HELP">QUAN TRỌNG: Di chuyển con chuột của bạn càng nhiều trong cửa sổ này càng tốt. Bạn làm càng lâu càng tốt. Chuyện này sẽ gia tăng sức mạnh mã hóa của các khóa mã hóa. Sau đó nhấn Định dạng để cấu tạo tập đĩa.</string>
@@ -523,6 +539,7 @@
     <string lang="vi" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">Có lỗi xảy ra khi đang lấy tình trạng mã hóa hệ thống.</string>
     <string lang="vi" key="INIT_SYS_ENC">Không thể sơ khởi các bộ phận của ứng dụng cho việc mã hóa hệ thống.</string>
     <string lang="vi" key="INIT_RAND">Không sơ khởi hàm tạo ra các số ngẫu nhiên được!</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="vi" key="INIT_REGISTER">Không thể sơ khởi ứng dụng được. Không đăng ký hạng Hộp thoại được.</string>
     <string lang="vi" key="INIT_RICHEDIT">Lỗi: Không nạp thư viện hệ thống Rich Edit được.</string>
     <string lang="vi" key="INTRO_TITLE">Trợ lý Cấu tạo Tập đĩa VeraCrypt</string>
@@ -535,6 +552,7 @@
     <string lang="vi" key="MOUNT_BUTTON">&amp;Nạp lên</string>
     <string lang="vi" key="NEW_VERSION_REQUIRED">Cần có một phiên bản mới của VeraCrypt để nạp tập đĩa này lên.</string>
     <string lang="vi" key="VOL_CREATION_WIZARD_NOT_FOUND">Lỗi: Không tìm được Trợ lý Cấu tạo Tập đĩa.\n\nXin đảm bảo là tập tin 'VeraCrypt Format.exe' có trong thư mục nơi mà 'VeraCrypt.exe' được khởi chạy. Không thôi có thì xin cài đặt VeraCrypt lại, hoặc tìm 'VeraCrypt Format.exe' trong đĩa của bạn và cho nó chạy.</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="vi" key="NEXT">&amp;Kế tiếp &gt;</string>
     <string lang="vi" key="FINALIZE">&amp;Kết thúc</string>
     <string lang="vi" key="INSTALL">&amp;Cài đặt</string>
@@ -542,6 +560,7 @@
     <string lang="vi" key="NODRIVER">Không thể nối vào trình điều khiển thiết bị của VeraCrypt. VeraCrypt không thể làm việc được nếu trình điều khiển thiết bị không đang chạy.\n\nXin lưu ý là vì một vấn đề của Windows, có thể cần phải đăng xuất hoặc bắt đầu hệ thống lại trước khi trình điều khiển cí thể được nạp lên.</string>
     <string lang="vi" key="NOFONT">Có lỗi xảy ra khi đang nạp/chuẩn bị các kiểu chữ.</string>
     <string lang="vi" key="NOT_FOUND">Không tìm được chữ hiệu ổ đĩa hoặc không có chữ hiệu ổ đĩa nào được xác định.</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="vi" key="DRIVE_LETTER_UNAVAILABLE">Chữ hiệu ổ đĩa không có sẵn.</string>
     <string lang="vi" key="NO_FILE_SELECTED">Không có tập tin nào được chọn!</string>
     <string lang="vi" key="NO_FREE_DRIVES">Không có chữ hiệu ổ đĩa nào có sẵn.</string>
@@ -561,15 +580,18 @@
     <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_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="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="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="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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="vi" key="IDD_PCDM_CHANGE_PKCS5_PRF">Đặt Khóa Đầu của Thuật toán Chuyển hóa</string>
     <string lang="vi" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Thêm/Bỏ các Tập tin khóa vào/ra khỏi Tập đĩa</string>
     <string lang="vi" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Bỏ Tất cả các Tập tin khóa ra khỏi Tập đĩa</string>
     <string lang="vi" key="PASSWORD_CHANGED">Mật mã và/hay tập tin khóa được thay đổi thành công.\n\nQUAN TRỌNG: Xin đảm bảo bạn có đọc phần 'Thay đổi Mật mã và Tập tin khóa' trong chương 'Yêu cầu và Đề phòng Bảo mật' trong Hướng dẫn cho Người dùng của VeraCrypt.</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="vi" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">QUAN TRỌNG: Nếu bạn đã không hủy bỏ Đĩa Cứu hộ VeraCrypt của bạn, hệ thống phân vùng/ổ đĩa của bạn vẫn có thể được giải mã khi dùng mật mã cũ (bằng cách khởi động Đĩa Cứu hộ VeraCrypt và nhập vào mật mã cũ). Bạn nên cấu tạo một Đĩa Cứu hộ VeraCrypt mới và sau đó hủy bỏ cái cũ.\n\nBạn có muốn cấu tạo một Đĩa Cứu hộ VeraCrypt mới không?</string>
     <string lang="vi" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Lưu ý là Đĩa Cứu hộ VeraCrypt của bạn vẫn còn dùng thuật toán trước đó. Nếu bạn cho là thuật toán trước đó không an toàn thì bạn nên cấu tạo một Đĩa Cứu hộ VeraCrypt mới và sau đó hủy bỏ cái cũ.\n\nBạn có muốn cấu tạo một Đĩa Cứu hộ VeraCrypt mới không?</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,6 +600,7 @@
     <string lang="vi" key="PKCS5_PRF_CHANGED">Khóa đầu của thuật toán chuyển hóa được đặt thành công.</string>
     <string lang="vi" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">Xin nhập mật mã và/hay (các) tập tin khóa vào cho tập đĩa vô hệ nơi mà bạn muốn tiếp tục lại quá trình mã hóa tại chỗ.\n\n\nGhi chú: Sau khi bạn nhấn Kế tiếp, VeraCrypt sẽ thử tìm tất cả các tập đĩa vô hệ nơi mà quá trình mã hóa đã bị gián đoạn và nơi mà phần đầu tập đĩa VeraCrypt 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ếu nhiều hơn một tập đĩa như thế được tìm, bạn sẽ cần chọn một trong những cái đó trong bước kế tiếp.</string>
     <string lang="vi" key="NONSYS_INPLACE_ENC_RESUME_VOL_SELECT_HELP">Xin chọn một trong các tập đĩa được liệt kê. Danh sách có chứa mọi tập đĩa vô hệ có thể truy cập được nơi mà quá trình mã hóa đã bị gián đoạn và phần đầu của chúng 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.</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="vi" key="PASSWORD_HELP">Chọn một mật mã tốt là điều rất quan trọng. Bạn nên tránh chọn cái mà chỉ có chứa một chữ đơn độc mà có thể tìm trong tự điển (hoặc là một kết hợp của 2, 3, or 4 chữ như thế). Nó không nên chứa bất cứ tên hoặc ngày sinh nào cả. Nó không dễ đoán được. Một mật mã tốt là một kết hợp ngẫu nhiên của chữ hoa và chữ thường, số, và những ký tự đặc biệt như @ ^ = $ * + v.v. Chúng tôi khuyên nên chọn một mật mã có chứa nhiều hơn 20 ký tự (càng dài càng tốt). Chiều dài tối đa có thể được là 64 ký tự.</string>
     <string lang="vi" key="PASSWORD_HIDDENVOL_HELP">Xin chọn một mật mã cho tập đĩa ẩn.</string>
     <string lang="vi" key="PASSWORD_HIDDEN_OS_HELP">Xin chọn một mật mã cho hệ điều hành ẩn (nghĩa là cho tập đĩa ẩn).</string>
@@ -597,11 +620,26 @@
     <string lang="vi" key="PASSWORD_WRONG_AUTOMOUNT">Mật mã không đúng hoặc không tìm được tập đĩa VeraCrypt nào cả.</string>
     <string lang="vi" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">Tập tin khóa/mật mã không đúng hoặc không tìm được tập đĩa VeraCrypt nào cả.</string>
     <string lang="vi" key="PASSWORD_WRONG_CAPSLOCK_ON">\n\nCảnh báo: Caps Lock đang bật. Chuyện này có thể làm cho bạn nhập mật mã của bạn không đúng.</string>
+    <string lang="en" key="PIM_CHANGE_WARNING">Remember Number to Mount Volume</string>
+    <string lang="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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="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>
+    <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="vi" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\nLưu ý: Nếu bạn thử nạp một phân vùng nằm trong một ổ đĩa hệ thống được mã hóa mà không có chứng thực tiền khởi động hoặc nạp một phân vùng hệ thống được mã hóa của hệ điều hành không đang chạy, bạn có thể làm vậy bằng cách chọn 'Hệ thống' &gt; 'Nạp lên mà Không có Chứng thực Tiền Khởi động'.</string>
     <string lang="vi" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">Trong phương thức này, bạn không thể nạp lên một phân vùng nằm trong một ổ đĩa mà một phần của nó nằm trong phạm vi chính của việc mã hóa hệ thống hoạt động.\n\nTrước khi bạn có thể nạp phân vùng này trong phương thức này lên, bạn cần khởi động một hệ điều hành được cài đặt trong một ổ đĩa khác (được mã hóa hay không) hoặc khởi động một hệ điều hành không được mã hóa.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <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>
@@ -701,11 +739,18 @@
     <string lang="vi" key="FOR_MORE_INFO_ON_PARTITIONS">Để có thêm hướng dẫn làm sao cấu tạo và quản lý các phân vùng, xin tham khảo tài liệu được cung cấp với hệ điều hành của bạn hoặc liên lạc ban hỗ trợ kỹ thuật từ nhà cung cấp máy điện toán của bạn để xin giúp đỡ.</string>
     <string lang="vi" key="SYSTEM_PARTITION_NOT_ACTIVE">Lỗi: Hệ điều hành đang chạy không được cài đặt trong phân vùng khởi động (phân vùng hoạt động đầu tiên). Chuyện này không được hỗ trợ.</string>
     <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="vi" key="CANT_ACCESS_VOL">Lỗi: Không thể truy cập tập đĩa được!\n\nĐảm bảo là tập đĩa được chọn đã có, và nó không được nạp hoặc đang được dùng bởi hệ thống hoặc một ứng dụng, và bạn có quyền đọc/viết cho tập đĩa, và nó không được bảo vệ viết.</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="vi" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Lỗi: Không thể truy cập tập đĩa và/hay thu thập tin tức về tập đĩa được.\n\nĐảm bảo là tập đĩa được chọn đã có, và nó không đang được dùng bởi hệ thống hoặc các ứng dụng, và bạn có quyền đọc/viết cho tập đĩa, và nó không được bảo vệ viết.</string>
     <string lang="vi" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Lỗi: Không thể truy cập tập đĩa và/hay thu thập tin tức về tập đĩa được. Đảm bảo là tập đĩa được chọn đã có, và nó không đang được dùng bởi hệ thống hoặc các ứng dụng, và bạn có quyền đọc/viết cho tập đĩa, và nó không được bảo vệ viết.\n\nNếu vấn đề vẫn còn, theo những bước bên dưới có thể giúp được.</string>
     <string lang="vi" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">Một lỗi đã ngăn cản VeraCrypt mã hóa phân vùng. Xin giải quyết bất cứ vấn đề nào đã được báo trước và sau đó thử lại. Nếu vấn đề vẫn còn, theo những bước bên dưới có thể giúp được.</string>
     <string lang="vi" key="INPLACE_ENC_GENERIC_ERR_RESUME">Một lỗi đã ngăn cản VeraCrypt bắt đầu lại quá trình mã hóa phân vùng.\n\nXin giải quyết bất cứ vấn đề nào đã được báo trước và sau đó thử bắt đầu quá trình lại lần nữa. Lưu ý là tập đĩa không thể được nạp cho đến khi nó mã hóa hoàn toà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="vi" key="CANT_DISMOUNT_OUTER_VOL">Lỗi: Không thể tháo tập đĩa bên ngoài xuống được!\n\nTập đĩa không thể được tháo xuống nếu nó có chứa những tập tin hoặc thư mục đang được dùng bởi một chương trình hay hệ thống.\n\nXin chọn bất cứ chương trình nào có thể đang dùng những tập tin hoặc thư mục trong tập đĩa và nhấn Thử lại.</string>
     <string lang="vi" key="CANT_GET_OUTER_VOL_INFO">Lỗi: Không thể thu thập tin tức về tập đĩa bên ngoài được!\nCấu tạo tập đĩa không thể tiếp tục.</string>
     <string lang="vi" key="CANT_ACCESS_OUTER_VOL">Lỗi: Không thể truy cập tập đĩa bên ngoài được! Cấu tạo tập đĩa không thể tiếp tục.</string>
@@ -790,7 +835,7 @@
     <string lang="vi" key="TC_INSTALLER_IS_RUNNING">Bộ cài đặt của VeraCrypt hiện đang chạy trong hệ thống này và đang thi hành hay chuẩn bị việc cài đặt hay cập nhật VeraCrypt. Trước khi bạn tiến hành, xin chờ cho nó chấm dứt hoặc đóng nó lại. Nếu bạn không đóng nó được thì xin bắt đầu máy điện toán của bạn lại trước khi tiến hành.</string>
     <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 www.veracrypt.org).</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="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>
@@ -977,6 +1022,7 @@
     <string lang="vi" key="CONFIRM_EXIT_UNIVERSAL">Thoát ra không?</string>
     <string lang="vi" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt không có đủ tin tức để xác định là nên mã hóa hay giải mã.</string>
     <string lang="vi" key="CHOOSE_ENCRYPT_OR_DECRYPT_FINALIZE_DECRYPT_NOTE">VeraCrypt không có đủ tin tức để xác định là nên mã hóa hay giải mã.\n\nLưu ý: Nếu bạn giải mã phân vùng/ổ đĩa hệ thống trong môi trường tiền-khởi động thì bạn có thể cần phải kết thúc quá trình bằng cách nhấn Giải mã.</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="vi" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">Bạn có muốn gián đoạn và dời lại quá trình mã hóa của phân vùng/tập đĩa không?\n\nLưu ý: Nhớ là tập đĩa không thể được nạp lên cho đến khi nó được mã hóa hoàn toàn. Bạn sẽ có thể tiếp tục lại quá trình mã hóa và nó sẽ tiếp tục từ điểm mà nó bị ngừng. Bạn có thể làm thế, ví dụ như bằng cách chọn 'Tập đĩa' &gt; 'Tiếp tục lại Quá trình bị Gián đoạn' từ thanh trình đơn của cửa sổ chính của VeraCrypt.</string>
     <string lang="vi" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">Bạn có muốn gián đoạn và dời lại quá trình mã hóa của phân vùng/tập đĩa không?\n\nLưu ý: Bạn sẽ có thể tiếp tục lại quá trình mã hóa và nó sẽ tiếp tục từ điểm mà nó bị ngừng. Bạn có thể làm thế, ví dụ như bằng cách chọn 'Tập đĩa' &gt; 'Tiếp tục lại Quá trình bị Gián đoạn' từ thanh trình đơn của cửa sổ chính của VeraCrypt. Nếu bạn muốn vĩnh viễn chấm dứt hoặc đảo ngược quá trình mã hóa, chọn 'Hệ thống' &gt; 'Vĩnh viễn Giải mã Phân vùng/Ổ đĩa Hệ thống'.</string>
     <string lang="vi" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">Bạn có muốn gián đoạn và dời lại quá trình giải mã của phân vùng/ổ đĩa hệ thống không?\n\nLưu ý: Bạn sẽ có thể tiếp tục lại quá trình và nó sẽ tiếp tục từ điểm mà nó bị ngừng. Bạn có thể làm thế, ví dụ như bằng cách chọn 'Hệ thống' &gt; 'Tiếp tục lại Quá trình bị Gián đoạn' từ thanh trình đơn của cửa sổ chính của VeraCrypt. Nếu bạn muốn đảo ngược quá trình giải mã (và bắt đầu mã hóa), chọn 'Hệ thống' &gt; ' Mã hóa Phân vùng/Ổ đĩa Hệ thống'.</string>
@@ -986,6 +1032,7 @@
     <string lang="vi" key="FAILED_TO_START_WIPING">Lỗi: Không bắt đầu quá trình tẩy được.</string>
     <string lang="vi" key="INCONSISTENCY_RESOLVED">Mâu thuẫn đã được giải quyết.\n\n\n(Nếu bạn báo một lỗi liên quan đến chuyện này, xin bao gồm tin tức kỹ thuật sau đây trong phần báo lỗi:\n%hs)</string>
     <string lang="vi" key="UNEXPECTED_STATE">Lỗi: Trạng thái bất thường.\n\n\n(Nếu bạn báo một lỗi liên quan đến chuyện này, xin bao gồm tin tức kỹ thuật sau đây trong phần báo lỗi:\n%hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="vi" key="NOTHING_TO_RESUME">Không có quá trình/tác vụ nào để tiếp tục lại.</string>
     <string lang="vi" key="HIDVOL_PROT_BKG_TASK_WARNING">CẢNH BÁO: Tác vụ Phụ của VeraCrypt bị tắt. Sau khi bạn ra khỏi VeraCrypt, bạn sẽ không được thông báo nếu tổn hại cho tập đĩa ẩn được ngăn cản.\n\nLưu ý: Bạn có thể tắt Tác vụ Phụ bất cứ lúc nào bằng cách nhấn phải biểu tượng khay và chọn 'Thoát ra'.\n\nBật Tác vụ Phụ của VeraCrypt lên không?</string>
     <string lang="vi" key="LANG_PACK_VERSION">Phiên bản của bộ ngôn ngữ:  %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="vi" key="ERROR_MBR_PROTECTED">Không viết vào khu vực MBR được.\n\nBIOS của bạn có thể được cấu hình để bảo vệ khu vực MBR. Kiểm soát những thiết đặt BIOS của bạn (bấm F2, Xóa, hay Esc, sau khi bật máy của bạn lên) xem coi có bảo vệ MBR/chống vi-rút.</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="vi" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">Phiên bản cần có của Bộ tải Khởi nạp VeraCrypt hiện không đang được cài đặt. Việc này có thể ngăn cản sự lưu trữ một số thiết lập.</string>
     <string lang="vi" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Lưu ý: Trong một vài trường hợp, bạn có thể muốn ngăn cản một người (đối phương) đang nhìn xem bạn bắt đầu máy điện toán không cho biết là bạn sử dụng VeraCrypt. Những tùy chọn bên trên cho phép bạn làm như thế bằng cách đặc chế màn ảnh bộ tải khởi nạp của VeraCrypt. Nếu bạn bật tùy chọn thứ nhất lên, không có chữ nào sẽ được hiển thị bởi bộ tải khởi nạp (ngay cả khi bạn đánh mật mã sai vào). Máy điện toán sẽ nhìn giống như đang bị "ngưng đọng" trong lúc bạn có thể đánh mật mã của bạn vào. Thêm vào đó, một thông điệp riêng có thể được hiển thị để đánh lạc đối phương. Ví dụ như những thông điệp lỗi giả như "Mất hệ điều hành" (thường được hiển thị bởi bộ tải khởi nạp của Windows nếu nó không tìm được phân vùng khởi động Windows). Tuy nhiên, điều quan trọng cần lưu ý là nếu đối phương có thể phân tích nội dung của đĩa cứng thì họ vẫn có thể tìm được là nó có chứa bộ tải khởi nạp của VeraCrypt.</string>
     <string lang="vi" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">CẢNH BÁO: Xin nhớ là bạn bật tùy chọn này lên, bộ tải khởi nạp của VeraCrypt sẽ không hiển thị bất cứ chữ nào (ngay cả khi bạn đánh mật mã sai vào). Máy điện toán sẽ nhìn giống như đang bị "ngưng đọng" (không đáp lại) trong lúc bạn có thể đánh mật mã của bạn vào (con trỏ sẽ KHÔNG di chuyển và sẽ không có dấu sao nào được hiển thị khi bạn bấm một phím).\n\nBạn có chắc là bạn muốn bật tùy chọn này lên không?</string>
@@ -1034,8 +1082,11 @@
     <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="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>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="vi" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Các tập tin khóa hiện không được hỗ trợ cho việc mã hóa hệ thống.</string>
     <string lang="vi" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Cảnh báo: VeraCrypt không thể hồi phục bố trí bàn phím gốc được. Chuyện này có thể làm cho bạn đánh mật mã không đúng vào.</string>
     <string lang="vi" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">Lỗi: Không thể thiết đặt bố trí bàn phím cho VeraCrypt thành bố trí bàn phím căn bản của Mỹ được.\n\nLưu ý là mật mã cần được đánh vào trong môi trường tiền khởi động (trước khi Windows bắt đầu) lúc mà bố trí bàn phím Windows không phải của Mỹ không có sẵn. Vì vậy, mật mã phải luôn luôn được đánh vào dùng bố trí bàn phím căn bản của Mỹ.</string>
@@ -1120,6 +1171,7 @@
     <string lang="vi" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">Dự bị thử nghiệm đã được hoàn tất thành công.\n\nCẢNH BÁO: Xin lưu ý là nếu cung cấp điện bị gián đoạn đột ngột trong khi mã hóa dữ liệu hiện có tại chỗ, hoặc khi hệ điều hành bị hỏng do lỗi phần mềm hoặc trục trặc phần cứng trong khi VeraCrypt đang mã hóa dữ liệu hiện có tại chỗ, các phần của dữ liệu sẽ bị hỏng hoặc bị mất. Vì vậy, trước khi bắt đầu mã hóa, hãy chắc chắn rằng bạn đã sao lưu dự phòng dữ liệu mà bạn muốn mã hóa. Không thôi, xin sao lưu các tập tin ngay bây giờ (bạn có thể nhấn Hoãn, Sao lưu các tập tin, sau đó chạy VeraCrypt lại bất cứ lúc nào, và chọn 'Hệ thống'&gt; 'Tiếp tục lại quá trình bị gián đoạn' để bắt đầu mã hóa). \n\nKhi đã sẵn sàng, nhấn Mã hóa để bắt đầu mã hóa.</string>
     <string lang="vi" key="SYSENC_ENCRYPTION_PAGE_INFO">Bạn có thể nhấn vào Tạm dừng hoặc Trì hoãn bất cứ lúc nào để gây ngăn cản quá trình mã hóa hay giải mã, đi ra thuật này, khởi động lại hoặc tắt máy điện toán của bạn, và sau đó tiếp tục lại quá trình, mà sẽ tiếp tục từ chổ nó đã được ngừng lại. Để ngăn cản suy giảm khi hệ thống hoặc các ứng dụng viết hoặc đọc dữ liệu từ hệ thống ổ đĩa, tự động VeraCrypt đợi cho đến khi dữ liệu được viết hoặc đọc (xem Status trên) và sau đó tiếp tục tự động mã hóa hoặc giải mã.</string>
     <string lang="vi" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nBạn có thể nhấn vào Tạm dừng hoặc Trì hoãn bất cứ lúc nào để gây cắt đứt quá trình mã hóa, xuất khỏi thuật này, khởi động lại hoặc tắt máy điện toán của bạn, và sau đó tiếp tục lại quá trình, mà sẽ tiếp tục từ chổ nó đã ngừng lại. Lưu ý là tập đĩa không thể được gắn kết cho đến khi nó đã được mã hóa hoàn toà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="vi" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Hệ Thống Ẩn đã bắt đầu</string>
     <string lang="vi" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Hệ thống gốc</string>
     <string lang="vi" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows cấu tạo (thường, không cần sự hiểu biết hoặc sự đồng ý của bạn) các loại tập tin ghi bản, các tập tin tạm thời, v.v., trên phân vùng hệ thống. Nó cũng giúp để cho phần RAM được yên nghỉ và các tập tin phân trang nằm trên phân vùng hệ thống. Do đó, nếu một đối phương đã phân tích các tập tin được lưu trữ trên phân vùng mà hệ thống ban đầu (trong đó hệ thống ẩn là một bản sao) cư trú, họ có thể tìm hiểu, ví dụ như rằng bạn đã sử dụng thuật VeraCrypt ở trạng thái cấu tạo hệ thống ẩn, (mà có thể cho biết sự tồn tại của một hệ điều hành ẩn trên máy điện toán của bạn).\n\nĐể ngăn ngừa các vấn đề như vậy, VeraCrypt sẽ, trong các bước kế tiếp, an toàn xóa toàn bộ nội dung của phân vùng mà hệ thống ban đầu cư trú. Sau đó, để đạt được từ chối được chính đáng, bạn sẽ cần phải cài đặt một hệ thống mới trên phân vùng đó và mã hóa nó. Vì vậy bạn sẽ cấu tạo các hệ thống nghi trang và toàn bộ quá trình cấu tạo của hệ điều hành ẩn sẽ được hoàn thành.</string>
@@ -1159,7 +1211,7 @@
     <string lang="vi" key="HIDDEN_OS_CREATION_PREINFO_HELP">Trong các bước kế tiếp, VeraCrypt sẽ cấu tạo hệ điều hành ẩn bằng cách sao chép nội dung của phân vùng hệ thống thành tập đĩa ẩn (dữ liệu đã được sao chép sẽ được mã hóa ở bộ phận fly với một khoá mật mã khác với hệ sẽ được sử dụng cho các hệ thống hoạt động nghi trang).\n\nXin lưu ý là quá trình này sẽ được thực hiện trong môi trường tiền khởi động (trước khi bắt đầu Windows) và nó có thể mất một thời gian dài để hoàn thành; vài giờ hoặc thậm chí vài ngày (tùy thuộc vào kích cỡ của hệ thống phân vùng và về hiệu suất của máy điện toán của bạn).\n\n Bạn sẽ có thể làm gián đoạn quá trình,. tắt máy, khởi động hệ điều hành và sau đó tiếp tục lại quá trình. Tuy nhiên, nếu bạn làm gián đoạn nó, toàn bộ quá trình sao chép hệ thống sẽ phải bắt đầu từ đầu (vì nội dung của phân vùng hệ thống không phải thay đổi trong quá trình sao y).</string>
     <string lang="vi" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Bạn có muốn hủy bỏ toàn bộ quá trình sáng tạo của hệ điều hành ẩn?\n\nLưu ý: Bạn sẽ không thể tiếp tục lại quá trình nếu bạn hủy bỏ nó ngay bây giờ.</string>
     <string lang="vi" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">Bạn có muốn hủy bỏ hệ thống mã hóa thử trước?</string>
-    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="vi" key="SYS_DRIVE_NOT_ENCRYPTED">Các phân vùng/ổ đĩa hệ thống dường như không được mã hóa (một phần hoặc hoàn toàn).</string>
     <string lang="vi" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">Phân vùng/ổ đĩa hệ thống của bạn được mã hóa (một phần hoặc hoàn toàn). \n\nXin giải mã phân vùng/ổ đĩa hệ thống của bạn hoàn toàn trước khi tiến hành. Để làm như vậy, hãy chọn 'Hệ thống'&gt; 'Vĩnh viễn Giải mã Phân vùng/Ổ đĩa Hệ thống' từ thanh trình đơn của cửa sổ VeraCrypt chính.</string>
     <string lang="vi" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">Khi phân vùng/ổ đĩa hệ thống được mã hóa (một phần hoặc hoàn toàn), bạn không thể hạ cấp VeraCrypt xuống (nhưng bạn có thể nâng cấp hoặc cài đặt một phiên bản giống vậy lại).</string>
@@ -1176,6 +1228,8 @@
     <string lang="vi" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">Bạn đã lựa chọn các phân vùng/ổ đĩa hệ thống (hoặc phân vùng khởi động), nhưng phương thức trợ lý bạn lựa chọn chỉ thích hợp cho phân vùng/ổ đĩa vô hệ.\n\nBạn có muốn thiết lập chứng thực tiền khởi động (có nghĩa là bạn sẽ cần phải bỏ vào mật mã của bạn mỗi lần trước khi</string>
     <string lang="vi" key="CONFIRM_DECRYPT_SYS_DEVICE">Bạn có chắc bạn muốn vĩnh viễn giải mã phân vùng/ổ đĩa hệ thống?</string>
     <string lang="vi" key="CONFIRM_DECRYPT_SYS_DEVICE_CAUTION">LƯU Ý: Nếu bạn thường giải mã phân vùng/ổ đĩa hệ thống, dữ liệu không được mã hóa sẽ được ghi vào nó. \n\nBạn có thực sự chắc chắn muốn vĩnh viễn giải mã hệ thống phân vùng/ổ đĩa?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE">Are you sure you want to permanently decrypt the following volume?</string>
+    <string lang="en" key="CONFIRM_DECRYPT_NON_SYS_DEVICE_CAUTION">CAUTION: If you permanently decrypt the VeraCrypt volume, unencrypted data will be written to the disk.\n\nAre you really sure you want to permanently decrypt the selected volume?</string>
     <string lang="vi" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Cảnh báo: Nếu bạn sử dụng một thác của thuật toán mã hóa cho hệ thống mã hóa, bạn có thể gặp phải các vấn đề sau:\n\n1) Bộ tải Khởi nạp VeraCrypt lớn hơn thông thường và, do đó, không có đủ chổ trong phần đường đầu tiên của ổ đĩa cho sự sao lưu Bộ tải Khởi nạp VeraCrypt. Vì vậy, bất cứ khi nào nó bị tổn hại (mà thường xảy ra, ví dụ như, trong những qúa trình kích hoạt chống sao chép lậu được thiết kế một cách không thích hợp của những chương trình nhất định), bạn sẽ cần phải sử dụng Đĩa Cứu hộ VeraCrypt để khởi nạp hoặc để sửa chữa Bộ tải Khởi nạp VeraCrypt.\n\n2) Trên một số máy vi tính, sẽ cần thời gian lâu hơn để tiếp tục lại sự ngưng hoạt động.\n\nNhững vấn đề tiềm năng này có thể được phòng ngừa bằng cách chọn một thuật toán mã hóa phi-thác (ví dụ như AES).\n\n Bạn có chắc bạn muốn sử dụng một thác của thuật toán mã hóa?</string>
     <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>
@@ -1191,6 +1245,7 @@
     <string lang="vi" key="ENABLE_BAD_SECTOR_ZEROING">Lỗi: Nội dung của một hoặc nhiều khu trên đĩa không đọc được (có lẽ vì đĩa hư).\n\nQuá trình mã hóa tại chỗ chỉ có thể tiếp tục khi các khu được làm cho đọc được lại. VeraCrypt có thể thử làm cho các khu này đọc được bằng cách viết những số không vào các khu này (sau đó các khối toàn bằng số không này sẽ được mã hóa). Tuy nhiên, lưu ý là bất cứ dữ liệu nào được cất giữ trong các khu không đọc được sẽ bị mất đi. Nếu bạn muốn tránh chuyện đó thì bạn có thể thử phục hồi một phần của dữ liệu bị hư bằng các công cụ thích hợp của những hãng khác.\n\nLưu ý: Trong trường hợp các khu bị tổn hại (thay vì chỉ là dữ liệu bị hư và tổng kiểm có lỗi) đa số các loại thiết bị cất giữ tự phân phối lại các khu khi dữ liệu được viết vào chúng (thế thì dữ liệu đã có trong các khu bị tổn hại có thể vẫn không được mã hóa trong ổ đĩa).\n\nBạn có muốn VeraCrypt viết các số không vào những khu không đọc được không?</string>
     <string lang="vi" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Lỗi: Nội dung của một hoặc nhiều khu trên đĩa không đọc được (có lẽ vì đĩa hư).\n\nĐể có thể tiến hành việc giải mã, VeraCrypt sẽ phải bỏ nội dung của các khu không đọc được (nội dung sẽ được thay thế với dữ liệu ngẫu nhiên giả). Xin lưu ý là trước khi tiến hành, bạn có thể thử phục hồi một phần của bất cứ dữ liệu bị hư nào bằng các công cụ thích hợp của những hãng khác.\n\nBạn có muốn VeraCrypt bỏ những dữ liệu trong các khu không đọc được bây giờ không?</string>
     <string lang="vi" key="ZEROED_BAD_SECTOR_COUNT">Lưu ý: VeraCrypt đã thay thế nội dung của %I64d khu không đọc được (%s) với các khối chữ thường toàn bằng số không được mã hóa.</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="vi" key="ENTER_TOKEN_PASSWORD">Nhập vào mật mã/PIN cho hiệu bài '%s':</string>
     <string lang="vi" key="PKCS11_LIB_LOCATION_HELP">Để cho phép VeraCrypt truy cập một hiệu bài bảo mật hoặc thẻ smart, bạn cần cài đặt một thư viện nhu liệu của PKCS #11 cho hiệu bài hoặc thẻ smart trước. Một thư viện như thế có thể được cung cấp với thiết bị hoặc nó có sẵn để tải xuống từ trang web của nhà sản xuất hoặc những hãng khác.\n\nSau khi bạn cài đặt thư viện, bạn có thể tự chọn nó bằng cách nhấn 'Chọn Thư viện' hoặc bạn có thể để VeraCrypt tự động tìm và chọn nó bằng cách nhấn 'Tự động-Phát hiện Thư viện' (chỉ có thư mục hệ thống của Windows sẽ được kiếm).</string>
     <string lang="vi" key="SELECT_PKCS11_MODULE_HELP">Lưu ý: Để biết tên tập tin và vị trí của thư viện của PKCS #11 được cài đặt cho hiệu bài bảo mật hoặc thẻ smart của bạn, xin tham khảo tài liệu hướng dẫn được cung cấp với hiệu bài, thẻ, hoặc nhu liệu của hãng khác.\n\nNhấn 'OK' để chọn đường dẫn và tên tập tin.</string>

Translations/Language.zh-cn.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="zh-cn" name="简体中文" en-name="Chinese (Simplified)" version="1.0.0" translators="Barney Li" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <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_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>
@@ -57,6 +58,7 @@
     <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_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>
@@ -72,6 +74,7 @@
     <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="en" key="IDT_DRIVE_LETTER">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>
@@ -85,6 +88,8 @@
     <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="en" key="IDT_OLD_PIM">Volume 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_SINGLE_BOOT">如果计算机上只安装了一个操作系统请选择此项（尽管该操作系统下可能有多个用户）。</control>
@@ -142,6 +147,8 @@
     <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="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</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>
@@ -155,6 +162,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_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>
@@ -167,11 +175,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="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</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_FAVORITE_VOLUMES">VeraCrypt - 收藏加密卷</control>
     <control lang="zh-cn" key="IDD_HOTKEYS_DLG">VeraCrypt - 系统热键</control>
     <control lang="zh-cn" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,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_DEFAULT_KEYFILES">默认密钥文件...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">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>
@@ -243,6 +254,7 @@
     <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_VERSION_HISTORY">版本历史（联网）</control>
+    <control lang="en" key="IDM_VOLUME_EXPANDER">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>
@@ -485,7 +497,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_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="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="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>
@@ -523,6 +539,7 @@
     <string lang="zh-cn" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">获取系统加密状态时出错。</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="INIT_REGISTER">无法初始化应用程序。注册对话框类失败。</string>
     <string lang="zh-cn" key="INIT_RICHEDIT">错误：加载富文本编辑系统运行库失败。</string>
     <string lang="zh-cn" key="INTRO_TITLE">VeraCrypt 加密卷创建向导</string>
@@ -535,6 +552,7 @@
     <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="NEXT">下一步(&amp;N) &gt;</string>
     <string lang="zh-cn" key="FINALIZE">完成(&amp;F)</string>
     <string lang="zh-cn" key="INSTALL">安装(&amp;I)</string>
@@ -542,6 +560,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="DRIVE_LETTER_UNAVAILABLE">驱动器盘符不可用。</string>
     <string lang="zh-cn" key="NO_FILE_SELECTED">未选定文件！</string>
     <string lang="zh-cn" key="NO_FREE_DRIVES">无可用驱动器盘符。</string>
@@ -561,15 +580,18 @@
     <string lang="zh-cn" key="OVERWRITEPROMPT">警告：加密卷 '%hs' 已存在！\n\n重要：VeraCrypt 并不会加密这个文件，而是会删除这个文件。 您确定要删除这个文件并用一个新的 VeraCrypt 加密卷来替换它吗？</string>
     <string lang="zh-cn" key="OVERWRITEPROMPT_DEVICE">务必小心：当前存储在选择的 %s '%hs'%s 上的所有数据将会丢失（它们并不会被加密）！\n\n您一定要继续格式化吗？</string>
     <string lang="zh-cn" key="NONSYS_INPLACE_ENC_CONFIRM">警告：您在加密卷完全加密前不能加载此加密卷或者访问存储于该卷上的任何文件。\n\n您确认要开始加密选择的 %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 '%hs'%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_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="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_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="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>
@@ -578,6 +600,7 @@
     <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="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>
@@ -597,11 +620,26 @@
     <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="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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="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="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="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="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="PREV">&lt; 后退(&amp;B)</string>
     <string lang="zh-cn" key="RAWDEVICES">不能列表安装在系统上的 raw 设备！</string>
     <string lang="zh-cn" key="READONLYPROMPT">加密卷 '%hs' 存在，并且是只读的。您确定要替换它吗？</string>
@@ -701,11 +739,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="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="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="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="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>
@@ -790,7 +835,7 @@
     <string lang="zh-cn" key="TC_INSTALLER_IS_RUNNING">VeraCrypt 安装程序正在执行 VeraCrypt 的安装或更新。在您继续进行前，请等待其完成或者关闭它。如果您无法关闭它，请在继续之前重启计算机。</string>
     <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 官方网站 www.veracrypt.org 下载）。</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="EXTRACTING_VERB">正在释放</string>
     <string lang="zh-cn" key="CANNOT_READ_FROM_PACKAGE">不能从安装包中读取数据</string>
@@ -977,6 +1022,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_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>
@@ -986,6 +1032,7 @@
     <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="NOTHING_TO_RESUME">没有可以继续的进程/任务。</string>
     <string lang="zh-cn" key="HIDVOL_PROT_BKG_TASK_WARNING">警告： VeraCrypt 后台任务已禁用。在您退出 VeraCrypt 后，如果设置了阻止损坏隐藏加密卷，您也将无法得到提示。\n\n注意：您可以随时在通过右键单击 VeraCrypt 通知栏图标并 选择〖退出〗来停止后台任务。\n\n\n您要启用 VeraCrypt 后台任务吗？</string>
     <string lang="zh-cn" key="LANG_PACK_VERSION">语言包版本： %s</string>
@@ -1013,6 +1060,7 @@
     <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_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>
@@ -1034,8 +1082,11 @@
     <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="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="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>
@@ -1120,6 +1171,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="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>
@@ -1159,7 +1211,7 @@
     <string lang="zh-cn" key="HIDDEN_OS_CREATION_PREINFO_HELP">在下一步中，VeraCrypt 将会通过复制当前运行系统的内容到隐藏加密卷来创建隐形系统（被复制的数据将会使用与迷惑系统不同的密钥实时加密））。\n\n请注意该过程将会在启动验证环境中执行（在 Windows 启动前），并可能花费较长的时间；可能需要花费几个小时或者几天（依据系统分区容量和计算机性能而定，例如PM1.6GHz加密时大概的速度是0.5GB/分钟左右）。\n\n您可以中断该过程，关机，启动操作系统并在此之后继续该过程。然而，如果您中断该过程，整个复制系统的过程将会不得不从头开始（因为系统分区的内容在克隆期间必须不能被改变）。</string>
     <string lang="zh-cn" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">您想要取消整个隐形操作系统的创建过程吗？\n\n注意：如果现在取消，您将无法继续该进程。</string>
     <string lang="zh-cn" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">您要取消系统加密预测试吗？</string>
-    <string lang="zh-cn" key="BOOT_PRETEST_FAILED_RETRY">VeraCrypt 系统加密预测试失败。您希望再试一次吗？\n\n如果选择〖否〗，则启动验证组件将会被卸载。\n\n说明：如果 VeraCrypt 启动管理器在 Windows 启动前不要求您输入密码，这很可能是您的操作系统并没有从该系统所安装的驱动器引导的。目前并不支持这种方式。\n\n- 如果您使用了AES 之外的加密算法并且预测试失败了（并且您也输入了密码），这可能由有设计缺陷的驱动导致的。选择〖否〗，尝试再次加密系统分区/设备，但是要使用 AES 加密算法（该算法所需内存最低）。\n\n- 更多可能导致该错误的原因，请参考: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="zh-cn" key="BOOT_PRETEST_FAILED_RETRY">VeraCrypt 系统加密预测试失败。您希望再试一次吗？\n\n如果选择〖否〗，则启动验证组件将会被卸载。\n\n说明：如果 VeraCrypt 启动管理器在 Windows 启动前不要求您输入密码，这很可能是您的操作系统并没有从该系统所安装的驱动器引导的。目前并不支持这种方式。\n\n- 如果您使用了AES 之外的加密算法并且预测试失败了（并且您也输入了密码），这可能由有设计缺陷的驱动导致的。选择〖否〗，尝试再次加密系统分区/设备，但是要使用 AES 加密算法（该算法所需内存最低）。\n\n- 更多可能导致该错误的原因，请参考: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="zh-cn" key="SYS_DRIVE_NOT_ENCRYPTED">该系统分区/驱动器看起来没有被加密（或者是没有被完全加密）。</string>
     <string lang="zh-cn" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">您的系统分区/驱动器已加密（部分或完全加密）。\n\n请在继续进行前解密该系统分区/驱动器。操作步骤：在 VeraCrypt 主窗口的菜单中，选择〖系统〗-&gt;〖永久解密系统分区/驱动器〗。</string>
     <string lang="zh-cn" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">当系统分区/驱动器已部份或完全加密时，您不能降级 VeraCrypt 的版本（但是可以更新到新版本或者从新安装同一版本）。</string>
@@ -1176,6 +1228,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="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_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>
@@ -1191,6 +1245,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="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>

Translations/Language.zh-hk.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="zh-hk" name="繁體中文" en-name="Chinese (Hong Kong)" version="0.1.0" translators="PUN Chi Ho" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <control lang="zh-hk" key="IDC_KEY_FILES">密鑰文件(&amp;K)..</control>
     <control lang="zh-hk" key="IDC_LINK_HASH_INFO">關於混雜演算法的更多資訊（聯網）</control>
     <control lang="zh-hk" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">更多資訊（聯網）</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="zh-hk" key="IDC_MB">MB(&amp;M)</control>
     <control lang="zh-hk" key="IDC_MORE_INFO_ON_CONTAINERS">更多資訊（聯網）</control>
     <control lang="zh-hk" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">關於系統盤加密的更多資訊（聯網）</control>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <control lang="zh-hk" key="IDT_COLLECTING_RANDOM_DATA_NOTE">重要：在視窗範圍內儘量任意移動滑鼠。移動時間越長越好。這將會極大的增強密鑰的加密強度。之後點擊 '下一步' 按鈕繼續。</control>
     <control lang="zh-hk" key="IDT_CONFIRM">確認(&amp;C)：</control>
     <control lang="zh-hk" key="IDT_DONE">完成 </control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="zh-hk" key="IDT_ENCRYPTION_ALGO">加密演算法</control>
     <control lang="zh-hk" key="IDT_FILESYSTEM">檔系統 </control>
     <control lang="zh-hk" key="IDT_FILE_CONTAINER">創建一個檔類型的加密盤，推薦入門用戶使用。</control>
@@ -85,6 +88,8 @@
     <control lang="zh-hk" key="IDT_PARTIAL_POOL_CONTENTS">當前緩存內容（部分）</control>
     <control lang="zh-hk" key="IDT_PASS">密碼</control>
     <control lang="zh-hk" 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-hk" key="IDT_PROGRESS">進程：</control>
     <control lang="zh-hk" key="IDT_RANDOM_POOL">隨機緩衝：</control>
     <control lang="zh-hk" key="IDT_SINGLE_BOOT">如果電腦上只安裝了一個作業系統請選擇此項（儘管該作業系統下可能有多個用戶）。</control>
@@ -142,6 +147,8 @@
     <control lang="zh-hk" key="IDC_MOUNT_OPTIONS">載入選項(&amp;A)...</control>
     <control lang="zh-hk" key="IDC_MOUNT_READONLY">以唯讀模式載入加密卷(&amp;O)</control>
     <control lang="zh-hk" key="IDC_NEW_KEYFILES">密鑰文件...</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="zh-hk" key="IDC_PREF_BKG_TASK_ENABLE">啟用</control>
     <control lang="zh-hk" key="IDC_PREF_CACHE_PASSWORDS">在驅動記憶體中緩存密碼</control>
     <control lang="zh-hk" key="IDC_PREF_DISMOUNT_INACTIVE">自動卸載加密卷，在無數據讀寫動作下面時間後</control>
@@ -155,6 +162,7 @@
     <control lang="zh-hk" key="IDC_PREF_MOUNT_READONLY">以唯讀模式載入加密卷</control>
     <control lang="zh-hk" key="IDC_PREF_MOUNT_REMOVABLE">以可移動介質模式載入加密卷</control>
     <control lang="zh-hk" 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="en" key="IDC_PREF_USE_DIFF_TRAY_ICON_IF_VOL_MOUNTED">Use a different taskbar icon when there are mounted volumes</control>
     <control lang="zh-hk" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">自動卸載時擦除緩存的密碼</control>
     <control lang="zh-hk" key="IDC_PREF_WIPE_CACHE_ON_EXIT">退出時擦除緩存的密碼</control>
@@ -167,11 +175,12 @@
     <control lang="zh-hk" key="IDC_SHOW_PASSWORD_CHPWD_ORI">顯示密碼</control>
     <control lang="zh-hk" key="IDC_TRAVEL_OPEN_EXPLORER">為載入的加密卷打開資源管理器視窗(&amp;E)</control>
     <control lang="zh-hk" key="IDC_TRAV_CACHE_PASSWORDS">在驅動記憶體中緩存密碼(&amp;C)</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="zh-hk" key="IDC_UNMOUNTALL">全部卸載(&amp;S)</control>
     <control lang="zh-hk" key="IDC_VOLUME_PROPERTIES">加密卷屬性(&amp;V)...</control>
     <control lang="zh-hk" key="IDC_VOLUME_TOOLS">加密卷工具(&amp;T)...</control>
     <control lang="zh-hk" key="IDC_WIPE_CACHE">擦除緩存(&amp;W)</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="zh-hk" key="IDD_FAVORITE_VOLUMES">VeraCrypt - 收藏加密卷</control>
     <control lang="zh-hk" key="IDD_HOTKEYS_DLG">VeraCrypt - 系統熱鍵</control>
     <control lang="zh-hk" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +209,9 @@
     <control lang="zh-hk" key="IDM_CREATE_HIDDEN_OS">創建隱形作業系統...</control>
     <control lang="zh-hk" key="IDM_CREATE_RESCUE_DISK">創建應急盤...</control>
     <control lang="zh-hk" key="IDM_CREATE_VOLUME">創建加密卷...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="zh-hk" key="IDM_DEFAULT_KEYFILES">默認密鑰文件...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="zh-hk" key="IDM_ENCRYPT_SYSTEM_DEVICE">加密系統分區/驅動器...</control>
     <control lang="zh-hk" key="IDM_FAQ">常見問題（聯網）</control>
@@ -243,6 +254,7 @@
     <control lang="zh-hk" key="IDM_UNMOUNT_VOLUME">卸載所選加密卷</control>
     <control lang="zh-hk" key="IDM_VERIFY_RESCUE_DISK">驗證應急盤</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>
     <control lang="zh-hk" key="IDM_VOLUME_WIZARD">加密卷創建嚮導</control>
     <control lang="zh-hk" key="IDM_WEBSITE">官方網站（聯網）</control>
@@ -485,7 +497,11 @@
     <string lang="zh-hk" key="FORMAT_FINISHED_HELP">\n\nVeraCrypt 加密卷已被創建並準備就緒。要創建另外的 VeraCrypt 加密卷，請單擊“下一步”，否則請單擊“退出”按鈕。</string>
     <string lang="zh-hk" key="SYSENC_HIDDEN_VOL_FORMAT_FINISHED_HELP">\n\n隱藏的 VeraCrypt 加密卷已成功創建（隱形作業系統將包含在這個隱藏加密卷之內）。\n\n單擊 '下一步' 按鈕繼續。</string>
     <string lang="zh-hk" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">該卷已被成功加密</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="zh-hk" 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="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="zh-hk" key="FORMAT_FINISHED_INFO">VeraCrypt 加密卷已成功創建。</string>
     <string lang="zh-hk" key="FORMAT_FINISHED_TITLE">加密卷已創建</string>
     <string lang="zh-hk" key="FORMAT_HELP">重要：請在此視窗內隨機移動滑鼠，移動時間越長越好。這將會顯著增加密鑰的加密強度。之後點擊“格式化”按鈕創建加密卷。</string>
@@ -523,6 +539,7 @@
     <string lang="zh-hk" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">獲取系統加密狀態時出錯。</string>
     <string lang="zh-hk" key="INIT_SYS_ENC">不能初始化用於系統加密的程式元件。</string>
     <string lang="zh-hk" key="INIT_RAND">初始化亂數據生成器失敗！</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="zh-hk" key="INIT_REGISTER">無法初始化應用程式。註冊對話方塊類失敗。</string>
     <string lang="zh-hk" key="INIT_RICHEDIT">錯誤：載入富文本編輯系統運行庫失敗。</string>
     <string lang="zh-hk" key="INTRO_TITLE">VeraCrypt 加密卷創建嚮導</string>
@@ -535,6 +552,7 @@
     <string lang="zh-hk" key="MOUNT_BUTTON">載入(&amp;M)</string>
     <string lang="zh-hk" key="NEW_VERSION_REQUIRED">需要新版本的 VeraCrypt 來載入此加密卷。</string>
     <string lang="zh-hk" 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-hk" key="NEXT">下一步(&amp;N) &gt;</string>
     <string lang="zh-hk" key="FINALIZE">完成(&amp;F)</string>
     <string lang="zh-hk" key="INSTALL">安裝(&amp;I)</string>
@@ -542,6 +560,7 @@
     <string lang="zh-hk" key="NODRIVER">不能連接到 VeraCrypt 設備驅動。如果設備驅動不能運行則 VeraCrypt 也無法正常工作。\n\n請注意，由於 Windows 系統問題，在能夠正常載入設備驅動前可能需要登出或者重啟電腦。</string>
     <string lang="zh-hk" key="NOFONT">載入/準備字體時出錯。</string>
     <string lang="zh-hk" 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-hk" key="DRIVE_LETTER_UNAVAILABLE">驅動器盤符不可用。</string>
     <string lang="zh-hk" key="NO_FILE_SELECTED">未選定文件！</string>
     <string lang="zh-hk" key="NO_FREE_DRIVES">無可用驅動器盤符。</string>
@@ -561,15 +580,18 @@
     <string lang="zh-hk" key="OVERWRITEPROMPT">警告：加密卷 '%hs' 已存在！\n\n重要：VeraCrypt 並不會加密這個檔，而是會刪除這個檔。 您確定要刪除這個檔並用一個新的 VeraCrypt 加密卷來替換它嗎？</string>
     <string lang="zh-hk" key="OVERWRITEPROMPT_DEVICE">務必小心：當前存儲在選擇的 %s '%hs'%s 上的所有資料將會丟失（它們並不會被加密）！\n\n您一定要繼續格式化嗎？</string>
     <string lang="zh-hk" key="NONSYS_INPLACE_ENC_CONFIRM">警告：您在加密卷完全加密前不能載入此加密卷或者訪問存儲於該卷上的任何檔。\n\n您確認要開始加密選擇的 %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 '%hs'%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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="zh-hk" key="IDD_PCDM_CHANGE_PKCS5_PRF">設置首密鑰衍生演算法</string>
     <string lang="zh-hk" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">添加/移除 密鑰文件..</string>
     <string lang="zh-hk" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">從加密卷中移除所有密鑰檔</string>
     <string lang="zh-hk" 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-hk" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">重要：如果您不銷毀 VeraCrypt 應急盤，您的系統分區/驅動器仍然可以通過使用舊密碼解密（通過啟動 VeraCrypt 應急盤和輸入舊密碼）。您應當創建一個新的 VeraCrypt 應急盤，之後並銷毀原來的應急盤。\n\n您希望創建一個新的 VeraCrypt 應急盤嗎？</string>
     <string lang="zh-hk" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">請注意，VeraCrypt 應急盤仍然使用著早期的加密演算法。如果您覺的先前的加密演算法不安全，您應當創建一個新的 VeraCrypt 應急盤，之後並銷毀原來的應急盤。\n\n您希望創建一個新的 VeraCrypt 應急盤嗎？</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,6 +600,7 @@
     <string lang="zh-hk" key="PKCS5_PRF_CHANGED">首密鑰衍生演算法已成功設置。</string>
     <string lang="zh-hk" key="NONSYS_INPLACE_ENC_RESUME_PASSWORD_PAGE_HELP">請為您想要繼續就地加密的非系統分區輸入密碼 和/或 密鑰檔。\n\n\n注解：在您點擊 '下一步' 之後，VeraCrypt 將嘗試查找所有加密過程已被中斷的非系統分區（這些中斷加密的分區的 VeraCrypt 頭資訊可以使用提供的密碼 和/或 密鑰檔解密）。如果發現了多個此類的分區，您需要在下個步驟裏面選擇他們其中的一個。</string>
     <string lang="zh-hk" 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-hk" key="PASSWORD_HELP">選擇一個安全的密碼非常重要。您應該避免選取能夠在字典中查到的簡單辭彙（或是2、3、4 這類字元組合）作為密碼，也不應包含任何名字或生日，同時也不應該容易被猜到。安全的密碼應當包含隨機的大小寫字元、數位、以及類似 @ ^ = $ * + 這樣的特殊字元。我們推薦使用大於 20 個字元的密碼（越長越好）。最大的密碼長度為 64 個字元。</string>
     <string lang="zh-hk" key="PASSWORD_HIDDENVOL_HELP">請為隱藏加密卷選擇一個密碼。 </string>
     <string lang="zh-hk" key="PASSWORD_HIDDEN_OS_HELP">請為隱形作業系統設置一個密碼（即隱藏加密卷的密碼）。</string>
@@ -597,11 +620,26 @@
     <string lang="zh-hk" key="PASSWORD_WRONG_AUTOMOUNT">密碼不正確或不是 VeraCrypt 加密卷。</string>
     <string lang="zh-hk" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">密鑰 和/或 密碼不正確或不是 VeraCrypt 加密卷</string>
     <string lang="zh-hk" 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="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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="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>
+    <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-hk" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\n注意：如果您試圖載入不帶有啟動驗證的加密系統驅動器中的分區，或者是載入沒有運行的加密系統分區，您可以通過選擇 '系統' &gt; '以非啟動驗證方式載入'。</string>
     <string lang="zh-hk" 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="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>
@@ -701,11 +739,18 @@
     <string lang="zh-hk" key="FOR_MORE_INFO_ON_PARTITIONS">關於創建和管理分區的更多資訊，請參考您的作業系統所提供的文檔，或者聯繫您的電腦提供商以獲取技術支援。</string>
     <string lang="zh-hk" key="SYSTEM_PARTITION_NOT_ACTIVE">錯誤：當前運行的作業系統並未安裝到啟動分區（第一個作用/啟動的分區）。目前不支援此情況。</string>
     <string lang="zh-hk" 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="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="zh-hk" key="CANT_ACCESS_VOL">錯誤：不能訪問加密卷！\n\n請確認選擇的加密卷存在，並且該加密卷並未由系統或其他程式使用，同時該卷未被防寫，並且你具有對該卷的讀寫許可權，並且確認該卷未被防寫。</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="zh-hk" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">錯誤：不能訪問該卷 和/或 獲取該卷的資訊。\n\n請確認該卷存在，並且未被作業系統或其他程式佔用，以及您具有對該卷的讀寫許可權，同時還要保證該卷未被防寫。</string>
     <string lang="zh-hk" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">錯誤：不能訪問該卷 和/或 獲取該卷的資訊。請確認選擇的卷存在，並且未被作業系統或其他程式佔用，以及您具有對該卷的讀寫許可權，同時還要保證該卷未被防寫。\n\n如果此問題仍然存在，遵循以下步驟可能有所幫助。</string>
     <string lang="zh-hk" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">發生了一個錯誤，VeraCrypt 無法加密分區。請嘗試修復任何前面報告的問題之後再次嘗試。如果此問題依然存在，遵循以下步驟可能有所幫助。</string>
     <string lang="zh-hk" 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-hk" key="CANT_DISMOUNT_OUTER_VOL">錯誤：不能卸載外層加密卷！\n\n如果加密卷中的檔或檔夾被程式或被 系統使用，則該加密卷不能被鎖定。\n\n請關閉任何可能使用加密卷上檔或目錄 的程式，然後再點擊“重試”。</string>
     <string lang="zh-hk" key="CANT_GET_OUTER_VOL_INFO">錯誤：不能獲取外層加密卷的資訊！ 加密卷創建不能繼續。</string>
     <string lang="zh-hk" key="CANT_ACCESS_OUTER_VOL">錯誤：不能訪問外層加密卷！ 加密卷創建不能繼續。</string>
@@ -790,7 +835,7 @@
     <string lang="zh-hk" key="TC_INSTALLER_IS_RUNNING">VeraCrypt 安裝程式正在執行 VeraCrypt 的安裝或更新。在您繼續進行前，請等待其完成或者關閉它。如果您無法關閉它，請在繼續之前重啟電腦。</string>
     <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 官方網站 www.veracrypt.org 下載）。</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="EXTRACTING_VERB">正在釋放</string>
     <string lang="zh-hk" key="CANNOT_READ_FROM_PACKAGE">不能從安裝包中讀取資料</string>
@@ -977,6 +1022,7 @@
     <string lang="zh-hk" key="CONFIRM_EXIT_UNIVERSAL">退出嗎？</string>
     <string lang="zh-hk" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt 沒有足夠資訊確定是否要加密還是解密。</string>
     <string lang="zh-hk" 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-hk" key="NONSYS_INPLACE_ENC_DEFER_CONFIRM">您想要打斷和推遲對分區/驅動器的加密嗎？\n\n注意：要記住這個加密卷在完全加密前是不能被載入的。您可以繼續加密過程，加密則會在中斷的地方繼續。要達到這點，例如，可以從 VeraCrypt 主視窗的功能表中選擇 '加密卷' &gt; '繼續被中斷的過程'。</string>
     <string lang="zh-hk" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">您想要打斷和推遲對系統分區/驅動器的加密嗎？\n\n注意：您以後也可以從中斷位置恢復加密進程。操作如下：在 VeraCrypt 介面中選擇 '系統' &gt; '繼續被中斷的進程'。如果您想永久中止或回滾加密進程，請選擇 '系統' &gt; '永久解密系統分區/驅動器'。</string>
     <string lang="zh-hk" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">您想要打斷和推遲對系統分區/驅動器的加密嗎？\n\n注意：您以後也可以從中斷位置恢復加密進程。操作如下：在 VeraCrypt 介面中選擇 '系統' &gt; '繼續被中斷的進程'。如果您想回滾解密進程（和開始加密），選擇 '系統' &gt; '加密系統分區/驅動器'。</string>
@@ -986,6 +1032,7 @@
     <string lang="zh-hk" key="FAILED_TO_START_WIPING">錯誤：啟動擦除過程時失敗。</string>
     <string lang="zh-hk" key="INCONSISTENCY_RESOLVED">發現不一致性。\n\n\n（如果您使用此鏈結報告這個錯誤，請在報告中包含下面資訊： %hs）</string>
     <string lang="zh-hk" key="UNEXPECTED_STATE">錯誤：未知狀態。\n\n\n（如果您報告與之相關的 BUG，請在錯誤報告裏面包含下面的技術資訊： %hs）</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="zh-hk" key="NOTHING_TO_RESUME">沒有可以繼續的進程/任務。</string>
     <string lang="zh-hk" key="HIDVOL_PROT_BKG_TASK_WARNING">警告： VeraCrypt 後臺任務已禁用。在您退出 VeraCrypt 後，如果對隱藏加密卷的損壞企圖已被保護，您也將無法得到提示。\n\n注意：您可以隨時在通過右鍵單擊 VeraCrypt 的通知欄圖示並 選擇“退出”來停止後臺任務。\n\n\n您要啟用 VeraCrypt 後臺任務嗎？</string>
     <string lang="zh-hk" key="LANG_PACK_VERSION">語言包版本： %s</string>
@@ -1013,6 +1060,7 @@
     <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>
     <string lang="zh-hk" 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-hk" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">所要求版本的 VeraCrypt 啟動管理器當前沒有安裝。這可能導致某些設置無法保持。</string>
     <string lang="zh-hk" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">提示：在某些環境，您可能希望避免外人（攻擊者）在您啟動電腦時看到您使用了 VeraCrypt 加密了系統。上面的選項允許您自定義 VeraCrypt 啟動管理器螢幕比避免此類被識別的事情發生。如果您啟用了第一個選項，在啟動管理器螢幕不會顯示任何文本（即時您輸入錯誤的密碼也不會顯示）。在您輸入密碼的時候電腦看起來就像被凍結的一樣。此外，也可以顯示自定義的資訊來誤導攻擊者。例如，諸如 "Missing operating system" 之類的英文資訊（這個資訊在 Windows 啟動管理器未發現啟動分區的時候顯示）。然而，必須要提醒的是，如果攻擊者分析硬碟的內容，他仍然可以發現硬碟上存在 VeraCrypt 啟動管理器（譯注：此乃下策矣）。</string>
     <string lang="zh-hk" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">警告：請記住，如果您啟用此選項，VeraCrypt 啟動管理器不會顯示任何文本（即便是輸錯密碼了也不會顯示任何文本）。電腦在夠輸入密碼的時候電腦看起來就像被凍結（沒有回應）一樣（游標不會移動並且在按下按鍵的時候也不會顯示遮罩）。\n\n您確認要啟用此選項嗎？ </string>
@@ -1034,8 +1082,11 @@
     <string lang="zh-hk" 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-hk" key="GAP_BETWEEN_SYS_AND_HIDDEN_OS_PARTITION">警告：在系統分區和其後的第一個分區之間存在未分配空間。在您創建隱形作業系統之後，您必須不能在此未分配空間上創建任何新的分區，否則，隱形作業系統將無法啟動（直到刪除了這個新創建的分區）。</string>
     <string lang="zh-hk" 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="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="zh-hk" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">密鑰檔當前不支援用在系統加密中。</string>
     <string lang="zh-hk" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">警告：VeraCrypt 不能存儲原始鍵盤佈局。這可能導致您無法正確輸入密碼。</string>
     <string lang="zh-hk" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">錯誤：不能設置 VeraCrypt 鍵盤佈局為標準的美國鍵盤佈局。\n\n說明：在 Windows 啟動前的啟動驗證裏需要輸入密碼，此時非美國標準鍵盤佈局不可用。因此，密碼必須使用標準的美國鍵盤佈局輸入。</string>
@@ -1120,6 +1171,7 @@
     <string lang="zh-hk" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">預測試已經成功完成。\n\n警告：請注意，加密時如果遇到突然斷電、或者加密時由於軟硬體故障而導致的系統當機，有些資料可能會損壞或丟失。因此，在您開始加密前，請確認您已經備份了要加密的資料。如果您還沒有備份，請現在就備份這些資料（您可以點擊 '推遲'，備份檔案，之後在以後的任何時候再運行 VeraCrypt，並選擇 '系統' &gt; '繼續中斷的進程' 來啟動加密）。\n\n當一切準備就緒時，點擊 '加密' 開始執行加密過程。</string>
     <string lang="zh-hk" key="SYSENC_ENCRYPTION_PAGE_INFO">您可以在任何時候點擊 '暫停' 或者 '推遲' 以打斷加解密進程、退出嚮導、重啟或關閉電腦，並在以後繼續中斷的進程，繼續時將會從中斷位置開始。為防止對系統或程式讀寫系統驅動器造成的速度降低，VeraCrypt 會自動等待資料讀寫完畢後（參考上面的狀態）自動繼續加解密。</string>
     <string lang="zh-hk" 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-hk" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">隱形系統已啟動</string>
     <string lang="zh-hk" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">原始系統</string>
     <string lang="zh-hk" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows 會在系統分區創建（通常情況下，您並不知道或者同意）不同的日誌檔、暫存檔案等等。同時也會在系統分區存儲記憶體中的內容到休眠檔或虛擬記憶體頁面檔。因此，如果攻擊者分析原始系統（即隱形系統所克隆的系統來源）所在分區的檔，他可能會發現，例如，您使用過 VeraCrypt 嚮導的隱形系統創建模式（因此可能暗示電腦中存在隱形系統。\n\n要預防此類問題，在後面步驟中，VeraCrypt 將會安全擦除原始系統所在分區的所有內容。在此之後，為了達到隱蔽性，您需要在此分區上安裝新的作業系統並使用 VeraCrypt 加密它（即成為所謂的迷惑系統）。因此您將會創建完成這個迷惑系統並且整個隱形系統的創建過程也會相應的完成。</string>
@@ -1159,7 +1211,7 @@
     <string lang="zh-hk" key="HIDDEN_OS_CREATION_PREINFO_HELP">在下一步中，VeraCrypt 將會通過複製當前運行系統的內容到隱藏加密卷來創建隱形系統（被複製的資料將會使用與迷惑系統不同的密鑰即時加密））。\n\n請注意該過程將會在啟動驗證環境中執行（在 Windows 啟動前），並可能花費較長的時間；可能需要花費幾個小時或者幾天（依據系統分區容量和電腦性能而定，例如PM1.6GHz加密時大概的速度是0.5GB/分鐘左右）。\n\n您可以中斷該過程，關機，啟動作業系統並在此之後繼續該過程。然而，如果您中斷該過程，整個複製系統的過程將會不得不從頭開始（因為系統分區的內容在克隆期間必須不能被改變）。</string>
     <string lang="zh-hk" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">您想要取消整個隱形作業系統的創建過程嗎？\n\n注意：如果現在取消，您將無法繼續該進程。</string>
     <string lang="zh-hk" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">您要取消系統加密預測試嗎？</string>
-    <string lang="zh-hk" key="BOOT_PRETEST_FAILED_RETRY">VeraCrypt 系統加密預測試失敗。您希望再試一次嗎？\n\n如果您選擇 '否'，則啟動驗證元件將會被卸載。\n\n說明：如果 VeraCrypt 啟動管理器在 Windows 啟動前不要求您輸入密碼，這很可能是您的作業系統並沒有從該系統所安裝的驅動器引導的。目前並不支援這種方式。\n\n- 如果您使用了AES 之外的加密演算法並且預測試失敗了（並且您也輸入了密碼），這可能由有設計缺陷的驅動導致的。選擇 '否'，嘗試再次加密系統分區/設備，但是要使用 AES 加密演算法（該演算法所需記憶體最低）。\n\n- 更多可能導致該錯誤的原因，請參考: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="zh-hk" key="BOOT_PRETEST_FAILED_RETRY">VeraCrypt 系統加密預測試失敗。您希望再試一次嗎？\n\n如果您選擇 '否'，則啟動驗證元件將會被卸載。\n\n說明：如果 VeraCrypt 啟動管理器在 Windows 啟動前不要求您輸入密碼，這很可能是您的作業系統並沒有從該系統所安裝的驅動器引導的。目前並不支援這種方式。\n\n- 如果您使用了AES 之外的加密演算法並且預測試失敗了（並且您也輸入了密碼），這可能由有設計缺陷的驅動導致的。選擇 '否'，嘗試再次加密系統分區/設備，但是要使用 AES 加密演算法（該演算法所需記憶體最低）。\n\n- 更多可能導致該錯誤的原因，請參考: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="zh-hk" key="SYS_DRIVE_NOT_ENCRYPTED">該系統分區/驅動器看起來沒有被加密（或者是沒有被完全加密）。</string>
     <string lang="zh-hk" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">您的系統分區/驅動器已加密（部分或完全加密）。\n\n請在繼續進行前解密這個系統分區/驅動器。操作步驟：在 VeraCrypt 主視窗的功能表中，選擇 '系統' &gt; '永久解密系統分區/驅動器'。</string>
     <string lang="zh-hk" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">當系統分區/驅動器已被部份或完全加密時，您不能降級 VeraCrypt 的版本（但是可以更新到新版本或者從新安裝同一版本）。</string>
@@ -1176,6 +1228,8 @@
     <string lang="zh-hk" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">您已經選擇了系統分區/驅動器（或啟動分區），但是您選擇的嚮導模式只適用於非系統驅動器。\n\n您希望設置啟動驗證（意味著每次啟動 Windows 前，都需要您輸入密碼）和加密系統分區或驅動器嗎？</string>
     <string lang="zh-hk" key="CONFIRM_DECRYPT_SYS_DEVICE">您確認要永久解密系統分區/驅動器嗎？</string>
     <string lang="zh-hk" 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="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-hk" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">警告：如果您使用一種級聯演算法加密作業系統，您可能會遇到以下問題：\n\n1）VeraCrypt 啟動管理器體積偏大，因此驅動器的第一個柱面可能無法容納 VeraCrypt 啟動管理器的備份。因此，當其損壞的時候（這個可能會經常發生，例如，在某些程式的有設計缺陷的反隱私操作情況下），您將需要使用 VeraCrypt 應急盤啟動和修復 VeraCrypt 啟動管理器。\n\n2）在一些電腦上，導致休眠時間過長。\n\n這些潛在的問題可以通過選擇一種非級聯演算法（例如 AES）來預防。\n\n您真的要堅持繼續使用級聯演算法嗎？</string>
     <string lang="zh-hk" 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>
@@ -1191,6 +1245,7 @@
     <string lang="zh-hk" key="ENABLE_BAD_SECTOR_ZEROING">錯誤：磁片上一個或多個磁區的內容無法讀取（可能由於物理因素影響）。\n\n這些磁區能夠重新讀取之前，就地加密的過程將無法繼續。VeraCrypt 能夠嘗試向其中寫入 0 來使這些磁區可讀（之後這些 0 填充的區塊將會被加密）。然而，請注意存儲於這些不可讀磁區的資料將會丟失。如果您想要避免資料丟失，您可以使用適當的第三方軟體恢復這些損壞資料的某些部分。\n\n注意：在有物理損壞磁區的情況下（不同於簡單的資料損壞和校驗錯誤），當有資料試圖向這些損壞磁區寫入資料時，大多數存儲設備都會在內部為這些要寫入的資料重新分配磁區（因此當前損壞磁區上的現有資料可能在啟動器上仍然保持未加密狀態）。\n\n您希望 VeraCrypt 為這些不可讀磁區填充 0 嗎？</string>
     <string lang="zh-hk" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">錯誤：磁片上一個或多個磁區的內容無法讀取（可能由於物理因素影響）。\n\n為了能夠繼續加密，VeraCrypt 不得不放棄這些不可讀磁區（磁區內容會被偽亂數據填充）。請注意，在繼續進行之前，您可以嘗試使用適當的第三方軟體恢復任何損壞資料的一部分。\n\n您希望 VeraCrypt 廢棄不可讀磁區中的資料嗎？</string>
     <string lang="zh-hk" 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-hk" key="ENTER_TOKEN_PASSWORD">輸入口權杖 '%s' 的密碼/PIN:</string>
     <string lang="zh-hk" key="PKCS11_LIB_LOCATION_HELP">為允許 VeraCrypt 訪問安全口權杖或智慧卡，您首先需要為口權杖或智慧卡安裝一種 PKCS #11 運行庫，這些運行庫可能已經隨設備提供，或者可以從供應商網站或其他第三方網站上下載。\n\n在您安裝了運行庫後，您可以通過單擊 '選擇運行庫' 手動選擇，或者通過單擊 自動檢測運行庫' 來讓 VeraCrypt 發現和選擇（僅會搜索 Windows 系統目錄，比較耗費時間）。</string>
     <string lang="zh-hk" key="SELECT_PKCS11_MODULE_HELP">說明：對於安裝到您電腦上的 PKCS #11 運行庫以及安全口權杖或智慧卡的檔案名和位置，請參考口權杖、智慧卡的文檔，或者參考第三方軟體。\n\n單擊 '確定' 按鈕選擇路徑和檔案名。</string>

Translations/Language.zh-tw.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.0f">
+  <localization prog-version="1.12">
     <!-- Languages -->
     <language langid="zh-tw" name="繁體中文" en-name="Chinese (Taiwan)" version="0.1.0" translators="Barney Li, Simon Ma, ChangMing Hsu" />
     <!-- Fonts -->
@@ -48,6 +48,7 @@
     <control lang="zh-tw" key="IDC_KEY_FILES">金鑰檔案(&amp;K)...</control>
     <control lang="zh-tw" key="IDC_LINK_HASH_INFO">關於雜湊演算法的更多資訊</control>
     <control lang="zh-tw" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">更多訊息</control>
+    <control lang="en" key="IDC_LINK_PIM_INFO">Information on PIM</control>
     <control lang="zh-tw" key="IDC_MB">MB(&amp;M)</control>
     <control lang="zh-tw" key="IDC_MORE_INFO_ON_CONTAINERS">更多訊息</control>
     <control lang="zh-tw" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">關於系統磁區加密的更多訊息</control>
@@ -57,6 +58,7 @@
     <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="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>
@@ -72,6 +74,7 @@
     <control lang="zh-tw" key="IDT_COLLECTING_RANDOM_DATA_NOTE">重要：請在此視窗內僅可能的隨機移動滑鼠。移動時間越長越好。這將極為增強金鑰的加密強度。然後點 '下一步' 繼續。</control>
     <control lang="zh-tw" key="IDT_CONFIRM">確定(&amp;C)：</control>
     <control lang="zh-tw" key="IDT_DONE">完成</control>
+    <control lang="en" key="IDT_DRIVE_LETTER">Drive letter:</control>
     <control lang="zh-tw" key="IDT_ENCRYPTION_ALGO">加密演算法</control>
     <control lang="zh-tw" key="IDT_FILESYSTEM">檔案系統 </control>
     <control lang="zh-tw" key="IDT_FILE_CONTAINER">在檔案內建立虛擬加密磁碟。推薦給經驗不足的使用者使用。</control>
@@ -142,6 +145,8 @@
     <control lang="zh-tw" key="IDC_MOUNT_OPTIONS">掛載選項(&amp;A)...</control>
     <control lang="zh-tw" key="IDC_MOUNT_READONLY">以唯讀模式掛載加密區(&amp;O)</control>
     <control lang="zh-tw" key="IDC_NEW_KEYFILES">金鑰檔案...</control>
+    <control lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</control>
+    <control lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</control>	
     <control lang="zh-tw" key="IDC_PREF_BKG_TASK_ENABLE">啟用</control>
     <control lang="zh-tw" key="IDC_PREF_CACHE_PASSWORDS">在驅動記憶體中快取密碼</control>
     <control lang="zh-tw" key="IDC_PREF_DISMOUNT_INACTIVE">自動卸載加密區，在無資料讀寫活動以下時間後</control>
@@ -155,6 +160,7 @@
     <control lang="zh-tw" key="IDC_PREF_MOUNT_READONLY">以唯讀模式掛載加密區</control>
     <control lang="zh-tw" key="IDC_PREF_MOUNT_REMOVABLE">以卸除式媒體模式掛載加密區</control>
     <control lang="zh-tw" 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="en" key="IDC_PREF_USE_DIFF_TRAY_ICON_IF_VOL_MOUNTED">Use a different taskbar icon when there are mounted volumes</control>
     <control lang="zh-tw" key="IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT">自動卸載時清除快取的密碼</control>
     <control lang="zh-tw" key="IDC_PREF_WIPE_CACHE_ON_EXIT">結束時清除快取的密碼</control>
@@ -167,11 +173,12 @@
     <control lang="zh-tw" key="IDC_SHOW_PASSWORD_CHPWD_ORI">顯示密碼</control>
     <control lang="zh-tw" key="IDC_TRAVEL_OPEN_EXPLORER">為掛載的加密區打開檔案總管視窗(&amp;E)</control>
     <control lang="zh-tw" key="IDC_TRAV_CACHE_PASSWORDS">在動態記憶體中快取密碼(&amp;C)</control>
-	<control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
+    <control lang="en" key="IDC_TRUECRYPT_MODE">TrueCrypt Mode</control>
     <control lang="zh-tw" key="IDC_UNMOUNTALL">全部卸載(&amp;S)</control>
     <control lang="zh-tw" key="IDC_VOLUME_PROPERTIES">加密區內容(&amp;V)...</control>
     <control lang="zh-tw" key="IDC_VOLUME_TOOLS">加密區工具(&amp;T)...</control>
     <control lang="zh-tw" key="IDC_WIPE_CACHE">清除快取(&amp;W)</control>
+    <control lang="en" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Mount Parameters</control>
     <control lang="en" key="IDD_FAVORITE_VOLUMES">VeraCrypt - Favorite Volumes</control>
     <control lang="zh-tw" key="IDD_HOTKEYS_DLG">VeraCrypt - 系統快速鍵</control>
     <control lang="zh-tw" key="IDD_MOUNT_DLG">VeraCrypt</control>
@@ -200,7 +207,9 @@
     <control lang="en" key="IDM_CREATE_HIDDEN_OS">Create Hidden Operating System...</control>
     <control lang="zh-tw" key="IDM_CREATE_RESCUE_DISK">建立救援磁碟...</control>
     <control lang="zh-tw" key="IDM_CREATE_VOLUME">建立新的加密區...</control>
+    <control lang="en" key="IDM_DECRYPT_NONSYS_VOL">Permanently Decrypt...</control>
     <control lang="zh-tw" key="IDM_DEFAULT_KEYFILES">預設金鑰檔案...</control>
+    <control lang="en" key="IDM_DEFAULT_MOUNT_PARAMETERS">Default Mount Parameters...</control>
     <control lang="en" key="IDM_DONATE">Donate now...</control>
     <control lang="zh-tw" key="IDM_ENCRYPT_SYSTEM_DEVICE">加密系統分割區/磁碟機...</control>
     <control lang="zh-tw" key="IDM_FAQ">常見問題(線上)</control>
@@ -243,6 +252,7 @@
     <control lang="zh-tw" key="IDM_UNMOUNT_VOLUME">卸載選擇的加密區</control>
     <control lang="zh-tw" key="IDM_VERIFY_RESCUE_DISK">驗證救援磁碟</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>
     <control lang="zh-tw" key="IDM_VOLUME_WIZARD">加密區建立精靈</control>
     <control lang="zh-tw" key="IDM_WEBSITE">官方網站(線上)</control>
@@ -485,7 +495,11 @@
     <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>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_TITLE">Volume Fully Encrypted</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_TITLE">Volume Fully Decrypted</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_FINISHED_INFO">IMPORTANT: TO MOUNT THIS NEWLY CREATED VERACRYPT VOLUME AND TO ACCESS DATA STORED IN IT, CLICK 'Auto-Mount Devices' IN THE MAIN VERACRYPT WINDOW. After you enter the correct password (and/or supply correct keyfiles), the volume will be mounted to the drive letter you select from the list in the main VeraCrypt window (and you will be able to access the encrypted data via the selected drive letter).\n\nPLEASE REMEMBER OR WRITE DOWN THE ABOVE STEPS. YOU MUST FOLLOW THEM WHENEVER YOU WANT TO MOUNT THE VOLUME AND ACCESS DATA STORED IN IT. Alternatively, in the main VeraCrypt window, click 'Select Device', then select this partition/volume, and click 'Mount'.\n\nThe partition/volume has been successfully encrypted (it contains a fully encrypted VeraCrypt volume now) and is ready for use.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_INFO">The VeraCrypt volume has been successfully decrypted.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_DRIVE_LETTER_SEL_INFO">The VeraCrypt volume has been successfully decrypted.\n\nPlease select a drive letter that you wish to assign to the decrypted volume and then click Finish.\n\nIMPORTANT: Until a drive letter is assigned to the decrypted volume, you will not be able to access data stored on the volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DEC_FINISHED_NO_DRIVE_LETTER_AVAILABLE">Warning: To be able to access the decrypted data, a drive letter needs to be assigned to the decrypted volume. However, no drive letter is currently available.\n\nPlease vacate a drive letter (for example, by disconnecting a USB flash drive or external hard drive, etc.) and then click OK.</string>
     <string lang="zh-tw" key="FORMAT_FINISHED_INFO">VeraCrypt 加密區已成功建立。</string>
     <string lang="zh-tw" key="FORMAT_FINISHED_TITLE">加密區已建立</string>
     <string lang="zh-tw" key="FORMAT_HELP">重要：請在此視窗內僅可能的隨機移動滑鼠。移動時間越長越好。這將極為增強金鑰的加密強度。然後點 '格式化' 建立加密區。</string>
@@ -523,6 +537,7 @@
     <string lang="zh-tw" key="ERR_GETTING_SYSTEM_ENCRYPTION_STATUS">取得系統加密狀態時出錯。</string>
     <string lang="zh-tw" key="INIT_SYS_ENC">不能初始化用於系統加密的應用程式元件。</string>
     <string lang="zh-tw" key="INIT_RAND">初始化亂數資料產生器失敗！</string>
+    <string lang="en" key="CAPI_RAND">Windows Crypto API failed!\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs, Last Error = 0x%.8X)</string>
     <string lang="zh-tw" key="INIT_REGISTER">無法初始化應用程式。註冊對話方塊類別失敗。</string>
     <string lang="en" key="INIT_RICHEDIT">Error: Failed to load the Rich Edit system library.</string>
     <string lang="zh-tw" key="INTRO_TITLE">VeraCrypt 加密區建立精靈</string>
@@ -535,6 +550,7 @@
     <string lang="zh-tw" key="MOUNT_BUTTON">掛載(&amp;M)</string>
     <string lang="zh-tw" key="NEW_VERSION_REQUIRED">需要新版本的 VeraCrypt 來掛載此加密區。</string>
     <string lang="zh-tw" 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-tw" key="NEXT">下一步(&amp;N) &gt;</string>
     <string lang="zh-tw" key="FINALIZE">完成(&amp;F)</string>
     <string lang="zh-tw" key="INSTALL">安裝(&amp;I)</string>
@@ -542,6 +558,7 @@
     <string lang="zh-tw" key="NODRIVER">不能連接到 VeraCrypt 裝置驅動程式。如果裝置驅動程式不能執行則 VeraCrypt 也不能執行。\n\n請注意由於 Windows 問題，可能需要登出或者重啟系統才能正常載入裝置驅動程式。</string>
     <string lang="zh-tw" key="NOFONT">當載入/準備字型時出錯。</string>
     <string lang="zh-tw" 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-tw" key="DRIVE_LETTER_UNAVAILABLE">磁碟機代號不可用。</string>
     <string lang="zh-tw" key="NO_FILE_SELECTED">未選定檔案！</string>
     <string lang="zh-tw" key="NO_FREE_DRIVES">無可用磁碟機代號。</string>
@@ -561,15 +578,18 @@
     <string lang="zh-tw" key="OVERWRITEPROMPT">警告：加密區 '%hs' 已存在！\n\n重要：VeraCrypt 並不會加密這個檔案，而是會刪除這個檔案。您確定要刪除這個檔案並用一個新的 VeraCrypt 容器來取代它嗎？</string>
     <string lang="zh-tw" key="OVERWRITEPROMPT_DEVICE">小心：目前儲存在 %s '%hs'%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_BACKUP">WARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt.\n\nDo you have such a backup?</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_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_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>
+    <string lang="en" key="PIM">PIM</string>
     <string lang="zh-tw" key="IDD_PCDM_CHANGE_PKCS5_PRF">設定首金鑰推衍演算法</string>
     <string lang="zh-tw" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">新增/移除 金鑰檔案...</string>
     <string lang="zh-tw" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">從加密區中移除所有金鑰檔</string>
-    <string lang="en" key="PASSWORD_CHANGED">Password and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</string>
+    <string lang="en" key="PASSWORD_CHANGED">Password, PIM and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</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="en" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">IMPORTANT: If you did not destroy your VeraCrypt Rescue Disk, your system partition/drive can still be decrypted using the old password (by booting the VeraCrypt Rescue Disk and entering the old password). You should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</string>
     <string lang="zh-tw" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">要注意您的 VeraCrypt 救援磁碟仍然使用之前的加密演算法。如果您認為之前的加密演算法不安全，您應該建立一個新的 VeraCrypt 救援磁碟然後並銷毀原來的救援磁碟。\n\n您希望建立一個新的 VeraCrypt 救援磁碟嗎？要注意 VeraCrypt 將會使用之前的演算法。如果您認為之前的演算法不安全，您應該建立一片新的 VeraCrypt 救援磁碟且然後銷毀舊的。\n\n您想要建立一片新的 VeraCrypt 救援磁碟嗎？</string>
     <string lang="en" key="KEYFILES_NOTE">Any kind of file (for example, .mp3, .jpg, .zip, .avi) may be used as a VeraCrypt keyfile. Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</string>
@@ -578,7 +598,8 @@
     <string lang="zh-tw" key="PKCS5_PRF_CHANGED">首金鑰推導演算法已成功設定。</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_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="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 more than 20 characters (the longer, the better). The maximum possible length is 64 characters.</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="zh-tw" key="PASSWORD_HIDDENVOL_HELP">請為隱藏加密區選擇一個密碼。 </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_HELP">Please choose a password for the hidden operating system (i.e. for the hidden volume). </string>
     <string lang="en" key="PASSWORD_HIDDEN_OS_NOTE">IMPORTANT: The password that you choose for the hidden operating system in this step must be substantially different from the other two passwords (i.e. from the password for the outer volume and from the password for the decoy operating system).</string>
@@ -597,11 +618,26 @@
     <string lang="zh-tw" key="PASSWORD_WRONG_AUTOMOUNT">密碼不正確或不是 VeraCrypt 加密區。</string>
     <string lang="zh-tw" key="PASSWORD_OR_KEYFILE_WRONG_AUTOMOUNT">金鑰 和/或 密碼不正確或不是 VeraCrypt 加密區</string>
     <string lang="zh-tw" 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="en" key="PIM_HIDVOL_HOST_TITLE">Outer Volume PIM</string>
+    <string lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</string>
+    <string lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</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="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="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</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="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_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>
+    <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-tw" key="SYSENC_MOUNT_WITHOUT_PBA_NOTE">\n\n注意：如果您試圖掛載位於加密的系統磁碟機中的分割區而沒有啟動前置認證的話，或者是掛載作業系統沒有執行的加密的系統分割區，您可以經由選擇 "系統" &gt; "以沒有啟動前置認證的方式掛載" 來達到。</string>
     <string lang="en" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">In this mode, you cannot mount a partition located on a drive whose portion is within the key scope of active system encryption.\n\nBefore you can mount this partition in this mode, you need to either boot an operating system installed on a different drive (encrypted or unencrypted) or boot an unencrypted operating system.</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive).</string>
+    <string lang="en" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Warning: As the drive contains the VeraCrypt Boot Loader, it may be an entirely encrypted system drive. If it is, please note that VeraCrypt cannot decrypt an individual partition on an entirely encrypted system drive (you can decrypt only the entire system drive). If that is the case, you will be able to continue now but you will receive the 'Incorrect password' error message later.</string>
     <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>
@@ -701,11 +737,18 @@
     <string lang="en" key="FOR_MORE_INFO_ON_PARTITIONS">For information on how to create and manage partitions, please refer to the documentation supplied with your operating system or contact your computer vendor's technical support team for assistance.</string>
     <string lang="en" key="SYSTEM_PARTITION_NOT_ACTIVE">Error: The currently running operating system is not installed on the boot partition (first Active partition). This is not supported.</string>
     <string lang="en" key="CONFIRM_FAT_FOR_FILES_OVER_4GB">You indicated that you intend to store files larger than 4 GB in this VeraCrypt volume. However, you chose the FAT file system, on which files larger than 4 GB cannot be stored.\n\nAre you sure you want to format the volume as FAT?</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_BAD_VOL_FORMAT">Error: VeraCrypt does not support in-place decryption of legacy non-system volumes created by VeraCrypt 1.0b or earlier.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="NONSYS_INPLACE_DECRYPTION_CANT_DECRYPT_HID_VOL">Error: VeraCrypt cannot in-place decrypt a hidden VeraCrypt volume.\n\nNote: You can still decrypt files stored on the volume by copying/moving them to any unencrypted volume.</string>
+    <string lang="en" key="CONFIRM_VOL_CONTAINS_NO_HIDDEN_VOL">Warning: Note that VeraCrypt cannot in-place decrypt a volume that contains a hidden VeraCrypt volume (the hidden volume would be overwritten with pseudorandom data).\n\nPlease confirm that the volume you are about to decrypt contains no hidden volume.\n\nNote: If the volume contains a hidden volume but you do not mind losing the hidden volume, you can select Proceed (the outer volume will be safely decrypted).</string>
+    <string lang="en" key="VOL_CONTAINS_NO_HIDDEN_VOL">The volume does not contain any hidden volume. Proceed.</string>
+    <string lang="en" key="VOL_CONTAINS_A_HIDDEN_VOL">The volume contains a hidden volume. Cancel.</string>
     <string lang="zh-tw" key="CANT_ACCESS_VOL">錯誤：無法存取加密區！\n\n請確定選擇的加密區存在，該加密區並未由系統或其他程式使用，同時該區未被防寫，而且具有對該區的讀寫權限。</string>
+    <string lang="en" key="CANT_GET_VOL_INFO">Error: Cannot obtain volume properties.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL">Error: Cannot access the volume and/or obtain information about the volume.\n\nMake sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.</string>
     <string lang="en" key="INPLACE_ENC_CANT_ACCESS_OR_GET_INFO_ON_VOL_ALT">Error: Cannot access the volume and/or obtain information about the volume. Make sure that the selected volume exists, that it is not being used by the system or applications, that you have read/write permission for the volume, and that it is not write-protected.\n\nIf the problem persists, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_ALT_STEPS">An error prevented VeraCrypt from encrypting the partition. Please try fixing any previously reported problems and then try again. If the problems persist, it might help to follow the below steps.</string>
     <string lang="en" key="INPLACE_ENC_GENERIC_ERR_RESUME">An error prevented VeraCrypt from resuming the process of encryption of the partition.\n\nPlease try fixing any previously reported problems and then try resuming the process again. Note that the volume cannot be mounted until it has been fully encrypted.</string>
+    <string lang="en" key="INPLACE_DEC_GENERIC_ERR">An error prevented VeraCrypt from decrypting the volume. Please try fixing any previously reported problems and then try again if possible.</string>
     <string lang="zh-tw" key="CANT_DISMOUNT_OUTER_VOL">錯誤：無法卸載外層加密區！\n\n如果加密區中的檔案或資料夾被程式或系統使用，則該加密區無法被鎖定。\n\n請關閉任何可能使用加密區上檔案或目錄的程式，然後再選取 '重試'。</string>
     <string lang="zh-tw" key="CANT_GET_OUTER_VOL_INFO">錯誤：不能獲得外層加密區的訊息！ 加密區建立不能繼續。</string>
     <string lang="zh-tw" key="CANT_ACCESS_OUTER_VOL">錯誤：無法存取外層加密區！加密區建立無法繼續。</string>
@@ -790,7 +833,7 @@
     <string lang="en" key="TC_INSTALLER_IS_RUNNING">VeraCrypt Installer is currently running on this system and performing or preparing installation or update of VeraCrypt. Before you proceed, please wait for it to finish or close it. If you cannot close it, please restart your computer before proceeding.</string>
     <string lang="zh-tw" key="INSTALL_FAILED">安裝失敗。</string>
     <string lang="zh-tw" key="UNINSTALL_FAILED">移除失敗。</string>
-    <string lang="zh-tw" key="DIST_PACKAGE_CORRUPTED">這發行包裝檔已經損壞。請試著再下載一次(最好從 VeraCrypt 官方網站 www.veracrypt.org 下載)。</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="EXTRACTING_VERB">正在解壓縮</string>
     <string lang="zh-tw" key="CANNOT_READ_FROM_PACKAGE">不能從包裝檔中讀取資料</string>
@@ -977,6 +1020,7 @@
     <string lang="zh-tw" key="CONFIRM_EXIT_UNIVERSAL">結束嗎？</string>
     <string lang="zh-tw" key="CHOOSE_ENCRYPT_OR_DECRYPT">VeraCrypt 沒有足夠的訊息確定是否加密還是解密了。</string>
     <string lang="zh-tw" 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="zh-tw" key="SYSTEM_ENCRYPTION_DEFER_CONFIRM">您想要中斷和延緩對系統分割區/磁碟機的加密操作嗎？\n\n注意：您以後也可以從中斷點恢復操作。您可以這樣做，舉例來說，經由在 VeraCrypt 主視窗選單中選擇 "系統" &gt; "恢復被中斷的操作"。如果您想永久終止或返回加密操作，選擇 "系統" &gt; "永久解密系統分割區/磁碟機..."。</string>
     <string lang="zh-tw" key="SYSTEM_DECRYPTION_DEFER_CONFIRM">您想要中斷和延緩對系統分割區/磁碟機的解密操作嗎？\n\n注意：您以後也可以從中斷點恢復操作。您可以這樣做，舉例來說，經由在 VeraCrypt 主視窗選單中選擇 "系統" &gt; "恢復被中斷的操作"。如果您想返回解密操作(並開始加密)，選擇 "系統" &gt; "加密系統分割區/磁碟機..."。</string>
@@ -986,6 +1030,7 @@
     <string lang="en" key="FAILED_TO_START_WIPING">Error: Failed to start the process of wiping.</string>
     <string lang="zh-tw" key="INCONSISTENCY_RESOLVED">解決不一致性。\n\n\n(如果您報告錯誤與這個有關，請在報告中包含下面技術訊息： %hs)</string>
     <string lang="en" key="UNEXPECTED_STATE">Error: Unexpected state.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n%hs)</string>
+    <string lang="en" key="NO_SYS_ENC_PROCESS_TO_RESUME">There is no interrupted process of encryption/decryption of the system partition/drive to resume.\n\nNote: If you want to resume an interrupted process of encryption/decryption of a non-system partition/volume, select 'Volumes' &gt; 'Resume Interrupted Process'.</string>
     <string lang="zh-tw" key="NOTHING_TO_RESUME">沒有可以恢復的操作/工作。</string>
     <string lang="zh-tw" key="HIDVOL_PROT_BKG_TASK_WARNING">警告：VeraCrypt 背景工作已停用。在您結束 VeraCrypt 後，如果對隱藏加密區的損壞被阻止時，您也將無法得到提示。\n\n注意：您可以隨時在 VeraCrypt 的圖示按右鍵並選擇 "結束" 來停止背景工作。\n\n\n您要啟用 VeraCrypt 背景工作嗎？</string>
     <string lang="zh-tw" key="LANG_PACK_VERSION">語言檔案版本： %s</string>
@@ -1013,6 +1058,7 @@
     <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>
     <string lang="zh-tw" key="ERROR_MBR_PROTECTED">寫入 MBR 磁扇區時失敗。\n\n您的 BIOS 可能設定為保護 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="en" key="BOOT_LOADER_VERSION_INCORRECT_PREFERENCES">The required version of the VeraCrypt Boot Loader is currently not installed. This may prevent some of the settings from being saved.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_HELP">Note: In some situations, you may wish to prevent a person (adversary) that is watching you start the computer from knowing that you use VeraCrypt. The above options allow you to do that by customizing the VeraCrypt boot loader screen. If you enable the first option, no texts will be displayed by the boot loader (not even when you enter the wrong password). The computer will appear to be "frozen" while you can type your password. In addition, a custom message can be displayed to mislead the adversary. For example, fake error messages such as "Missing operating system" (which is normally displayed by the Windows boot loader if it finds no Windows boot partition). It is, however, important to note that if the adversary can analyze the content of the hard drive, he can still find out that it contains the VeraCrypt boot loader.</string>
     <string lang="en" key="CUSTOM_BOOT_LOADER_MESSAGE_PROMPT">WARNING: Please keep in mind that if you enable this option, the VeraCrypt boot loader will not display any texts (not even when you enter the wrong password). The computer will appear to be "frozen" (unresponsive) while you can type your password (the cursor will NOT move and no asterisk will be displayed when you press a key).\n\nAre you sure you want to enable this option?</string>
@@ -1034,8 +1080,11 @@
     <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="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>
-	<string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 7.x series</string>
+    <string lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</string>
+    <string lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</string>	  
+    <string lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</string>
+    <string lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</string>
+    <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
     <string lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</string>
     <string lang="zh-tw" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">&gt;警告：VeraCrypt 不能回復原始鍵盤配置。這可能導致您輸入不正確的密碼。</string>
     <string lang="zh-tw" key="CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION">錯誤：不能設定 VeraCrypt 鍵盤配置為標準美式鍵盤配置。\n\n要注意在啟動前置環境(Windows 啟動前)需要輸入密碼，這時非標準美式鍵盤配置是無法使用的。因此，密碼必須總是使用標準美式鍵盤配置輸入。</string>
@@ -1120,6 +1169,7 @@
     <string lang="en" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">The pretest has been successfully completed.\n\nWARNING: Please note that if power supply is suddenly interrupted while encrypting existing data in place, or when the operating system crashes due to a software error or hardware malfunction while VeraCrypt is encrypting existing data in place, portions of the data will be corrupted or lost. Therefore, before you start encrypting, please make sure that you have backup copies of the files you want to encrypt. If you do not, please back up the files now (you can click Defer, back up the files, then run VeraCrypt again anytime, and select 'System' &gt; 'Resume Interrupted Process' to start encrypting).\n\nWhen ready, click Encrypt to start encrypting.</string>
     <string lang="en" key="SYSENC_ENCRYPTION_PAGE_INFO">You can click Pause or Defer anytime to interrupt the process of encryption or decryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. To prevent slowdown when the system or applications write or read data from the system drive, VeraCrypt automatically waits until the data is written or read (see Status above) and then automatically continues encrypting or decrypting.</string>
     <string lang="en" key="NONSYS_INPLACE_ENC_ENCRYPTION_PAGE_INFO">\n\nYou can click Pause or Defer anytime to interrupt the process of encryption, exit this wizard, restart or shut down your computer, and then resume the process, which will continue from the point it was stopped. Note that the volume cannot be mounted until it has been fully encrypted.</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="en" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Hidden System Started</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO_TITLE">Original System</string>
     <string lang="en" key="SYSENC_HIDDEN_OS_WIPE_INFO">Windows creates (typically, without your knowledge or consent) various log files, temporary files, etc., on the system partition. It also saves the content of RAM to hibernation and paging files located on the system partition. Therefore, if an adversary analyzed files stored on the partition where the original system (of which the hidden system is a clone) resides, he might find out, for example, that you used the VeraCrypt wizard in the hidden-system-creation mode (which might indicate the existence of a hidden operating system on your computer).\n\nTo prevent such issues, VeraCrypt will, in the next steps, securely erase the entire content of the partition where the original system resides. Afterwards, in order to achieve plausible deniability, you will need to install a new system on the partition and encrypt it. Thus you will create the decoy system and the whole process of creation of the hidden operating system will be completed.</string>
@@ -1159,7 +1209,7 @@
     <string lang="en" key="HIDDEN_OS_CREATION_PREINFO_HELP">In the next steps, VeraCrypt will create the hidden operating system by copying the content of the system partition to the hidden volume (data being copied will be encrypted on the fly with an encryption key different from the one that will be used for the decoy operating system).\n\nPlease note that the process will be performed in the pre-boot environment (before Windows starts) and it may take a long time to complete; several hours or even several days (depending on the size of the system partition and on the performance of your computer).\n\nYou will be able to interrupt the process, shut down your computer, start the operating system and then resume the process. However, if you interrupt it, the entire process of copying the system will have to start from the beginning (because the content of the system partition must not change during cloning).</string>
     <string lang="en" key="CONFIRM_CANCEL_HIDDEN_OS_CREATION">Do you want to cancel the entire process of creation of the hidden operating system?\n\nNote: You will NOT be able to resume the process if you cancel it now.</string>
     <string lang="zh-tw" key="CONFIRM_CANCEL_SYS_ENC_PRETEST">您要取消系統加密預先測試嗎？</string>
-    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: http://www.veracrypt.org/docs/?s=troubleshooting</string>
+    <string lang="en" key="BOOT_PRETEST_FAILED_RETRY">The VeraCrypt system encryption pretest failed. Do you want to try again?\n\nIf you select 'No', the pre-boot authentication component will be uninstalled.\n\nNotes:\n\n- If the VeraCrypt Boot Loader did not ask you to enter the password before Windows started, it is possible that your operating system does not boot from the drive on which it is installed. This is not supported.\n\n- If you used an encryption algorithm other than AES and the pretest failed (and you entered the password), it may have been caused by an inappropriately designed driver. Select 'No', and try encrypting the system partition/drive again, but use the AES encryption algorithm (which has the lowest memory requirements).\n\n- For more possible causes and solutions, see: https://veracrypt.codeplex.com/wikipage?title=Troubleshooting</string>
     <string lang="zh-tw" key="SYS_DRIVE_NOT_ENCRYPTED">系統分割區/磁碟機看起來並未加密(即沒有部分也沒有完全加密)。</string>
     <string lang="zh-tw" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED">您的系統分割區/磁碟機已加密(部分或完全加密)。\n\n請在繼續進行之前解密這個系統分割區/磁碟機。要這樣做，在 VeraCrypt 主視窗的選單中，選擇 "系統" &gt; "永久解密系統分割區/磁碟機"。</string>
     <string lang="en" key="SETUP_FAILED_BOOT_DRIVE_ENCRYPTED_DOWNGRADE">When the system partition/drive is encrypted (partially or fully), you cannot downgrade VeraCrypt (but you can upgrade it or reinstall the same version).</string>
@@ -1176,6 +1226,8 @@
     <string lang="en" key="CONFIRM_SYSTEM_ENCRYPTION_MODE">You have selected the system partition/drive (or the boot partition), but the wizard mode you selected is suitable only for non-system partitions/drives.\n\nDo you want to set up pre-boot authentication (which means that you will need to enter your password each time before Windows boots/starts) and encrypt the system partition/drive?</string>
     <string lang="zh-tw" key="CONFIRM_DECRYPT_SYS_DEVICE">您確認要永久解密系統分割區/磁碟機嗎？</string>
     <string lang="zh-tw" 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="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="en" key="CONFIRM_CASCADE_FOR_SYS_ENCRYPTION">Warning: If you use a cascade of ciphers for system encryption, you may encounter the following issues:\n\n1) The VeraCrypt Boot Loader is larger than normal and, therefore, there is not enough space in the first drive track for a backup of the VeraCrypt Boot Loader. Hence, whenever it gets damaged (which often happens, for example, during inappropriately designed anti-piracy activation procedures of certain programs), you will need to use the VeraCrypt Rescue Disk to boot or to repair the VeraCrypt Boot Loader.\n\n2) On some computers, resuming from hibernation takes longer.\n\nThese potential issues can be prevented by choosing a non-cascade encryption algorithm (e.g. AES).\n\nAre you sure you want to use a cascade of ciphers?</string>
     <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>
@@ -1191,6 +1243,7 @@
     <string lang="en" key="ENABLE_BAD_SECTOR_ZEROING">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nThe process of in-place encryption can continue only when the sectors have been made readable again. VeraCrypt can attempt to make these sectors readable by writing zeros to the sectors (subsequently such all-zero blocks would be encrypted). However, note that any data stored in the unreadable sectors will be lost. If you want to avoid that, you can attempt to recover portions of the corrupted data using appropriate third-party tools.\n\nNote: In case of physically damaged sectors (as opposed to mere data corruption and checksum errors) most types of storage devices internally reallocate the sectors when data is attempted to be written to them (so the existing data in the damaged sectors may remain unencrypted on the drive).\n\nDo you want VeraCrypt to write zeroes to unreadable sectors?</string>
     <string lang="en" key="DISCARD_UNREADABLE_ENCRYPTED_SECTORS">Error: Content of one or more sectors on the disk cannot be read (probably due to a physical defect).\n\nTo be able to proceed with decryption, VeraCrypt will have to discard the content of the unreadable sectors (the content will be replaced with pseudorandom data). Please note that, before proceeding, you can attempt to recover portions of any corrupted data using appropriate third-party tools.\n\nDo you want VeraCrypt to discard data in the unreadable sectors now?</string>
     <string lang="en" key="ZEROED_BAD_SECTOR_COUNT">Note: VeraCrypt has replaced the content of %I64d unreadable sectors (%s) with encrypted all-zero plaintext blocks.</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="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>

src/Boot/Windows/Bios.h

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #ifndef TC_HEADER_Boot_Bios

src/Boot/Windows/BootCommon.h

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #ifndef TC_HEADER_Boot_BootCommon
@@ -13,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 0x010e
+#define TC_RESCUE_DISK_UPGRADE_NOTICE_MAX_VERSION 0x0111
 
 #define TC_BOOT_LOADER_AREA_SIZE (TC_BOOT_LOADER_AREA_SECTOR_COUNT * TC_SECTOR_SIZE_BIOS)
 

src/Boot/Windows/BootConfig.cpp

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008-2012 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #include "BootConfig.h"

src/Boot/Windows/BootConfig.h

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008-2009 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #ifndef TC_HEADER_Boot_BootConfig

src/Boot/Windows/BootConsoleIo.cpp

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008-2009 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #include "Platform.h"
@@ -305,6 +309,11 @@ bool IsPrintable (char c)
 	return c >= ' ' && c <= '~';
 }
 
+bool IsDigit (char c)
+{
+	return c >= '0' && c <= '9';
+}
+
 
 int GetString (char *buffer, size_t bufferSize)
 {

src/Boot/Windows/BootConsoleIo.h

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #ifndef TC_HEADER_Boot_BootConsoleIo
@@ -48,6 +52,7 @@ int GetString (char *buffer, size_t bufferSize);
 void InitVideoMode ();
 bool IsKeyboardCharAvailable ();
 bool IsPrintable (char c);
+bool IsDigit (char c);
 void Print (const char *str);
 void Print (uint32 number);
 void Print (const uint64 &number);

src/Boot/Windows/BootCrt.asm

@@ -1,9 +1,13 @@
 ;
-; Copyright (c) 2008 TrueCrypt Developers Association. All rights reserved.
+; Derived from source code of TrueCrypt 7.1a, which is
+; Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+; by the TrueCrypt License 3.0.
 ;
-; Governed by the TrueCrypt License 3.0 the full text of which is contained in
-; the file License.txt included in TrueCrypt binary and source code distribution
-; packages.
+; 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 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.
 ;
 
 .MODEL tiny, C

src/Boot/Windows/BootDebug.cpp

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #include "Platform.h"

src/Boot/Windows/BootDebug.h

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #ifndef TC_HEADER_Boot_BootDebug

src/Boot/Windows/BootDefs.h

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008-2009 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #ifndef TC_HEADER_Boot_BootDefs

src/Boot/Windows/BootDiskIo.cpp

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008-2011 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #include "Bios.h"

src/Boot/Windows/BootDiskIo.h

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008-2011 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #ifndef TC_HEADER_Boot_BootDiskIo

src/Boot/Windows/BootEncryptedIo.cpp

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #include "Crypto.h"

src/Boot/Windows/BootEncryptedIo.h

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #ifndef TC_HEADER_Boot_BootEncryptionIo

src/Boot/Windows/BootMain.cpp

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008-2011 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #include "Crc.h"
@@ -60,6 +64,7 @@ static void PrintMainMenu ()
 		return;
 
 	Print ("    Keyboard Controls:\r\n");
+	Print ("    [F5]   Hide/Show Password\r\n");
 	Print ("    [Esc]  ");
 
 #ifndef TC_WINDOWS_BOOT_RESCUE_DISK_MODE
@@ -144,11 +149,14 @@ static int AskSelection (const char *options[], size_t optionCount)
 }
 
 
-static byte AskPassword (Password &password)
+static byte AskPassword (Password &password, int& pim)
 {
 	size_t pos = 0;
 	byte scanCode;
 	byte asciiCode;
+	byte hidePassword = 1;
+
+	pim = 0;
 
 	Print ("Enter password");
 	Print (PreventNormalSystemBoot ? " for hidden system:\r\n" : ": ");
@@ -164,7 +172,7 @@ static byte AskPassword (Password &password)
 			PrintEndl();
 
 			password.Length = pos;
-			return scanCode;
+			break;
 
 		case TC_BIOS_KEY_BACKSPACE:
 			if (pos > 0)
@@ -178,6 +186,66 @@ static byte AskPassword (Password &password)
 			}
 			continue;
 
+		case TC_BIOS_KEY_F5:
+			hidePassword ^= 0x01;
+			continue;
+
+		default:
+			if (scanCode == TC_BIOS_KEY_ESC || IsMenuKey (scanCode))
+			{
+				burn (password.Text, sizeof (password.Text));
+				ClearBiosKeystrokeBuffer();
+
+				PrintEndl();
+				return scanCode;
+			}
+		}
+
+		if (TC_BIOS_KEY_ENTER == scanCode)
+			break;
+
+		if (!IsPrintable (asciiCode) || pos == MAX_PASSWORD)
+		{
+			Beep();
+			continue;
+		}
+
+		password.Text[pos++] = asciiCode;
+		if (hidePassword) asciiCode = '*';
+		if (pos < MAX_PASSWORD)
+			PrintChar (asciiCode);
+		else
+			PrintCharAtCursor (asciiCode);
+	}
+
+	pos = 0;
+	Print ("PIM: ");
+
+	while (true)
+	{
+		asciiCode = GetKeyboardChar (&scanCode);
+
+		switch (scanCode)
+		{
+		case TC_BIOS_KEY_ENTER:
+			ClearBiosKeystrokeBuffer();
+			PrintEndl();
+
+			return TC_BIOS_KEY_ENTER;
+
+		case TC_BIOS_KEY_BACKSPACE:
+			if (pos > 0)
+			{
+				if (pos < MAX_PIM)
+					PrintBackspace();
+				else
+					PrintCharAtCursor (' ');
+
+				--pos;
+				pim /= 10;
+			}
+			continue;
+
 		default:
 			if (scanCode == TC_BIOS_KEY_ESC || IsMenuKey (scanCode))
 			{
@@ -189,17 +257,19 @@ static byte AskPassword (Password &password)
 			}
 		}
 
-		if (!IsPrintable (asciiCode) || pos == MAX_PASSWORD)
+		if (!IsDigit (asciiCode) || pos == MAX_PIM)
 		{
 			Beep();
 			continue;
 		}
 
-		password.Text[pos++] = asciiCode;
-		if (pos < MAX_PASSWORD)
-			PrintChar ('*');
+		pim = 10*pim + (asciiCode - '0');
+		pos++;
+
+		if (pos < MAX_PIM)
+			PrintChar (asciiCode);
 		else
-			PrintCharAtCursor ('*');
+			PrintCharAtCursor (asciiCode);
 	}
 }
 
@@ -230,7 +300,7 @@ static void ExecuteBootSector (byte drive, byte *sectorBuffer)
 }
 
 
-static bool OpenVolume (byte drive, Password &password, CRYPTO_INFO **cryptoInfo, uint32 *headerSaltCrc32, bool skipNormal, bool skipHidden)
+static bool OpenVolume (byte drive, Password &password, int pim, CRYPTO_INFO **cryptoInfo, uint32 *headerSaltCrc32, bool skipNormal, bool skipHidden)
 {
 	int volumeType;
 	bool hiddenVolume;
@@ -261,7 +331,7 @@ static bool OpenVolume (byte drive, Password &password, CRYPTO_INFO **cryptoInfo
 		if (ReadSectors (SectorBuffer, drive, headerSec, 1) != BiosResultSuccess)
 			continue;
 
-		if (ReadVolumeHeader (!hiddenVolume, (char *) SectorBuffer, &password, cryptoInfo, nullptr) == ERR_SUCCESS)
+		if (ReadVolumeHeader (!hiddenVolume, (char *) SectorBuffer, &password, pim, cryptoInfo, nullptr) == ERR_SUCCESS)
 		{
 			// Prevent opening a non-system hidden volume
 			if (hiddenVolume && !((*cryptoInfo)->HeaderFlags & TC_HEADER_FLAG_ENCRYPTED_SYSTEM))
@@ -315,21 +385,25 @@ static bool CheckMemoryRequirements ()
 static bool MountVolume (byte drive, byte &exitKey, bool skipNormal, bool skipHidden)
 {
 	BootArguments *bootArguments = (BootArguments *) TC_BOOT_LOADER_ARGS_OFFSET;
-	int incorrectPasswordCount = 0;
+	int incorrectPasswordCount = 0, pim = 0;
 
 	EraseMemory (bootArguments, sizeof (*bootArguments));
 
 	// Open volume header
 	while (true)
 	{
-		exitKey = AskPassword (bootArguments->BootPassword);
+		exitKey = AskPassword (bootArguments->BootPassword, pim);
 
 		if (exitKey != TC_BIOS_KEY_ENTER)
 			return false;
 
-		if (OpenVolume (BootDrive, bootArguments->BootPassword, &BootCryptoInfo, &bootArguments->HeaderSaltCrc32, skipNormal, skipHidden))
-			break;
+		Print ("Verifying password...");
 
+		if (OpenVolume (BootDrive, bootArguments->BootPassword, pim, &BootCryptoInfo, &bootArguments->HeaderSaltCrc32, skipNormal, skipHidden))
+		{
+			Print ("OK\r\n");
+			break;
+		}
 		if (GetShiftFlags() & TC_BIOS_SHIFTMASK_CAPSLOCK)
 			Print ("Warning: Caps Lock is on.\r\n");
 
@@ -351,6 +425,7 @@ static bool MountVolume (byte drive, byte &exitKey, bool skipNormal, bool skipHi
 	bootArguments->BootLoaderVersion = VERSION_NUM;
 	bootArguments->CryptoInfoOffset = (uint16) BootCryptoInfo;
 	bootArguments->CryptoInfoLength = sizeof (*BootCryptoInfo);
+	bootArguments->Flags = (((uint32)pim) << 16);
 
 	if (BootCryptoInfo->hiddenVolume)
 		bootArguments->HiddenSystemPartitionStart = PartitionFollowingActive.StartSector << TC_LB_SIZE_BIT_SHIFT_DIVISOR;
@@ -799,7 +874,7 @@ askBadSectorSkip:
 		CRYPTO_INFO *headerCryptoInfo = crypto_open();
 		while (ReadSectors (SectorBuffer, drive, headerSector, 1) != BiosResultSuccess);
 
-		if (ReadVolumeHeader (TRUE, (char *) SectorBuffer, &bootArguments->BootPassword, NULL, headerCryptoInfo) == 0)
+		if (ReadVolumeHeader (TRUE, (char *) SectorBuffer, &bootArguments->BootPassword, (int) (bootArguments->Flags >> 16), NULL, headerCryptoInfo) == 0)
 		{
 			DecryptBuffer (SectorBuffer + HEADER_ENCRYPTED_DATA_OFFSET, HEADER_ENCRYPTED_DATA_SIZE, headerCryptoInfo);
 
@@ -952,7 +1027,8 @@ static void RepairMenu ()
 						uint32 masterKeyScheduleCrc;
 
 						Password password;
-						byte exitKey = AskPassword (password);
+						int pim;
+						byte exitKey = AskPassword (password, pim);
 
 						if (exitKey != TC_BIOS_KEY_ENTER)
 							goto abort;
@@ -963,7 +1039,7 @@ static void RepairMenu ()
 						ReleaseSectorBuffer();
 
 						// Restore volume header only if the current one cannot be used
-						if (OpenVolume (TC_FIRST_BIOS_DRIVE, password, &cryptoInfo, nullptr, false, true))
+						if (OpenVolume (TC_FIRST_BIOS_DRIVE, password, pim, &cryptoInfo, nullptr, false, true))
 						{
 							validHeaderPresent = true;
 							masterKeyScheduleCrc = GetCrc32 (cryptoInfo->ks, sizeof (cryptoInfo->ks));
@@ -973,7 +1049,7 @@ static void RepairMenu ()
 						AcquireSectorBuffer();
 						CopyMemory (TC_BOOT_LOADER_BUFFER_SEGMENT, 0, SectorBuffer, TC_LB_SIZE);
 
-						if (ReadVolumeHeader (TRUE, (char *) SectorBuffer, &password, &cryptoInfo, nullptr) == 0)
+						if (ReadVolumeHeader (TRUE, (char *) SectorBuffer, &password, pim, &cryptoInfo, nullptr) == 0)
 						{
 							if (validHeaderPresent)
 							{

src/Boot/Windows/BootMain.h

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #ifndef TC_HEADER_Boot_BootMain
@@ -12,7 +16,7 @@
 #include "TCdefs.h"
 #include "Platform.h"
 
-static byte AskPassword (Password &password);
+static byte AskPassword (Password &password, int& pim);
 static int AskSelection (const char *options[], size_t optionCount);
 static bool AskYesNo (const char *message);
 static byte BootEncryptedDrive ();

src/Boot/Windows/BootMemory.cpp

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #include "BootDefs.h"

src/Boot/Windows/BootMemory.h

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #include "Platform.h"

src/Boot/Windows/BootSector.asm

@@ -1,9 +1,13 @@
 ;
-; Copyright (c) 2008-2009 TrueCrypt Developers Association. All rights reserved.
+; Derived from source code of TrueCrypt 7.1a, which is
+; Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+; by the TrueCrypt License 3.0.
 ;
-; Governed by the TrueCrypt License 3.0 the full text of which is contained in
-; the file License.txt included in TrueCrypt binary and source code distribution
-; packages.
+; 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 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.
 ;
 
 .MODEL tiny

src/Boot/Windows/BootStrings.h

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #ifndef TC_HEADER_Boot_BootStrings

src/Boot/Windows/Decompressor.c

@@ -23,6 +23,7 @@
 */
 
 /* Adapted for TrueCrypt */
+/* Adapted for VeraCrypt */
 
 
 #define local static            /* for local function definitions */

src/Boot/Windows/IntFilter.cpp

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #include "Platform.h"

src/Boot/Windows/IntFilter.h

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #ifndef TC_HEADER_Boot_IntFilter

src/Boot/Windows/Makefile

@@ -1,10 +1,13 @@
 #
-# Copyright (c) 2008-2010 TrueCrypt Developers Association. All rights reserved.
-#
-# Governed by the TrueCrypt License 3.0 the full text of which is contained in
-# the file License.txt included in TrueCrypt binary and source code distribution
-# packages.
+# Derived from source code of TrueCrypt 7.1a, which is
+# Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+# 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 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.
 
 PROJ = BootLoader
 .SILENT:

src/Boot/Windows/Platform.cpp

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #include "Platform.h"

src/Boot/Windows/Platform.h

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008-2009 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #ifndef TC_HEADER_Boot_Platform

src/Build/Include/Makefile.inc

@@ -1,9 +1,13 @@
 #
-# Copyright (c) 2008 TrueCrypt Developers Association. All rights reserved.
+# Derived from source code of TrueCrypt 7.1a, which is
+# Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+# by the TrueCrypt License 3.0.
 #
-# Governed by the TrueCrypt License 3.0 the full text of which is contained in
-# the file License.txt included in TrueCrypt binary and source code distribution
-# packages.
+# 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 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.
 #
 
 $(NAME): $(NAME).a

src/Build/Resources/MacOSX/Info.plist.xml

@@ -27,7 +27,7 @@
 	<string>TRUE</string>
 
 	<key>CFBundleVersion</key>
-	<string>0</string>
+	<string>1.12.22</string>
 
 	<key>CFBundleShortVersionString</key>
 	<string>_VERSION_</string>
@@ -36,7 +36,7 @@
 	<string>VeraCrypt _VERSION_</string>
 
 	<key>LSRequiresCarbon</key>
-	<true/>
+	<false/>
 
 	<key>CSResourcesFileMapped</key>
 	<true/>

src/Build/build_veracrypt_linux.sh

@@ -1,3 +1,10 @@
+#
+# Copyright (c) 2013-2015 IDRIX
+# 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.
+#
+
 # Absolute path to this script
 SCRIPT=$(readlink -f "$0")
 # Absolute path this script is in
@@ -17,13 +24,24 @@ fi
 export WX_ROOT=$PARENTDIR/wxWidgets-3.0.2
 echo "Using wxWidgets sources in $WX_ROOT"
 
-# this will be the temporary wxWidgets directory
-export WX_BUILD_DIR=$PARENTDIR/wxBuild
-
 cd $SOURCEPATH
 
 echo "Building GUI version of VeraCrypt"
+
+# this will be the temporary wxWidgets directory
+export WX_BUILD_DIR=$PARENTDIR/wxBuildGui
+
 make WXSTATIC=1 wxbuild && make WXSTATIC=1 clean && make WXSTATIC=1
 
+# Uncomment below and comment line above to reuse existing wxWidgets build
+# make WXSTATIC=1 clean && make WXSTATIC=1
+
 echo "Building console version of VeraCrypt"
+
+# this will be the temporary wxWidgets directory
+export WX_BUILD_DIR=$PARENTDIR/wxBuildConsole
+
 make WXSTATIC=1 NOGUI=1 wxbuild && make WXSTATIC=1 NOGUI=1 clean && make WXSTATIC=1 NOGUI=1
+
+# Uncomment below and comment line above to reuse existing wxWidgets build
+# make WXSTATIC=1 NOGUI=1 clean && make WXSTATIC=1 NOGUI=1

src/Build/build_veracrypt_macosx.sh

@@ -1,3 +1,10 @@
+#
+# Copyright (c) 2013-2015 IDRIX
+# 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.
+#
+
 # Absolute path this script is in
 SCRIPTPATH=$(cd "$(dirname "$0")"; pwd)
 # source directory which contains the Makefile

src/Common/Apidrvr.h

@@ -1,12 +1,14 @@
 /*
  Legal Notice: Some portions of the source code contained in this file were
- derived from the source code of Encryption for the Masses 2.02a, which is
- Copyright (c) 1998-2000 Paul Le Roux and which is governed by the 'License
- Agreement for Encryption for the Masses'. Modifications and additions to
- the original source code (contained in this file) and all other portions
- of this file are Copyright (c) 2003-2010 TrueCrypt Developers Association
- and are governed by the TrueCrypt License 3.0 the full text of which is
- contained in the file License.txt included in TrueCrypt binary and source
+ derived from the source code of TrueCrypt 7.1a, which is 
+ Copyright (c) 2003-2012 TrueCrypt Developers Association and which is 
+ governed by the TrueCrypt License 3.0, also from the source code of
+ Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
+ and which is governed by the 'License Agreement for Encryption for the Masses' 
+ 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 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. */
 
 #pragma once
@@ -62,6 +64,7 @@
 #define TC_IOCTL_SET_SYSTEM_FAVORITE_VOLUME_DIRTY		TC_IOCTL (36)
 #define TC_IOCTL_REREAD_DRIVER_CONFIG					TC_IOCTL (37)
 #define TC_IOCTL_GET_SYSTEM_DRIVE_DUMP_CONFIG			TC_IOCTL (38)
+#define VC_IOCTL_GET_BOOT_LOADER_FINGERPRINT			TC_IOCTL (39)
 
 // Legacy IOCTLs used before version 5.0
 #define TC_IOCTL_LEGACY_GET_DRIVER_VERSION		466968
@@ -103,6 +106,9 @@ typedef struct
 	int pkcs5_prf;
 	int ProtectedHidVolPkcs5Prf;
 	BOOL bTrueCryptMode;
+	uint32 BytesPerPhysicalSector;
+	int VolumePim;
+	int ProtectedHidVolPim;
 } MOUNT_STRUCT;
 
 typedef struct
@@ -120,6 +126,7 @@ typedef struct
 	unsigned __int64 diskLength[26];
 	int ea[26];
 	int volumeType[26];	/* Volume type (e.g. PROP_VOL_TYPE_OUTER, PROP_VOL_TYPE_OUTER_VOL_WRITE_PREVENTED, etc.) */
+	BOOL truecryptMode[26];
 } MOUNT_LIST_STRUCT;
 
 typedef struct
@@ -141,6 +148,7 @@ typedef struct
 	unsigned __int64 totalBytesWritten;
 	int hiddenVolProtection;	/* Hidden volume protection status (e.g. HIDVOL_PROT_STATUS_NONE, HIDVOL_PROT_STATUS_ACTIVE, etc.) */
 	int volFormatVersion;
+	int volumePim;
 } VOLUME_PROPERTIES_STRUCT;
 
 typedef struct
@@ -239,6 +247,7 @@ typedef struct
 {
 	Password VolumePassword;
 	int pkcs5_prf;
+	int pim;
 } ReopenBootVolumeHeaderRequest;
 
 
@@ -248,6 +257,11 @@ typedef struct
 	char BootPrfAlgorithmName[256];
 } GetBootEncryptionAlgorithmNameRequest;
 
+typedef struct
+{
+	byte Fingerprint[WHIRLPOOL_DIGESTSIZE + SHA512_DIGESTSIZE];
+} BootLoaderFingerprintRequest;
+
 typedef struct
 {
 	wchar_t DevicePath[TC_MAX_PATH];

src/Common/BaseCom.cpp

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2007-2010 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #include <atlcomcli.h>
@@ -43,12 +47,27 @@ BOOL ComGetInstanceBase (HWND hWnd, REFCLSID clsid, REFIID iid, void **tcServer)
 	BOOL r;
 
 	if (IsUacSupported ())
-		r = CreateElevatedComObject (hWnd, clsid, iid, tcServer) == S_OK;
+	{
+		while (true)
+		{
+			r = CreateElevatedComObject (hWnd, clsid, iid, tcServer) == S_OK;
+			if (r)
+				break;
+			else
+			{
+				if (IDRETRY == ErrorRetryCancel ("UAC_INIT_ERROR", hWnd))
+					continue;
+				else
+					break;
+			}
+		}
+	}
 	else
+	{
 		r = CoCreateInstance (clsid, NULL, CLSCTX_LOCAL_SERVER, iid, tcServer) == S_OK;
-
-	if (!r)
-		Error ("UAC_INIT_ERROR", hWnd);
+		if (!r)
+			Error ("UAC_INIT_ERROR", hWnd);
+	}
 
 	return r;
 }
@@ -119,6 +138,7 @@ DWORD BaseCom::ReadWriteFile (BOOL write, BOOL device, BSTR filePath, BSTR *buff
 	try
 	{
 		auto_ptr <File> file (device ? new Device (string (szFilePathA.m_psz), !write) : new File (string (szFilePathA.m_psz), !write));
+		file->CheckOpened (SRC_POS);
 		file->SeekAt (offset);
 
 		if (write)

src/Common/BaseCom.h

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2007-2010 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #ifndef TC_HEADER_BASE_COM

src/Common/BootEncryption.h

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008-2010 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #ifndef TC_HEADER_Common_BootEncryption
@@ -22,10 +26,11 @@ namespace VeraCrypt
 	class File
 	{
 	public:
-		File () : Elevated (false), FileOpen (false), FilePointerPosition(0), Handle(NULL), IsDevice(false) { }
-		File (string path, bool readOnly = false, bool create = false);
-		~File () { Close(); }
+		File () : Elevated (false), FileOpen (false), FilePointerPosition(0), Handle(INVALID_HANDLE_VALUE), IsDevice(false), LastError(0) { }
+		File (string path,bool readOnly = false, bool create = false);
+		virtual ~File () { Close(); }
 
+		void CheckOpened (const char* srcPos) { if (!FileOpen) { SetLastError (LastError); throw SystemException (srcPos);} }
 		void Close ();
 		DWORD Read (byte *buffer, DWORD size);
 		void Write (byte *buffer, DWORD size);
@@ -38,13 +43,15 @@ namespace VeraCrypt
 		HANDLE Handle;
 		bool IsDevice;
 		string Path;
+		DWORD LastError;
 	};
 
 
 	class Device : public File
 	{
 	public:
-		Device (string path, bool readOnly = false);
+		Device (string path,bool readOnly = false);
+		virtual ~Device () {}
 	};
 
 
@@ -137,11 +144,12 @@ namespace VeraCrypt
 			DumpFilter
 		};
 
+		void SetParentWindow (HWND parent) { ParentWindow = parent; }
 		void AbortDecoyOSWipe ();
 		void AbortSetup ();
 		void AbortSetupWait ();
 		void CallDriver (DWORD ioctl, void *input = nullptr, DWORD inputSize = 0, void *output = nullptr, DWORD outputSize = 0);
-		int ChangePassword (Password *oldPassword, int old_pkcs5, Password *newPassword, int pkcs5, int wipePassCount, HWND hwndDlg);
+		int ChangePassword (Password *oldPassword, int old_pkcs5, int old_pim, Password *newPassword, int pkcs5, int pim, int wipePassCount, HWND hwndDlg);
 		void CheckDecoyOSWipeResult ();
 		void CheckEncryptionSetupResult ();
 		void CheckRequirements ();
@@ -154,6 +162,7 @@ namespace VeraCrypt
 		DWORD GetDriverServiceStartType ();
 		unsigned int GetHiddenOSCreationPhase ();
 		uint16 GetInstalledBootLoaderVersion ();
+		void GetInstalledBootLoaderFingerprint (byte fingerprint[WHIRLPOOL_DIGESTSIZE + SHA512_DIGESTSIZE]);
 		Partition GetPartitionForHiddenOS ();
 		bool IsBootLoaderOnDrive (char *devicePath);
 		BootEncryptionStatus GetStatus ();
@@ -161,19 +170,22 @@ namespace VeraCrypt
 		void GetVolumeProperties (VOLUME_PROPERTIES_STRUCT *properties);
 		SystemDriveConfiguration GetSystemDriveConfiguration ();
 		void Install (bool hiddenSystem);
+		void InstallBootLoader (Device& device, bool preserveUserConfig = false, bool hiddenOSCreation = false);
 		void InstallBootLoader (bool preserveUserConfig = false, bool hiddenOSCreation = false);
+		bool CheckBootloaderFingerprint (bool bSilent = false);
 		void InvalidateCachedSysDriveProperties ();
 		bool IsCDDrivePresent ();
 		bool IsHiddenSystemRunning ();
 		bool IsPagingFileActive (BOOL checkNonWindowsPartitionsOnly);
 		void PrepareHiddenOSCreation (int ea, int mode, int pkcs5);
-		void PrepareInstallation (bool systemPartitionOnly, Password &password, int ea, int mode, int pkcs5, const string &rescueIsoImagePath);
+		void PrepareInstallation (bool systemPartitionOnly, Password &password, int ea, int mode, int pkcs5, int pim, const string &rescueIsoImagePath);
 		void ProbeRealSystemDriveSize ();
 		void ReadBootSectorConfig (byte *config, size_t bufLength, byte *userConfig = nullptr, string *customUserMessage = nullptr, uint16 *bootLoaderVersion = nullptr);
 		uint32 ReadDriverConfigurationFlags ();
 		void RegisterBootDriver (bool hiddenSystem);
 		void RegisterFilterDriver (bool registerDriver, FilterType filterType);
 		void RegisterSystemFavoritesService (BOOL registerService);
+		void RegisterSystemFavoritesService (BOOL registerService, BOOL noFileHandling);
 		void RenameDeprecatedSystemLoaderBackup ();
 		bool RestartComputer (void);
 		void InitialSecurityChecksForHiddenOS ();
@@ -201,7 +213,7 @@ namespace VeraCrypt
 
 		void BackupSystemLoader ();
 		void CreateBootLoaderInMemory (byte *buffer, size_t bufferSize, bool rescueDisk, bool hiddenOSCreation = false);
-		void CreateVolumeHeader (uint64 volumeSize, uint64 encryptedAreaStart, Password *password, int ea, int mode, int pkcs5);
+		void CreateVolumeHeader (uint64 volumeSize, uint64 encryptedAreaStart, Password *password, int ea, int mode, int pkcs5, int pim);
 		string GetSystemLoaderBackupPath ();
 		uint32 GetChecksum (byte *data, size_t size);
 		DISK_GEOMETRY GetDriveGeometry (int driveNumber);

src/Common/Cache.c

@@ -1,12 +1,14 @@
 /*
  Legal Notice: Some portions of the source code contained in this file were
- derived from the source code of Encryption for the Masses 2.02a, which is
- Copyright (c) 1998-2000 Paul Le Roux and which is governed by the 'License
- Agreement for Encryption for the Masses'. Modifications and additions to
- the original source code (contained in this file) and all other portions
- of this file are Copyright (c) 2003-2008 TrueCrypt Developers Association
- and are governed by the TrueCrypt License 3.0 the full text of which is
- contained in the file License.txt included in TrueCrypt binary and source
+ derived from the source code of TrueCrypt 7.1a, which is 
+ Copyright (c) 2003-2012 TrueCrypt Developers Association and which is 
+ governed by the TrueCrypt License 3.0, also from the source code of
+ Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
+ and which is governed by the 'License Agreement for Encryption for the Masses' 
+ 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 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. */
 
 #include "Tcdefs.h"
@@ -21,7 +23,7 @@ Password CachedPasswords[CACHE_SIZE];
 int cacheEmpty = 1;
 static int nPasswordIdx = 0;
 
-int ReadVolumeHeaderWCache (BOOL bBoot, BOOL bCache, char *header, Password *password, int pkcs5_prf, BOOL truecryptMode, PCRYPTO_INFO *retInfo)
+int ReadVolumeHeaderWCache (BOOL bBoot, BOOL bCache, char *header, Password *password, int pkcs5_prf, int pim, BOOL truecryptMode, PCRYPTO_INFO *retInfo)
 {
 	int nReturnCode = ERR_PASSWORD_WRONG;
 	int i;
@@ -29,7 +31,7 @@ int ReadVolumeHeaderWCache (BOOL bBoot, BOOL bCache, char *header, Password *pas
 	/* Attempt to recognize volume using mount password */
 	if (password->Length > 0)
 	{
-		nReturnCode = ReadVolumeHeader (bBoot, header, password, pkcs5_prf, truecryptMode, retInfo, NULL);
+		nReturnCode = ReadVolumeHeader (bBoot, header, password, pkcs5_prf, pim, truecryptMode, retInfo, NULL);
 
 		/* Save mount passwords back into cache if asked to do so */
 		if (bCache && (nReturnCode == 0 || nReturnCode == ERR_CIPHER_INIT_WEAK_KEY))
@@ -59,7 +61,7 @@ int ReadVolumeHeaderWCache (BOOL bBoot, BOOL bCache, char *header, Password *pas
 		{
 			if (CachedPasswords[i].Length > 0)
 			{
-				nReturnCode = ReadVolumeHeader (bBoot, header, &CachedPasswords[i], pkcs5_prf, truecryptMode, retInfo, NULL);
+				nReturnCode = ReadVolumeHeader (bBoot, header, &CachedPasswords[i], pkcs5_prf, pim, truecryptMode, retInfo, NULL);
 
 				if (nReturnCode != ERR_PASSWORD_WRONG)
 					break;

src/Common/Cache.h

@@ -1,12 +1,14 @@
 /*
  Legal Notice: Some portions of the source code contained in this file were
- derived from the source code of Encryption for the Masses 2.02a, which is
- Copyright (c) 1998-2000 Paul Le Roux and which is governed by the 'License
- Agreement for Encryption for the Masses'. Modifications and additions to
- the original source code (contained in this file) and all other portions
- of this file are Copyright (c) 2003-2008 TrueCrypt Developers Association
- and are governed by the TrueCrypt License 3.0 the full text of which is
- contained in the file License.txt included in TrueCrypt binary and source
+ derived from the source code of TrueCrypt 7.1a, which is 
+ Copyright (c) 2003-2012 TrueCrypt Developers Association and which is 
+ governed by the TrueCrypt License 3.0, also from the source code of
+ Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
+ and which is governed by the 'License Agreement for Encryption for the Masses' 
+ 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 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. */
 
 #include "Common.h"
@@ -19,5 +21,5 @@
 extern int cacheEmpty;
 
 void AddPasswordToCache (Password *password);
-int ReadVolumeHeaderWCache (BOOL bBoot, BOOL bCache, char *header, Password *password, int pkcs5_prf, BOOL truecryptMode, PCRYPTO_INFO *retInfo);
+int ReadVolumeHeaderWCache (BOOL bBoot, BOOL bCache, char *header, Password *password, int pkcs5_prf, int pim, BOOL truecryptMode, PCRYPTO_INFO *retInfo);
 void WipeCache (void);

src/Common/Cmdline.c

@@ -1,12 +1,14 @@
 /*
  Legal Notice: Some portions of the source code contained in this file were
- derived from the source code of Encryption for the Masses 2.02a, which is
- Copyright (c) 1998-2000 Paul Le Roux and which is governed by the 'License
- Agreement for Encryption for the Masses'. Modifications and additions to
- the original source code (contained in this file) and all other portions
- of this file are Copyright (c) 2003-2009 TrueCrypt Developers Association
- and are governed by the TrueCrypt License 3.0 the full text of which is
- contained in the file License.txt included in TrueCrypt binary and source
+ derived from the source code of TrueCrypt 7.1a, which is 
+ Copyright (c) 2003-2012 TrueCrypt Developers Association and which is 
+ governed by the TrueCrypt License 3.0, also from the source code of
+ Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
+ and which is governed by the 'License Agreement for Encryption for the Masses' 
+ 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 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. */
 
 #include "Tcdefs.h"
@@ -22,13 +24,17 @@
 #include "Language.h"
 #include <Strsafe.h>
 
+#ifndef SRC_POS
+#define SRC_POS (__FUNCTION__ ":" TC_TO_STRING(__LINE__))
+#endif
+
 /* Except in response to the WM_INITDIALOG message, the dialog box procedure
    should return nonzero if it processes the message, and zero if it does
    not. - see DialogProc */
 BOOL CALLBACK CommandHelpDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-	if (lParam);		/* remove warning */
-	if (wParam);		/* remove warning */
+	UNREFERENCED_PARAMETER (lParam);		/* remove warning */
+	UNREFERENCED_PARAMETER (wParam);		/* remove warning */
 
 	switch (msg)
 	{
@@ -45,7 +51,17 @@ BOOL CALLBACK CommandHelpDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 
 		*tmp = 0;
 
-		StringCbCopyA (tmp, 8192, "Command line options:\n\n");
+		StringCbCopyA (tmp, 8192, "VeraCrypt " VERSION_STRING);
+#ifdef _WIN64
+		StringCbCatA (tmp, 8192, "  (64-bit)");
+#else
+		StringCbCatA (tmp, 8192, "  (32-bit)");
+#endif
+#if (defined(_DEBUG) || defined(DEBUG))
+		StringCbCatA (tmp, 8192, "  (debug)");
+#endif
+
+		StringCbCatA (tmp, 8192, "\n\nCommand line options:\n\n");
 		for (i = 0; i < as->arg_cnt; i ++)
 		{
 			if (!as->args[i].Internal)
@@ -55,6 +71,8 @@ BOOL CALLBACK CommandHelpDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 			}
 		}
 
+		StringCbCatA (tmp, 8192, "\nExamples:\n\nMount a volume as X:\tveracrypt.exe /q /v volume.hc /l X\nDismount a volume X:\tveracrypt.exe /q /d X");
+
 		SetWindowText (GetDlgItem (hwndDlg, IDC_COMMANDHELP_TEXT), (char*) tmp);
 		
 		TCfree(tmp);
@@ -80,7 +98,7 @@ int Win32CommandLine (char *lpszCommandLine, char ***lpszArgs)
 	LPWSTR *arguments = CommandLineToArgvW (GetCommandLineW(), &argumentCount);
 	if (!arguments)
 	{
-		handleWin32Error (NULL);
+		handleWin32Error (NULL, SRC_POS);
 		return 0;
 	}
 
@@ -105,10 +123,10 @@ int Win32CommandLine (char *lpszCommandLine, char ***lpszArgs)
 
 		if (argLen > 0)
 		{
-			int len = WideCharToMultiByte (CP_ACP, 0, arguments[i + 1], -1, arg, argLen + 1, NULL, NULL);
+			int len = WideCharToMultiByte (CP_ACP, 0, arguments[i + 1], -1, arg, (int) argLen + 1, NULL, NULL);
 			if (len == 0)
 			{
-				handleWin32Error (NULL);
+				handleWin32Error (NULL, SRC_POS);
 				AbortProcessSilent();
 			}
 		}
@@ -130,81 +148,26 @@ int GetArgSepPosOffset (char *lpszArgument)
 	return 0;
 }
 
-int GetArgumentID (argumentspec *as, char *lpszArgument, int *nArgPos)
+int GetArgumentID (argumentspec *as, char *lpszArgument)
 {
-	char szTmp[MAX_PATH * 2];
 	int i;
 
-	i = strlen (lpszArgument);
-	szTmp[i] = 0;
-	while (--i >= 0)
-	{
-		szTmp[i] = (char) tolower (lpszArgument[i]);
-	}
-
 	for (i = 0; i < as->arg_cnt; i++)
 	{
-		size_t k;
-
-		k = strlen (as->args[i].long_name);
-		if (memcmp (as->args[i].long_name, szTmp, k * sizeof (char)) == 0)
+		if (_stricmp (as->args[i].long_name, lpszArgument) == 0)
 		{
-			int x;
-			for (x = i + 1; x < as->arg_cnt; x++)
-			{
-				size_t m;
-
-				m = strlen (as->args[x].long_name);
-				if (memcmp (as->args[x].long_name, szTmp, m * sizeof (char)) == 0)
-				{
-					break;
-				}
-			}
-
-			if (x == as->arg_cnt)
-			{
-				if (strlen (lpszArgument) != k)
-					*nArgPos = k;
-				else
-					*nArgPos = 0;
-				return as->args[i].Id;
-			}
+			return as->args[i].Id;
 		}
 	}
 
 	for (i = 0; i < as->arg_cnt; i++)
 	{
-		size_t k;
-
 		if (as->args[i].short_name[0] == 0)
 			continue;
 
-		k = strlen (as->args[i].short_name);
-		if (memcmp (as->args[i].short_name, szTmp, k * sizeof (char)) == 0)
+		if (_stricmp (as->args[i].short_name, lpszArgument) == 0)
 		{
-			int x;
-			for (x = i + 1; x < as->arg_cnt; x++)
-			{
-				size_t m;
-
-				if (as->args[x].short_name[0] == 0)
-					continue;
-
-				m = strlen (as->args[x].short_name);
-				if (memcmp (as->args[x].short_name, szTmp, m * sizeof (char)) == 0)
-				{
-					break;
-				}
-			}
-
-			if (x == as->arg_cnt)
-			{
-				if (strlen (lpszArgument) != k)
-					*nArgPos = k;
-				else
-					*nArgPos = 0;
-				return as->args[i].Id;
-			}
+			return as->args[i].Id;
 		}
 	}
 
@@ -212,27 +175,19 @@ int GetArgumentID (argumentspec *as, char *lpszArgument, int *nArgPos)
 	return -1;
 }
 
-int GetArgumentValue (char **lpszCommandLineArgs, int nArgPos, int *nArgIdx,
+int GetArgumentValue (char **lpszCommandLineArgs, int *nArgIdx,
 		  int nNoCommandLineArgs, char *lpszValue, int nValueSize)
 {
 	*lpszValue = 0;
 
-	if (nArgPos)
-	{
-		/* Handles the case of no space between parameter code and
-		   value */
-		StringCbCopyA (lpszValue, nValueSize, &lpszCommandLineArgs[*nArgIdx][nArgPos]);
-		lpszValue[nValueSize - 1] = 0;
-		return HAS_ARGUMENT;
-	}
-	else if (*nArgIdx + 1 < nNoCommandLineArgs)
+	if (*nArgIdx + 1 < nNoCommandLineArgs)
 	{
 		int x = GetArgSepPosOffset (lpszCommandLineArgs[*nArgIdx + 1]);
 		if (x == 0)
 		{
 			/* Handles the case of space between parameter code
 			   and value */
-			StringCbCopyA (lpszValue, nValueSize, &lpszCommandLineArgs[*nArgIdx + 1][x]);
+			StringCbCopyA (lpszValue, nValueSize, lpszCommandLineArgs[*nArgIdx + 1]);
 			lpszValue[nValueSize - 1] = 0;
 			(*nArgIdx)++;
 			return HAS_ARGUMENT;

src/Common/Cmdline.h

@@ -1,12 +1,14 @@
 /*
  Legal Notice: Some portions of the source code contained in this file were
- derived from the source code of Encryption for the Masses 2.02a, which is
- Copyright (c) 1998-2000 Paul Le Roux and which is governed by the 'License
- Agreement for Encryption for the Masses'. Modifications and additions to
- the original source code (contained in this file) and all other portions
- of this file are Copyright (c) 2003-2008 TrueCrypt Developers Association
- and are governed by the TrueCrypt License 3.0 the full text of which is
- contained in the file License.txt included in TrueCrypt binary and source
+ derived from the source code of TrueCrypt 7.1a, which is 
+ Copyright (c) 2003-2012 TrueCrypt Developers Association and which is 
+ governed by the TrueCrypt License 3.0, also from the source code of
+ Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
+ and which is governed by the 'License Agreement for Encryption for the Masses' 
+ 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 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. */
 
 #ifdef __cplusplus
@@ -33,8 +35,8 @@ typedef struct argumentspec_t
 BOOL CALLBACK CommandHelpDlgProc ( HWND hwndDlg , UINT msg , WPARAM wParam , LPARAM lParam );
 int Win32CommandLine ( char *lpszCommandLine , char ***lpszArgs );
 int GetArgSepPosOffset ( char *lpszArgument );
-int GetArgumentID ( argumentspec *as , char *lpszArgument , int *nArgPos );
-int GetArgumentValue ( char **lpszCommandLineArgs , int nArgPos , int *nArgIdx , int nNoCommandLineArgs , char *lpszValue , int nValueSize );
+int GetArgumentID ( argumentspec *as , char *lpszArgument );
+int GetArgumentValue ( char **lpszCommandLineArgs , int *nArgIdx , int nNoCommandLineArgs , char *lpszValue , int nValueSize );
 
 #ifdef __cplusplus
 }

src/Common/Combo.c

@@ -1,12 +1,14 @@
 /*
  Legal Notice: Some portions of the source code contained in this file were
- derived from the source code of Encryption for the Masses 2.02a, which is
- Copyright (c) 1998-2000 Paul Le Roux and which is governed by the 'License
- Agreement for Encryption for the Masses'. Modifications and additions to
- the original source code (contained in this file) and all other portions
- of this file are Copyright (c) 2003-2008 TrueCrypt Developers Association
- and are governed by the TrueCrypt License 3.0 the full text of which is
- contained in the file License.txt included in TrueCrypt binary and source
+ derived from the source code of TrueCrypt 7.1a, which is 
+ Copyright (c) 2003-2012 TrueCrypt Developers Association and which is 
+ governed by the TrueCrypt License 3.0, also from the source code of
+ Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
+ and which is governed by the 'License Agreement for Encryption for the Masses' 
+ 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 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. */
 
 #include "Tcdefs.h"
@@ -133,23 +135,64 @@ LPARAM UpdateComboOrder (HWND hComboBox)
 	return nIndex;
 }
 
-void LoadCombo (HWND hComboBox)
+void LoadCombo (HWND hComboBox, BOOL bEnabled, BOOL bOnlyCheckModified, BOOL *pbModified)
 {
 	DWORD size;
 	char *history = LoadFile (GetConfigPath (TC_APPD_FILENAME_HISTORY), &size);
 	char *xml = history;
 	char volume[MAX_PATH];
+	int i, nComboIdx[SIZEOF_MRU_LIST] = {0};
+	int count = SendMessage (hComboBox, CB_GETCOUNT, 0, 0);
 
-	if (xml == NULL) return;
-
-	while (xml = XmlFindElement (xml, "volume"))
+	if (xml == NULL)
 	{
-		XmlGetNodeText (xml, volume, sizeof (volume));
-		AddComboItem (hComboBox, volume, TRUE);
-		xml++;
+		// No history XML file but history is enabled
+		if (bEnabled && pbModified)
+		*pbModified = TRUE;
+		return;
 	}
 
-	SendMessage (hComboBox, CB_SETCURSEL, 0, 0);
+	if (!bEnabled && bOnlyCheckModified)
+	{
+		// History is disable but there is a history XML file
+		if (pbModified)
+			*pbModified = TRUE;
+		free (history);
+		return;
+	}
+
+
+	/* combo list part:- get mru items */
+	for (i = 0; i < SIZEOF_MRU_LIST; i++)
+		nComboIdx[i] = GetOrderComboIdx (hComboBox, &nComboIdx[0], i);
+
+	i = 0;
+	while (xml = XmlFindElement (xml, "volume"))
+	{
+		char szTmp[MAX_PATH] = { 0 };
+		 
+		if (i < count)
+		{
+			if (SendMessage (hComboBox, CB_GETLBTEXTLEN, nComboIdx[i], 0) < sizeof (szTmp))
+				SendMessage (hComboBox, CB_GETLBTEXT, nComboIdx[i], (LPARAM) & szTmp[0]);
+		}
+
+		XmlGetNodeText (xml, volume, sizeof (volume));
+		if (!bOnlyCheckModified)
+			AddComboItem (hComboBox, volume, TRUE);
+
+		if (pbModified && strcmp (volume, szTmp))
+			*pbModified = TRUE;
+
+		xml++;
+		i++;
+	}
+
+	if (pbModified && (i != count))
+		*pbModified = TRUE;
+
+	if (!bOnlyCheckModified)
+		SendMessage (hComboBox, CB_SETCURSEL, 0, 0);
 
 	free (history);
 }
@@ -157,7 +200,7 @@ void LoadCombo (HWND hComboBox)
 void DumpCombo (HWND hComboBox, int bClear)
 {
 	FILE *f;
-	int i, nComboIdx[SIZEOF_MRU_LIST];
+	int i, nComboIdx[SIZEOF_MRU_LIST] = {0};
 
 	if (bClear)
 	{

src/Common/Combo.h

@@ -1,12 +1,14 @@
 /*
  Legal Notice: Some portions of the source code contained in this file were
- derived from the source code of Encryption for the Masses 2.02a, which is
- Copyright (c) 1998-2000 Paul Le Roux and which is governed by the 'License
- Agreement for Encryption for the Masses'. Modifications and additions to
- the original source code (contained in this file) and all other portions
- of this file are Copyright (c) 2003-2008 TrueCrypt Developers Association
- and are governed by the TrueCrypt License 3.0 the full text of which is
- contained in the file License.txt included in TrueCrypt binary and source
+ derived from the source code of TrueCrypt 7.1a, which is 
+ Copyright (c) 2003-2012 TrueCrypt Developers Association and which is 
+ governed by the TrueCrypt License 3.0, also from the source code of
+ Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
+ and which is governed by the 'License Agreement for Encryption for the Masses' 
+ 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 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. */
 
 #ifdef __cplusplus
@@ -17,7 +19,7 @@ void AddComboItem (HWND hComboBox, char *lpszFileName, BOOL saveHistory);
 LPARAM MoveEditToCombo (HWND hComboBox, BOOL saveHistory);
 int GetOrderComboIdx ( HWND hComboBox , int *nIdxList , int nElems );
 LPARAM UpdateComboOrder ( HWND hComboBox );
-void LoadCombo ( HWND hComboBox );
+void LoadCombo (HWND hComboBox, BOOL bEnabled, BOOL bOnlyCheckModified, BOOL *pbModified);
 void DumpCombo ( HWND hComboBox , int bClear );
 void ClearCombo (HWND hComboBox);
 int IsComboEmpty (HWND hComboBox);

src/Common/Common.h

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2005-2009 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #ifndef COMMON_H
@@ -76,6 +80,7 @@ typedef struct
 	BOOL UseBackupHeader;
 	BOOL RecoveryMode;
 	int ProtectedHidVolPkcs5Prf;
+	int ProtectedHidVolPim;
 } MountOptions;
 
 #endif

src/Common/Common.rc

@@ -29,30 +29,30 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 IDD_ABOUT_DLG DIALOGEX 31, 51, 292, 199
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About VeraCrypt"
-CLASS "SplashDlg"
+CLASS "VeraCryptSplashDlg"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     EDITTEXT        IDC_ABOUT_CREDITS,7,111,277,45,ES_MULTILINE | WS_VSCROLL | NOT WS_TABSTOP
     DEFPUSHBUTTON   "OK",IDOK,230,178,52,14
     LTEXT           "",IDC_HOMEPAGE,18,87,117,9,SS_NOTIFY
     LTEXT           "",IDT_ABOUT_RELEASE,18,71,235,8
-    CONTROL         517,IDC_ABOUT_BKG,"Static",SS_BITMAP,0,0,12,11,WS_EX_STATICEDGE
+    CONTROL         IDB_TEXTUAL_LOGO_BKG,IDC_ABOUT_BKG,"Static",SS_BITMAP,0,0,12,11,WS_EX_STATICEDGE
     LTEXT           "",IDT_ABOUT_VERSION,18,61,161,8
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,1,167,291,1,WS_EX_STATICEDGE
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,1,169,291,1,WS_EX_STATICEDGE
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,1,107,291,1,WS_EX_STATICEDGE
     CONTROL         "",IDC_ABOUT_LOGO_AREA,"Static",SS_GRAYRECT | NOT WS_VISIBLE,0,0,293,50,WS_EX_TRANSPARENT | WS_EX_STATICEDGE
-    CONTROL         518,IDC_TEXTUAL_LOGO_IMG,"Static",SS_BITMAP,12,26,157,16
+    CONTROL         IDB_TEXTUAL_LOGO_96DPI,IDC_TEXTUAL_LOGO_IMG,"Static",SS_BITMAP,12,26,157,16
 END
 
-IDD_COMMANDHELP_DLG DIALOGEX 0, 0, 249, 213
+IDD_COMMANDHELP_DLG DIALOGEX 0, 0, 249, 274
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Command Line Help"
-CLASS "CustomDlg"
+CLASS "VeraCryptCustomDlg"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,93,191,59,14
-    LTEXT           "",IDC_COMMANDHELP_TEXT,20,11,208,174
+    DEFPUSHBUTTON   "OK",IDOK,93,252,59,14
+    LTEXT           "",IDC_COMMANDHELP_TEXT,20,10,208,241
 END
 
 IDD_RAWDEVICES_DLG DIALOGEX 0, 0, 305, 209
@@ -65,7 +65,7 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,248,190,50,14
 END
 
-IDD_MOUNT_OPTIONS DIALOGEX 0, 0, 277, 204
+IDD_MOUNT_OPTIONS DIALOGEX 0, 0, 277, 224
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "VeraCrypt - Mount Options"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
@@ -73,23 +73,27 @@ BEGIN
     CONTROL         "Mount volume as read-&only",IDC_MOUNT_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,11,194,10
     CONTROL         "Mount volume as removable &medium",IDC_MOUNT_REMOVABLE,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,25,195,10
+    CONTROL         "Use backup header embedded in &volume if available",IDC_USE_EMBEDDED_HEADER_BAK,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,39,257,11
     CONTROL         "Mount partition &using system encryption without pre-boot authentication",IDC_MOUNT_SYSENC_PART_WITHOUT_PBA,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,53,259,11
     CONTROL         "&Protect hidden volume against damage caused by writing to outer volume",IDC_PROTECT_HIDDEN_VOL,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,86,252,10
     EDITTEXT        IDC_PASSWORD_PROT_HIDVOL,112,104,151,14,ES_PASSWORD | ES_AUTOHSCROLL
-    CONTROL         "&Display password",IDC_SHOW_PASSWORD_MO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,146,90,10
-    CONTROL         "U&se keyfiles",IDC_KEYFILES_ENABLE_HIDVOL_PROT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,159,90,10
-    PUSHBUTTON      "&Keyfiles...",IDC_KEYFILES_HIDVOL_PROT,203,148,60,14
-    LTEXT           "What is hidden volume protection?",IDC_LINK_HIDVOL_PROTECTION_INFO,16,174,247,10,SS_NOTIFY
+    COMBOBOX        IDC_PKCS5_PRF_ID,112,125,91,90,CBS_DROPDOWNLIST | WS_TABSTOP
+    EDITTEXT        IDC_PIM,112,145,42,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER | NOT WS_VISIBLE
+    LTEXT           "(Empty or 0 for default iterations)",IDC_PIM_HELP,158,148,112,8,NOT WS_VISIBLE
+    CONTROL         "&Display password",IDC_SHOW_PASSWORD_MO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,165,90,10
+    CONTROL         "U&se keyfiles",IDC_KEYFILES_ENABLE_HIDVOL_PROT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,178,90,10
+    PUSHBUTTON      "&Keyfiles...",IDC_KEYFILES_HIDVOL_PROT,204,174,60,14
     DEFPUSHBUTTON   "OK",IDOK,211,7,60,14
     PUSHBUTTON      "Cancel",IDCANCEL,211,24,60,14
+    LTEXT           "What is hidden volume protection?",IDC_LINK_HIDVOL_PROTECTION_INFO,16,193,247,10,SS_NOTIFY
     RTEXT           "P&assword to hidden volume:\n(if empty, cache is used)",IDT_HIDDEN_PROT_PASSWD,15,103,91,17,0,WS_EX_RIGHT
-    GROUPBOX        "Hidden Volume Protection",IDT_HIDDEN_VOL_PROTECTION,6,72,265,120
-    CONTROL         "Use backup header embedded in &volume if available",IDC_USE_EMBEDDED_HEADER_BAK,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,39,257,11
-    COMBOBOX        IDC_PKCS5_PRF_ID,112,125,91,90,CBS_DROPDOWNLIST | WS_TABSTOP
+    GROUPBOX        "Hidden Volume Protection",IDT_HIDDEN_VOL_PROTECTION,6,72,265,139
     RTEXT           "PKCS-5 PRF:",IDT_PKCS5_PRF,15,126,91,17
+    RTEXT           "Volume PIM:",IDT_PIM,15,148,91,17,NOT WS_VISIBLE
+    CONTROL         "Use PIM",IDC_PIM_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,152,97,10
 END
 
 IDD_KEYFILES DIALOGEX 0, 0, 345, 237
@@ -174,7 +178,7 @@ BEGIN
     GROUPBOX        "Plaintext (hexadecimal)",IDT_TEST_PLAINTEXT,1,140,323,33
     GROUPBOX        "Ciphertext (hexadecimal)",IDT_TEST_CIPHERTEXT,1,174,323,33
     RTEXT           "",IDC_TESTS_MESSAGE,50,213,178,10
-    CONTROL         "",IDC_REDTICK,"REDTICK",0x0,234,214,10,8
+    CONTROL         "",IDC_REDTICK,"VCREDTICK",0x0,234,214,10,8
     RTEXT           "Key size:",IDT_KEY,8,57,56,8
     RTEXT           "Plaintext size:",IDT_PLAINTEXT,190,153,63,8
     LTEXT           "bits",IDT_KEY_UNIT,114,57,45,8
@@ -221,7 +225,7 @@ BEGIN
 END
 
 IDD_MULTI_CHOICE_DLG DIALOGEX 0, 0, 167, 322
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     PUSHBUTTON      "",IDC_CHOICE10,7,292,153,24,BS_CENTER | BS_MULTILINE,WS_EX_STATICEDGE
@@ -310,12 +314,11 @@ BEGIN
 END
 
 IDD_STATIC_MODAL_WAIT_DLG DIALOGEX 0, 0, 292, 74
-STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION
-EXSTYLE WS_EX_TOPMOST
+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "VeraCrypt"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CTEXT           "Please wait...\nThis process may take a long time and VeraCrypt may become unresponsive.",IDT_STATIC_MODAL_WAIT_DLG_INFO,9,11,274,33
+    CTEXT           "Please wait...\nThis process may take a long time and VeraCrypt may seem unresponsive.",IDT_STATIC_MODAL_WAIT_DLG_INFO,9,11,274,33
     CONTROL         "",IDC_WAIT_PROGRESS_BAR,"msctls_progress32",WS_BORDER,7,49,278,14
 END
 
@@ -328,9 +331,13 @@ END
 #ifdef APSTUDIO_INVOKED
 GUIDELINES DESIGNINFO 
 BEGIN
+    IDD_ABOUT_DLG, DIALOG
+    BEGIN
+    END
+
     IDD_COMMANDHELP_DLG, DIALOG
     BEGIN
-        BOTTOMMARGIN, 205
+        BOTTOMMARGIN, 266
     END
 
     IDD_RAWDEVICES_DLG, DIALOG
@@ -345,7 +352,7 @@ BEGIN
     BEGIN
         LEFTMARGIN, 7
         TOPMARGIN, 7
-        BOTTOMMARGIN, 198
+        BOTTOMMARGIN, 218
     END
 
     IDD_KEYFILES, DIALOG

src/Common/Crc.c

@@ -1,12 +1,14 @@
 /*
  Legal Notice: Some portions of the source code contained in this file were
- derived from the source code of Encryption for the Masses 2.02a, which is
- Copyright (c) 1998-2000 Paul Le Roux and which is governed by the 'License
- Agreement for Encryption for the Masses'. Modifications and additions to
- the original source code (contained in this file) and all other portions
- of this file are Copyright (c) 2003-2008 TrueCrypt Developers Association
- and are governed by the TrueCrypt License 3.0 the full text of which is
- contained in the file License.txt included in TrueCrypt binary and source
+ derived from the source code of TrueCrypt 7.1a, which is 
+ Copyright (c) 2003-2012 TrueCrypt Developers Association and which is 
+ governed by the TrueCrypt License 3.0, also from the source code of
+ Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
+ and which is governed by the 'License Agreement for Encryption for the Masses' 
+ 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 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. */
 
 #include "Tcdefs.h"

src/Common/Crc.h

@@ -1,12 +1,14 @@
 /*
  Legal Notice: Some portions of the source code contained in this file were
- derived from the source code of Encryption for the Masses 2.02a, which is
- Copyright (c) 1998-2000 Paul Le Roux and which is governed by the 'License
- Agreement for Encryption for the Masses'. Modifications and additions to
- the original source code (contained in this file) and all other portions
- of this file are Copyright (c) 2003-2008 TrueCrypt Developers Association
- and are governed by the TrueCrypt License 3.0 the full text of which is
- contained in the file License.txt included in TrueCrypt binary and source
+ derived from the source code of TrueCrypt 7.1a, which is 
+ Copyright (c) 2003-2012 TrueCrypt Developers Association and which is 
+ governed by the TrueCrypt License 3.0, also from the source code of
+ Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
+ and which is governed by the 'License Agreement for Encryption for the Masses' 
+ 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 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. */
 
 #ifndef TC_HEADER_CRC

src/Common/Crypto.c

@@ -1,12 +1,14 @@
 /*
  Legal Notice: Some portions of the source code contained in this file were
- derived from the source code of Encryption for the Masses 2.02a, which is
- Copyright (c) 1998-2000 Paul Le Roux and which is governed by the 'License
- Agreement for Encryption for the Masses'. Modifications and additions to
- the original source code (contained in this file) and all other portions
- of this file are Copyright (c) 2003-2010 TrueCrypt Developers Association
- and are governed by the TrueCrypt License 3.0 the full text of which is
- contained in the file License.txt included in TrueCrypt binary and source
+ derived from the source code of TrueCrypt 7.1a, which is 
+ Copyright (c) 2003-2012 TrueCrypt Developers Association and which is 
+ governed by the TrueCrypt License 3.0, also from the source code of
+ Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
+ and which is governed by the 'License Agreement for Encryption for the Masses' 
+ 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 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. */
 
 #include "Tcdefs.h"
@@ -408,19 +410,35 @@ BOOL EAInitMode (PCRYPTO_INFO ci)
 	return TRUE;
 }
 
+static void EAGetDisplayName(char *buf, int ea, int i)
+{
+	strcpy (buf, CipherGetName (i));
+	if (i = EAGetPreviousCipher(ea, i))
+	{
+		strcat (buf, "(");
+		EAGetDisplayName (&buf[strlen(buf)], ea, i);
+		strcat (buf, ")");
+	}
+}
 
 // Returns name of EA, cascaded cipher names are separated by hyphens
-char *EAGetName (char *buf, int ea)
+char *EAGetName (char *buf, int ea, int guiDisplay)
 {
-	int i = EAGetLastCipher(ea);
-	strcpy (buf, (i != 0) ? CipherGetName (i) : "?");
-
-	while (i = EAGetPreviousCipher(ea, i))
+	if (guiDisplay)
 	{
-		strcat (buf, "-");
-		strcat (buf, CipherGetName (i));
+		EAGetDisplayName (buf, ea, EAGetLastCipher(ea));
 	}
+	else
+	{
+		int i = EAGetLastCipher(ea);
+		strcpy (buf, (i != 0) ? CipherGetName (i) : "?");
 
+		while (i = EAGetPreviousCipher(ea, i))
+		{
+			strcat (buf, "-");
+			strcat (buf, CipherGetName (i));
+		}
+	}
 	return buf;
 }
 
@@ -432,7 +450,7 @@ int EAGetByName (char *name)
 
 	do
 	{
-		EAGetName (n, ea);
+		EAGetName (n, ea, 0);
 		if (strcmp (n, name) == 0)
 			return ea;
 	}

src/Common/Crypto.h

@@ -1,12 +1,14 @@
 /*
  Legal Notice: Some portions of the source code contained in this file were
- derived from the source code of Encryption for the Masses 2.02a, which is
- Copyright (c) 1998-2000 Paul Le Roux and which is governed by the 'License
- Agreement for Encryption for the Masses'. Modifications and additions to
- the original source code (contained in this file) and all other portions
- of this file are Copyright (c) 2003-2010 TrueCrypt Developers Association
- and are governed by the TrueCrypt License 3.0 the full text of which is
- contained in the file License.txt included in TrueCrypt binary and source
+ derived from the source code of TrueCrypt 7.1a, which is 
+ Copyright (c) 2003-2012 TrueCrypt Developers Association and which is 
+ governed by the TrueCrypt License 3.0, also from the source code of
+ Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
+ and which is governed by the 'License Agreement for Encryption for the Masses' 
+ 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 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. */
 
 /* Update the following when adding a new cipher or EA:
@@ -197,6 +199,7 @@ typedef struct CRYPTO_INFO_t
 	int ea;									/* Encryption algorithm ID */
 	int mode;								/* Mode of operation (e.g., XTS) */
 	int pkcs5;								/* PRF algorithm */
+
 	unsigned __int8 ks[MAX_EXPANDED_KEY];	/* Primary key schedule (if it is a cascade, it conatins multiple concatenated keys) */
 	unsigned __int8 ks2[MAX_EXPANDED_KEY];	/* Secondary key schedule (if cascade, multiple concatenated) for XTS mode. */
 
@@ -212,6 +215,7 @@ typedef struct CRYPTO_INFO_t
 	unsigned __int8 salt[PKCS5_SALT_SIZE];
 	int noIterations;	
 	BOOL bTrueCryptMode;
+	int volumePim;
 
 	uint64 volume_creation_time;	// Legacy
 	uint64 header_creation_time;	// Legacy
@@ -293,7 +297,7 @@ void DecipherBlocks (int cipher, void *dataPtr, void *ks, size_t blockCount);
 int EAGetFirst ();
 int EAGetCount (void);
 int EAGetNext (int previousEA);
-char * EAGetName (char *buf, int ea);
+char * EAGetName (char *buf, int ea, int guiDisplay);
 int EAGetByName (char *name);
 int EAGetKeySize (int ea);
 int EAGetFirstMode (int ea);

src/Common/Dictionary.c

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2005-2009 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #include "../Common/Dictionary.h"
@@ -22,11 +26,15 @@ static size_t DataPoolSize = 0;
 
 void AddDictionaryEntry (char *key, int intKey, void *value)
 {
-	if (key)
-		StringKeyMap[key] = value;
+	try
+	{
+		if (key)
+			StringKeyMap[key] = value;
 
-	if (intKey != 0)
-		IntKeyMap[intKey] = value;
+		if (intKey != 0)
+			IntKeyMap[intKey] = value;
+	}
+	catch (exception&) {}
 }
 
 

src/Common/Dictionary.h

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2005-2009 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #ifndef DICTIONARY_H

src/Common/Dlgcode.h

@@ -1,12 +1,14 @@
 /*
  Legal Notice: Some portions of the source code contained in this file were
- derived from the source code of Encryption for the Masses 2.02a, which is
- Copyright (c) 1998-2000 Paul Le Roux and which is governed by the 'License
- Agreement for Encryption for the Masses'. Modifications and additions to
- the original source code (contained in this file) and all other portions
- of this file are Copyright (c) 2003-2010 TrueCrypt Developers Association
- and are governed by the TrueCrypt License 3.0 the full text of which is
- contained in the file License.txt included in TrueCrypt binary and source
+ derived from the source code of TrueCrypt 7.1a, which is 
+ Copyright (c) 2003-2012 TrueCrypt Developers Association and which is 
+ governed by the TrueCrypt License 3.0, also from the source code of
+ Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
+ and which is governed by the 'License Agreement for Encryption for the Masses' 
+ 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 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. */
 
 #ifndef TC_HEADER_DLGCODE
@@ -77,6 +79,8 @@ enum
 #define TC_APPD_FILENAME_POST_INSTALL_TASK_TUTORIAL			"Post-Install Task - Tutorial"
 #define TC_APPD_FILENAME_POST_INSTALL_TASK_RELEASE_NOTES	"Post-Install Task - Release Notes"
 
+#define VC_FILENAME_RENAMED_SUFFIX				"_old"
+
 #ifndef USER_DEFAULT_SCREEN_DPI
 #define USER_DEFAULT_SCREEN_DPI 96
 #endif
@@ -128,9 +132,14 @@ extern WipeAlgorithmId nWipeMode;
 extern BOOL bSysPartitionSelected;
 extern BOOL bSysDriveSelected;
 
+extern char SysPartitionDevicePath [TC_MAX_PATH];
+extern char SysDriveDevicePath [TC_MAX_PATH];
+extern char bCachedSysDevicePathsValid;
+
 extern BOOL bHyperLinkBeingTracked;
 extern BOOL bInPlaceEncNonSysPending;
 
+extern BOOL PimEnable;
 extern BOOL	KeyFilesEnable;
 extern KeyFile	*FirstKeyFile;
 extern KeyFilesDlgParam		defaultKeyFilesParam;
@@ -226,11 +235,12 @@ void UpperCaseCopy ( char *lpszDest , size_t cbDest, const char *lpszSource );
 void CreateFullVolumePath ( char *lpszDiskFile , size_t cbDiskFile, const char *lpszFileName , BOOL *bDevice );
 int FakeDosNameForDevice ( const char *lpszDiskFile , char *lpszDosDevice , size_t cbDosDevice, char *lpszCFDevice , size_t cbCFDevice, BOOL bNameOnly );
 int RemoveFakeDosName ( char *lpszDiskFile , char *lpszDosDevice );
+void AbortProcessDirect ( wchar_t *abortMsg );
 void AbortProcess ( char *stringId );
 void AbortProcessSilent ( void );
 void *err_malloc ( size_t size );
 char *err_strdup ( char *lpszText );
-DWORD handleWin32Error ( HWND hwndDlg );
+DWORD handleWin32Error ( HWND hwndDlg, const char* srcPos );
 BOOL IsDiskReadError (DWORD error);
 BOOL IsDiskWriteError (DWORD error);
 BOOL IsDiskError (DWORD error);
@@ -288,14 +298,16 @@ void SavePostInstallTasksSettings (int command);
 void DoPostInstallTasks (HWND hwndDlg);
 void InitOSVersionInfo ();
 void InitApp ( HINSTANCE hInstance, char *lpszCommandLine );
+void FinalizeApp (void);
 void InitHelpFileName (void);
 BOOL OpenDevice (const char *lpszPath, OPEN_TEST_STRUCT *driver, BOOL detectFilesystem);
 void NotifyDriverOfPortableMode (void);
 int GetAvailableFixedDisks ( HWND hComboBox , char *lpszRootPath );
 int GetAvailableRemovables ( HWND hComboBox , char *lpszRootPath );
 int IsSystemDevicePath (const char *path, HWND hwndDlg, BOOL bReliableRequired);
+int IsNonSysPartitionOnSysDrive (const char *path);
 BOOL CALLBACK RawDevicesDlgProc ( HWND hwndDlg , UINT msg , WPARAM wParam , LPARAM lParam );
-BOOL TextInfoDialogBox (int nID);
+INT_PTR TextInfoDialogBox (int nID);
 BOOL CALLBACK TextInfoDialogBoxDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
 char * GetLegalNotices ();
 BOOL CALLBACK BenchmarkDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
@@ -308,7 +320,7 @@ void ResetCipherTest ( HWND hwndDlg , int idTestCipher );
 void ResetCurrentDirectory ();
 BOOL BrowseFiles (HWND hwndDlg, char *stringId, char *lpszFileName, BOOL keepHistory, BOOL saveMode, wchar_t *browseFilter);
 BOOL BrowseDirectories (HWND hWnd, char *lpszTitle, char *dirName);
-void handleError ( HWND hwndDlg , int code );
+void handleError ( HWND hwndDlg , int code, const char* srcPos );
 BOOL CheckFileStreamWriteErrors (HWND hwndDlg, FILE *file, const char *fileName);
 void LocalizeDialog ( HWND hwnd, char *stringId );
 void OpenVolumeExplorerWindow (int driveNo);
@@ -325,8 +337,9 @@ BOOL IsDriveAvailable (int driveNo);
 BOOL IsDeviceMounted (char *deviceName);
 int DriverUnmountVolume (HWND hwndDlg, int nDosDriveNo, BOOL forced);
 void BroadcastDeviceChange (WPARAM message, int nDosDriveNo, DWORD driveMap);
-int MountVolume (HWND hwndDlg, int driveNo, char *volumePath, Password *password, int pkcs5, BOOL truecryptMode, BOOL cachePassword, BOOL sharedAccess,  const MountOptions* const mountOptions, BOOL quiet, BOOL bReportWrongPassword);
+int MountVolume (HWND hwndDlg, int driveNo, char *volumePath, Password *password, int pkcs5, int pim, BOOL truecryptMode, BOOL cachePassword, BOOL sharedAccess,  const MountOptions* const mountOptions, BOOL quiet, BOOL bReportWrongPassword);
 BOOL UnmountVolume (HWND hwndDlg , int nDosDriveNo, BOOL forceUnmount);
+BOOL UnmountVolumeAfterFormatExCall (HWND hwndDlg, int nDosDriveNo);
 BOOL IsPasswordCacheEmpty (void);
 BOOL IsMountedVolume (const char *volname);
 int GetMountedVolumeDriveNo (char *volname);
@@ -339,13 +352,13 @@ int FileSystemAppearsEmpty (const char *devicePath);
 __int64 GetStatsFreeSpaceOnPartition (const char *devicePath, float *percent, __int64 *occupiedBytes, BOOL silent);
 __int64 GetDeviceSize (const char *devicePath);
 HANDLE DismountDrive (char *devName, char *devicePath);
-int64 FindString (const char *buf, const char *str, int64 bufLen, size_t strLen, int64 startOffset);
+int64 FindString (const char *buf, const char *str, int64 bufLen, int64 strLen, int64 startOffset);
 BOOL FileExists (const char *filePathPtr);
 __int64 FindStringInFile (const char *filePath, const char *str, int strLen);
 BOOL TCCopyFile (char *sourceFileName, char *destinationFile);
-BOOL SaveBufferToFile (const char *inputBuffer, const char *destinationFile, DWORD inputLength, BOOL bAppend);
+BOOL SaveBufferToFile (const char *inputBuffer, const char *destinationFile, DWORD inputLength, BOOL bAppend, BOOL bRenameIfFailed);
 BOOL TCFlushFile (FILE *f);
-BOOL PrintHardCopyTextUTF16 (wchar_t *text, char *title, int byteLen);
+BOOL PrintHardCopyTextUTF16 (wchar_t *text, char *title, size_t byteLen);
 void GetSpeedString (unsigned __int64 speed, wchar_t *str, size_t cbStr);
 BOOL IsNonInstallMode ();
 BOOL DriverUnload ();
@@ -367,7 +380,7 @@ __int64 GetFileSize64 (const char *path);
 BOOL LoadInt16 (char *filePath, int *result, __int64 fileOffset);
 BOOL LoadInt32 (char *filePath, unsigned __int32 *result, __int64 fileOffset);
 char *LoadFile (const char *fileName, DWORD *size);
-char *LoadFileBlock (char *fileName, __int64 fileOffset, size_t count);
+char *LoadFileBlock (char *fileName, __int64 fileOffset, DWORD count);
 char *GetModPath (char *path, int maxSize);
 char *GetConfigPath (char *fileName);
 char *GetProgramConfigPath (char *fileName);
@@ -385,12 +398,14 @@ int Warning (char *stringId, HWND hwnd);
 int WarningTopMost (char *stringId, HWND hwnd);
 int WarningDirect (const wchar_t *warnMsg, HWND hwnd);
 int Error (char *stringId, HWND hwnd);
+int ErrorRetryCancel (char *stringId, HWND hwnd);
 int ErrorDirect (const wchar_t *errMsg, HWND hwnd);
 int ErrorTopMost (char *stringId, HWND hwnd);
 int AskYesNo (char *stringId, HWND hwnd);
 int AskYesNoString (const wchar_t *str, HWND hwnd);
 int AskYesNoTopmost (char *stringId, HWND hwnd);
 int AskNoYes (char *stringId, HWND hwnd);
+int AskNoYesString (const wchar_t *string, HWND hwnd);
 int AskOkCancel (char *stringId, HWND hwnd);
 int AskWarnYesNo (char *stringId, HWND hwnd);
 int AskWarnYesNoString (const wchar_t *string, HWND hwnd);
@@ -443,13 +458,16 @@ int GetTextGfxWidth (HWND hwndDlgItem, const wchar_t *text, HFONT hFont);
 int GetTextGfxHeight (HWND hwndDlgItem, const wchar_t *text, HFONT hFont);
 BOOL ToHyperlink (HWND hwndDlg, UINT ctrlId);
 BOOL ToCustHyperlink (HWND hwndDlg, UINT ctrlId, HFONT hFont);
+void DisableCloseButton (HWND hwndDlg);
+void EnableCloseButton (HWND hwndDlg);
 void ToBootPwdField (HWND hwndDlg, UINT ctrlId);
 void AccommodateTextField (HWND hwndDlg, UINT ctrlId, BOOL bFirstUpdate, HFONT hFont);
 BOOL GetDriveLabel (int driveNo, wchar_t *label, int labelSize);
+BOOL GetSysDevicePaths (HWND hwndDlg);
 BOOL DoDriverInstall (HWND hwndDlg);
-int OpenVolume (OpenVolumeContext *context, const char *volumePath, Password *password, int pkcs5_prf, BOOL truecryptMode, BOOL write, BOOL preserveTimestamps, BOOL useBackupHeader);
+int OpenVolume (OpenVolumeContext *context, const char *volumePath, Password *password, int pkcs5_prf, int pim, BOOL truecryptMode, BOOL write, BOOL preserveTimestamps, BOOL useBackupHeader);
 void CloseVolume (OpenVolumeContext *context);
-int ReEncryptVolumeHeader (HWND hwndDlg, char *buffer, BOOL bBoot, CRYPTO_INFO *cryptoInfo, Password *password, BOOL wipeMode);
+int ReEncryptVolumeHeader (HWND hwndDlg, char *buffer, BOOL bBoot, CRYPTO_INFO *cryptoInfo, Password *password, int pim, BOOL wipeMode);
 BOOL IsPagingFileActive (BOOL checkNonWindowsPartitionsOnly);
 BOOL IsPagingFileWildcardActive ();
 BOOL DisablePagingFile ();
@@ -460,7 +478,7 @@ BOOL FileHasReadOnlyAttribute (const char *path);
 BOOL IsFileOnReadOnlyFilesystem (const char *path);
 void CheckFilesystem (HWND hwndDlg, int driveNo, BOOL fixErrors);
 BOOL BufferContainsString (const byte *buffer, size_t bufferSize, const char *str);
-int AskNonSysInPlaceEncryptionResume (HWND hwndDlg);
+int AskNonSysInPlaceEncryptionResume (HWND hwndDlg, BOOL* pbDecrypt);
 BOOL RemoveDeviceWriteProtection (HWND hwndDlg, char *devicePath);
 void EnableElevatedCursorChange (HWND parent);
 BOOL DisableFileCompression (HANDLE file);
@@ -468,6 +486,8 @@ BOOL VolumePathExists (const char *volumePath);
 BOOL IsWindowsIsoBurnerAvailable ();
 BOOL LaunchWindowsIsoBurner (HWND hwnd, const char *isoPath);
 BOOL IsApplicationInstalled (const char *appName);
+int GetPim (HWND hwndDlg, UINT ctrlId);
+void SetPim (HWND hwndDlg, UINT ctrlId, int pim);
 
 #ifdef __cplusplus
 }
@@ -511,6 +531,12 @@ struct HostDevice
 	std::vector <HostDevice> Partitions;
 };
 
+struct RawDevicesDlgParam
+{
+	std::vector <HostDevice> devices;
+	char *pszFileName;
+};
+
 BOOL BrowseFilesInDir (HWND hwndDlg, char *stringId, char *initialDir, char *lpszFileName, BOOL keepHistory, BOOL saveMode, wchar_t *browseFilter, const wchar_t *initialFileName = NULL, const wchar_t *defaultExtension = NULL);
 std::wstring SingleStringToWide (const std::string &singleString);
 std::wstring Utf8StringToWide (const std::string &utf8String);
@@ -522,11 +548,17 @@ std::string ToUpperCase (const std::string &str);
 std::wstring GetWrongPasswordErrorMessage (HWND hwndDlg);
 std::string GetWindowsEdition ();
 std::string FitPathInGfxWidth (HWND hwnd, HFONT hFont, LONG width, const std::string &path);
-std::string GetServiceConfigPath (const char *fileName);
+std::string GetServiceConfigPath (const char *fileName, bool useLegacy);
 std::string VolumeGuidPathToDevicePath (std::string volumeGuidPath);
 std::string HarddiskVolumePathToPartitionPath (const std::string &harddiskVolumePath);
 std::string FindLatestFileOrDirectory (const std::string &directory, const char *namePattern, bool findDirectory, bool findFile);
 std::string GetUserFriendlyVersionString (int version);
+std::string IntToString (int val);
+std::wstring IntToWideString (int val);
+inline std::wstring AppendSrcPos (const wchar_t* msg, const char* srcPos)
+{
+	return std::wstring (msg) + L"\n\nSource: " + SingleStringToWide (srcPos);
+}
 
 // Display a wait dialog while calling the provided callback with the given parameter
 typedef void (CALLBACK* WaitThreadProc)(void* pArg, HWND hWaitDlg);

src/Common/EncryptionThreadPool.c

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008-2010 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #include "EncryptionThreadPool.h"

src/Common/EncryptionThreadPool.h

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008-2010 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #ifndef TC_HEADER_ENCRYPTION_THREAD_POOL

src/Common/Endian.c

@@ -1,12 +1,14 @@
 /*
  Legal Notice: Some portions of the source code contained in this file were
- derived from the source code of Encryption for the Masses 2.02a, which is
- Copyright (c) 1998-2000 Paul Le Roux and which is governed by the 'License
- Agreement for Encryption for the Masses'. Modifications and additions to
- the original source code (contained in this file) and all other portions
- of this file are Copyright (c) 2003-2009 TrueCrypt Developers Association
- and are governed by the TrueCrypt License 3.0 the full text of which is
- contained in the file License.txt included in TrueCrypt binary and source
+ derived from the source code of TrueCrypt 7.1a, which is 
+ Copyright (c) 2003-2012 TrueCrypt Developers Association and which is 
+ governed by the TrueCrypt License 3.0, also from the source code of
+ Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
+ and which is governed by the 'License Agreement for Encryption for the Masses' 
+ 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 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. */
 
 #include "Tcdefs.h"

src/Common/Endian.h

@@ -1,12 +1,14 @@
 /*
  Legal Notice: Some portions of the source code contained in this file were
- derived from the source code of Encryption for the Masses 2.02a, which is
- Copyright (c) 1998-2000 Paul Le Roux and which is governed by the 'License
- Agreement for Encryption for the Masses'. Modifications and additions to
- the original source code (contained in this file) and all other portions
- of this file are Copyright (c) 2003-2009 TrueCrypt Developers Association
- and are governed by the TrueCrypt License 3.0 the full text of which is
- contained in the file License.txt included in TrueCrypt binary and source
+ derived from the source code of TrueCrypt 7.1a, which is 
+ Copyright (c) 2003-2012 TrueCrypt Developers Association and which is 
+ governed by the TrueCrypt License 3.0, also from the source code of
+ Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
+ and which is governed by the 'License Agreement for Encryption for the Masses' 
+ 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 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. */
 
 #ifndef TC_ENDIAN_H
@@ -108,7 +110,7 @@ extern "C"
 	  ( ( unsigned __int32 ) memPtr[ -2 ] << 8 ) | ( unsigned __int32 ) memPtr[ -1 ] )
 
 #define mgetWord(memPtr) 		\
-	( memPtr += 2, ( unsigned short ) memPtr[ -2 ] << 8 ) | ( ( unsigned short ) memPtr[ -1 ] ) 
+	( memPtr += 2, ((( unsigned short ) memPtr[ -2 ] << 8 ) | ( ( unsigned short ) memPtr[ -1 ] )) ) 
 
 #define mgetByte(memPtr)		\
 	( ( unsigned char ) *memPtr++ )

src/Common/Exception.h

@@ -1,9 +1,13 @@
 /*
- Copyright (c) 2008 TrueCrypt Developers Association. All rights reserved.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
 
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ 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 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.
 */
 
 #ifndef TC_HEADER_Common_Exception
@@ -11,6 +15,8 @@
 
 #include "Platform/PlatformBase.h"
 #include "Dlgcode.h"
+#include "Language.h"
+#include <strsafe.h>
 
 namespace VeraCrypt
 {
@@ -21,30 +27,32 @@ namespace VeraCrypt
 
 	struct SystemException : public Exception
 	{
-		SystemException () : ErrorCode (GetLastError()) { }
+		SystemException (const char *srcPos) : ErrorCode (GetLastError()), SrcPos (srcPos) { }
 
 		void Show (HWND parent) const
 		{
 			SetLastError (ErrorCode);
-			handleWin32Error (parent);
+			handleWin32Error (parent, SrcPos);
 		}
 
 		DWORD ErrorCode;
+		const char *SrcPos;
 	};
 
 	struct ErrorException : public Exception
 	{
-		ErrorException (char *langId) : ErrLangId (langId) { }
-		ErrorException (const wstring &errMsg) : ErrLangId(NULL), ErrMsg (errMsg) { }
+		ErrorException (char *langId, const char *srcPos) : SrcPos (srcPos), ErrLangId (langId) { }
+		ErrorException (const wstring &errMsg, const char *srcPos) : SrcPos (srcPos), ErrLangId(NULL), ErrMsg (errMsg) { }
 
 		void Show (HWND parent) const
 		{
 			if (ErrMsg.empty())
-				::Error (ErrLangId? ErrLangId : "", parent);
+				::ErrorDirect (AppendSrcPos (GetString (ErrLangId? ErrLangId : ""), SrcPos).c_str (), parent);
 			else
-				::ErrorDirect (ErrMsg.c_str(), parent);
+				::ErrorDirect (AppendSrcPos (ErrMsg.c_str(), SrcPos).c_str (), parent);
 		}
 
+		const char *SrcPos;
 		char *ErrLangId;
 		wstring ErrMsg;
 	};
@@ -62,10 +70,44 @@ namespace VeraCrypt
 		const char *SrcPos;
 	};
 
+	struct RandInitFailed : public Exception
+	{
+		RandInitFailed (const char *srcPos, DWORD dwLastError) : SrcPos (srcPos), LastError (dwLastError) { }
+
+		void Show (HWND parent) const
+		{
+			char szErrCode[16];
+			StringCbPrintf (szErrCode, sizeof(szErrCode), "0x%.8X", LastError);
+			string msgBody = "The Random Generator initialization failed.\n\n\n(If you report a bug in connection with this, please include the following technical information in the bug report:\n" + string (SrcPos) + "\nLast Error = " + string (szErrCode) + ")";
+			MessageBox (parent, msgBody.c_str(), "VeraCrypt", MB_ICONERROR | MB_SETFOREGROUND);
+		}
+
+		const char *SrcPos;
+		DWORD LastError;
+	};
+
+	struct CryptoApiFailed : public Exception
+	{
+		CryptoApiFailed (const char *srcPos, DWORD dwLastError) : SrcPos (srcPos), LastError (dwLastError) { }
+
+		void Show (HWND parent) const
+		{
+			char szErrCode[16];
+			StringCbPrintf (szErrCode, sizeof(szErrCode), "0x%.8X", LastError);
+			string msgBody = "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" + string (SrcPos) + "\nLast Error = " + string (szErrCode) + ")";
+			MessageBox (parent, msgBody.c_str(), "VeraCrypt", MB_ICONERROR | MB_SETFOREGROUND);
+		}
+
+		const char *SrcPos;
+		DWORD LastError;
+	};
+
 	struct TimeOut : public Exception
 	{
-		TimeOut (const char *srcPos) { }
-		void Show (HWND parent) const { ErrorDirect (L"Timeout", parent); }
+		TimeOut (const char *srcPos) : SrcPos (srcPos) { }
+		void Show (HWND parent) const { ErrorDirect (AppendSrcPos (L"Timeout", SrcPos).c_str (), parent); }
+
+		const char *SrcPos;
 	};
 
 	struct UserAbort : public Exception
@@ -75,7 +117,7 @@ namespace VeraCrypt
 	};
 }
 
-#define throw_sys_if(condition) do { if (condition) throw SystemException(); } while (false)
+#define throw_sys_if(condition) do { if (condition) throw SystemException( SRC_POS ); } while (false)
 
 
 #endif // TC_HEADER_Common_Exception

src/Common/Fat.c

@@ -1,12 +1,14 @@
 /*
  Legal Notice: Some portions of the source code contained in this file were
- derived from the source code of Encryption for the Masses 2.02a, which is
- Copyright (c) 1998-2000 Paul Le Roux and which is governed by the 'License
- Agreement for Encryption for the Masses'. Modifications and additions to
- the original source code (contained in this file) and all other portions
- of this file are Copyright (c) 2003-2010 TrueCrypt Developers Association
- and are governed by the TrueCrypt License 3.0 the full text of which is
- contained in the file License.txt included in TrueCrypt binary and source
+ derived from the source code of TrueCrypt 7.1a, which is 
+ Copyright (c) 2003-2012 TrueCrypt Developers Association and which is 
+ governed by the TrueCrypt License 3.0, also from the source code of
+ Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
+ and which is governed by the 'License Agreement for Encryption for the Masses' 
+ 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 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. */
 
 #include <stdlib.h>
@@ -60,7 +62,7 @@ GetFatParams (fatparams * ft)
 		if (ft->cluster_size == 0)
 			ft->cluster_size = 1;
 
-		if (ft->cluster_size * ft->sector_size > TC_MAX_FAT_CLUSTER_SIZE)
+		if (((unsigned __int64) ft->cluster_size * ft->sector_size) > TC_MAX_FAT_CLUSTER_SIZE)
 			ft->cluster_size = TC_MAX_FAT_CLUSTER_SIZE / ft->sector_size;
 
 		if (ft->cluster_size > 128)
@@ -85,7 +87,7 @@ GetFatParams (fatparams * ft)
 	ft->size_fat = 12;
 	ft->reserved = 2;
 	fatsecs = ft->num_sectors - (ft->size_root_dir + ft->sector_size - 1) / ft->sector_size - ft->reserved;
-	ft->cluster_count = (int) (((__int64) fatsecs * ft->sector_size) / (ft->cluster_size * ft->sector_size));
+	ft->cluster_count = (int) (((unsigned __int64) fatsecs * ft->sector_size) / ((unsigned __int64) ft->cluster_size * ft->sector_size));
 	ft->fat_length = (((ft->cluster_count * 3 + 1) >> 1) + ft->sector_size - 1) / ft->sector_size;
 
 	if (ft->cluster_count >= 4085) // FAT16
@@ -108,7 +110,7 @@ GetFatParams (fatparams * ft)
 
 			fatsecs = ft->num_sectors - ft->reserved;
 			ft->size_root_dir = ft->cluster_size * ft->sector_size;
-			ft->cluster_count = (int) (((__int64) fatsecs * ft->sector_size) / (ft->cluster_size * ft->sector_size));
+			ft->cluster_count = (int) (((unsigned __int64) fatsecs * ft->sector_size) / (ft->cluster_size * ft->sector_size));
 			ft->fat_length = (ft->cluster_count * 4 + ft->sector_size - 1) / ft->sector_size;
 
 		// Align data area on TC_MAX_VOLUME_SECTOR_SIZE
@@ -282,7 +284,8 @@ FormatFat (void* hwndDlgPtr, unsigned __int64 startSector, fatparams * ft, void
 
 	memset (sector, 0, ft->sector_size);
 
-	RandgetBytes (hwndDlg, ft->volume_id, sizeof (ft->volume_id), FALSE);
+	if (!RandgetBytes (hwndDlg, ft->volume_id, sizeof (ft->volume_id), FALSE))
+		goto fail;
 
 	PutBoot (ft, (unsigned char *) sector);
 	if (WriteSector (dev, sector, write_buf, &write_buf_cnt, &nSecNo,