[pull] master from veracrypt:master

Translations/Language.ar.xml

@@ -610,7 +610,6 @@
     <entry lang="ar" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">‮أضف/احذف الملفات المفاتيح من/إلى المجلد</entry>
     <entry lang="ar" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">‮احذف كل الملفات المفاتيح من المجلد</entry>
     <entry lang="ar" key="PASSWORD_CHANGED">كلمة السر, PIM  and/or ملف/ملفات المفاتيح تم تغييرها بنجاح.\n\nمهم: الرجاء التأكد من قراءة هذا القسم 'Changing Passwords and Keyfiles' في فصل 'Security Requirements and Precautions' في دليل المستخدم لفيراكربت.</entry>
-    <entry lang="ar" key="FAVORITE_PIM_CHANGED">هذا القرص تم تسجيله في مفضلات النظام وهويته تغيرت.\nهل ترغب أن يقوم فيراكربت بتحديث تهيئة مفضلات النظام تلقائيا (يتطلب صلاحيات مدير نظام)?\n\nالرجاء إذا تمت الإجابة بلا, أنه يتحتم عليك تحديث مفضلات النظام يدويا.</entry>
     <entry lang="ar" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">‮هام: إذا لم تدمر قرص إنقاذ ڤيراكربت فإنه يمكن تظهير قسم\\نبيطة النظام باستخدام كلمة السر العتيقة (بإقلاع قرص إنقاذ ڤيراكربت و إدخال كلمة السر العتيقة). لذا ينبغي إنشاء قرص إنقاذ ڤيراكربت حديث ثم إتلاف العتيق. ‮ ‮أتريد إنشاء قرص ڤيراكربت حديث؟</entry>
     <entry lang="ar" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">‮لاحظ أن قرص ڤيراكربت لازال يستخدم الخوارزمية السابقة. إن كنت تعد الخوارزمية السابقة غير آمنة فينبغي لك أن تنشئ قرص إنقاذ ڤيراكربت جديد ثم تدمر العتيق. ‮ ‮أتريد إنشاء قرص إنقاذ ڤيراكربت جديد؟</entry>
     <entry lang="ar" key="KEYFILES_NOTE"> لاحظ أن فيراكربت لا يقوم بتغيير محتوى ملف المفتاح. يمكنك اختيار أكثر من ملف مفتاح (التريتب غير مؤثر). إذا أضفت مجلدا, كل الملفات غير المخفية سيتم اعتبارها ملفات مفاتيح. اضغط 'Add Token Files' لاختيار ملفات مفاتيح مخزنة على كرت ذكي أو توكن آمن (أو قم باستيرادهما).</entry>
@@ -1684,6 +1683,8 @@
     <entry lang="en" key="MACOSX_APFS_SYSTEM_STORE">The selected APFS physical store '{0}' contains the currently mounted macOS system volume and cannot be used as a VeraCrypt volume host.</entry>
     <entry lang="en" key="MACOSX_DEVICE_NOT_WRITABLE">macOS reports the selected device '{0}' as read-only. Select a writable physical partition or disk.</entry>
     <entry lang="en" key="MACOSX_APFS_EROFS_HINT">macOS reported the selected device as read-only. If this is an APFS disk, make sure you selected the physical APFS store partition, not an APFS synthesized volume. Use Disk Utility or 'diskutil list' to identify the physical partition, then retry.</entry>
+    <entry lang="en" key="FAVORITE_PIM_OR_KDF_CHANGED">This volume is registered as a System Favorite and its PIM and/or KDF settings were changed.\nDo you want VeraCrypt to automatically update the System Favorite configuration (administrator privileges required)?\n\nPlease note that if you answer no, you'll have to update the System Favorite manually.</entry>
+    <entry lang="en" key="PIM_RESET_ON_KDF_CHANGE_CONFIRM">The selected KDF uses different PIM parameters, so VeraCrypt will not reuse the current custom PIM. The new volume header will use the default PIM for the selected KDF unless you select "Use PIM" in the New section and enter a custom value.\n\nDo you want to continue?</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.be.xml

@@ -610,7 +610,6 @@
     <entry lang="be" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Дадаць/выдаліць ключавы файл для тома</entry>
     <entry lang="be" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Выдаліць усе ключавыя файлы з тома</entry>
     <entry lang="en" key="PASSWORD_CHANGED">Password, PIM and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</entry>
-    <entry lang="en" key="FAVORITE_PIM_CHANGED">This volume is registered as a System Favorite and its PIM was changed.\nDo you want VeraCrypt to automatically update the System Favorite configuration (administrator privileges required)?\n\nPlease note that if you answer no, you'll have to update the System Favorite manually.</entry>
     <entry lang="en" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">IMPORTANT: If you did not destroy your VeraCrypt Rescue Disk, your system partition/drive can still be decrypted using the old password (by booting the VeraCrypt Rescue Disk and entering the old password). You should create a new VeraCrypt Rescue Disk and then destroy the old one.\n\nDo you want to create a new VeraCrypt Rescue Disk?</entry>
     <entry lang="be" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Звярніце ўвагу, што ваш дыск узнаўлення VeraCrypt (Rescue Disk) усё яшчэ выкарыстоўвае ранейшы алгарытм. Калі вы лічыце гэты алгарытм нядосыць надзейным, стварыце новы дыск узнаўлення VeraCrypt, пасля чаго знішчыце стары.\n\nХочаце стварыць новы дыск узнаўлення VeraCrypt?</entry>
     <entry lang="en" key="KEYFILES_NOTE">Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</entry>
@@ -1684,6 +1683,8 @@
     <entry lang="en" key="MACOSX_APFS_SYSTEM_STORE">The selected APFS physical store '{0}' contains the currently mounted macOS system volume and cannot be used as a VeraCrypt volume host.</entry>
     <entry lang="en" key="MACOSX_DEVICE_NOT_WRITABLE">macOS reports the selected device '{0}' as read-only. Select a writable physical partition or disk.</entry>
     <entry lang="en" key="MACOSX_APFS_EROFS_HINT">macOS reported the selected device as read-only. If this is an APFS disk, make sure you selected the physical APFS store partition, not an APFS synthesized volume. Use Disk Utility or 'diskutil list' to identify the physical partition, then retry.</entry>
+    <entry lang="en" key="FAVORITE_PIM_OR_KDF_CHANGED">This volume is registered as a System Favorite and its PIM and/or KDF settings were changed.\nDo you want VeraCrypt to automatically update the System Favorite configuration (administrator privileges required)?\n\nPlease note that if you answer no, you'll have to update the System Favorite manually.</entry>
+    <entry lang="en" key="PIM_RESET_ON_KDF_CHANGE_CONFIRM">The selected KDF uses different PIM parameters, so VeraCrypt will not reuse the current custom PIM. The new volume header will use the default PIM for the selected KDF unless you select "Use PIM" in the New section and enter a custom value.\n\nDo you want to continue?</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.bg.xml

@@ -610,7 +610,6 @@
     <entry lang="bg" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Добавяне/Премахване на ключ-файлове на том</entry>
     <entry lang="bg" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Премахване на всички ключ-файлове от том</entry>
     <entry lang="en" key="PASSWORD_CHANGED">Password, PIM and/or keyfile(s) successfully changed.\n\nIMPORTANT: Please make sure you have read the section 'Changing Passwords and Keyfiles' in the chapter 'Security Requirements and Precautions' in the VeraCrypt User Guide.</entry>
-    <entry lang="en" key="FAVORITE_PIM_CHANGED">This volume is registered as a System Favorite and its PIM was changed.\nDo you want VeraCrypt to automatically update the System Favorite configuration (administrator privileges required)?\n\nPlease note that if you answer no, you'll have to update the System Favorite manually.</entry>
     <entry lang="bg" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">ВАЖНО: Ако не сте унищожили вашия VeraCrypt Спасителен Диск, вашият системен дял/устойство все още може да бъде декриптиран с помощта на старата парола (като стартирате от VeraCrypt Спасителния Диск и въведете старата парола). Би трябвало да създадете нов VeraCrypt Спасителен Диск и след това да унищожите стария.\n\nЖелаете ли да създадете нов VeraCrypt Спасителен Диск?</entry>
     <entry lang="bg" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Обърнете внимание на това, че вашият VeraCrypt Спасителен Диск все още използва предишният алгоритъм. Ако смятате, че предишният алгоритъм е несигурен, би трябвало да създадете нов VeraCrypt Спасителен Диск и след това да унищожите стария.\n\nЖелаете ли да създадете нов VeraCrypt Спасителен Диск?</entry>
     <entry lang="en" key="KEYFILES_NOTE">Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</entry>
@@ -1684,6 +1683,8 @@
     <entry lang="en" key="MACOSX_APFS_SYSTEM_STORE">The selected APFS physical store '{0}' contains the currently mounted macOS system volume and cannot be used as a VeraCrypt volume host.</entry>
     <entry lang="en" key="MACOSX_DEVICE_NOT_WRITABLE">macOS reports the selected device '{0}' as read-only. Select a writable physical partition or disk.</entry>
     <entry lang="en" key="MACOSX_APFS_EROFS_HINT">macOS reported the selected device as read-only. If this is an APFS disk, make sure you selected the physical APFS store partition, not an APFS synthesized volume. Use Disk Utility or 'diskutil list' to identify the physical partition, then retry.</entry>
+    <entry lang="en" key="FAVORITE_PIM_OR_KDF_CHANGED">This volume is registered as a System Favorite and its PIM and/or KDF settings were changed.\nDo you want VeraCrypt to automatically update the System Favorite configuration (administrator privileges required)?\n\nPlease note that if you answer no, you'll have to update the System Favorite manually.</entry>
+    <entry lang="en" key="PIM_RESET_ON_KDF_CHANGE_CONFIRM">The selected KDF uses different PIM parameters, so VeraCrypt will not reuse the current custom PIM. The new volume header will use the default PIM for the selected KDF unless you select "Use PIM" in the New section and enter a custom value.\n\nDo you want to continue?</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.ca.xml

@@ -610,7 +610,6 @@
     <entry lang="ca" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Afegir/Eliminar fitxers de claus a/d'un volum</entry>
     <entry lang="ca" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Eliminar tots els fitxers de claus d'un volum</entry>
     <entry lang="ca" key="PASSWORD_CHANGED">La contrasenya, PIM i/o els fitxers de claus s'han canviat amb èxit.\n\nIMPORTANT: Si us plau, assegureu-vos d'haver llegit 'Canviar contrasenyes i fitxers de claus' al capítol 'Requisits de seguretat i precaucions' de la guia d'usuari del VeraCrypt.</entry>
-    <entry lang="en" key="FAVORITE_PIM_CHANGED">This volume is registered as a System Favorite and its PIM was changed.\nDo you want VeraCrypt to automatically update the System Favorite configuration (administrator privileges required)?\n\nPlease note that if you answer no, you'll have to update the System Favorite manually.</entry>
     <entry lang="ca" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">IMPORTANT: Si no ha destruït el disc de recuperació del VeraCrypt, la seva partició/unitat de sistema es podrà desxifrar utilitzant la contrasenya antiga (introduïnt el disc de ercuperació antic i la contrasenya antiga). Hauria de crear un nou disc de recuperació i destruïr l'antic.\n\nVol crear un nou disc de recuperació?</entry>
     <entry lang="ca" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Tingui en compte que el seu disc de recuperació encara utilitza l'algorisme anterior. Si considera que l'algorisme anterior és insegur, hauria de crear un nou disc de recuperació i destruïr l'antic.\n\nVol crear un nou disc de recuperació?</entry>
     <entry lang="en" key="KEYFILES_NOTE">Note that VeraCrypt never modifies the keyfile contents. You can select more than one keyfile (the order does not matter). If you add a folder, all non-hidden files found in it will be used as keyfiles. Click 'Add Token Files' to select keyfiles stored on security tokens or smart cards (or to import keyfiles to security tokens or smart cards).</entry>
@@ -1684,6 +1683,8 @@
     <entry lang="en" key="MACOSX_APFS_SYSTEM_STORE">The selected APFS physical store '{0}' contains the currently mounted macOS system volume and cannot be used as a VeraCrypt volume host.</entry>
     <entry lang="en" key="MACOSX_DEVICE_NOT_WRITABLE">macOS reports the selected device '{0}' as read-only. Select a writable physical partition or disk.</entry>
     <entry lang="en" key="MACOSX_APFS_EROFS_HINT">macOS reported the selected device as read-only. If this is an APFS disk, make sure you selected the physical APFS store partition, not an APFS synthesized volume. Use Disk Utility or 'diskutil list' to identify the physical partition, then retry.</entry>
+    <entry lang="en" key="FAVORITE_PIM_OR_KDF_CHANGED">This volume is registered as a System Favorite and its PIM and/or KDF settings were changed.\nDo you want VeraCrypt to automatically update the System Favorite configuration (administrator privileges required)?\n\nPlease note that if you answer no, you'll have to update the System Favorite manually.</entry>
+    <entry lang="en" key="PIM_RESET_ON_KDF_CHANGE_CONFIRM">The selected KDF uses different PIM parameters, so VeraCrypt will not reuse the current custom PIM. The new volume header will use the default PIM for the selected KDF unless you select "Use PIM" in the New section and enter a custom value.\n\nDo you want to continue?</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">

Translations/Language.co.xml

@@ -632,7 +632,6 @@ Information about Corsican localization:
 	    <entry lang="co" key="IDD_PCDM_ADD_REMOVE_VOL_KEYFILES">Aghjunghje à u vulume o cacciacci schedarii chjave</entry>
 	    <entry lang="co" key="IDD_PCDM_REMOVE_ALL_KEYFILES_FROM_VOL">Caccià tutti i schedarii chjave da u vulume</entry>
 	    <entry lang="co" key="PASSWORD_CHANGED">Cambiamentu di parolla d’intesa, PIM è/o schedarii chjave riesciutu.\n\nIMPURTANTE :Assicuratevi chì vò avete lettu u paragrafu « Cambiamentu di parolla d’intesa è di schedarii chjave » di u capitulu « Esigenze di sicurità è precauzioni » in a guida di l’utilizatore VeraCrypt.</entry>
-	    <entry lang="co" key="FAVORITE_PIM_CHANGED">Stu vulume hè arregistratu cum’è un favuritu di u sistema è u so PIM hè statu cambiatu.\nVulete chì VeraCrypt mudificheghji autumaticamente a cunfigurazione di favuritu di u sistema (i privileghji d’amministratore sò richiesti) ?\n\nSappiate chì, s’è vò rispundite nò, tuccherà à voi di fallu manualmente.</entry>
 	    <entry lang="co" key="SYS_PASSWORD_CHANGED_ASK_RESCUE_DISK">IMPURTANTE : s’è ùn avete micca distruttu u vostru discu di succorsu VeraCrypt, a vostra partizione o u lettore di u vostru sistema pò ancu esse dicifratu impieghendu a vechja parolla d’intesa (avviendu nant’à u discu di succorsu VeraCrypt è stampittendu a vechja parolla d’intesa). Duveriate creà un novu discu di succorsu VeraCrypt è distrughje u vechju.\n\nVulete creà un novu discu di succorsu VeraCrypt ?</entry>
 	    <entry lang="co" key="SYS_HKD_ALGO_CHANGED_ASK_RESCUE_DISK">Sappiate chì u vostru discu di succorsu VeraCrypt impieghi ancu a cudificazione precedente. S’è a cudificazione precedente ùn vi pare micca sicura, duveriate creà un novu discu di succorsu VeraCrypt è distrughje u vechju.\n\nVulete creà un novu discu di succorsu VeraCrypt ?</entry>
 	    <entry lang="co" key="KEYFILES_NOTE">Sappiate chì VeraCrypt ùn mudificheghja mai u cuntenutu di u schedariu chjave. Pudete selezziunà più d’un schedariu chjave (l’ordine ùn hè micca impurtante). S’è vò aghjunghjite un cartulare, tutti i schedarii micca piattati chì si trovanu in issu cartulare seranu impiegati cum’è schedarii chjave. Cliccu nant’à « + sched. di &amp;gettone » per selezziunà i schedarii chjave chì sò arregistrati nant’à gettoni di sicurità o carte à stampinu (o per impurtà schedarii chjave versu gettoni di sicurità o carte à stampinu).</entry>
@@ -1706,6 +1705,8 @@ Information about Corsican localization:
 	    <entry lang="co" key="MACOSX_APFS_SYSTEM_STORE">L’allucamentu fisicu APFS selezziunatu « {0} » cuntene u vulume di u sistema macOS muntatu attualmente è ùn pò micca esse impiegatu cum’è un ospite di vulume VeraCrypt.</entry>
 	    <entry lang="co" key="MACOSX_DEVICE_NOT_WRITABLE">macOS signaleghja l’apparechju selezziunatu « {0} » cum’è essendu in lettura sola. Selezziunate una partizione fisica o un discu induve si pò scrive.</entry>
 	    <entry lang="co" key="MACOSX_APFS_EROFS_HINT">macOS hà signalatu l’apparechju selezziunatu cum’è essendu in lettura sola. S’ellu hè un discu APFS, assicuratevi chì ghjè a partizione d’allucamentu APFS fisica chì hè selezziunata, è micca un vulume APFS sintetizatu. Impiegate l’attrezzu di discu o « diskutil list » per identificà a partizione fisica eppò pruvate torna.</entry>
+    <entry lang="en" key="FAVORITE_PIM_OR_KDF_CHANGED">This volume is registered as a System Favorite and its PIM and/or KDF settings were changed.\nDo you want VeraCrypt to automatically update the System Favorite configuration (administrator privileges required)?\n\nPlease note that if you answer no, you'll have to update the System Favorite manually.</entry>
+    <entry lang="en" key="PIM_RESET_ON_KDF_CHANGE_CONFIRM">The selected KDF uses different PIM parameters, so VeraCrypt will not reuse the current custom PIM. The new volume header will use the default PIM for the selected KDF unless you select "Use PIM" in the New section and enter a custom value.\n\nDo you want to continue?</entry>
 	</localization>
 	<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 		<xs:element name="VeraCrypt">