diff options
42 files changed, 67 insertions, 0 deletions
diff --git a/Translations/Language.ar.xml b/Translations/Language.ar.xml index 38ceeb26..3f67b3ec 100644 --- a/Translations/Language.ar.xml +++ b/Translations/Language.ar.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.be.xml b/Translations/Language.be.xml index c9bbbcda..407cd70f 100644 --- a/Translations/Language.be.xml +++ b/Translations/Language.be.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.bg.xml b/Translations/Language.bg.xml index 69371981..23a0c4da 100644 --- a/Translations/Language.bg.xml +++ b/Translations/Language.bg.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.ca.xml b/Translations/Language.ca.xml index 232f8c45..10b216fb 100644 --- a/Translations/Language.ca.xml +++ b/Translations/Language.ca.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.cs.xml b/Translations/Language.cs.xml index 76394607..8383f6f1 100644 --- a/Translations/Language.cs.xml +++ b/Translations/Language.cs.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.da.xml b/Translations/Language.da.xml index 694fd96d..53b19044 100644 --- a/Translations/Language.da.xml +++ b/Translations/Language.da.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.de.xml b/Translations/Language.de.xml index ba822627..c40b662c 100644 --- a/Translations/Language.de.xml +++ b/Translations/Language.de.xml @@ -1568,6 +1568,7 @@ <entry lang="de" key="UNKNOWN_OPTION">Unbekannte Option</entry> <entry lang="de" key="VOLUME_LOCATION">Volumen-Speicherort</entry> <entry lang="de" key="VOLUME_HOST_IN_USE">WARNUNG: Die Datei/das Laufwerk {0} ist bereits in Verwendung!\n\nWenn Sie diese Warnung ignorieren, können nicht vorhersehbare Probleme einschließlich Systemabstürze auftreten. Alle Programme, die die Datei/das Laufwerk verwenden (zum Beispiel Virenscanner oder Backup-Software) sollten geschlossen werden, bevor das Volumen eingehängt wird.\n\nTrotzdem fortfahren?</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> </localization> <!-- XML-Schema --> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> diff --git a/Translations/Language.el.xml b/Translations/Language.el.xml index d3967b71..764a7494 100644 --- a/Translations/Language.el.xml +++ b/Translations/Language.el.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.es.xml b/Translations/Language.es.xml index 256526af..47537f68 100644 --- a/Translations/Language.es.xml +++ b/Translations/Language.es.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.et.xml b/Translations/Language.et.xml index 4028c75e..85f6b70a 100644 --- a/Translations/Language.et.xml +++ b/Translations/Language.et.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.eu.xml b/Translations/Language.eu.xml index ae695970..218a8fd6 100644 --- a/Translations/Language.eu.xml +++ b/Translations/Language.eu.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.fa.xml b/Translations/Language.fa.xml index d3da3701..e3025940 100644 --- a/Translations/Language.fa.xml +++ b/Translations/Language.fa.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.fi.xml b/Translations/Language.fi.xml index c90cd0bd..e5c42bcf 100644 --- a/Translations/Language.fi.xml +++ b/Translations/Language.fi.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.fr.xml b/Translations/Language.fr.xml index 21cb2b8a..fd45a31a 100644 --- a/Translations/Language.fr.xml +++ b/Translations/Language.fr.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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="fr" key="CANT_INSTALL_WITH_EXE_OVER_MSI">VeraCrypt a déjà été installé à l'aide d'un package MSI et de ce fait il ne peut pas être mis à jour à l'aide du programme d'installation standard.\n\nVeuillez utiliser le package MSI pour mettre à jour votre installation VeraCrypt.</entry> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.he.xml b/Translations/Language.he.xml index c49aaddf..1a4dae91 100644 --- a/Translations/Language.he.xml +++ b/Translations/Language.he.xml @@ -1566,6 +1566,7 @@ <entry lang="he" key="UNKNOWN_OPTION">אפשרות לא ידועה</entry> <entry lang="he" key="VOLUME_LOCATION">מיקום אמצעי אחסון</entry> <entry lang="he" key="VOLUME_HOST_IN_USE">אזהרה: הקובץ / ההתקן המארח {0} כבר נמצא בשימוש! \n \n התעלמות מכך עלולה לגרום לתוצאות לא רצויות כולל חוסר יציבות במערכת.יש לסגור את כל היישומים שעשויים להשתמש בקובץ המארח / בהתקן לפני התקנת אמצעי האחסון. \n \n האם להמשיך בטעינה?</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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.hu.xml b/Translations/Language.hu.xml index 469da2c8..63528605 100644 --- a/Translations/Language.hu.xml +++ b/Translations/Language.hu.xml @@ -1565,6 +1565,7 @@ <entry lang="hu" key="UNKNOWN_OPTION">Ismeretlen opció</entry> <entry lang="hu" key="VOLUME_LOCATION">Kötet helye</entry> <entry lang="hu" key="VOLUME_HOST_IN_USE">FIGYELEM: A(z) {0} gazdafájl/eszköz már használatban van!\n\nEnnek figyelmen kívül hagyása nemkívánatos eredményekhez vezethet, beleértve a rendszer instabilitását is.\nA kötet csatolása előtt minden olyan alkalmazást le kell állítani, amely a gazdafájlt/eszközt használja.\nFolytatja a csatolást?</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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.id.xml b/Translations/Language.id.xml index b521168f..8a901413 100644 --- a/Translations/Language.id.xml +++ b/Translations/Language.id.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.it.xml b/Translations/Language.it.xml index 2e04ddf2..2ca6426a 100644 --- a/Translations/Language.it.xml +++ b/Translations/Language.it.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.ja.xml b/Translations/Language.ja.xml index b5080ce3..edf3252a 100644 --- a/Translations/Language.ja.xml +++ b/Translations/Language.ja.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.ka.xml b/Translations/Language.ka.xml index 363b592d..9efecc9b 100644 --- a/Translations/Language.ka.xml +++ b/Translations/Language.ka.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.ko.xml b/Translations/Language.ko.xml index fcee880e..acea6c97 100644 --- a/Translations/Language.ko.xml +++ b/Translations/Language.ko.xml @@ -1565,6 +1565,7 @@ <entry lang="ko" key="UNKNOWN_OPTION">알 수 없는 옵션</entry> <entry lang="ko" key="VOLUME_LOCATION">볼륨 위치</entry> <entry lang="ko" key="VOLUME_HOST_IN_USE">경고: 호스트 파일 및 장치 {0}이 이미 사용 중입니다!\n\n이 것을 무시하면 시스템 불안정을 포함한 원치 않은 결과를 불러일으킬 수 있습니다. 호스트 파일 혹은 장치를 사용하는 모든 애플리케이션은 볼륨을 마운트하기 전에 종료되어야 합니다.\n\n계속 마운트하시겠습니까?</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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.lv.xml b/Translations/Language.lv.xml index 67610542..2d17fe24 100644 --- a/Translations/Language.lv.xml +++ b/Translations/Language.lv.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.my.xml b/Translations/Language.my.xml index d3fc4f57..f338778d 100644 --- a/Translations/Language.my.xml +++ b/Translations/Language.my.xml @@ -1567,6 +1567,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.nl.xml b/Translations/Language.nl.xml index f0eefff3..f25e37de 100644 --- a/Translations/Language.nl.xml +++ b/Translations/Language.nl.xml @@ -1576,6 +1576,7 @@ 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> </localization> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.nn.xml b/Translations/Language.nn.xml index 85ce6137..c687da6b 100644 --- a/Translations/Language.nn.xml +++ b/Translations/Language.nn.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.pl.xml b/Translations/Language.pl.xml index 15bc4fba..c4626fd7 100644 --- a/Translations/Language.pl.xml +++ b/Translations/Language.pl.xml @@ -1565,6 +1565,7 @@ <entry lang="pl" key="UNKNOWN_OPTION">Nieznana opcja</entry> <entry lang="pl" key="VOLUME_LOCATION">Położenie wolumenu</entry> <entry lang="pl" key="VOLUME_HOST_IN_USE">OSTRZEŻENIE: Plik/urządzenie {0} jest już używane!\n\nZignorowanie tego może spowodować niepożądane skutki, w tym niestabilność systemu. Wszystkie aplikacje, które mogą korzystać z pliku/urządzenia, powinny zostać zamknięte przed podłączeniem wolumenu.\n\nKontynuować podłączanie?</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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.pt-br.xml b/Translations/Language.pt-br.xml index 13f7dc30..2273c5e2 100644 --- a/Translations/Language.pt-br.xml +++ b/Translations/Language.pt-br.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.ro.xml b/Translations/Language.ro.xml index 74ac5fcd..96a4bf28 100644 --- a/Translations/Language.ro.xml +++ b/Translations/Language.ro.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.ru.xml b/Translations/Language.ru.xml index 228f155b..116b60dc 100644 --- a/Translations/Language.ru.xml +++ b/Translations/Language.ru.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.sk.xml b/Translations/Language.sk.xml index 16630857..31506f38 100644 --- a/Translations/Language.sk.xml +++ b/Translations/Language.sk.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.sl.xml b/Translations/Language.sl.xml index dc6f8ab0..d1a12a27 100644 --- a/Translations/Language.sl.xml +++ b/Translations/Language.sl.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.sv.xml b/Translations/Language.sv.xml index 48213a4c..66939148 100644 --- a/Translations/Language.sv.xml +++ b/Translations/Language.sv.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.th.xml b/Translations/Language.th.xml index 37b3a6f3..c077ce60 100644 --- a/Translations/Language.th.xml +++ b/Translations/Language.th.xml @@ -1566,6 +1566,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.tr.xml b/Translations/Language.tr.xml index 77a9fba3..71c5ada9 100644 --- a/Translations/Language.tr.xml +++ b/Translations/Language.tr.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.uk.xml b/Translations/Language.uk.xml index 08b04f47..3074038a 100644 --- a/Translations/Language.uk.xml +++ b/Translations/Language.uk.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.uz.xml b/Translations/Language.uz.xml index 7a7e54c4..f07140f5 100644 --- a/Translations/Language.uz.xml +++ b/Translations/Language.uz.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.vi.xml b/Translations/Language.vi.xml index 0e2fbb85..cc8bce4d 100644 --- a/Translations/Language.vi.xml +++ b/Translations/Language.vi.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.zh-cn.xml b/Translations/Language.zh-cn.xml index 714e4991..57902fec 100644 --- a/Translations/Language.zh-cn.xml +++ b/Translations/Language.zh-cn.xml @@ -1565,6 +1565,7 @@ <entry lang="zh-cn" key="UNKNOWN_OPTION">未知选项</entry> <entry lang="zh-cn" key="VOLUME_LOCATION">卷的位置</entry> <entry lang="zh-cn" key="VOLUME_HOST_IN_USE">警告：宿主文件/设备 {0} 已在使用中！\n\n忽略此提示可能会导致意外结果，包括系统不稳定。在装载卷之前，应关闭可能正在使用宿主文件/设备的所有应用程序。\n\n是否继续装载？</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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.zh-hk.xml b/Translations/Language.zh-hk.xml index ad916688..96099053 100644 --- a/Translations/Language.zh-hk.xml +++ b/Translations/Language.zh-hk.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/Translations/Language.zh-tw.xml b/Translations/Language.zh-tw.xml index b8ce0da4..b174a5cb 100644 --- a/Translations/Language.zh-tw.xml +++ b/Translations/Language.zh-tw.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/src/Common/Language.xml b/src/Common/Language.xml index 6ca142d8..e2a0fc46 100644 --- a/src/Common/Language.xml +++ b/src/Common/Language.xml @@ -1565,6 +1565,7 @@ <entry lang="en" key="UNKNOWN_OPTION">Unknown option</entry> <entry lang="en" key="VOLUME_LOCATION">Volume Location</entry> <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> </localization> <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VeraCrypt"> diff --git a/src/Setup/Setup.c b/src/Setup/Setup.c index 382617ab..cbe1e85e 100644 --- a/src/Setup/Setup.c +++ b/src/Setup/Setup.c @@ -738,6 +738,24 @@ void DetermineUpgradeDowngradeStatus (BOOL bCloseDriverHandle, LONG *driverVersi *driverVersionPtr = driverVersion; } +BOOL isMsiInstalled () +{ + BOOL bRet = FALSE; + HKEY hKey; + if (ERROR_SUCCESS == RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\VeraCrypt_MSI", 0, KEY_READ | KEY_WOW64_64KEY, &hKey)) + { + DWORD dwType = 0; + if ( (ERROR_SUCCESS == RegQueryValueExW(hKey, L"ProductGuid", NULL, &dwType, NULL, NULL)) + && (REG_SZ == dwType)) + { + bRet = TRUE; + } + RegCloseKey(hKey); + } + + return bRet; +} + static BOOL IsFileInUse (const wstring &filePath) { @@ -2224,6 +2242,14 @@ void DoInstall (void *arg) ClearLogWindow (hwndDlg); + if (isMsiInstalled()) + { + MessageBoxW (hwndDlg, GetString ("CANT_INSTALL_WITH_EXE_OVER_MSI"), lpszTitle, MB_ICONHAND); + Error ("INSTALL_FAILED", hwndDlg); + PostMessage (MainDlg, TC_APPMSG_INSTALL_FAILURE, 0, 0); + return; + } + if (mkfulldir (InstallationPath, TRUE) != 0) { if (mkfulldir (InstallationPath, FALSE) != 0) |