Language files: regroup newly added entries at the bottom for easy tracking

Translations/Language.zh-cn.xml

@@ -645,13 +645,10 @@
     <entry lang="zh-cn" key="PIM_HIDVOL_TITLE">隐藏卷 PIM</entry>
     <entry lang="zh-cn" key="PIM_HIDDEN_OS_TITLE">隐形操作系统 PIM</entry>
     <entry lang="zh-cn" key="PIM_HELP">PIM (自定迭代次数) 是一个控制头部密钥迭代次数的值，当导出头部密钥时会像这样使用：\n      迭代次数 = 15000 + (PIM x 1000) \n\n当这个值留空或设为0时，VeraCrypt会使用默认值(485)来确保安全性。\n\n当使用20位以下的密码时，为了保证维持最小的安全性，PIM的值不能小于485。\n当使用20位以上的密码时，PIM的值可以任意自定。\n\nPIM大于485可能导致加密卷的挂载速度下降。PIM小于485可能会提高挂载速度，但是如果您的密码强度不足，这会降低安全性。</entry>
-    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="zh-cn" key="PIM_SYSENC_HELP">PIM (自定迭代次数) 是一个控制头部密钥迭代次数的值，当导出头部密钥时会向这样使用：\n      迭代次数 = (PIM x 2048) \n\n当这个值留空或设为0时，VeraCrypt会使用默认值(98)来确保安全性。\n\n当使用20位以下的密码时，为了保证维持最小的安全性，PIM的值不能小于98。\n当使用20位以上的密码时，PIM的值可以任意自定。\n\nPIM大于98可能导致启动速度下降。PIM小于485可能会提高启动速度，但是如果您的密码强度不足，这会降低安全性。</entry>
     <entry lang="zh-cn" key="PIM_SYSENC_CHANGE_WARNING">记住所启动的系统的PIM</entry>
     <entry lang="zh-cn" key="PIM_LARGE_WARNING">您选择了一个大于VeraCrypt默认值的PIM。\n注意这可能使挂载/启动速度下降。</entry>
-    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="zh-cn" key="PIM_SMALL_WARNING">您选择了一个小于VeraCrypt默认值的PIM。\n注意如果您的密码强度不够强，这会是一个安全隐患。\n\n您确定您在使用一个强密码？</entry>
-    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="zh-cn" key="PIM_SYSENC_TOO_BIG">对于系统加密，自定迭代倍数 (PIM) 的最大值是65535。</entry>
     <entry lang="zh-cn" key="PIM_TITLE">卷 PIM</entry>
     <entry lang="zh-cn" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\n警告：在密钥文件搜索路径中存在隐藏文件。此类隐藏文件无法被用作密钥文件。如果您需要将它们当作密钥文件使用，请去除它们的“隐藏”属性（使用鼠标右键点击文件，选择“属性”，去除勾选“隐藏”标志再点击“确定”按钮）。注意：隐藏文件仅在启用相关选项后才可见（我的电脑 -&gt; 工具 -&gt; 文件夹选项 -&gt; 查看）。</entry>
@@ -1108,7 +1105,6 @@
     <entry lang="zh-cn" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">当使用TrueCrypt模式时不能使用这个算法。</entry>
     <entry lang="zh-cn" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">当使用TrueCrypt模式时不能使用PIM 。</entry>
     <entry lang="zh-cn" key="PIM_REQUIRE_LONG_PASSWORD">要使用这个PIM数值，您的密码必须大于20个字符。\n如果密码小于20个字符，只能使用485以上的PIM。</entry>
-    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="zh-cn" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">要使用这个PIM数值，您的启动验证密码必须大于20个字符。\n如果密码小于20个字符，只能使用98以上的PIM。</entry>
     <entry lang="zh-cn" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">密钥文件当前不支持用在系统加密中。</entry>
     <entry lang="zh-cn" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">警告：VeraCrypt 不能存储原始键盘布局。这可能导致您无法正确输入密码。</entry>
@@ -1474,8 +1470,6 @@
     <entry lang="zh-cn" key="LINUX_PREF_KERNEL_CRYPT">不要使用内核加密服务</entry>
     <entry lang="zh-cn" key="LINUX_PREF_TAB_MOUNT_OPTIONS_FS">文件系统</entry>
     <entry lang="zh-cn" key="IDT_LINUX_PREF_TAB_MOUNT_OPTIONS">装载选项：</entry>
-    <entry lang="en" key="LINUX_PREF_MOUNT_NTFS_WITH_NTFS3">Mount NTFS volumes with the Linux kernel ntfs3 driver</entry>
-    <entry lang="en" key="LINUX_PREF_MOUNT_NTFS_WITH_NTFS3_HELP">Linux only. When enabled, VeraCrypt probes the decrypted virtual device with blkid -p and mounts detected NTFS filesystems with ntfs3 instead of the default NTFS backend. If NTFS detection fails, VeraCrypt uses the normal automatic filesystem selection. If ntfs3 is unavailable or blocked by the distribution, mounting may fail. This opt-in option can avoid suspend or hibernate hangs caused by frozen user-space FUSE filesystems.</entry>
     <entry lang="zh-cn" key="LINUX_CROSS_SUPPORT">跨平台支持</entry>
     <entry lang="zh-cn" key="LINUX_CROSS_SUPPORT_OTHER">我将在其它平台上装载该卷</entry>
     <entry lang="zh-cn" key="LINUX_CROSS_SUPPORT_OTHER_HELP">如果需要在其它平台上使用该卷，请选择此选项。</entry>
@@ -1671,6 +1665,12 @@
     <entry lang="zh-cn" key="EFI_BOOT_LOADER_REPAIR_BLOCKED">系统加密或解密正在进行或未完成时，无法修复 EFI 引导加载程序。请先完成或继续挂起的系统加密/解密过程，然后再重试。</entry>
     <entry lang="zh-cn" key="EFI_BOOT_LOADER_REPAIR_NOT_APPLICABLE">此修复操作仅适用于从 GPT 系统分区以 UEFI 模式启动的系统。</entry>
     <entry lang="zh-cn" key="EFI_BOOT_LOADER_REPAIR_SUCCESS">EFI 引导加载程序已成功修复。</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
+    <entry lang="en" key="LINUX_PREF_MOUNT_NTFS_WITH_NTFS3">Mount NTFS volumes with the Linux kernel ntfs3 driver</entry>
+    <entry lang="en" key="LINUX_PREF_MOUNT_NTFS_WITH_NTFS3_HELP">Linux only. When enabled, VeraCrypt probes the decrypted virtual device with blkid -p and mounts detected NTFS filesystems with ntfs3 instead of the default NTFS backend. If NTFS detection fails, VeraCrypt uses the normal automatic filesystem selection. If ntfs3 is unavailable or blocked by the distribution, mounting may fail. This opt-in option can avoid suspend or hibernate hangs caused by frozen user-space FUSE filesystems.</entry>
   </localization>
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="VeraCrypt">