Windows: fix buffer overrun caused by wrong use of wmemset

Windows: Add missing string in Language.xml
Windows: Remove unused variable
2026-08-29 12:17:16 +00:00 · 2022-01-16 21:02:09 +01:00 · 2022-01-16 20:28:30 +01:00 · 2022-01-16 16:50:40 +01:00 · 2022-01-16 16:40:49 +01:00 · 2022-01-16 15:47:03 +01:00
13 changed files with 1001704 additions and 373 deletions
@@ -8,60 +8,60 @@
    <font lang="nl" class="fixed" size="12" face="Lucida Console"/>
    <font lang="nl" class="title" size="21" face="Times New Roman"/>
    <entry lang="nl" key="IDCANCEL">Annuleren</entry>
-    <entry lang="nl" key="IDC_ALL_USERS">Installeren &amp;voor alle gebruikers</entry>
-    <entry lang="nl" key="IDC_BROWSE">&amp;Bladeren...</entry>
+    <entry lang="nl" key="IDC_ALL_USERS">Installeren voor alle gebruikers</entry>
+    <entry lang="nl" key="IDC_BROWSE">Bladeren...</entry>
    <entry lang="nl" key="IDC_DESKTOP_ICON">VeraCrypt-pictogram toevoegen aan het bureaublad</entry>
    <entry lang="nl" key="IDC_DONATE">Nu doneren...</entry>
    <entry lang="nl" key="IDC_FILE_TYPE">De .hc-bestandsextensie koppelen aan VeraCrypt</entry>
    <entry lang="nl" key="IDC_OPEN_CONTAINING_FOLDER">De bestemmingslocatie openen wanneer klaar</entry>
    <entry lang="nl" key="IDC_PROG_GROUP">VeraCrypt aan het startmenu toevoegen</entry>
    <entry lang="nl" key="IDC_SYSTEM_RESTORE">Systeemherstelpunt aanmaken</entry>
-    <entry lang="nl" key="IDC_UNINSTALL">&amp;Verwijderen</entry>
-    <entry lang="nl" key="IDC_WIZARD_MODE_EXTRACT_ONLY">&amp;Uitpakken</entry>
-    <entry lang="nl" key="IDC_WIZARD_MODE_INSTALL">&amp;Installeren</entry>
+    <entry lang="nl" key="IDC_UNINSTALL">Verwijderen</entry>
+    <entry lang="nl" key="IDC_WIZARD_MODE_EXTRACT_ONLY">Uitpakken</entry>
+    <entry lang="nl" key="IDC_WIZARD_MODE_INSTALL">Installeren</entry>
    <entry lang="nl" key="IDD_INSTL_DLG">VeraCrypt installatiewizard</entry>
    <entry lang="nl" key="IDD_UNINSTALL">VeraCrypt verwijderen</entry>
-    <entry lang="nl" key="IDHELP">&amp;Help</entry>
+    <entry lang="nl" key="IDHELP">Help</entry>
    <entry lang="nl" key="IDT_EXTRACT_DESTINATION">Selecteer of typ de locatie waar u de uitgepakte bestanden wilt plaatsen:</entry>
    <entry lang="nl" key="IDT_INSTALL_DESTINATION">Selecteer of typ de locatie waar u de VeraCrypt-programmabestanden wilt installeren. Als de opgegeven map niet bestaat, wordt deze automatisch aangemaakt.</entry>
    <entry lang="nl" key="IDT_UNINSTALL_DIR">Klik op Verwijderen om VeraCrypt van dit systeem te verwijderen.</entry>
    <entry lang="nl" key="IDC_ABORT_BUTTON">Afbreken</entry>
    <entry lang="nl" key="IDC_BENCHMARK">Benchmark</entry>
-    <entry lang="nl" key="IDC_CIPHER_TEST">&amp;Testen</entry>
+    <entry lang="nl" key="IDC_CIPHER_TEST">Testen</entry>
    <entry lang="nl" key="IDC_DEVICE_TRANSFORM_MODE_FORMAT">Versleuteld volume aanmaken en het formatteren</entry>
    <entry lang="nl" key="IDC_DEVICE_TRANSFORM_MODE_INPLACE">Partitie ter plaatse versleutelen</entry>
    <entry lang="nl" key="IDC_DISPLAY_KEYS">Genereerde sleutels (hun delen) weergeven</entry>
    <entry lang="nl" key="IDC_DISPLAY_POOL_CONTENTS">Inhoud van pool weergeven</entry>
    <entry lang="nl" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Cd/dvd-opnamesoftware downloaden</entry>
    <entry lang="nl" key="IDC_FILE_CONTAINER">Een versleutelde bestandscontainer aanmaken</entry>
-    <entry lang="nl" key="IDC_GB">&amp;GiB</entry>
-    <entry lang="nl" key="IDC_TB">&amp;TiB</entry>
+    <entry lang="nl" key="IDC_GB">GiB</entry>
+    <entry lang="nl" key="IDC_TB">TiB</entry>
    <entry lang="nl" key="IDC_HIDDEN_SYSENC_INFO_LINK">Meer informatie</entry>
    <entry lang="nl" key="IDC_HIDDEN_VOL">Verborgen VeraCrypt-volume </entry>
    <entry lang="nl" key="IDC_HIDDEN_VOL_HELP">Meer informatie over verborgen volumes</entry>
    <entry lang="nl" key="IDC_HIDVOL_WIZ_MODE_DIRECT">Directe modus</entry>
    <entry lang="nl" key="IDC_HIDVOL_WIZ_MODE_FULL">Normale modus</entry>
-    <entry lang="nl" key="IDC_KB">&amp;KiB</entry>
+    <entry lang="nl" key="IDC_KB">KiB</entry>
    <entry lang="nl" key="IDC_KEYFILES_ENABLE">Sleutelbestanden gebruiken</entry>
    <entry lang="nl" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Probeer eerst te koppelen met een leeg wachtwoord</entry>
    <entry lang="nl" key="IDC_KEYFILES_RANDOM_SIZE">Willekeurige grootte (64 &lt;-&gt; 1048576)</entry>
-    <entry lang="nl" key="IDC_KEY_FILES">&amp;Sleutelbestanden...</entry>
+    <entry lang="nl" key="IDC_KEY_FILES">Sleutelbestanden...</entry>
    <entry lang="nl" key="IDC_LINK_HASH_INFO">Informatie over hash-algoritmen</entry>
    <entry lang="nl" key="IDC_LINK_MORE_INFO_ABOUT_CIPHER">Meer informatie</entry>
    <entry lang="nl" key="IDC_LINK_PIM_INFO">Informatie over PIM</entry>
-    <entry lang="nl" key="IDC_MB">&amp;MiB</entry>
+    <entry lang="nl" key="IDC_MB">MiB</entry>
    <entry lang="nl" key="IDC_MORE_INFO_ON_CONTAINERS">Meer informatie</entry>
    <entry lang="nl" key="IDC_MORE_INFO_ON_SYS_ENCRYPTION">Meer informatie over systeemversleuteling</entry>
    <entry lang="nl" key="IDC_MORE_INFO_SYS_ENCRYPTION">Meer informatie</entry>
    <entry lang="nl" key="IDC_MULTI_BOOT">Multi-boot</entry>
    <entry lang="nl" key="IDC_NONSYS_DEVICE">Een niet-systeempartitie/schijf versleutelen</entry>
-    <entry lang="nl" key="IDC_NO_HISTORY">&amp;Nooit geschiedenis opslaan</entry>
+    <entry lang="nl" key="IDC_NO_HISTORY">Nooit geschiedenis opslaan</entry>
    <entry lang="nl" key="IDC_OPEN_OUTER_VOLUME">Buitenste volume openen</entry>
-    <entry lang="nl" key="IDC_PAUSE">&amp;Pauzeren</entry>
+    <entry lang="nl" key="IDC_PAUSE">Pauzeren</entry>
    <entry lang="nl" key="IDC_PIM_ENABLE">PIM gebruiken</entry>
    <entry lang="nl" key="IDC_NEW_PIM_ENABLE">PIM gebruiken</entry>
    <entry lang="nl" key="IDC_QUICKFORMAT">Snelformatteren</entry>
-    <entry lang="nl" key="IDC_SHOW_PASSWORD">&amp;Wachtwoord weergeven</entry>
+    <entry lang="nl" key="IDC_SHOW_PASSWORD">Wachtwoord weergeven</entry>
    <entry lang="nl" key="IDC_SHOW_PASSWORD_SINGLE">Wachtwoord weergeven</entry>
    <entry lang="nl" key="IDC_SHOW_PIM">PIM weergeven</entry>
    <entry lang="nl" key="IDC_SINGLE_BOOT">Single-boot</entry>
@@ -74,7 +74,7 @@
    <entry lang="nl" key="IDD_VOL_CREATION_WIZARD_DLG">VeraCrypt wizard volume aanmaken</entry>
    <entry lang="nl" key="IDT_CLUSTER">Cluster </entry>
    <entry lang="nl" key="IDT_COLLECTING_RANDOM_DATA_NOTE">BELANGRIJK: Beweeg de muis zo willekeurig mogelijk binnen dit venster. Hoe langer u ze beweegt, hoe beter. Dit verhoogt de cryptografische kracht van de encryptiesleutels aanzienlijk. Klik vervolgens op Volgende om verder te gaan.</entry>
-    <entry lang="nl" key="IDT_CONFIRM">&amp;Bevestigen:</entry>
+    <entry lang="nl" key="IDT_CONFIRM">Bevestigen:</entry>
    <entry lang="nl" key="IDT_DONE">Klaar</entry>
    <entry lang="nl" key="IDT_DRIVE_LETTER">Stationsletter:</entry>
    <entry lang="nl" key="IDT_ENCRYPTION_ALGO">Versleutelingsalgoritme</entry>
@@ -107,13 +107,13 @@
    <entry lang="nl" key="IDC_AUTORUN_DISABLE">Niets doen</entry>
    <entry lang="nl" key="IDC_AUTORUN_MOUNT">VeraCrypt-volume automatisch koppelen (hieronder opgegeven)</entry>
    <entry lang="nl" key="IDC_AUTORUN_START">VeraCrypt starten</entry>
-    <entry lang="nl" key="IDC_AUTO_DETECT_PKCS11_MODULE">Bibliotheek auto-&amp;detecteren</entry>
+    <entry lang="nl" key="IDC_AUTO_DETECT_PKCS11_MODULE">Bibliotheek auto-detecteren</entry>
    <entry lang="nl" key="IDC_BOOT_LOADER_CACHE_PASSWORD">Pre-boot-authenticatiewachtwoord in het stuurprogrammageheugen opslaan (voor het koppelen van niet-systeemvolumes)</entry>
    <entry lang="nl" key="IDC_BROWSE_DIRS">Bladeren...</entry>
    <entry lang="nl" key="IDC_BROWSE_FILES">Bladeren...</entry>
    <entry lang="nl" key="IDC_CACHE">Wachtwoorden en sleutelbestanden in geheugen opslaan</entry>
    <entry lang="nl" key="IDC_CLOSE_BKG_TASK_WHEN_NOVOL">Afsluiten als er geen gekoppelde volumes zijn</entry>
-    <entry lang="nl" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">&amp;Token-sessie sluiten (afmelden) nadat een volume met succes is gekoppeld</entry>
+    <entry lang="nl" key="IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT">Token-sessie sluiten (afmelden) nadat een volume met succes is gekoppeld</entry>
    <entry lang="nl" key="IDC_COPY_EXPANDER">Inclusief VeraCrypt volume-uitbreider</entry>
    <entry lang="nl" key="IDC_COPY_WIZARD">Inclusief VeraCrypt wizard volume aanmaken</entry>
    <entry lang="nl" key="IDC_CREATE">Aanmaken</entry>
@@ -123,11 +123,11 @@
    <entry lang="nl" key="IDC_ENABLE_HARDWARE_ENCRYPTION">AES-versleuteling/ontsleuteling versnellen door gebruik te maken van de AES-instructies van de processor (indien beschikbaar).</entry>
    <entry lang="nl" key="IDC_ENABLE_KEYFILES">Sleutelbestanden gebruiken</entry>
    <entry lang="nl" key="IDC_ENABLE_NEW_KEYFILES">Sleutelbestanden gebr.</entry>
-    <entry lang="nl" key="IDC_EXIT">&amp;Sluiten</entry>
+    <entry lang="nl" key="IDC_EXIT">Sluiten</entry>
    <entry lang="nl" key="IDC_FAVORITES_HELP_LINK">Hulp bij favoriete volumes</entry>
    <entry lang="nl" key="IDC_FAVORITE_DISABLE_HOTKEY">Geselecteerd volume niet koppelen wanneer sneltoets 'favoriete volumes koppelen' wordt ingedrukt</entry>
-    <entry lang="nl" key="IDC_FAVORITE_MOUNT_ON_ARRIVAL">Koppel het geselecteerde volume wanneer zijn host-apparaat wordt aangesloten.</entry>
-    <entry lang="nl" key="IDC_FAVORITE_MOUNT_ON_LOGON">Geselecteerd volume koppelen bij het &amp;aanmelden</entry>
+    <entry lang="nl" key="IDC_FAVORITE_MOUNT_ON_ARRIVAL">Geselecteerd volume koppelen wanneer zijn host-apparaat wordt aangesloten</entry>
+    <entry lang="nl" key="IDC_FAVORITE_MOUNT_ON_LOGON">Geselecteerd volume koppelen bij het aanmelden</entry>
    <entry lang="nl" key="IDC_FAVORITE_MOUNT_READONLY">Geselecteerd volume koppelen als alleen-lezen</entry>
    <entry lang="nl" key="IDC_FAVORITE_MOUNT_REMOVABLE">Geselecteerd volume koppelen als verwisselbaar medium</entry>
    <entry lang="nl" key="IDC_FAVORITE_MOVE_DOWN">Omlaag</entry>
@@ -149,8 +149,8 @@
    <entry lang="nl" key="IDC_MORE_INFO_ON_HW_ACCELERATION">Meer informatie</entry>
    <entry lang="nl" key="IDC_MORE_INFO_ON_THREAD_BASED_PARALLELIZATION">Meer informatie</entry>
    <entry lang="nl" key="IDC_MORE_SETTINGS">Meer instellingen...</entry>
-    <entry lang="nl" key="IDC_MOUNTALL">&amp;Automatisch koppelen</entry>
-    <entry lang="nl" key="IDC_MOUNT_OPTIONS">&amp;Koppelopties...</entry>
+    <entry lang="nl" key="IDC_MOUNTALL">Automatisch koppelen</entry>
+    <entry lang="nl" key="IDC_MOUNT_OPTIONS">Koppelopties...</entry>
    <entry lang="nl" key="IDC_MOUNT_READONLY">Volume koppelen als alleen-lezen</entry>
    <entry lang="nl" key="IDC_NEW_KEYFILES">Sleutelbestanden...</entry>
    <entry lang="nl" key="IDC_OLD_PIM_HELP">(Leeg of 0 voor standaard iteraties)</entry>
@@ -174,17 +174,17 @@
    <entry lang="nl" key="IDC_PREF_WIPE_CACHE_ON_EXIT">Opgeslagen wachtwoorden wissen bij afsluiten</entry>
    <entry lang="nl" key="IDC_PRESERVE_TIMESTAMPS">Tijdstempel van wijziging van bestandscontainers bewaren</entry>
    <entry lang="nl" key="IDC_RESET_HOTKEYS">Herstellen</entry>
-    <entry lang="nl" key="IDC_SELECT_DEVICE">&amp;Apparaat selecteren...</entry>
-    <entry lang="nl" key="IDC_SELECT_FILE">&amp;Bestand selecteren...</entry>
-    <entry lang="nl" key="IDC_SELECT_PKCS11_MODULE">&amp;Bibliotheek selecteren...</entry>
+    <entry lang="nl" key="IDC_SELECT_DEVICE">Apparaat selecteren...</entry>
+    <entry lang="nl" key="IDC_SELECT_FILE">Bestand selecteren...</entry>
+    <entry lang="nl" key="IDC_SELECT_PKCS11_MODULE">Bibliotheek selecteren...</entry>
    <entry lang="nl" key="IDC_SHOW_PASSWORD_CHPWD_NEW">Wachtwoord weergeven</entry>
    <entry lang="nl" key="IDC_SHOW_PASSWORD_CHPWD_ORI">Wachtwoord weergeven</entry>
-    <entry lang="nl" key="IDC_TRAVEL_OPEN_EXPLORER">&amp;Verkennervenster openen voor gekoppeld volume</entry>
-    <entry lang="nl" key="IDC_TRAV_CACHE_PASSWORDS">&amp;Wachtwoord in stuurprogramma-geheugen opslaan</entry>
+    <entry lang="nl" key="IDC_TRAVEL_OPEN_EXPLORER">Verkennervenster openen voor gekoppeld volume</entry>
+    <entry lang="nl" key="IDC_TRAV_CACHE_PASSWORDS">Wachtwoord in stuurprogramma-geheugen opslaan</entry>
    <entry lang="nl" key="IDC_TRUECRYPT_MODE">TrueCrypt-modus</entry>
-    <entry lang="nl" key="IDC_UNMOUNTALL">Alles &amp;ontkoppelen</entry>
-    <entry lang="nl" key="IDC_VOLUME_PROPERTIES">&amp;Volume-eigenschappen</entry>
-    <entry lang="nl" key="IDC_VOLUME_TOOLS">&amp;Volumegereedschap...</entry>
+    <entry lang="nl" key="IDC_UNMOUNTALL">Alles ontkoppelen</entry>
+    <entry lang="nl" key="IDC_VOLUME_PROPERTIES">Volume-eigenschappen</entry>
+    <entry lang="nl" key="IDC_VOLUME_TOOLS">Volumegereedschap...</entry>
    <entry lang="nl" key="IDC_WIPE_CACHE">Cache wissen</entry>
    <entry lang="nl" key="IDD_DEFAULT_MOUNT_PARAMETERS">VeraCrypt - Koppelingparameters</entry>
    <entry lang="nl" key="IDD_FAVORITE_VOLUMES">VeraCrypt - favoriete volumes</entry>
@@ -302,23 +302,23 @@
    <entry lang="nl" key="IDT_TRAVEL_ROOT">Reisschijf-bestanden aanmaken in (reisschijf-basismap):</entry>
    <entry lang="nl" key="IDT_VOLUME">Volume</entry>
    <entry lang="nl" key="IDT_WINDOWS_RELATED_SETTING">Windows</entry>
-    <entry lang="nl" key="IDC_ADD_KEYFILE_PATH">&amp;Pad toevoegen...</entry>
-    <entry lang="nl" key="IDC_AUTO">&amp;Alles auto-testen</entry>
-    <entry lang="nl" key="IDC_CONTINUE">&amp;Doorgaan</entry>
-    <entry lang="nl" key="IDC_DECRYPT">&amp;Ontsleutelen</entry>
+    <entry lang="nl" key="IDC_ADD_KEYFILE_PATH">Pad toevoegen...</entry>
+    <entry lang="nl" key="IDC_AUTO">Alles auto-testen</entry>
+    <entry lang="nl" key="IDC_CONTINUE">Doorgaan</entry>
+    <entry lang="nl" key="IDC_DECRYPT">Ontsleutelen</entry>
    <entry lang="nl" key="IDC_DELETE">Verwijderen</entry>
-    <entry lang="nl" key="IDC_ENCRYPT">&amp;Versleutelen</entry>
-    <entry lang="nl" key="IDC_EXPORT">&amp;Exporteren...</entry>
+    <entry lang="nl" key="IDC_ENCRYPT">Versleutelen</entry>
+    <entry lang="nl" key="IDC_EXPORT">Exporteren...</entry>
    <entry lang="nl" key="IDC_GENERATE_AND_SAVE_KEYFILE">Sleutelbestand genereren en opslaan...</entry>
-    <entry lang="nl" key="IDC_GENERATE_KEYFILE">&amp;Willekeurig sleutelbest. genereren...</entry>
+    <entry lang="nl" key="IDC_GENERATE_KEYFILE">Willekeurig sleutelbest. genereren...</entry>
    <entry lang="nl" key="IDC_GET_LANG_PACKS">Taalpakket downloaden</entry>
    <entry lang="nl" key="IDC_HW_AES_LABEL_LINK">Hardware-versneld AES:</entry>
    <entry lang="nl" key="IDC_IMPORT_KEYFILE">Sleutelbestand importeren naar token...</entry>
-    <entry lang="nl" key="IDC_KEYADD">&amp;Best. toev...</entry>
+    <entry lang="nl" key="IDC_KEYADD">Best. toev...</entry>
    <entry lang="nl" key="IDC_KEYFILES_ENABLE_HIDVOL_PROT">Sleutelbestanden gebruiken</entry>
-    <entry lang="nl" key="IDC_KEYFILES_HIDVOL_PROT">&amp;Sleutelbestanden...</entry>
-    <entry lang="nl" key="IDC_KEYREMOVE">&amp;Verwijderen</entry>
-    <entry lang="nl" key="IDC_KEYREMOVEALL">&amp;Alles verwijderen</entry>
+    <entry lang="nl" key="IDC_KEYFILES_HIDVOL_PROT">Sleutelbestanden...</entry>
+    <entry lang="nl" key="IDC_KEYREMOVE">Verwijderen</entry>
+    <entry lang="nl" key="IDC_KEYREMOVEALL">Alles verwijderen</entry>
    <entry lang="nl" key="IDC_LINK_HIDVOL_PROTECTION_INFO">Wat is de bescherming van een verborgen volume?</entry>
    <entry lang="nl" key="IDC_LINK_KEYFILES_INFO">Meer informatie over sleutelbestanden</entry>
    <entry lang="nl" key="IDC_MOUNT_REMOVABLE">Volume koppelen als verwisselbaar medium</entry>
@@ -327,7 +327,7 @@
    <entry lang="nl" key="IDC_PERFORM_BENCHMARK">Benchmark</entry>
    <entry lang="nl" key="IDC_PRINT">Afdrukken</entry>
    <entry lang="nl" key="IDC_PROTECT_HIDDEN_VOL">Beschermen tegen schade veroorzaakt door schrijven naar het buitenste volume</entry>
-    <entry lang="nl" key="IDC_RESET">&amp;Herstellen</entry>
+    <entry lang="nl" key="IDC_RESET">Herstellen</entry>
    <entry lang="nl" key="IDC_SHOW_PASSWORD_MO">Wachtwoord weergeven</entry>
    <entry lang="nl" key="IDC_TOKEN_FILES_ADD">Tokenbest. toev...</entry>
    <entry lang="nl" key="IDC_USE_EMBEDDED_HEADER_BAK">Back-up header ingebed in volume gebruiken indien beschikbaar</entry>
@@ -369,7 +369,7 @@
    <entry lang="nl" key="IDT_SECURITY_TOKEN">Beveiligingstoken:</entry>
    <entry lang="nl" key="IDT_SORT_METHOD">Weergave:</entry>
    <entry lang="nl" key="IDT_STATIC_MODELESS_WAIT_DLG_INFO">Even geduld. Dit proces kan lang duren....</entry>
-    <entry lang="nl" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Even geduld...\nDit proces kan lang duren en VeraCrypt lijkt misschien niet te reageren.</entry>
+    <entry lang="nl" key="IDT_STATIC_MODAL_WAIT_DLG_INFO">Even geduld...\nDit proces kan lang duren en het kan lijken dat VeraCrypt niet meer reageert.</entry>
    <entry lang="nl" key="IDT_TEST_BLOCK_NUMBER">Bloknummer:</entry>
    <entry lang="nl" key="IDT_TEST_CIPHERTEXT">Versleutelingstekst (hexadecimaal)</entry>
    <entry lang="nl" key="IDT_TEST_DATA_UNIT_NUMBER">Gegevenseenheid-nummer (64-bits hexadecimaal, grootte van gegevenseenh. is 512 bytes).</entry>
@@ -378,13 +378,13 @@
    <entry lang="nl" key="IDT_TOKEN_KEYFILE_NAME">Naam sleutelbestand:</entry>
    <entry lang="nl" key="IDT_XTS_MODE">XTS-modus</entry>
    <entry lang="nl" key="MENU_SYSTEM_ENCRYPTION">Systeem</entry>
-    <entry lang="nl" key="MENU_VOLUMES">&amp;Volumes</entry>
-    <entry lang="nl" key="MENU_FAVORITES">&amp;Favorieten</entry>
-    <entry lang="nl" key="MENU_TOOLS">&amp;Gereedschap</entry>
-    <entry lang="nl" key="MENU_SETTINGS">&amp;Instellingen</entry>
-    <entry lang="nl" key="MENU_HELP">&amp;Help</entry>
+    <entry lang="nl" key="MENU_VOLUMES">Volumes</entry>
+    <entry lang="nl" key="MENU_FAVORITES">Favorieten</entry>
+    <entry lang="nl" key="MENU_TOOLS">Gereedschap</entry>
+    <entry lang="nl" key="MENU_SETTINGS">Instellingen</entry>
+    <entry lang="nl" key="MENU_HELP">Help</entry>
    <entry lang="nl" key="MENU_WEBSITE">   Startpagina   </entry>
-    <entry lang="nl" key="ABOUTBOX">&amp;Over...</entry>
+    <entry lang="nl" key="ABOUTBOX">Over...</entry>
    <entry lang="nl" key="ACCESSMODEFAIL">Het alleen-lezen attribuut op uw oude volume kon niet worden gewijzigd. Controleer de toegangsrechten voor het bestand.</entry>
    <entry lang="nl" key="ACCESS_DENIED">Fout: Toegang geweigerd.\n\nDe partitie die u probeert te benaderen is ofwel 0 sectoren lang, of het is het opstartapparaat. </entry>
    <entry lang="nl" key="ADMINISTRATOR">Beheerder</entry>
@@ -465,8 +465,8 @@
    <entry lang="nl" key="SYSTEM_CRASH_REPORT">Om ons te helpen bepalen of er een bug in VeraCrypt zit, kunt u ons een automatisch gegenereerde foutmelding sturen met de volgende items:\n- Programmaversie\n- Versie van het besturingssysteem\n- Type CPU\n- Foutcategorie\n- Naam en versie van het stuurprogramma\n- Oproepensysteem\n\nAls u 'Ja' selecteert, wordt de volgende URL (die de volledige foutmelding bevat) geopend in uw standaard internetbrowser.</entry>
    <entry lang="nl" key="ASK_SEND_ERROR_REPORT">Wilt u ons bovenstaande foutmelding sturen?</entry>
    <entry lang="nl" key="ENCRYPT">Versleutelen</entry>
-    <entry lang="nl" key="DECRYPT">&amp;Ontsleutelen</entry>
-    <entry lang="nl" key="PERMANENTLY_DECRYPT">&amp;Permanent ontsleutelen</entry>
+    <entry lang="nl" key="DECRYPT">Ontsleutelen</entry>
+    <entry lang="nl" key="PERMANENTLY_DECRYPT">Permanent ontsleutelen</entry>
    <entry lang="nl" key="EXIT">Sluiten</entry>
    <entry lang="nl" key="EXT_PARTITION">Maak een logische schijf aan voor deze uitgebreide partitie en probeer het dan opnieuw.</entry>
    <entry lang="nl" key="FILE_HELP">Een VeraCrypt-volume kan zich bevinden in een bestand (de VeraCrypt-container genoemd), dat zich op een harde schijf, op een USB-flashstation, enz. kan bevinden. Een VeraCrypt-container is net als elk normaal bestand (het kan bijvoorbeeld worden verplaatst of verwijderd zoals elk normaal bestand). Klik op 'Bestand selecteren' om een bestandsnaam voor de container te kiezen en de locatie te selecteren waar u de container wilt aanmaken.\n\nWAARSCHUWING: als u een bestaand bestand selecteert, zal VeraCrypt het bestand NIET versleutelen; het bestand zal worden verwijderd en vervangen door de nieuw aangemaakte VeraCrypt-container. U kunt bestaande bestanden (later) versleutelen door ze te verplaatsen naar de VeraCrypt-container die u nu gaat maken.</entry>
@@ -488,12 +488,12 @@
    <entry lang="nl" key="DEVICE_TRANSFORM_MODE_PAGE_FORMAT_HELP">Dit is de snelste manier om een partitie-gehost of apparaat-gehost VeraCrypt-volume aan te maken (versleuteling ter plaatse, wat de andere optie is, is langzamer omdat de inhoud van elke sector eerst gelezen, versleuteld en vervolgens geschreven moet worden). Alle gegevens die momenteel op de geselecteerde partitie/apparaat zijn opgeslagen, gaan verloren (de gegevens worden NIET versleuteld; ze worden overschreven door willekeurige gegevens). Als u bestaande gegevens op een partitie wilt versleutelen, kiest u de andere optie.</entry>
    <entry lang="nl" key="DEVICE_TRANSFORM_MODE_PAGE_INPLACE_HELP">De volledige geselecteerde partitie en alle gegevens die erop zijn opgeslagen worden ter plaatse versleuteld. Als de partitie leeg is, moet u de andere optie kiezen (het volume zal veel sneller worden aangemaakt).</entry>
    <entry lang="nl" key="NOTE_BEGINNING">Opmerking: </entry>
-    <entry lang="nl" key="RESUME">&amp;Hervatten</entry>
+    <entry lang="nl" key="RESUME">Hervatten</entry>
    <entry lang="nl" key="DEFER">Uitstellen</entry>
-    <entry lang="nl" key="START">&amp;Starten</entry>
-    <entry lang="nl" key="CONTINUE">&amp;Doorgaan</entry>
-    <entry lang="nl" key="FORMAT">&amp;Formatteren</entry>
-    <entry lang="nl" key="WIPE">&amp;Wissen</entry>
+    <entry lang="nl" key="START">Starten</entry>
+    <entry lang="nl" key="CONTINUE">Doorgaan</entry>
+    <entry lang="nl" key="FORMAT">Formatteren</entry>
+    <entry lang="nl" key="WIPE">Wissen</entry>
    <entry lang="nl" key="FORMAT_ABORT">Formatteren afbreken?</entry>
    <entry lang="nl" key="SHOW_MORE_INFORMATION">Meer informatie</entry>
    <entry lang="nl" key="DO_NOT_SHOW_THIS_AGAIN">Dit niet meer weergeven</entry>
@@ -567,13 +567,13 @@
    <entry lang="nl" key="MAX_HIDVOL_SIZE_TB">De maximaal mogelijke verborgen volumegrootte voor dit volume is %.2f TiB.</entry>
    <entry lang="nl" key="MOUNTED_NOPWCHANGE">Volumewachtwoord/sleutelbestanden kunnen niet worden gewijzigd als het volume is gekoppeld. Ontkoppel het volume eerst.</entry>
    <entry lang="nl" key="MOUNTED_NO_PKCS5_PRF_CHANGE">Het sleutel-afleidingsalgoritme van de header kan niet worden gewijzigd terwijl het volume is gekoppeld. Ontkoppel eerst het volume.</entry>
-    <entry lang="nl" key="MOUNT_BUTTON">&amp;Koppelen</entry>
+    <entry lang="nl" key="MOUNT_BUTTON">Koppelen</entry>
    <entry lang="nl" key="NEW_VERSION_REQUIRED">Er is een nieuwere versie van VeraCrypt nodig om dit volume te koppelen.</entry>
    <entry lang="nl" key="VOL_CREATION_WIZARD_NOT_FOUND">Fout: wizard volume aanmaken niet gevonden.\n\nZorg ervoor dat het bestand 'VeraCrypt Format.exe' in de map staat waaruit 'VeraCrypt.exe' is gestart. Is dit niet het geval, installeer dan VeraCrypt opnieuw, of zoek 'VeraCrypt Format.exe' op uw schijf en voer het uit.</entry>
    <entry lang="nl" key="VOL_EXPANDER_NOT_FOUND">Fout: volume-uitbreider niet gevonden.\n\nZorg ervoor dat het bestand 'VeraCryptExpander.exe' in de map staat waaruit 'VeraCryptExpander.exe' is gestart. Als dit niet het geval is, installeer dan VeraCrypt opnieuw, of zoek 'VeraCryptExpander.exe' op uw schijf en voer het uit.</entry>
    <entry lang="nl" key="NEXT">Volgende &gt;</entry>
-    <entry lang="nl" key="FINALIZE">&amp;Beëindigen</entry>
-    <entry lang="nl" key="INSTALL">&amp;Installeren</entry>
+    <entry lang="nl" key="FINALIZE">Voltooien</entry>
+    <entry lang="nl" key="INSTALL">Installeren</entry>
    <entry lang="nl" key="EXTRACT">Uitpakken</entry>
    <entry lang="nl" key="NODRIVER">Kan geen verbinding maken met het VeraCrypt-apparaatstuurprogramma. VeraCrypt kan niet werken als het apparaatstuurprogramma niet actief is.\n\nHoud er rekening mee dat het vanwege een Windows-probleem nodig kan zijn om af te melden of het systeem opnieuw op te starten voordat het apparaatstuurprogramma kan worden geladen. </entry>
    <entry lang="nl" key="NOFONT">Er is een fout opgetreden bij het laden/voorbereiden van lettertypen.</entry>
@@ -658,7 +658,7 @@
    <entry lang="nl" key="MOUNT_WITHOUT_PBA_VOL_ON_ACTIVE_SYSENC_DRIVE">In deze modus kunt u geen partitie koppelen die zich op een schijf bevindt waarvan het gedeelte binnen de sleutelomvang van de actieve systeemversleuteling valt.\n\nVoordat u deze partitie in deze modus kunt koppelen, moet u ofwel een besturingssysteem opstarten dat op een andere schijf is geïnstalleerd (versleuteld of niet-versleuteld) of een niet-versleuteld besturingssysteem opstarten.</entry>
    <entry lang="nl" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE">VeraCrypt kan geen individuele partitie ontsleutelen van een volledig versleutelde systeemschijf (u kunt alleen de hele systeemschijf ontsleutelen)</entry>
    <entry lang="nl" key="CANT_DECRYPT_PARTITION_ON_ENTIRELY_ENCRYPTED_SYS_DRIVE_UNSURE">Waarschuwing: aangezien de schijf de VeraCrypt-bootloader bevat, kan het een volledig versleutelde systeemschijf zijn. Als dit het geval is, moet u er rekening mee houden dat VeraCrypt een individuele partitie op een volledig versleutelde systeemschijf niet kan ontsleutelen (u kunt alleen de volledige systeemschijf ontsleutelen). Als dat het geval is, kunt u nu verder gaan, maar krijgt u later de foutmelding 'onjuist wachtwoord'.</entry>
-    <entry lang="nl" key="PREV">&lt; &amp;Terug</entry>
+    <entry lang="nl" key="PREV">&lt; Terug</entry>
    <entry lang="nl" key="RAWDEVICES">Kan geen lijst weergeven van "raw" apparaten die op uw systeem zijn geïnstalleerd!</entry>
    <entry lang="nl" key="READONLYPROMPT">Het volume '%s' bestaat en is alleen-lezen. Weet u zeker dat u het wilt vervangen?</entry>
    <entry lang="nl" key="SELECT_DEST_DIR">Doelmap selecteren</entry>
@@ -694,7 +694,7 @@
    <entry lang="nl" key="UNKNOWN">Onbekend</entry>
    <entry lang="nl" key="ERR_UNKNOWN">Er is een niet nader omschreven of onbekende fout opgetreden (%d).</entry>
    <entry lang="nl" key="UNMOUNTALL_LOCK_FAILED">Sommige volumes bevatten bestanden of mappen die door toepassingen of systemen worden gebruikt.\n\nOntkoppelen forceren?</entry>
-    <entry lang="nl" key="UNMOUNT_BUTTON">&amp;Ontkoppelen</entry>
+    <entry lang="nl" key="UNMOUNT_BUTTON">Ontkoppelen</entry>
    <entry lang="nl" key="UNMOUNT_FAILED">Ontkoppelen is mislukt!</entry>
    <entry lang="nl" key="UNMOUNT_LOCK_FAILED">Volume bevat bestanden of mappen die worden gebruikt door toepassingen of het systeem.\n\nOntkoppelen forceren?</entry>
    <entry lang="nl" key="NO_VOLUME_MOUNTED_TO_DRIVE">Er is geen volume gekoppeld aan de opgegeven stationsletter.</entry>
@@ -903,8 +903,8 @@
    <entry lang="nl" key="HOURS">uur</entry>
    <entry lang="nl" key="MINUTES">minuten</entry>
    <entry lang="nl" key="SECONDS"> s</entry>
-    <entry lang="nl" key="OPEN">Open</entry>
-    <entry lang="nl" key="DISMOUNT">Ontkoppel</entry>
+    <entry lang="nl" key="OPEN">Openen</entry>
+    <entry lang="nl" key="DISMOUNT">Ontkoppelen</entry>
    <entry lang="nl" key="SHOW_TC">VeraCrypt weergeven</entry>
    <entry lang="nl" key="HIDE_TC">VeraCrypt verbergen</entry>
    <entry lang="nl" key="TOTAL_DATA_READ">Gegevens gelezen sinds koppeling</entry>
@@ -921,7 +921,7 @@
    <entry lang="nl" key="PROGRESS_STATUS_DECRYPTING">Ontsleutelen</entry>
    <entry lang="nl" key="PROGRESS_STATUS_FINALIZING">Afronden</entry>
    <entry lang="nl" key="PROGRESS_STATUS_PAUSED">Gepauzeerd</entry>
-    <entry lang="nl" key="PROGRESS_STATUS_FINISHED">Klaar</entry>
+    <entry lang="nl" key="PROGRESS_STATUS_FINISHED">Voltooid</entry>
    <entry lang="nl" key="PROGRESS_STATUS_ERROR">Fout</entry>
    <entry lang="nl" key="FAVORITE_DISCONNECTED_DEV">Apparaat losgekoppeld</entry>
    <entry lang="nl" key="SYS_FAVORITE_VOLUMES_SAVED">Favoriete volumes van het systeem opgeslagen.\n\nOm koppeling van de favoriete volumes van het systeem in te schakelen wanneer het systeem wordt opgestart, selecteert u 'Instellingen' &gt; 'Systeemfavoriete volumes' &gt; 'Systeemfavoriete volumes koppelen wanneer Windows start'.</entry>
@@ -982,7 +982,7 @@
    <entry lang="nl" key="IDPM_REPAIR_FILESYS">Bestandssysteem repareren</entry>
    <entry lang="nl" key="IDPM_ADD_TO_FAVORITES">Aan favorieten toevoegen...</entry>
    <entry lang="nl" key="IDPM_ADD_TO_SYSTEM_FAVORITES">Aan systeemfavorieten toevoegen...</entry>
-    <entry lang="nl" key="IDPM_PROPERTIES">E&amp;igenschappen...</entry>
+    <entry lang="nl" key="IDPM_PROPERTIES">Eigenschappen...</entry>
    <entry lang="nl" key="HIDDEN_VOL_PROTECTION">Verborgen volume beschermd</entry>
    <entry lang="nl" key="NOT_APPLICABLE_OR_NOT_AVAILABLE">n.v.t.</entry>
    <entry lang="nl" key="UISTR_YES">Ja</entry>
@@ -1296,8 +1296,8 @@ Wisselbestanden kunnen zich alleen op de systeempartitie bevinden.</entry>
    <entry lang="nl" key="SETTING_REQUIRES_REBOOT">Merk op dat deze instelling pas van kracht wordt nadat het besturingssysteem opnieuw is opgestart.</entry>
    <entry lang="nl" key="COMMAND_LINE_ERROR">Fout bij het verwerken van de opdrachtregel.</entry>
    <entry lang="nl" key="RESCUE_DISK">Herstelschijf</entry>
-    <entry lang="nl" key="SELECT_FILE_AND_MOUNT">&amp;Bestand selecteren en koppelen...</entry>
-    <entry lang="nl" key="SELECT_DEVICE_AND_MOUNT">&amp;Apparaat selecteren en koppelen...</entry>
+    <entry lang="nl" key="SELECT_FILE_AND_MOUNT">Bestand selecteren en koppelen...</entry>
+    <entry lang="nl" key="SELECT_DEVICE_AND_MOUNT">Apparaat selecteren en koppelen...</entry>
    <entry lang="nl" key="DISABLE_NONADMIN_SYS_FAVORITES_ACCESS">Alleen beheerders toestaan om de systeemfavoriete volumes weer te geven en te ontkoppelen in VeraCrypt</entry>
    <entry lang="nl" key="MOUNT_SYSTEM_FAVORITES_ON_BOOT">Systeemfavoriete volumes koppelen wanneer Windows start (in de beginfase van de opstartprocedure)</entry>
    <entry lang="nl" key="MOUNTED_VOLUME_DIRTY">Waarschuwing: het bestandssysteem op het als '%s' gekoppelde volume is niet goed ontkoppeld en kan dus fouten bevatten. Het gebruik van een beschadigd bestandssysteem kan gegevensverlies of gegevensbeschadiging veroorzaken.\n\nOpmerking: Voordat u een apparaat (zoals een USB-flashstation of een externe harde schijf) waarop een gekoppeld VeraCrypt-volume staat, fysiek verwijdert of uitschakelt, moet u altijd eerst het VeraCrypt-volume in VeraCrypt ontkoppelen.\n\n\nWilt u dat Windows probeert (eventuele) fouten in het bestandssysteem op te sporen en op te lossen?</entry>
@@ -1383,7 +1383,7 @@ Wisselbestanden kunnen zich alleen op de systeempartitie bevinden.</entry>
    <entry lang="nl" key="TB_PER_SEC">TiB/s</entry>
    <entry lang="nl" key="PB_PER_SEC">PiB/s</entry>
    <entry lang="nl" key="TRIPLE_DOT_GLYPH_ELLIPSIS">…</entry>
-    <entry lang="nl" key="IDC_BOOT_LOADER_CACHE_PIM">&amp;PIM toevoegen bij cachen van pre-boot-authenticatiewachtwoord</entry>
+    <entry lang="nl" key="IDC_BOOT_LOADER_CACHE_PIM">PIM toevoegen bij cachen van pre-boot-authenticatiewachtwoord</entry>
    <entry lang="nl" key="IDC_PREF_CACHE_PIM">PIM toevoegen bij opslaan van een wachtwoord</entry>
    <entry lang="nl" key="IDC_SHOW_DISCONNECTED_NETWORK_DRIVES">Losgekoppelde netwerkstations beschikbaar stellen voor koppeling</entry>
    <entry lang="nl" key="PASSWORD_UTF8_TOO_LONG">Het ingevoerde wachtwoord is te lang: de UTF-8-weergave is groter dan %d bytes.</entry>
@@ -1481,7 +1481,6 @@ Merk op dat VeraCrypt in dit geval niet de exacte maximaal toegestane grootte vo
    <entry lang="nl" key="LINUX_CROSS_SUPPORT_OTHER_HELP">Kies deze optie als u het volume op andere platforms moet gebruiken.</entry>
    <entry lang="nl" key="LINUX_CROSS_SUPPORT_ONLY">Ik zal het volume alleen koppelen op {0}</entry>
    <entry lang="nl" key="LINUX_CROSS_SUPPORT_ONLY_HELP">Kies deze optie als u het volume niet op andere platforms moet gebruiken.</entry>
-    <entry lang="nl" key="LINUX_CROSS_SUPPORT_ONLY_HELP">Kies deze optie als u het volume niet op andere platforms moet gebruiken.</entry>
    <entry lang="nl" key="LINUX_DESELECT">Deselecteren</entry>
    <entry lang="nl" key="LINUX_ADMIN_PW_QUERY">Voer uw gebruikers- of beheerderswachtwoord in:</entry>
    <entry lang="nl" key="LINUX_ADMIN_PW_QUERY_TITLE">Beheerdersrechten vereist</entry>
@@ -1576,8 +1575,8 @@ Merk op dat VeraCrypt in dit geval niet de exacte maximaal toegestane grootte vo
    <entry lang="nl" key="UNKNOWN_OPTION">Onbekende optie</entry>
    <entry lang="nl" key="VOLUME_LOCATION">Volumelocatie</entry>
    <entry lang="nl" key="VOLUME_HOST_IN_USE">WAARSCHUWING: hostbestand/apparaat {0} is al in gebruik!\n\nHet negeren hiervan kan ongewenste resultaten veroorzaken, waaronder systeeminstabiliteit. Alle toepassingen die het hostbestand/apparaat gebruiken moeten worden gesloten voordat het volume wordt gekoppeld.\n\nDoorgaan met koppelen?</entry>
-    <entry lang="en" key="CANT_INSTALL_WITH_EXE_OVER_MSI">VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation.</entry>
-    <entry lang="en" key="IDC_USE_ALL_FREE_SPACE">Use all available free space</entry>
+    <entry lang="nl" key="CANT_INSTALL_WITH_EXE_OVER_MSI">VeraCrypt werd eerder geïnstalleerd met een MSI-pakket en kan dus niet worden bijgewerkt met het standaardinstallatieprogramma. Gebruik het MSI-pakket om uw VeraCrypt-installatie bij te werken.</entry>
+    <entry lang="nl" key="IDC_USE_ALL_FREE_SPACE">Alle beschikbare vrije ruimte gebruiken</entry>
  </localization>
  <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified">
    <xs:element name="VeraCrypt">
@@ -210,6 +210,14 @@ BOOL EnableMemoryProtection = FALSE;

 BOOL WaitDialogDisplaying = FALSE;

+wchar_t DefaultKeyboardLayout [KL_NAMELENGTH];
+HKL hklDefaultKeyboardLayout;
+HKL hklUSKeyboardLayout;
+int iPwdCounter = 0;
+wchar_t TranslatedPassword[MAX_PASSWORD + 1];
+BOOL bAltKeyDown = FALSE;
+BOOL bAltKeyWarningShown = FALSE;	/* TRUE if the user has been informed that it is not possible to type characters by pressing keys while the right Alt key is held down. */
+
 /* Handle to the device driver */
 HANDLE hDriver = INVALID_HANDLE_VALUE;

@@ -1273,23 +1281,293 @@ void HandlePasswordEditWmChar (HWND hwnd, WPARAM wParam)
 		SendMessage(hwnd, EM_HIDEBALLOONTIP, 0, 0);
 }

-// Protects an input field from having its content updated by a Paste action (call ToBootPwdField() to use this).
+/* Protects an input field from having its content updated by a Paste action and translates password into 
+	US keyboard layout (call ToBootPwdField() to use this). */
 static LRESULT CALLBACK BootPwdFieldProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
 	WNDPROC wp = (WNDPROC) GetWindowLongPtrW (hwnd, GWLP_USERDATA);
-
+	
 	switch (message)
 	{
 	case WM_PASTE:
+		Error ("ERROR_PASTE_ACTION", GetParent(hwnd));
 		return 1;
+
+	case WM_LBUTTONDOWN:
+		if (CheckKeyboardLayout())
+		{
+			// put caret at the end if user tries to change caret position
+			int iLength = GetWindowTextLength (hwnd);
+			SendMessage (hwnd, EM_SETSEL, MAKELONG (iLength, iLength), MAKELONG (iLength, iLength));
+			SetFocus(hwnd);
+			return 1;
+		}
+			break;
+
+	case WM_DEADCHAR:
+		{
+		if (CheckKeyboardLayout())
+		{
+			if ((GetKeyState (VK_RMENU) < 0) || (GetKeyState (VK_MENU) < 0 && GetKeyState (VK_CONTROL) < 0)) 
+			{
+				bAltKeyDown = TRUE;
+
+				if (!bAltKeyWarningShown)
+				{
+					bAltKeyWarningShown = TRUE;
+
+					wchar_t szTmp [4096];
+					StringCbCopyW (szTmp, sizeof(szTmp), GetString ("ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION"));
+					StringCbCatW (szTmp, sizeof(szTmp), L"\n\n");
+					StringCbCatW (szTmp, sizeof(szTmp), GetString ("KEYB_LAYOUT_SYS_ENC_EXPLANATION"));
+					MessageBoxW (MainDlg, szTmp, lpszTitle, MB_ICONINFORMATION  | MB_SETFOREGROUND | MB_TOPMOST);
+				}
+
+				return 1;
+			}
+			
+			Warning ("DEAD_KEY_SUPPORT", GetParent (hwnd));
+			if (!(TranslatePwdToUSKbdLayout(hwnd, lParam, TRUE)))
+				return 1;
+		}
+		break;
+		}
+	
+	case WM_SYSDEADCHAR:
+		{ 
+		if (GetKeyState (VK_MENU) < 0) 
+		{
+			bAltKeyDown = TRUE;
+
+			if (!bAltKeyWarningShown)
+			{
+				bAltKeyWarningShown = TRUE;
+
+				wchar_t szTmp [4096];
+				StringCbCopyW (szTmp, sizeof(szTmp), GetString ("ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION"));
+				StringCbCatW (szTmp, sizeof(szTmp), L"\n\n");
+				StringCbCatW (szTmp, sizeof(szTmp), GetString ("KEYB_LAYOUT_SYS_ENC_EXPLANATION"));
+				MessageBoxW (MainDlg, szTmp, lpszTitle, MB_ICONINFORMATION  | MB_SETFOREGROUND | MB_TOPMOST);
+			}
+
+			return 1;
+		}
+		break;
+		}
+
+	case WM_SYSCHAR:
+		if (GetKeyState (VK_MENU) < 0) 
+		{
+			if (!bAltKeyWarningShown)
+			{
+				bAltKeyWarningShown = TRUE;
+
+				wchar_t szTmp [4096];
+				StringCbCopyW (szTmp, sizeof(szTmp), GetString ("ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION"));
+				StringCbCatW (szTmp, sizeof(szTmp), L"\n\n");
+				StringCbCatW (szTmp, sizeof(szTmp), GetString ("KEYB_LAYOUT_SYS_ENC_EXPLANATION"));
+				MessageBoxW (MainDlg, szTmp, lpszTitle, MB_ICONINFORMATION  | MB_SETFOREGROUND | MB_TOPMOST);
+			}
+
+			return 1;
+		}
+		break;
+
 	case WM_CHAR:
+		{	
+		if (bAltKeyDown == TRUE)
+		{
+			bAltKeyDown = FALSE;
+			return 1;
+		}
+
+		if (CheckKeyboardLayout ())
+		{
+			if (GetKeyState (VK_RMENU) < 0)
+				return 1;
+				
+			if (!(TranslatePwdToUSKbdLayout(hwnd, lParam, FALSE)))
+				return 1;
+		}
+		else
+		{
+			wchar_t OrigPassword[MAX_PASSWORD + 1];
+			GetWindowText (hwnd, OrigPassword, ARRAYSIZE (OrigPassword));
+
+			iPwdCounter = (int) wcslen (OrigPassword);
+			TranslatedPassword[iPwdCounter] = (wchar_t) wParam;
+			iPwdCounter++;
+			TranslatedPassword[iPwdCounter] = '\0';
+			burn (OrigPassword, sizeof (OrigPassword));
+		}
+
 		HandlePasswordEditWmChar (hwnd, wParam);
 		break;
 	}
+	case WM_KEYDOWN:
+		if (CheckKeyboardLayout ())
+		{
+			if (wParam == VK_LEFT || wParam == VK_HOME)
+			{
+				// put caret at the end if user tries to change caret position
+				int iLength = GetWindowTextLength (hwnd);
+				SendMessage(hwnd, EM_SETSEL, MAKELONG (iLength, iLength), MAKELONG (iLength, iLength));
+				return 1;
+			}
+		}
+		break;
+	}

 	return CallWindowProcW (wp, hwnd, message, wParam, lParam);
 }

+BOOL TranslatePwdToUSKbdLayout (HWND hwnd, LPARAM lParam, BOOL deadKey)
+{
+	BYTE keyState[256];
+	UINT scanCode = (lParam >> 16) & 0xFF;
+	UINT virtualKey = MapVirtualKeyExW (scanCode, MAPVK_VSC_TO_VK_EX, hklUSKeyboardLayout);
+			
+	BOOL bKeyboardState = GetKeyboardState (keyState);
+	if (!bKeyboardState)
+		Error ("ERROR_GETTING_KEYB_STATE", GetParent (hwnd));
+
+	unsigned short tempChar[2] = {0};	
+	wchar_t OrigPassword[MAX_PASSWORD + 1];
+
+	if (deadKey)
+	{
+		int iTemp;
+			
+		do
+			iTemp = ToUnicode (virtualKey, scanCode, keyState, (LPWSTR)tempChar, sizeof (tempChar), 0);
+		while (iTemp < 0);
+		
+		wchar_t tempOrigPwd[MAX_PASSWORD + 1];
+		GetWindowText (hwnd, tempOrigPwd, sizeof (tempOrigPwd));
+
+		int iLength = (int) wcslen (tempOrigPwd);
+		tempOrigPwd[iLength] = tempChar[0];
+		tempOrigPwd[++iLength] = '\0';
+
+		SetWindowText(hwnd, tempOrigPwd);
+		int iWindowTextLength = GetWindowTextLength (hwnd);
+		SendMessage (hwnd, EM_SETSEL, MAKELONG (iWindowTextLength, iWindowTextLength), MAKELONG (iWindowTextLength, iWindowTextLength));
+
+		tempChar[0] = '\0';
+
+		do
+			iTemp = ToUnicodeEx (virtualKey, scanCode, keyState, (LPWSTR)tempChar, sizeof ((LPWSTR)tempChar) / 2, 0, hklUSKeyboardLayout);
+		while (iTemp < 0);
+
+		if (iTemp == 0)
+			Error ("ERR_NO_TRANSLATION", GetParent(hwnd));
+
+		burn (tempOrigPwd, sizeof (tempOrigPwd));
+	}
+	else
+	{
+		// function MapVirtualKey map numpad keys like PageUp, PageDown, ... so they need to be set to right values
+		switch (scanCode)
+		{
+		case 71:
+			tempChar[0] = '7';
+			break;
+		case 72:
+			tempChar[0] = '8';
+			break;
+		case 73:
+			tempChar[0] = '9';
+			break;
+		case 75:
+			tempChar[0] = '4';
+			break;
+		case 76:
+			tempChar[0] = '5';
+			break;
+		case 77:
+			tempChar[0] = '6';
+			break;
+		case 79:
+			tempChar[0] = '1';
+			break;
+		case 80:
+			tempChar[0] = '2';
+			break;
+		case 81:
+			tempChar[0] = '3';
+			break;
+		case 82:
+			tempChar[0] = '0';
+			break;
+		case 83:
+			tempChar[0] = ',';
+			break;
+		case 57:
+			tempChar[0] = ' ';
+			break;
+		default:
+			int iReturnAscii;
+
+			iReturnAscii = ToAsciiEx (virtualKey, scanCode, keyState, tempChar, 0, hklUSKeyboardLayout);
+			if (iReturnAscii == 0)
+				Error ("ERR_NO_TRANSLATION", GetParent(hwnd));
+			break;
+		}
+	}
+
+	GetWindowText (hwnd, OrigPassword, ARRAYSIZE (OrigPassword));
+		
+	if (tempChar[0] != '\0')
+	{
+		if ((wcslen (OrigPassword) == 0) && iPwdCounter != 0) 
+		{
+			iPwdCounter = 0;
+			TranslatedPassword[iPwdCounter] = tempChar[0];
+		}
+		else if (iPwdCounter == 0)
+		{
+			TranslatedPassword[iPwdCounter] = tempChar[0];
+		}
+		else
+		{
+			if (deadKey)
+				iPwdCounter = wcslen (OrigPassword) - 1; // Dead key is already written in edit control
+			else
+				iPwdCounter = wcslen (OrigPassword);
+				
+			TranslatedPassword[iPwdCounter] = tempChar[0];
+		}
+		TranslatedPassword[++iPwdCounter] = '\0';
+	}
+	else
+	{
+		burn (tempChar, sizeof (tempChar));
+		burn (OrigPassword, sizeof (OrigPassword));
+		return FALSE;
+	}
+
+	burn (tempChar, sizeof (tempChar));
+	burn (OrigPassword, sizeof (OrigPassword));
+	return TRUE;
+}
+
+wchar_t *GetTranslatedPassword ()
+{
+	return TranslatedPassword;
+}
+
+void WipeTranslatedPassword ()
+{
+	burn (TranslatedPassword, sizeof (TranslatedPassword));
+}
+
+BOOL CheckKeyboardLayout ()
+{
+	GetKeyboardLayoutName (DefaultKeyboardLayout);
+	if ((wcscmp (DefaultKeyboardLayout, TEXT ("00000409")) != 0) || (wcscmp (DefaultKeyboardLayout, TEXT ("00000409")) != 0))
+		return TRUE;
+	return FALSE;
+}

 // Protects an input field from having its content updated by a Paste action. Used for pre-boot password
 // input fields (only the US keyboard layout is supported in pre-boot environment so we must prevent the 
@@ -1300,6 +1578,24 @@ void ToBootPwdField (HWND hwndDlg, UINT ctrlId)
 	WNDPROC originalwp = (WNDPROC) GetWindowLongPtrW (hwndCtrl, GWLP_USERDATA);

 	SendMessage (hwndCtrl, EM_LIMITTEXT, MAX_LEGACY_PASSWORD, 0);
+	
+	GetKeyboardLayoutName (DefaultKeyboardLayout);
+	
+	if (CheckKeyboardLayout ())
+	{
+		// Load US keyboard layout into the system
+		hklUSKeyboardLayout = LoadKeyboardLayout (TEXT ("00000409"), KLF_NOTELLSHELL);
+
+		if (hklUSKeyboardLayout == NULL)
+			AbortProcess ("ERROR_KEYB_LAYOUT_NOT_LOADED");
+
+		hklDefaultKeyboardLayout = LoadKeyboardLayout (DefaultKeyboardLayout, KLF_ACTIVATE);
+
+		/* If US keyboard layout is not availabe, LoadKeyboardLayout will return default system layout */
+
+		if (hklUSKeyboardLayout == hklDefaultKeyboardLayout)
+			AbortProcess ("ERROR_KEYB_LAYOUT_NOT_LOADED");
+	}

 	// if ToNormalPwdField has been called before, GWLP_USERDATA already contains original WNDPROC
 	if (!originalwp)
@@ -1309,6 +1605,12 @@ void ToBootPwdField (HWND hwndDlg, UINT ctrlId)
 	SetWindowLongPtrW (hwndCtrl, GWLP_WNDPROC, (LONG_PTR) BootPwdFieldProc);
 }

+BOOL CheckIsIMESupported ()
+{
+	if (himm32dll == NULL)
+		return FALSE;
+	return TRUE;
+}
 // Ensures that a warning is displayed when user is pasting a password longer than the maximum
 // length which is set to 64 characters
 static LRESULT CALLBACK NormalPwdFieldProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
@@ -2138,7 +2440,7 @@ SelectAlgo (HWND hComboBox, int *algo_id)

 	/* Something went wrong ; couldn't find the requested algo id so we drop
 	   back to a default */
-
+	
 	*algo_id = (int) SendMessage (hComboBox, CB_GETITEMDATA, 0, 0);

 	SendMessage (hComboBox, CB_SETCURSEL, 0, 0);
@@ -4784,6 +5086,53 @@ BOOL BrowseFiles (HWND hwndDlg, char *stringId, wchar_t *lpszFileName, BOOL keep
 	return BrowseFilesInDir (hwndDlg, stringId, NULL, lpszFileName, keepHistory, saveMode, browseFilter);
 }

+BOOL BrowseFile (HWND hwndDlg, char *stringId, wchar_t *initialDir)
+{
+	OPENFILENAMEW ofn;
+	wchar_t file[TC_MAX_PATH] = { 0 };
+	wchar_t filter[1024];
+	BOOL status = FALSE;
+
+	CoInitialize (NULL);
+	
+	ZeroMemory (&ofn, sizeof (ofn));
+	
+	if (initialDir)
+	{
+		ofn.lpstrInitialDir			= initialDir;
+	}
+	
+	ofn.lStructSize				= sizeof (ofn);
+	ofn.hwndOwner				= hwndDlg;
+	StringCbPrintfW (filter, sizeof(filter), L"%ls (*.*)%c*.*%c",
+		GetString ("ALL_FILES"), 0, 0);
+	ofn.lpstrFilter				= filter;
+	ofn.nFilterIndex			= 1;
+	ofn.lpstrFile				= NULL;
+	ofn.nMaxFile				= sizeof (file) / sizeof (file[0]);
+	ofn.lpstrTitle				= GetString (stringId);
+	ofn.lpstrDefExt				= NULL;
+	ofn.Flags					= OFN_HIDEREADONLY
+		| OFN_PATHMUSTEXIST
+		| OFN_DONTADDTORECENT;
+	
+	SystemFileSelectorCallerThreadId = GetCurrentThreadId();
+	SystemFileSelectorCallPending = TRUE;
+
+	if (!GetOpenFileNameW (&ofn))
+			goto ret;
+
+	SystemFileSelectorCallPending = FALSE;
+
+	status = TRUE;
+
+ret:
+	SystemFileSelectorCallPending = FALSE;
+	ResetCurrentDirectory();
+	CoUninitialize();
+
+	return status;
+}

 BOOL BrowseFilesInDir (HWND hwndDlg, char *stringId, wchar_t *initialDir, wchar_t *lpszFileName, BOOL keepHistory, BOOL saveMode, wchar_t *browseFilter, const wchar_t *initialFileName, const wchar_t *defaultExtension)
 {
@@ -9573,8 +9922,6 @@ BOOL PrintHardCopyTextUTF16 (wchar_t *text, wchar_t *title, size_t textByteLen)

 	return TRUE;
 }
-
-
 BOOL IsNonInstallMode ()
 {
 	HKEY hkey, hkeybis;
@@ -9673,7 +10020,6 @@ BOOL IsNonInstallMode ()
 		return TRUE;
 }

-
 LRESULT SetCheckBox (HWND hwndDlg, int dlgItem, BOOL state)
 {
 	return SendDlgItemMessage (hwndDlg, dlgItem, BM_SETCHECK, state ? BST_CHECKED : BST_UNCHECKED, 0);
@@ -11446,7 +11792,7 @@ BYTE *MapResource (wchar_t *resourceType, int resourceId, PDWORD size)
 {
 	HGLOBAL hResL;
    HRSRC hRes;
-    HINSTANCE hResInst = NULL;
+	HINSTANCE hResInst = NULL;

 #ifdef SETUP_DLL
 	//	In case we're being called from the SetupDLL project, FindResource()
@@ -11458,7 +11804,7 @@ BYTE *MapResource (wchar_t *resourceType, int resourceId, PDWORD size)

 	hRes = FindResource (hResInst, MAKEINTRESOURCE(resourceId), resourceType);
 	hResL = LoadResource (hResInst, hRes);
-
+	
 	if (size != NULL)
 		*size = SizeofResource (hResInst, hRes);

@@ -282,6 +282,12 @@ typedef NTSTATUS (WINAPI *NtQuerySystemInformationFn)(
 #define	ISO_BURNER_TOOL L"isoburn.exe"
 #define PRINT_TOOL L"notepad.exe"

+wchar_t *GetTranslatedPassword ();
+BOOL TranslatePwdToUSKbdLayout (HWND hwnd, LPARAM lParam, BOOL deadKey);
+void WipeTranslatedPassword ();
+BOOL CheckKeyboardLayout ();
+BOOL CheckIsIMESupported ();
+
 void InitGlobalLocks ();
 void FinalizeGlobalLocks ();
 void cleanup ( void );
@@ -374,6 +380,7 @@ BOOL CALLBACK CipherTestDialogProc ( HWND hwndDlg , UINT uMsg , WPARAM wParam ,
 void ResetCipherTest ( HWND hwndDlg , int idTestCipher );
 void ResetCurrentDirectory ();
 BOOL BrowseFiles (HWND hwndDlg, char *stringId, wchar_t *lpszFileName, BOOL keepHistory, BOOL saveMode, wchar_t *browseFilter);
+BOOL BrowseFile (HWND hwndDlg, char *stringId, wchar_t *initialDir);
 BOOL BrowseDirectories (HWND hWnd, char *lpszTitle, wchar_t *dirName);
 void handleError ( HWND hwndDlg , int code, const char* srcPos );
 BOOL CheckFileStreamWriteErrors (HWND hwndDlg, FILE *file, const wchar_t *fileName);
@@ -6,6 +6,7 @@
    <font lang="en" class="bold" size="13" face="Arial" />
    <font lang="en" class="fixed" size="12" face="Lucida Console" />
    <font lang="en" class="title" size="21" face="Times New Roman" />
+
    <entry lang="en" key="IDCANCEL">Cancel</entry>
    <entry lang="en" key="IDC_ALL_USERS">Install &amp;for all users</entry>
    <entry lang="en" key="IDC_BROWSE">Bro&amp;wse...</entry>
@@ -58,7 +59,7 @@
    <entry lang="en" key="IDC_OPEN_OUTER_VOLUME">Open Outer Volume</entry>
    <entry lang="en" key="IDC_PAUSE">&amp;Pause</entry>
    <entry lang="en" key="IDC_PIM_ENABLE">Use P&amp;IM</entry>
-    <entry lang="en" key="IDC_NEW_PIM_ENABLE">Use PIM</entry>
+    <entry lang="en" key="IDC_NEW_PIM_ENABLE">Modify PIM</entry>
    <entry lang="en" key="IDC_QUICKFORMAT">Quick Format</entry>
    <entry lang="en" key="IDC_SHOW_PASSWORD">&amp;Display password</entry>
    <entry lang="en" key="IDC_SHOW_PASSWORD_SINGLE">&amp;Display password</entry>
@@ -70,7 +71,7 @@
    <entry lang="en" key="IDC_SYS_DEVICE">Encrypt the system partition or entire system drive</entry>
    <entry lang="en" key="IDC_SYS_PARTITION">Encrypt the Windows system partition</entry>
    <entry lang="en" key="IDC_WHOLE_SYS_DRIVE">Encrypt the whole drive</entry>
-    <entry lang="en" key="IDD_VOL_CREATION_WIZARD_DLG">VeraCrypt Volume Creation Wizard</entry>
+    <entry lang="en" key="IDD_VOL_CREATION_WIZARD_DLG">VeraCrypt Wizard</entry>
    <entry lang="en" key="IDT_CLUSTER">Cluster </entry>
    <entry 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.</entry>
    <entry lang="en" key="IDT_CONFIRM">&amp;Confirm:</entry>
@@ -100,7 +101,7 @@
    <entry lang="en" key="IDT_SYS_DEVICE">Encrypts the partition/drive where Windows is installed. Anyone who wants to gain access and use the system, read and write files, etc., will need to enter the correct password each time before Windows boots. Optionally, creates a hidden system.</entry>
    <entry lang="en" key="IDT_SYS_PARTITION">Select this option to encrypt the partition where the currently running Windows operating system is installed.</entry>
    <entry lang="en" key="IDT_VOLUME_LABEL">Volume Label in Windows:</entry>
-    <entry lang="en" key="IDT_WIPE_MODE">Wipe mode:</entry>
+    <entry lang="en" key="IDT_WIPE_MODE">Wipe Mode</entry>
    <entry lang="en" key="IDCLOSE">Close</entry>
    <entry lang="en" key="IDC_ALLOW_ESC_PBA_BYPASS">Allow pre-boot &amp;authentication to be bypassed by pressing the Esc key (enables boot manager)</entry>
    <entry lang="en" key="IDC_AUTORUN_DISABLE">Do nothing</entry>
@@ -488,7 +489,7 @@
    <entry lang="en" key="DEVICE_TRANSFORM_MODE_PAGE_INPLACE_HELP">The entire selected partition and all data stored on it will be encrypted in place. If the partition is empty, you should choose the other option (the volume will be created much faster).</entry>
    <entry lang="en" key="NOTE_BEGINNING">Note: </entry>
    <entry lang="en" key="RESUME">&amp;Resume</entry>
-    <entry lang="en" key="DEFER">&amp;Defer</entry>
+    <entry lang="en" key="DEFER">&amp;Cancel</entry>
    <entry lang="en" key="START">&amp;Start</entry>
    <entry lang="en" key="CONTINUE">&amp;Continue</entry>
    <entry lang="en" key="FORMAT">&amp;Format</entry>
@@ -936,6 +937,8 @@
    <entry lang="en" key="ENTER_NORMAL_VOL_PASSWORD">Enter password for the normal/outer volume</entry>
    <entry lang="en" key="ENTER_HIDDEN_VOL_PASSWORD">Enter password for the hidden volume</entry>
    <entry lang="en" key="ENTER_HEADER_BACKUP_PASSWORD">Enter password for the header stored in backup file</entry>
+
+
    <entry lang="en" key="KEYFILE_CREATED">Keyfiles have been successfully created.</entry>
    <entry lang="en" key="KEYFILE_INCORRECT_NUMBER">The number of keyfiles you supplied is invalid.</entry>
    <entry lang="en" key="KEYFILE_INCORRECT_SIZE">The keyfile size must be comprized between 64 and 1048576 bytes.</entry>
@@ -1106,7 +1109,7 @@
    <entry lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</entry>
    <entry 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.</entry>
    <entry 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.</entry>
-    <entry lang="en" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">As VeraCrypt temporarily changed the keyboard layout to the standard US keyboard layout, it is not possible to type characters by pressing keys while the right Alt key is held down. However, you can type most of such characters by pressing appropriate keys while the Shift key is held down.</entry>
+    <entry lang="en" key="ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION">It is not possible to type characters by pressing keys while the right Alt key is held down. However, you can type most of such characters by pressing appropriate keys while the Shift key is held down.</entry>
    <entry lang="en" key="KEYB_LAYOUT_CHANGE_PREVENTED">VeraCrypt prevented change of keyboard layout.</entry>
    <entry lang="en" key="KEYB_LAYOUT_SYS_ENC_EXPLANATION">Note: The password will need to be typed in the pre-boot environment (before Windows starts) where non-US Windows keyboard layouts are not available. Therefore, the password must always be typed using the standard US keyboard layout. However, it is important to note that you do NOT need a real US keyboard. VeraCrypt automatically ensures that you can safely type the password (right now and in the pre-boot environment) even if you do NOT have a real US keyboard.</entry>
    <entry lang="en" key="RESCUE_DISK_INFO">Before you can encrypt the partition/drive, you must create a VeraCrypt Rescue Disk (VRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the VRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the VRD allows you to permanently decrypt the partition/drive before Windows starts.\n\n- The VRD will contain a backup of the present content of the first drive track (which typically contains a system loader or boot manager) and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ISO image will be created in the location specified below.</entry>
@@ -1154,7 +1157,7 @@
    <entry lang="en" key="WINDOWS_BOOT_LOADER_HINTS">If the currently running operating system is installed on the boot partition, then, after you encrypt it, you will need to enter the correct password even if you want to start any other unencrypted Windows system(s) (as they will share a single encrypted Windows boot loader/manager).\n\nIn contrast, if the currently running operating system is not installed on the boot partition (or if the Windows boot loader/manager is not used by any other system), then, after you encrypt this system, you will not need to enter the correct password to boot the other unencrypted system(s) -- you will only need to press the Esc key to start the unencrypted system (if there are multiple unencrypted systems, you will also need to choose which system to start in the VeraCrypt Boot Manager menu).\n\nNote: Typically, the earliest installed Windows system is installed on the boot partition.</entry>
    <entry lang="en" key="SYSENC_PRE_DRIVE_ANALYSIS_TITLE">Encryption of Host Protected Area</entry>
    <entry lang="en" key="SYSENC_PRE_DRIVE_ANALYSIS_HELP">At the end of many drives, there is an area that is normally hidden from the operating system (such areas are usually referred to as Host Protected Areas). However, some programs can read and write data from/to such areas.\n\nWARNING: Some computer manufacturers may use such areas to store tools and data for RAID, system recovery, system setup, diagnostic, or other purposes. If such tools or data must be accessible before booting, the hidden area should NOT be encrypted (choose 'No' above).\n\nDo you want VeraCrypt to detect and encrypt such a hidden area (if any) at the end of the system drive?</entry>
-    <entry lang="en" key="SYSENC_TYPE_PAGE_TITLE">Type of System Encryption</entry>
+    <entry lang="en" key="SYSENC_TYPE_PAGE_TITLE">Encrypt Windows Drive (%c:)</entry>
    <entry lang="en" key="SYSENC_NORMAL_TYPE_HELP">Select this option if you merely want to encrypt the system partition or the entire system drive.</entry>
    <entry lang="en" key="SYSENC_HIDDEN_TYPE_HELP">It may happen that you are forced by somebody to decrypt the operating system. There are many situations where you cannot refuse to do so (for example, due to extortion). If you select this option, you will create a hidden operating system whose existence should be impossible to prove (provided that certain guidelines are followed). Thus, you will not have to decrypt or reveal the password to the hidden operating system. For a detailed explanation, please click the link below.</entry>
    <entry lang="en" key="HIDDEN_OS_PREINFO">It may happen that you are forced by somebody to decrypt the operating system. There are many situations where you cannot refuse to do so (for example, due to extortion).\n\nUsing this wizard, you can create a hidden operating system whose existence should be impossible to prove (provided that certain guidelines are followed). Thus, you will not have to decrypt or reveal the password for the hidden operating system.</entry>
@@ -1173,7 +1176,7 @@
    <entry lang="en" key="CD_BURNER_NOT_PRESENT_WILL_STORE_ISO_INFO">Please follow these steps:\n\n1) Connect a removable drive, such as a USB flash drive, to your computer now.\n\n2) Copy the VeraCrypt Rescue Disk image file (%s) to the removable drive.\n\nIn case you need to use the VeraCrypt Rescue Disk in the future, you will be able to connect your removable drive (containing the VeraCrypt Rescue Disk image) to a computer with a CD/DVD burner and create a bootable VeraCrypt Rescue Disk by burning the image to a CD or DVD. IMPORTANT: Note that the VeraCrypt Rescue Disk image file must be written to the CD/DVD as an ISO disk image (not as an individual file).</entry>
    <entry lang="en" key="RESCUE_DISK_RECORDING_TITLE">Rescue Disk Recording</entry>
    <entry lang="en" key="RESCUE_DISK_CREATED_TITLE">Rescue Disk Created</entry>
-    <entry lang="en" key="SYS_ENCRYPTION_PRETEST_TITLE">System Encryption Pretest</entry>
+    <entry lang="en" key="SYS_ENCRYPTION_PRETEST_TITLE">System Encryption Test</entry>
    <entry lang="en" key="RESCUE_DISK_DISK_VERIFIED_TITLE">Rescue Disk Verified</entry>
    <entry lang="en" key="RESCUE_DISK_VERIFIED_INFO">\nThe VeraCrypt Rescue Disk has been successfully verified. Please remove it from the drive now and store it in a safe place.\n\nClick Next to continue.</entry>
    <entry lang="en" key="REMOVE_RESCUE_DISK_FROM_DRIVE">WARNING: During the next steps, the VeraCrypt Rescue Disk must not be in the drive. Otherwise, it will not be possible to complete the steps correctly.\n\nPlease remove it from the drive now and store it in a safe place. Then click OK.</entry>
@@ -1183,9 +1186,9 @@
    <entry lang="en" key="SYS_ENCRYPTION_PRETEST_INFO2_PORTION_2">What to Do If Windows Cannot Start\n------------------------------------------------\n\nNote: These instructions are valid only if you have not started encrypting.\n\n- If Windows does not start after you enter the correct password (or if you repeatedly enter the correct password but VeraCrypt says that the password is incorrect), do not panic. Restart (power off and on) the computer, and in the VeraCrypt Boot Loader screen, press the Esc key on your keyboard (and if you have multiple systems, choose which to start). Then Windows should start (provided that it is not encrypted) and VeraCrypt will automatically ask whether you want to uninstall the pre-boot authentication component. Note that the previous steps do NOT work if the system partition/drive is encrypted (nobody can start Windows or access encrypted data on the drive without the correct password even if he or she follows the previous steps).\n\n</entry>
    <entry lang="en" key="SYS_ENCRYPTION_PRETEST_INFO2_PORTION_3">- If the previous steps do not help or if the VeraCrypt Boot Loader screen does not appear (before Windows starts), insert the VeraCrypt Rescue Disk into your CD/DVD drive and restart your computer. If the VeraCrypt Rescue Disk screen does not appear (or if you do not see the 'Repair Options' item in the 'Keyboard Controls' section of the VeraCrypt Rescue Disk screen), it is possible that your BIOS is configured to attempt to boot from hard drives before CD/DVD drives. If that is the case, restart your computer, press F2 or Delete (as soon as you see a BIOS start-up screen), and wait until a BIOS configuration screen appears. If no BIOS configuration screen appears, restart (reset) the computer again and start pressing F2 or Delete repeatedly as soon as you restart (reset) the computer. When a BIOS configuration screen appears, configure your BIOS to boot from the CD/DVD drive first (for information on how to do so, please refer to the documentation for your BIOS/motherboard or contact your computer vendor's technical support team for assistance). Then restart your computer. The VeraCrypt Rescue Disk screen should appear now. In the VeraCrypt Rescue Disk screen, select 'Repair Options' by pressing F8 on your keyboard. From the 'Repair Options' menu, select 'Restore original system loader'. Then remove the Rescue Disk from your CD/DVD drive and restart your computer. Windows should start normally (provided that it is not encrypted).\n\n</entry>
    <entry lang="en" key="SYS_ENCRYPTION_PRETEST_INFO2_PORTION_4">Note that the previous steps do NOT work if the system partition/drive is encrypted (nobody can start Windows or access encrypted data on the drive without the correct password even if he or she follows the previous steps).\n\n\nNote that even if you lose your VeraCrypt Rescue Disk and an attacker finds it, he or she will NOT be able to decrypt the system partition or drive without the correct password.</entry>
-    <entry lang="en" key="SYS_ENCRYPTION_PRETEST_RESULT_TITLE">Pretest Completed</entry>
-    <entry 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.</entry>
-    <entry 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.</entry>
+    <entry lang="en" key="SYS_ENCRYPTION_PRETEST_RESULT_TITLE">Pretest Successfully Completed</entry>
+    <entry lang="en" key="SYS_ENCRYPTION_PRETEST_RESULT_INFO">If the encryption is interrupted you can resume it restarting VeraCrypt and selecting 'System' > 'Resume Interrupted Process'\n\nPlease make sure, that your device does not run out of power during the encryption process.</entry>
+    <entry lang="en" key="SYSENC_ENCRYPTION_PAGE_INFO">Make sure that your device does not run out of power.\nIf the encryption is interrupted you can resume it restarting VeraCrypt and selecting 'System' > 'Resume Interrupted Process'.</entry>
    <entry 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.</entry>
    <entry 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.</entry>
    <entry lang="en" key="SYSENC_HIDDEN_OS_INITIAL_INFO_TITLE">Hidden System Started</entry>
@@ -1307,7 +1310,7 @@
    <entry lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</entry>
    <entry lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</entry>
    <entry 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</entry>
-    <entry lang="en" key="TEST">Test</entry>
+    <entry lang="en" key="TEST">Start pretest</entry>
    <entry lang="en" key="KEYFILE">Keyfile</entry>
    <entry lang="en" key="VKEY_08">Backspace</entry>
    <entry lang="en" key="VKEY_09">Tab</entry>
@@ -1400,9 +1403,9 @@
    <entry lang="en" key="TIME">Time</entry>
    <entry lang="en" key="ITERATIONS">Iterations</entry>
    <entry lang="en" key="PRE-BOOT">Pre-Boot</entry>
-    <entry lang="en" key="RESCUE_DISK_EFI_INFO">Before you can encrypt the partition, you must create a VeraCrypt Rescue Disk (VRD), which serves the following purposes:\n\n- If the VeraCrypt Boot Loader, master key, or other critical data gets damaged, the VRD allows you to restore it (note, however, that you will still have to enter the correct password then).\n\n- If Windows gets damaged and cannot start, the VRD allows you to permanently decrypt the partition before Windows starts.\n\n- The VRD will contain a backup of the present EFI boot loader and will allow you to restore it if necessary.\n\nThe VeraCrypt Rescue Disk ZIP image will be created in the location specified below.</entry>
+    <entry lang="en" key="RESCUE_DISK_EFI_INFO">\n\nIf Windows gets damaged and cannot start, the VeraCrypt Rescue Disk allows you to permanently decrypt the partition. Note, however, that you will still have to enter the correct password then!\n\n\nWARNING: If you have already created a VeraCrypt Rescue Disk in the past, it cannot be reused for this encryption! Every time you use this encryption tool, you must create and securely store a new VeraCrypt Rescue Disk for it even if you use the same password.</entry>
    <entry lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you need to extract it to a USB stick that is formatted as FAT/FAT32.\n\n%lsAfter you create the Rescue Disk, click Next to verify that it has been correctly created.</entry>
-    <entry lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n%lsClick Next to continue.</entry>
+    <entry lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NO_CHECK">The Rescue Disk ZIP image has been created and stored in this file:\n%s\n\nNow you should either extract the image to a USB stick that is formatted as FAT/FAT32 or move it to a safe location for later use.\n\n\n\n%lsClick Next to continue.</entry>
    <entry lang="en" key="RESCUE_DISK_EFI_EXTRACT_INFO_NOTE">IMPORTANT: Note that the zip file must be extracted directly to the root of the USB stick. For example, if the drive letter of the USB stick is E: then extracting the zip file should create a folder E:\\EFI on the USB stick.\n\n</entry>
    <entry lang="en" key="RESCUE_DISK_EFI_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk, please eject and reinsert the USB stick; then click Next to try again. If this does not help, please try another USB stick and/or another ZIP software.\n\nIf you have not extracted the Rescue Disk yet, please do so, and then click Next.\n\nIf you attempted to verify a VeraCrypt Rescue Disk created before you started this wizard, please note that such Rescue Disk cannot be used, because it was created for a different master key. You need to extract the newly generated Rescue Disk ZIP image.</entry>
    <entry lang="en" key="RESCUE_DISK_EFI_NON_WIZARD_CHECK_FAILED">Cannot verify that the Rescue Disk has been correctly extracted.\n\nIf you have extracted the Rescue Disk image to a USB stick, please eject it and reinsert it; then try again. If this does not help, please try other ZIP software and/or medium.\n\nIf you attempted to verify a VeraCrypt Rescue Disk created for a different master key, password, salt, etc., please note that such Rescue Disk will always fail this verification. To create a new Rescue Disk fully compatible with your current configuration, select 'System' > 'Create Rescue Disk'.</entry>
@@ -1425,7 +1428,7 @@
    <entry lang="en" key="PASSWORD_MAXLENGTH_REACHED">Password already reached its maximum length of %d characters.\nNo additional character is allowed.</entry>
    <entry lang="en" key="IDC_SELECT_LANGUAGE_LABEL">Select the language to use during the installation:</entry>
    <entry lang="en" key="VOLUME_TOO_LARGE_FOR_HOST">ERROR: The size of the file container is larger than the available free space on disk.</entry>
-    <entry lang="en" key="IDC_ALLOW_WINDOWS_DEFRAG">Allow Windows Disk Defragmenter to defragment non-system partition/drive</entry>    
+    <entry lang="en" key="IDC_ALLOW_WINDOWS_DEFRAG">Allow Windows Disk Defragmenter to defragment non-system partition/drive</entry>
    <entry lang="en" key="CONFIRM_ALLOW_WINDOWS_DEFRAG">WARNING: Defragmenting non-system partitions/drives may leak metadata about their content or cause issues with hidden volumes they may contain.\n\nContinue?</entry>
    <entry lang="en" key="VIRTUAL_DEVICE">Virtual Device</entry>
    <entry lang="en" key="MOUNTED_VOLUME_NOT_ASSOCIATED">The selected mounted volume is not associated with its drive letter in Windows and so it can not be opened in Windows Explorer.</entry>
@@ -1567,6 +1570,53 @@
    <entry lang="en" key="VOLUME_HOST_IN_USE">WARNING: The host file/device {0} is already in use!\n\nIgnoring this can cause undesired results including system instability. All applications that might be using the host file/device should be closed before mounting the volume.\n\nContinue mounting?</entry>
    <entry lang="en" key="CANT_INSTALL_WITH_EXE_OVER_MSI">VeraCrypt was previously installed using an MSI package and so it can't be updated using the standard installer.\n\nPlease use the MSI package to update your VeraCrypt installation.</entry>
    <entry lang="en" key="IDC_USE_ALL_FREE_SPACE">Use all available free space</entry>
+    <entry lang="en" key="RESCUE_DISK_BACK_BUTTON">The Rescue Disk was already created depending on the selected options. In order to prevent incompatibility, you have to click 'cancel' and restart the system encryption process, if you want to modify any configuration.</entry>
+    <entry lang="en" key="AES_BOX_HELP">AES is secure according to NIST</entry>
+    <entry lang="en" key="BACKUP_RESCUE_DISK_TITLE">Backup Rescue Disk</entry>
+    <entry lang="en" key="RESCUE_DISK_CHECKLIST_A">Store your password in a safe location. You can not recover your data without your password.\nThat is why VeraCrypt is considered to be secure.</entry>
+    <entry lang="en" key="RESCUE_DISK_CHECKLIST_B">Make sure that the rescue file is stored on an external medium. This could be a flash drive, an external hard drive or even a cloud storage.\nYour rescue file is located here:</entry>
+    <entry lang="en" key="RESCUE_DISK_CHECKLIST_C">Before you start encrypting your system, it is always a good idea to backup your personal data on an external drive for the unlikely case that the encryption process fails.</entry>
+    <entry lang="en" key="RESCUE_DISK_INFO_2">The VeraCrypt Rescue Disk ZIP image will be created by clicking the Next button in location specified below.</entry>
+    <entry lang="en" key="REMEMBER_PASSWORD"> I remember my Password</entry>
+    <entry lang="en" key="STORE_RESCUE_DISK"> I stored my rescue file</entry>
+    <entry lang="en" key="BACKUP_DATA"> I considered doing a backup of my personal Data</entry>
+    <entry lang="en" key="CHECKLIST_TITLE">Checklist - Before clicking 'Next'</entry>
+    <entry lang="en" key="SYS_ENCRYPTION_PRETEST_INFO">Some tests have to be done now to verify that everything works correctly.\n\nFor this test, your computer has to be restarted. Then you will have to enter your password in the VeraCrypt Boot Loader screen that will appear before Windows starts. After Windows starts, VeraCrypt is started automatically and you will be informed about the result of this pretest.\n\n\nThe following device will be modified: Drive %c:</entry>
+    <entry lang="en" key="SYSENC_DECRYPTION_PAGE_INFO">Make sure that your device does not run out of power.\nIf the decryption is interrupted you can resume it restarting VeraCrypt and selecting 'System' > 'Resume Interrupted Process'.</entry>
+    <entry lang="en" key="ADVANCED_FEATURES">Advanced features</entry>
+    <entry lang="en" key="VERY_WEAK_PASSWORD">very weak</entry>
+    <entry lang="en" key="WEAK_PASSWORD">weak</entry>
+    <entry lang="en" key="MEDIUM_PASSWORD">medium</entry>
+    <entry lang="en" key="STRONG_PASSWORD">strong</entry>
+    <entry lang="en" key="VERY_STRONG_PASSWORD">very strong</entry>
+    <entry lang="en" key="IDT_PASSWORD_STRENGTH">Password strength:</entry>
+    <entry lang="en" key="PASSWORD_HELP_SYSENC">You might consider to write the password down somewhere safe. </entry>
+    <entry lang="en" key="AES_HELP_NEW">AES is secure accoring to the National Institute of Standards and Technology (NIST) and the privacy and security research community.</entry>
+    <entry lang="en" key="SHA512_HELP">SHA-512 is secure accoring to the National Institute of Standards and Technology (NIST) and the privacy and security research community.</entry>
+    <entry lang="en" key="CHOOSE_PASSWORD_TITLE">Choose Password</entry>
+    <entry lang="en" key="TRANSLATED_PWD_NOT_WRITTEN">Warning: Error occured while writing translated password! Please try again. If this error happens again, change keyboard layout to US keyboard layout manually.</entry>
+    <entry lang="en" key="ERROR_TRANSLATE_PWD">Warning: Error occured while translating password!\nPlease type password again and try. If this error happens again, switch keyboard layout to US keyboard layout manually.</entry>
+    <entry lang="en" key="ERROR_KEYB_LAYOUT_NOT_LOADED">Your system does not support the standard US-Keyboard layout. Please make sure the layout is available. For further help, please visit: https://support.microsoft.com/en-us/windows/manage-the-input-and-display-language-settings-in-windows-10-12a10cb4-8626-9b77-0ccb-5013e0c7c7a2 </entry>  
+    <entry lang="en" key="ERROR_PASTE_ACTION">Pasting text is disabled. Please type your password.</entry>
+    <entry lang="en" key="WARNING_PASSWORD_NOT_IDENTICAL">Passwords are not identical! Please type identic passwords in both fields!</entry>
+    <entry lang="en" key="SYSENC_INFO">This assistant will help you encrypt your drive (%c:)</entry>
+    <entry lang="en" key="SYSENC_INFO_2">A windows password can easily be circumvented by bad actors with physical access to your device. Drive encryption helps to secure your data from beeing accessed by bad actors. VeraCrypt Drive Encryption will keep them out by protecting your data with an additional password. </entry>
+    <entry lang="en" key="ADV_FEATURES_INTRO_TOOLTIP">Activate hidden OS here.</entry>
+    <entry lang="en" key="ADV_FEATURES_NOTE">Most experts agree that the following preselected options are secure. Only change them if you know what you are doing. </entry>
+    <entry lang="en" key="PIM_INFO">A Personal Iterations Multiplier (PIM) allows you to set the number of password hash iterations. This provides more flexibility for adjusting the desired security level while also controling the performance of the mount/boot operation.</entry>
+    <entry lang="en" key="WIPE_INFO">Overrides your data before the encryption. This prevents possible data recovery. Wipe is not needed under normal circumstances.</entry>
+    <entry lang="en" key="PRETEST_INFO">Before encrypting VeraCrypt will verify that everything is working correctly.\n\nVeraCrypt will run some tests, restart your computer and you have to enter you password before windows starts.</entry>
+    <entry lang="en" key="PRETEST_CANCEL">If you click cancel now, no changes will be made your system.</entry>
+    <entry lang="en" key="ERROR_GETTING_PATH">Error occured while getting path to executable file.</entry>
+    <entry lang="en" key="ERROR_GETTING_PWD">Error occured while getting the password. Please try again.</entry>
+    <entry lang="en" key="ERROR_GETTING_KEYB_STATE">Error occured while getting the keyboard state.</entry>
+    <entry lang="en" key="ERR_NO_TRANSLATION">There is no translation for that key you just pressed!</entry>
+    <entry lang="en" key="DEAD_KEY_SUPPORT">Dead keys will not reproduce dead char in this case because your password need to be translated to US keyboard layout so you can type your password in pre-boot environment.</entry>
+    <entry lang="en" key="PRETEST_CHECKBOX"> I made sure that my device will not run out of power during the encryption process.</entry>
+    <entry lang="en" key="OPEN_PATH_CHECKLIST_PAGE">Open path</entry>
+    <entry lang="en" key="RESCUE_DISK_PATH">Rescue Disk Path</entry>
+    <entry lang="en" key="PRETEST_BACK_BUTTON">If you want to cancel the encryption wizard, please click on cancel. In this case no changes will be made to your computer.</entry>
+    <entry lang="en" key="WIPE_WARNING">Wiping can take a long time (Up to hours). Wiping is not recommended if you have an SSD Drive.</entry>
  </localization>
  <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
    <xs:element name="VeraCrypt">
@@ -39,6 +39,7 @@ void VerifyPasswordAndUpdate (HWND hwndDlg, HWND hButton, HWND hPassword,
 	char szTmp1Utf8[MAX_PASSWORD + 1];
 	char szTmp2Utf8[MAX_PASSWORD + 1];
 	int k = GetWindowTextLength (hPassword);
+	int j = GetWindowTextLength (hVerify);
 	BOOL bEnable = FALSE;
 	int utf8Len1, utf8Len2;

@@ -51,7 +52,12 @@ void VerifyPasswordAndUpdate (HWND hwndDlg, HWND hButton, HWND hPassword,
 	utf8Len2 = WideCharToMultiByte (CP_UTF8, 0, szTmp2, -1, szTmp2Utf8, MAX_PASSWORD + 1, NULL, NULL);

 	if (wcscmp (szTmp1, szTmp2) != 0)
+	{
 		bEnable = FALSE;
+		if(k > 0 && j == k)
+			Warning ("WARNING_PASSWORD_NOT_IDENTICAL", hwndDlg);
+
+	}
 	else if (utf8Len1 <= 0)
 		bEnable = FALSE;
 	else
@@ -145,11 +151,6 @@ BOOL CheckPasswordLength (HWND hwndDlg, unsigned __int32 passwordLength, int pim
 			Error (bootPimCondition? "BOOT_PIM_REQUIRE_LONG_PASSWORD": "PIM_REQUIRE_LONG_PASSWORD", hwndDlg);
 			return FALSE;
 		}
-
-#ifndef _DEBUG
-		if (!bSkipPasswordWarning && (MessageBoxW (hwndDlg, GetString ("PASSWORD_LENGTH_WARNING"), lpszTitle, MB_YESNO|MB_ICONWARNING|MB_DEFBUTTON2) != IDYES))
-			return FALSE;
-#endif
 	}
 #ifndef _DEBUG
 	else if (bCustomPimSmall)
@@ -563,4 +564,3 @@ error:

 	return nStatus;
 }
-
@@ -85,13 +85,13 @@ CAPTION "VeraCrypt Volume Creation Wizard"
 CLASS "VeraCryptCustomDlg"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    PUSHBUTTON      "&Help",IDHELP,166,234,60,14
-    PUSHBUTTON      "",IDC_PREV,238,234,60,14
-    DEFPUSHBUTTON   "",IDC_NEXT,310,234,60,14
+    PUSHBUTTON      "&Documentation",IDHELP,166,234,60,14
+    PUSHBUTTON      "",IDC_PREV,243,234,60,14
+    DEFPUSHBUTTON   "",IDC_NEXT,305,234,60,14
    PUSHBUTTON      "Cancel",IDCANCEL,382,234,60,14
-    LTEXT           "",IDC_BOX_TITLE,160,8,283,17
-    GROUPBOX        "",IDC_STATIC,4,0,439,230
-    CONTROL         116,IDC_BITMAP_WIZARD,"Static",SS_BITMAP | SS_SUNKEN,10,9,137,193
+    LTEXT           "",IDC_BOX_TITLE,160,10,283,17
+    GROUPBOX        "",IDC_STATIC,4,0,440,230
+    CONTROL         116,IDC_BITMAP_WIZARD,"Static",SS_BITMAP | SS_SUNKEN,10,18,137,200
    LTEXT           "",IDC_POS_BOX,160,24,281,193
 END

@@ -114,15 +114,21 @@ IDD_PASSWORD_PAGE_DLG DIALOGEX 0, 0, 276, 193
 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    EDITTEXT        IDC_PASSWORD,71,3,202,14,ES_PASSWORD | ES_AUTOHSCROLL
-    EDITTEXT        IDC_VERIFY,71,19,202,14,ES_PASSWORD | ES_AUTOHSCROLL
-    CONTROL         "U&se keyfiles",IDC_KEYFILES_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,71,35,103,10
-    PUSHBUTTON      "&Keyfiles...",IDC_KEY_FILES,182,36,91,14,WS_DISABLED
-    CONTROL         "&Display password",IDC_SHOW_PASSWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,71,45,108,11,WS_EX_TRANSPARENT
-    CONTROL         "Use P&IM",IDC_PIM_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,71,56,114,10
-    RTEXT           "Password:",IDT_PASSWORD,1,6,68,8
-    RTEXT           "&Confirm:",IDT_CONFIRM,1,23,68,8
-    LTEXT           "",IDC_BOX_HELP,0,71,273,121
+    EDITTEXT        IDC_PASSWORD,69,3,202,14,ES_PASSWORD | ES_AUTOHSCROLL
+    EDITTEXT        IDC_VERIFY,69,20,202,14,ES_PASSWORD | ES_AUTOHSCROLL
+	LTEXT           "Password strength: ", IDT_PASSWORD_STRENGTH, 71, 54, 70, 10
+	LTEXT           "", PASSWORD_METER, 140, 55, 50, 20
+    CONTROL         "&Display password",IDC_SHOW_PASSWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,71,41,108,11,WS_EX_TRANSPARENT
+	RTEXT           "Password:", IDT_PASSWORD, 1, 6, 40, 8	
+	RTEXT           "&Confirm:", IDT_CONFIRM, 1, 23, 40, 8
+	LTEXT           "", IDC_BOX_HELP, 1, 95, 270, 120
+	PUSHBUTTON      "Advanced features", IDC_ADVANCE, 203, 156, 68, 14, NOT WS_VISIBLE
+	CONTROL         "",IDC_SYS_POOL_CONTENTS,"Static",SS_LEFTNOWORDWRAP | WS_GROUP | NOT WS_VISIBLE,33,17,209,63,WS_EX_TRANSPARENT
+	CONTROL         "", IDC_ENTROPY_BAR, "msctls_progress32", WS_BORDER | NOT WS_VISIBLE, 11, 140, 202, 6
+	CONTROL         "U&se keyfiles",IDC_KEYFILES_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,71,64,103,10
+    PUSHBUTTON      "&Keyfiles...",IDC_KEY_FILES,192,65,71,14,WS_DISABLED
+    CONTROL         "Use P&IM",IDC_PIM_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,71,76,114,10
+   
 END

 IDD_SIZE_PAGE_DLG DIALOGEX 0, 0, 276, 193
@@ -202,7 +208,8 @@ IDD_INFO_PAGE_DLG DIALOGEX 0, 0, 276, 193
 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    LTEXT           "",IDC_BOX_HELP,0,31,269,155
+    LTEXT           "",IDC_BOX_HELP,0,15,267,155
+    CONTROL         "", IDC_CHECKBOX_PRETEST, "Button", BS_AUTOCHECKBOX | BS_MULTILINE | NOT WS_VISIBLE, 0, 150, 267, 50
 END

 IDD_HIDVOL_HOST_FILL_PAGE_DLG DIALOGEX 0, 0, 276, 193
@@ -267,11 +274,12 @@ IDD_SYSENC_RESCUE_DISK_CREATION_DLG DIALOGEX 0, 0, 276, 193
 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    EDITTEXT        IDC_RESCUE_DISK_ISO_PATH,0,180,201,13,ES_AUTOHSCROLL
-    PUSHBUTTON      "Bro&wse...",IDC_BROWSE,204,179,70,14
-    LTEXT           "",IDT_RESCUE_DISK_INFO,0,1,273,137
+	EDITTEXT        IDC_RESCUE_DISK_ISO_PATH, 0, 159, 180, 13, ES_AUTOHSCROLL
+    PUSHBUTTON      "Bro&wse...",IDC_BROWSE,185,159,70,14
+    LTEXT           "",IDT_RESCUE_DISK_INFO,0,1,266,137
+	LTEXT           "",IDT_RESCUE_DISK_INFO_2,0,135,266,20
    CONTROL         "Skip Rescue Disk verification",IDC_SKIP_RESCUE_VERIFICATION,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,166,273,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,178,273,10
 END

 IDD_SYSENC_COLLECTING_RANDOM_DATA_DLG DIALOGEX 0, 0, 276, 193
@@ -300,37 +308,46 @@ IDD_SYSENC_RESCUE_DISK_BURN_PAGE_DLG DIALOGEX 0, 0, 276, 193
 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT           "Download CD/DVD recording software",IDC_DOWNLOAD_CD_BURN_SOFTWARE,0,159,273,10,SS_NOTIFY
-    LTEXT           "",IDT_RESCUE_DISK_BURN_INFO,0,4,273,148
+    LTEXT           "",IDT_RESCUE_DISK_BURN_INFO,0,15,275,170
 END

 IDD_SYSENC_WIPE_MODE_PAGE_DLG DIALOGEX 0, 0, 276, 193
 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    COMBOBOX        IDC_WIPE_MODE,88,0,138,90,CBS_DROPDOWNLIST | WS_TABSTOP
-    RTEXT           "Wipe mode:",IDT_WIPE_MODE,0,2,83,8,0,WS_EX_RIGHT
-    LTEXT           "",IDT_WIPE_MODE_INFO,0,19,269,167
+    CONTROL         "A", IDC_CHECKLIST_A, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 0, 13, 10, 10
+	CONTROL         "B", IDC_CHECKLIST_B, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 0, 60, 10, 10
+	CONTROL         "C", IDC_CHECKLIST_C, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 0, 135, 10, 10
+	LTEXT			" I remember my Password", IDC_REMEMBER_PASSWORD, 11, 13, 212, 10
+	LTEXT			" I securely stored the Rescue Disk", IDC_STORE_RESCUE_DISK, 11, 60, 217, 10
+	LTEXT			" I considered doing a backup of my personal Data", IDC_BACKUP_DATA, 11, 135, 226, 10
+	LTEXT           "", IDT_REMEMBER_PASSWORD, 16, 26, 205, 32
+	LTEXT           "", IDT_STORE_RESCUE_DISK, 16, 73, 205, 60
+    PUSHBUTTON      "",IDC_BROWSE,16,109,60,14
+	LTEXT           "", IDT_BACKUP_DATA, 16, 146, 205, 72
+	COMBOBOX		IDC_WIPE_MODE,88,0,138,90,CBS_DROPDOWNLIST | WS_TABSTOP
+	RTEXT			"Wipe mode:", IDT_WIPE_MODE,0,2,83,8,0,WS_EX_RIGHT
+	LTEXT			"", IDT_WIPE_MODE_INFO,0,19,269,167
 END

 IDD_INPLACE_ENCRYPTION_PAGE_DLG DIALOGEX 0, 0, 276, 193
 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX        IDC_WIPE_MODE,96,13,125,90,CBS_DROPDOWNLIST | WS_TABSTOP
-    PUSHBUTTON      "&Pause",IDC_PAUSE,204,40,63,14
-    LTEXT           "More information",IDC_MORE_INFO_SYS_ENCRYPTION,1,176,266,10,SS_NOTIFY
-    LTEXT           "",IDC_BYTESWRITTEN,29,58,39,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT | WS_EX_RIGHT | WS_EX_STATICEDGE
-    RTEXT           "",IDC_WRITESPEED,110,58,56,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT | WS_EX_RIGHT | WS_EX_STATICEDGE
-    RTEXT           "",IDC_TIMEREMAIN,212,58,54,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT | WS_EX_RIGHT | WS_EX_STATICEDGE
-    RTEXT           "Wipe mode:",IDT_WIPE_MODE,6,15,85,8,0,WS_EX_RIGHT
-    CONTROL         "",IDC_PROGRESS_BAR,"msctls_progress32",PBS_SMOOTH | WS_BORDER,6,41,192,12
-    RTEXT           "Done",IDT_DONE,5,59,22,8
-    RTEXT           "Status",IDT_STATUS,73,59,33,8
-    RTEXT           "Left",IDT_LEFT,172,59,35,8
-    LTEXT           "",IDC_BOX_HELP,1,77,266,95
-    GROUPBOX        "Options",IDT_FORMAT_OPTIONS,0,3,267,29
-    GROUPBOX        "",IDC_STATIC,0,32,267,41
+    COMBOBOX        IDC_WIPE_MODE,96,60,125,90,CBS_DROPDOWNLIST | WS_TABSTOP
+    PUSHBUTTON      "&Pause",IDC_PAUSE,204,8,63,14
+    LTEXT           "More information",IDC_MORE_INFO_SYS_ENCRYPTION,1,176,266,10,SS_NOTIFY | NOT WS_VISIBLE
+    LTEXT           "",IDC_BYTESWRITTEN,29,26,39,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT | WS_EX_RIGHT | WS_EX_STATICEDGE
+    RTEXT           "",IDC_WRITESPEED,110,26,56,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT | WS_EX_RIGHT | WS_EX_STATICEDGE
+    RTEXT           "",IDC_TIMEREMAIN,212,26,54,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT | WS_EX_RIGHT | WS_EX_STATICEDGE
+    RTEXT           "Wipe mode:",IDT_WIPE_MODE,6,62,85,8,0,WS_EX_RIGHT
+    CONTROL         "",IDC_PROGRESS_BAR,"msctls_progress32",PBS_SMOOTH | WS_BORDER,6,9,192,12
+    RTEXT           "Done",IDT_DONE,5,27,22,8
+    RTEXT           "Status",IDT_STATUS,73,27,33,8
+    RTEXT           "Left",IDT_LEFT,172,27,35,8
+    LTEXT           "",IDC_BOX_HELP,1,100,266,90
+    GROUPBOX        "",IDC_STATIC,0,3,268,41
+    GROUPBOX        "Options",IDT_FORMAT_OPTIONS,0,50,268,29
 END

 IDD_SYSENC_KEYS_GEN_PAGE_DLG DIALOGEX 0, 0, 276, 193
@@ -369,13 +386,29 @@ IDD_SYSENC_TYPE_PAGE_DLG DIALOGEX 0, 0, 276, 193
 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    CONTROL         "Normal",IDC_SYSENC_NORMAL,"Button",BS_AUTORADIOBUTTON,0,7,269,10
-    CONTROL         "Hi&dden",IDC_SYSENC_HIDDEN,"Button",BS_AUTORADIOBUTTON,0,64,269,10
-    LTEXT           "More information",IDC_HIDDEN_SYSENC_INFO_LINK,16,173,253,10,SS_NOTIFY
-    LTEXT           "",IDC_BOX_HELP_SYSENC_NORMAL,16,20,253,41
-    LTEXT           "",IDC_BOX_HELP,16,78,253,90
+    LTEXT           "", IDC_BOX_HELP, 5, 20, 250, 16
+	LTEXT           "", IDT_SYSENC_INFO_2, 5, 50, 250, 60
+	PUSHBUTTON      "Advanced features", IDC_ADVANCE_INTRO, 190, 160, 68, 14
+	CONTROL			"", IDC_INFORMATION_TIP, "Static", SS_ICON | SS_NOTIFY, 262,163,10,5
 END

+IDD_ADVANCE_MBR DIALOGEX 102, -10, 245, 233	
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Advanced Options"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+	CONTROL         " Normal",IDC_SYSENC_NORMAL,"Button", BS_AUTOCHECKBOX, 10,40,200,10
+    CONTROL         " Hi&dden",IDC_SYSENC_HIDDEN,"Button", BS_AUTOCHECKBOX, 10,99,200,10
+    LTEXT           "Select this option if you merely want to encrypt the system partition or the entire system drive.",-1,26,57,200,30
+    LTEXT           "If you select this option, you will create a hidden operating system whose existence should be impossible to prove (provided that certain guidelines are followed). Thus, you will not have to decrypt or reveal the password to the hidden operating system.",-1,26,116,200,50
+	LTEXT			"For a detailed explanation, please click the Help button. ",-1,26,180,200,10
+	LTEXT			"IMPORTANT: Only advanced users should make modifications on this page.", -1, 10, 12, 217, 19,
+	
+	GROUPBOX		"", -1, 6, 30, 232, 178
+	DEFPUSHBUTTON   "OK", IDOK, 129, 213, 50, 14
+	PUSHBUTTON      "Cancel", IDCANCEL, 180, 213, 50, 14
+	PUSHBUTTON      "&Help",IDHELP,15,213,50,14
+END
 IDD_SYSENC_HIDDEN_OS_REQ_CHECK_PAGE_DLG DIALOGEX 0, 0, 276, 193
 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -453,6 +486,30 @@ BEGIN
    CONTROL         "Display PIM",IDC_SHOW_PIM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,74,17,196,10
 END

+IDD_ADVANCE DIALOGEX 75, -62, 245, 362	
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Advanced Algorithm Options"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+	DEFPUSHBUTTON   "OK", IDOK, 129, 345, 50, 14
+	PUSHBUTTON      "Cancel", IDCANCEL, 180, 345, 50, 14
+	COMBOBOX        IDC_COMBO_BOX_HASH_ALGO, 21, 47, 137, 130, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+	LTEXT           "",  IDC_SHA512_HELP, 21, 65, 205, 40
+	COMBOBOX        IDC_COMBO_BOX, 21, 113, 137, 126, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP 
+	LTEXT           "", IDC_BOX_HELP, 21, 131, 205, 40
+	PUSHBUTTON      "&Verify", IDC_CIPHER_TEST, 40, 181, 59, 14
+	PUSHBUTTON      "&Benchmark", IDC_BENCHMARK, 140, 181, 59, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE
+	GROUPBOX        "Encryption Algorithm", IDT_ENCRYPTION_ALGO, 14, 100, 217, 60
+	GROUPBOX        "Hash Algorithm", IDT_HASH_ALGO, 14, 35, 217, 60
+	GROUPBOX		"Test Algorithms", IDT_TEST_ALGO, 14, 168, 217, 35
+	GROUPBOX        "PIM", -1, 14, 206, 217, 59
+	CONTROL         "Modify P&IM", IDC_PIM_ENABLE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 19, 217, 97, 10
+	LTEXT           "", IDT_PIM_INFO, 21, 231, 203, 25
+	GROUPBOX        "Wipe Mode", IDT_WIPE_MODE, 14, 270, 217, 71
+	COMBOBOX        IDC_WIPE_MODE, 21, 284, 127, 90, CBS_DROPDOWNLIST | WS_TABSTOP
+	LTEXT           "", IDT_WIPE_INFO, 21, 303, 200, 32
+	LTEXT			"", IDT_IMPORTANT_NOTE, 18, 10, 217, 19
+END

 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -623,6 +680,22 @@ BEGIN
        HORZGUIDE, 96
    END

+	IDD_ADVANCE, DIALOG
+	BEGIN
+		LEFTMARGIN, 7
+		RIGHTMARGIN, 238
+		TOPMARGIN, 7
+		BOTTOMMARGIN, 242
+	END
+
+	IDD_ADVANCE_MBR, DIALOG
+	BEGIN
+		LEFTMARGIN, 7
+		RIGHTMARGIN, 238
+		TOPMARGIN, 7
+		BOTTOMMARGIN, 242
+	END
+
    IDD_SYSENC_KEYS_GEN_PAGE_DLG, DIALOG
    BEGIN
        RIGHTMARGIN, 267
@@ -741,4 +814,3 @@ END

 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
-
@@ -118,7 +118,6 @@
 #define IDT_SINGLE_BOOT                 1079
 #define IDC_SYS_POOL_CONTENTS           1080
 #define IDT_PARTIAL_POOL_CONTENTS       1081
-#define IDC_DOWNLOAD_CD_BURN_SOFTWARE   1082
 #define IDT_RESCUE_DISK_BURN_INFO       1083
 #define IDT_WIPE_MODE_INFO              1084
 #define IDC_WIPE_MODE                   1085
@@ -146,6 +145,30 @@
 #define IDC_TB                          1107
 #define IDC_SKIP_RESCUE_VERIFICATION    1108
 #define SPARSE_FILE                     1109
+#define IDC_ADVANCE_INTRO               1110
+#define IDD_ADVANCE						1111
+#define IDC_ADVANCE						1112
+#define PASSWORD_METER					1113
+#define IDC_REMEMBER_PASSWORD			1114
+#define IDC_STORE_RESCUE_DISK			1115	
+#define IDC_BACKUP_DATA					1116
+#define IDT_REMEMBER_PASSWORD			1117
+#define IDT_STORE_RESCUE_DISK			1118
+#define IDT_BACKUP_DATA					1119
+#define IDC_CHECKLIST_A					1120
+#define IDC_CHECKLIST_B					1121
+#define IDC_CHECKLIST_C					1122
+#define IDD_ADVANCE_MBR					1123 
+#define IDC_INFORMATION_TIP				1124
+#define IDC_SHA512_HELP					1125
+#define IDT_PASSWORD_STRENGTH			1126
+#define IDT_RESCUE_DISK_INFO_2			1127
+#define IDT_SYSENC_INFO_2				1128
+#define IDT_IMPORTANT_NOTE				1129
+#define IDT_PIM_INFO					1130
+#define IDT_WIPE_INFO					1131
+#define IDT_TEST_ALGO					1132
+#define IDC_CHECKBOX_PRETEST			1133

 // Next default values for new objects
 // 
@@ -104,6 +104,14 @@ extern wchar_t HeaderKeyGUIView [KEY_GUI_VIEW_SIZE];
 extern wchar_t MasterKeyGUIView [KEY_GUI_VIEW_SIZE];
 extern volatile int NonSysInplaceEncStatus;

+BOOL CALLBACK AdvanceDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
+BOOL CALLBACK FinishDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
+void AddComboPairW (HWND hComboBox, const wchar_t *lpszItem, int value);
+int  PrintStrongness (char* input, unsigned int length);
+BOOL CheckWord (char search[]);
+BOOL CALLBACK AdvanceDlgProcIntro (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
+void CreateToolTip (HWND hWndParent, HWND hControlItem, PTSTR pszText);
+
 #ifdef __cplusplus
 }
 #endif
@@ -24,6 +24,7 @@ static wchar_t *szFiles[]=
 	L"ALicense.txt",
 	L"ALICENSE",
 	L"ANOTICE",
+	L"Apassword1000000.txt",
 	L"AVeraCrypt.exe",
 	L"AVeraCryptExpander.exe",
 	L"AVeraCrypt Format.exe",
@@ -42,6 +43,7 @@ static wchar_t *szCompressedFiles[]=
 	L"License.txt",
 	L"LICENSE",
 	L"NOTICE",
+	L"password1000000.txt",
 	L"VeraCrypt.exe",
 	L"VeraCryptExpander.exe",
 	L"VeraCrypt Format.exe",
@@ -2249,14 +2249,6 @@ BOOL InitDll (MSIHANDLE hInstaller)
 	SetUnhandledExceptionFilter (ExceptionHandler);
 	_set_invalid_parameter_handler (InvalidParameterHandler);
 	RemoteSession = GetSystemMetrics (SM_REMOTESESSION) != 0;
-	
-	// OS version check: from version 1.25, only Windows XP, Windows 10 and Windows 11 are supported because of new driver signing requirements
-	if (!IsOSVersionAtLeast(WIN_10, 0))
-	{
-		MSILogAndShow (hInstaller, MSI_ERROR_LEVEL, GetString("UNSUPPORTED_OS"));
-		bOK = FALSE;
-		goto end;
-	}

 end:
 	MSILog(hInstaller, MSI_INFO_LEVEL, L"End InitDll");
@@ -28,6 +28,7 @@ cd "..\Release\Setup Files\"
 copy ..\..\LICENSE .
 copy ..\..\License.txt .
 copy ..\..\NOTICE .
+copy ..\..\password1000000 .
 copy ..\..\Resources\Texts\License.rtf .
 copy ..\..\Common\VeraCrypt.ico .
 copy ..\..\Setup\VeraCrypt_setup_background.bmp .
@@ -52,6 +53,7 @@ call build_msi_x64.bat %VC_VERSION_NBRE%
 del LICENSE
 del License.txt
 del NOTICE
+del password1000000.txt
 del License.rtf
 del VeraCrypt.ico
 del VeraCrypt_setup_background.bmp
Author	SHA1	Message	Date
Mounir IDRASSI	70e9868c8e	Windows: fix buffer overrun caused by wrong use of wmemset	2022-01-16 21:02:09 +01:00
Mounir IDRASSI	768effbe96	Windows: Add missing string in Language.xml	2022-01-16 20:28:30 +01:00
Mounir IDRASSI	7314bd19f9	Windows: Remove unused variable	2022-01-16 16:50:40 +01:00
Mounir IDRASSI	8eada1f8c6	Windows: Fix build error following merge	2022-01-16 16:40:49 +01:00
Mounir IDRASSI	594a8d2706	Merge branch 'e2Security-master' into NewSysEncWizard	2022-01-16 15:47:03 +01:00
Mounir IDRASSI	fcb220e39a	Merge branch 'master' of https://github.com/e2Security/VeraCrypt into e2Security-master Changes made to src/Common/Dlgcode.c and src/Common/Language.xml to resolve conflicts. For Language.xml, new entries were put at the end and remove entries were put back in order to keep same order to entries as before. This important for compatibility with Transifex translation platform.	2022-01-16 15:43:45 +01:00
Mounir IDRASSI	0d92195c91	Windows MSI: set minimum support for MSI installation to Windows 8 as it was before	2022-01-16 15:18:48 +01:00
Thomas De RockerandGitHub	b0c4ac6a90	Update Language.nl.xml (#870 )	2022-01-12 00:20:11 +01:00
felixreichmannandGitHub	36f71280fa	Merge pull request #1 from e2Security/NewInterface System Encryption: translate password to US keyboard layout + improve…	2021-12-17 15:27:04 +01:00
Bruna2803	7499ae384f	System Encryption: translate password to US keyboard layout + improved new interface	2021-08-09 13:53:06 +02:00
Bruna2803	1c51a76c7e	New VeraCrypt interface (for system encryption) with improved usability	2021-05-05 01:06:24 +02:00