Translations: Update po files for zh and ja

Update po files by running `make` in `src/po/`.
Some po files were out of sync with the files in other encodings.

Related: #12749, #12787
closes: #12826
closes: #12840

3 files changed, 53 insertions, 73 deletions

diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
index f554976998..cec4953028 100644
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -2182,7 +2182,7 @@ msgstr "%s の処理中にエラーが検出されました:"
 msgid "line %4ld:"
 msgstr "行 %4ld:"
 
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
+msgid "Messages maintainer: The Vim Project"
 msgstr "日本語メッセージ翻訳/監修: 村岡 太郎 <koron.kaoriya@gmail.com>"
 
 msgid "Interrupt: "
diff --git a/src/po/zh_CN.cp936.po b/src/po/zh_CN.cp936.po
index c38f166c4a..ef3dfa8b29 100644
--- a/src/po/zh_CN.cp936.po
+++ b/src/po/zh_CN.cp936.po
@@ -514,22 +514,22 @@ msgstr "(ﾒﾑﾖﾐｶﾏ) "
 #, c-format
 msgid "%ld match on %ld line"
 msgid_plural "%ld matches on %ld line"
-msgstr[0] "%ld ｸ�ﾆ･ﾅ茱ｨ%ld ﾐﾐ｣ｩ"
+msgstr[0] "%2$ld ﾐﾐ %1$ld ｸ�ﾆ･ﾅ�"
 
 #, c-format
 msgid "%ld substitution on %ld line"
 msgid_plural "%ld substitutions on %ld line"
-msgstr[0] "%ld ｴﾎﾌ貊ｻ｣ｨ%ld ﾐﾐ｣ｩ"
+msgstr[0] "%2$ld ﾐﾐ %1$ld ｴﾎﾌ貊ｻ"
 
 #, c-format
 msgid "%ld match on %ld lines"
 msgid_plural "%ld matches on %ld lines"
-msgstr[0] "%ld ｸ�ﾆ･ﾅ茱ｨ%ld ﾐﾐ｣ｩ"
+msgstr[0] "%2$ld ﾐﾐ %1$ld ｸ�ﾆ･ﾅ�"
 
 #, c-format
 msgid "%ld substitution on %ld lines"
 msgid_plural "%ld substitutions on %ld lines"
-msgstr[0] "%ld ｴﾎﾌ貊ｻ｣ｨ%ld ﾐﾐ｣ｩ"
+msgstr[0] "%2$ld ﾐﾐ %1$ld ｴﾎﾌ貊ｻ"
 
 #, c-format
 msgid "Pattern found in every line: %s"
@@ -1676,8 +1676,8 @@ msgstr "--servername <ﾃ�ｳﾆ>\tｷ｢ﾋﾍｵｽｻ�ｳﾉﾎｪ Vim ｷ�ﾎ�ﾆ� <ﾃ�ｳﾆ>"
 msgid "--startuptime <file>\tWrite startup timing messages to <file>"
 msgstr "--startuptime <ﾎﾄｼ�>\tｽｫﾆ�ｶｯｼﾆﾊｱﾐﾅﾏ｢ﾐｴﾈ� <ﾎﾄｼ�>"
 
-msgid "--log <file>\t\tStart logging to <file> early"
-msgstr "--log <ﾎﾄｼ�>\t\tｾ｡ﾔ鄙ｪﾊｼｼﾇﾂｼﾈﾕﾖｾｵｽ <ﾎﾄｼ�>"
+msgid "--log <file>\tStart logging to <file> early"
+msgstr "--log <ﾎﾄｼ�>\tｾ｡ﾔ鄙ｪﾊｼｼﾇﾂｼﾈﾕﾖｾｵｽ <ﾎﾄｼ�>"
 
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\tﾊｹﾓﾃ <viminfo> ﾈ｡ｴ� .viminfo"
@@ -2416,15 +2416,13 @@ msgstr ""
 "\n"
 "ﾎﾞｷｨﾉ靹ﾃｰｲﾈｫﾉﾏﾏﾂﾎﾄ｣ｺ"
 
-# reorder if possible
 #, c-format
 msgid "Could not set security context %s for %s"
-msgstr "ﾎﾞｷｨﾉ靹ﾃｰｲﾈｫﾉﾏﾏﾂﾎﾄ %s｣ｺ%s"
+msgstr "ﾎﾞｷｨﾎｪ %2$s ﾉ靹ﾃｰｲﾈｫﾉﾏﾏﾂﾎﾄ %1$s"
 
-# reorder if possible
 #, c-format
 msgid "Could not get security context %s for %s. Removing it!"
-msgstr "ﾎﾞｷｨﾉ靹ﾃｰｲﾈｫﾉﾏﾏﾂﾎﾄ %s｣ｺ%s｡｣ﾉｾｵ�ﾋ�｣｡"
+msgstr "ﾎﾞｷｨﾎｪ %2$s ｻ�ﾈ｡ｰｲﾈｫﾉﾏﾏﾂﾎﾄ %1$s｡｣ﾉｾﾖｮ｣｡"
 
 msgid ""
 "\n"
@@ -2563,19 +2561,17 @@ msgstr "ﾎﾞｷｨｴ�ｿｪﾓﾃﾓﾚﾐｴﾈ�ｵﾄﾁﾙﾊｱﾈﾕﾖｾﾎﾄｼ�｣ｬﾏﾔﾊｾﾔﾚｱ�ﾗｼｴ�ﾎ�ﾉﾏﾁﾋ｡ｭ｡ｭ"
 
 #, c-format
 msgid " into \"%c"
-msgstr "ｽ� \"%c "
+msgstr "ｽ� \"%c"
 
-# reorder if possible
 #, c-format
 msgid "block of %ld line yanked%s"
 msgid_plural "block of %ld lines yanked%s"
-msgstr[0] "%ld ﾐﾐｵﾄｿ鮑ｴﾖﾆ%sﾁﾋ"
+msgstr[0] "%ld ﾐﾐｵﾄｿ鰓ﾑｸｴﾖﾆ%s"
 
-# reorder if possible
 #, c-format
 msgid "%ld line yanked%s"
 msgid_plural "%ld lines yanked%s"
-msgstr[0] "%ld ﾐﾐｸｴﾖﾆ%sﾁﾋ"
+msgstr[0] "%ld ﾐﾐﾒﾑｸｴﾖﾆ%s"
 
 msgid ""
 "\n"
@@ -3023,18 +3019,16 @@ msgstr "ﾐｴﾈ�ﾆｴﾐｴﾎﾄｼ� %s ｡ｭ｡ｭ"
 msgid "Done!"
 msgstr "ﾍ�ｳﾉ｣｡"
 
-# reorder if possible
 #, c-format
 msgid "Word '%.*s' removed from %s"
-msgstr "ｵ･ｴﾊ '%.*s' ｴﾓ %s ﾖﾐﾉｾｳ�ﾁﾋ"
+msgstr "ｴﾓ %3$s ﾖﾐﾉｾｳ�ﾁﾋｵ･ｴﾊ '%1$.*2s'"
 
 msgid "Seek error in spellfile"
 msgstr "ﾆｴﾐｴﾎﾄｼ�ﾖﾐｶｨﾎｻｴ�ﾎ�"
 
-# reorder if possible
 #, c-format
 msgid "Word '%.*s' added to %s"
-msgstr "ｵ･ｴﾊ '%.*s' ﾌ�ｼﾓｵｽﾁﾋ %s"
+msgstr "ﾏ� %3$s ﾖﾐﾌ�ｼﾓﾁﾋｵ･ｴﾊ '%1$.*2s'"
 
 msgid "Sorry, no suggestions"
 msgstr "ｱｧﾇｸ｣ｬﾃｻﾓﾐｽｨﾒ�"
@@ -4597,10 +4591,9 @@ msgstr "E242: ﾔﾚｹﾘｱﾕｴｰｿﾚﾊｱｲｻﾄﾜｷﾖｸ�ﾁ�ﾒｻｸ�ｴｰｿﾚ"
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
 msgstr "E243: ｲｻﾖｧｳﾖｵﾄｲﾎﾊ�: \"-%s\"｣ｻﾇ�ﾊｹﾓﾃ OLE ｰ豎ｾ｡｣"
 
-# reorder if possible
-#, fuzzy, c-format
-# msgid "E244: Illegal %s name \"%s\" in font name \"%s\""
-# msgstr "E244: ﾗﾖﾌ蠹� \"%3$s\" ﾖﾐﾓﾐｷﾇｷｨ %1$s ﾃ�ｳﾆ \"%2$s\""
+#, c-format
+msgid "E244: Illegal %s name \"%s\" in font name \"%s\""
+msgstr "E244: ﾗﾖﾌ蠹� \"%3$s\" ﾖﾐﾓﾐｷﾇｷｨ %1$s ﾃ�ｳﾆ \"%2$s\""
 
 #, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
@@ -4836,10 +4829,9 @@ msgstr "E314: ｱ｣ﾁ�ﾊｧｰﾜ"
 msgid "E315: ml_get: Invalid lnum: %ld"
 msgstr "E315: ml_get: ﾎﾞﾐｧｵﾄ lnum: %ld"
 
-# reorder if possible
-#, fuzzy, c-format
-# msgid "E316: ml_get: Cannot find line %ld in buffer %d %s"
-# msgstr "E316: ml_get: ﾔﾚｻｺｳ衂� %2$d %3$s ﾖﾐﾕﾒｲｻｵｽｵﾚ %1$ld ﾐﾐ"
+#, c-format
+msgid "E316: ml_get: Cannot find line %ld in buffer %d %s"
+msgstr "E316: ml_get: ﾔﾚｻｺｳ衂� %2$d %3$s ﾖﾐﾕﾒｲｻｵｽｵﾚ %1$ld ﾐﾐ"
 
 msgid "E317: Pointer block id wrong"
 msgstr "E317: ﾖｸﾕ�ｿ� id ｴ�ﾎ�"
@@ -6428,7 +6420,7 @@ msgstr "E804: ｲｻﾄﾜｶﾔｸ｡ｵ飜�ﾊｹﾓﾃ '%'"
 msgid "E805: Using a Float as a Number"
 msgstr "E805: ｽｫｸ｡ｵ飜�ﾗ�ﾕ�ﾊ�ﾊｹﾓﾃ"
 
-msgid "E806: Using a Float as a String"
+msgid "E806: Using Float as a String"
 msgstr "E806: ｽｫｸ｡ｵ飜�ﾗ�ﾗﾖｷ�ｴｮﾊｹﾓﾃ"
 
 msgid "E807: Expected Float argument for printf()"
@@ -7246,10 +7238,9 @@ msgstr "E1035: % ﾐ靨ｪﾕ�ﾊ�ｲﾎﾊ�"
 msgid "E1036: %c requires number or float arguments"
 msgstr "E1036: %c ﾐ靨ｪﾕ�ﾊ�ｻ�ﾕﾟｸ｡ｵ飜�ｲﾎﾊ�"
 
-# reorder if possible
-#, fuzzy, c-format
-# msgid "E1037: Cannot use \"%s\" with %s"
-# msgstr "E1037: ｲｻﾄﾜｶﾔ %2$s ﾊｹﾓﾃ \"%1$s\""
+#, c-format
+msgid "E1037: Cannot use \"%s\" with %s"
+msgstr "E1037: ｲｻﾄﾜｶﾔ %2$s ﾊｹﾓﾃ \"%1$s\""
 
 msgid "E1038: \"vim9script\" can only be used in a script"
 msgstr "E1038: \"vim9script\" ﾖｻﾄﾜﾔﾚｽﾅｱｾﾖﾐﾊｹﾓﾃ"
@@ -7511,8 +7502,8 @@ msgstr "E1112: ﾁﾐｱ�ﾏ� %d ｵ･ﾔｪｸ�ｿ�ｶﾈﾎﾞﾐｧ"
 msgid "E1113: Overlapping ranges for 0x%lx"
 msgstr "E1113: ﾖﾘｵ�ｷｶﾎｧﾎｪ 0x%lx"
 
-msgid "E1114: Only values of 0x80 and higher supported"
-msgstr "E1114: ﾖｻﾖｧｳﾖ 0x80 ｻ�ｸ�ｸﾟｵﾄﾖｵ"
+msgid "E1114: Only values of 0x100 and higher supported"
+msgstr "E1114: ﾖｻﾖｧｳﾖ 0x100 ｻ�ｸ�ｸﾟｵﾄﾖｵ"
 
 msgid "E1115: \"assert_fails()\" fourth argument must be a number"
 msgstr "E1115: \"assert_fails()\" ｵﾚﾋﾄｸ�ｲﾎﾊ�ｱﾘﾐ�ﾊﾇﾒｻｸ�ﾕ�ﾊ�"
@@ -7676,10 +7667,9 @@ msgstr "E1162: ｼﾄｴ貳�ﾃ�ｱﾘﾐ�ﾊﾇﾒｻｸ�ﾗﾖｷ�｣ｺ%s"
 msgid "E1163: Variable %d: type mismatch, expected %s but got %s"
 msgstr "E1163: ｱ菽ｿ %d: ﾀ獎ﾍｲｻﾆ･ﾅ茱ｬﾐ靨ｪ %s ｵｫｵﾃｵｽ %s"
 
-# reorder if possible
 #, c-format
 msgid "E1163: Variable %d: type mismatch, expected %s but got %s in %s"
-msgstr "E1163: ｱ菽ｿ %d: ﾀ獎ﾍｲｻﾆ･ﾅ茱ｬﾐ靨ｪ %s ｵｫｵﾃｵｽ %s ﾓﾚ %s ﾖﾐ"
+msgstr "E1163: %4$s ﾖﾐｱ菽ｿ %1$d: ﾀ獎ﾍｲｻﾆ･ﾅ茱ｬﾐ靨ｪ %2$s ｵｫｵﾃｵｽ %3$s"
 
 msgid "E1164: vim9cmd must be followed by a command"
 msgstr "E1164: vim9cmd ｺ�ｱﾟｱﾘﾐ�ﾊﾇﾃ�ﾁ�"
diff --git a/src/po/zh_CN.po b/src/po/zh_CN.po
index e88d496842..4e34616b86 100644
--- a/src/po/zh_CN.po
+++ b/src/po/zh_CN.po
@@ -514,22 +514,22 @@ msgstr "(ﾒﾑﾖﾐｶﾏ) "
 #, c-format
 msgid "%ld match on %ld line"
 msgid_plural "%ld matches on %ld line"
-msgstr[0] "%ld ｸ�ﾆ･ﾅ茱ｨ%ld ﾐﾐ｣ｩ"
+msgstr[0] "%2$ld ﾐﾐ %1$ld ｸ�ﾆ･ﾅ�"
 
 #, c-format
 msgid "%ld substitution on %ld line"
 msgid_plural "%ld substitutions on %ld line"
-msgstr[0] "%ld ｴﾎﾌ貊ｻ｣ｨ%ld ﾐﾐ｣ｩ"
+msgstr[0] "%2$ld ﾐﾐ %1$ld ｴﾎﾌ貊ｻ"
 
 #, c-format
 msgid "%ld match on %ld lines"
 msgid_plural "%ld matches on %ld lines"
-msgstr[0] "%ld ｸ�ﾆ･ﾅ茱ｨ%ld ﾐﾐ｣ｩ"
+msgstr[0] "%2$ld ﾐﾐ %1$ld ｸ�ﾆ･ﾅ�"
 
 #, c-format
 msgid "%ld substitution on %ld lines"
 msgid_plural "%ld substitutions on %ld lines"
-msgstr[0] "%ld ｴﾎﾌ貊ｻ｣ｨ%ld ﾐﾐ｣ｩ"
+msgstr[0] "%2$ld ﾐﾐ %1$ld ｴﾎﾌ貊ｻ"
 
 #, c-format
 msgid "Pattern found in every line: %s"
@@ -1676,8 +1676,8 @@ msgstr "--servername <ﾃ�ｳﾆ>\tｷ｢ﾋﾍｵｽｻ�ｳﾉﾎｪ Vim ｷ�ﾎ�ﾆ� <ﾃ�ｳﾆ>"
 msgid "--startuptime <file>\tWrite startup timing messages to <file>"
 msgstr "--startuptime <ﾎﾄｼ�>\tｽｫﾆ�ｶｯｼﾆﾊｱﾐﾅﾏ｢ﾐｴﾈ� <ﾎﾄｼ�>"
 
-msgid "--log <file>\t\tStart logging to <file> early"
-msgstr "--log <ﾎﾄｼ�>\t\tｾ｡ﾔ鄙ｪﾊｼｼﾇﾂｼﾈﾕﾖｾｵｽ <ﾎﾄｼ�>"
+msgid "--log <file>\tStart logging to <file> early"
+msgstr "--log <ﾎﾄｼ�>\tｾ｡ﾔ鄙ｪﾊｼｼﾇﾂｼﾈﾕﾖｾｵｽ <ﾎﾄｼ�>"
 
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\tﾊｹﾓﾃ <viminfo> ﾈ｡ｴ� .viminfo"
@@ -2416,15 +2416,13 @@ msgstr ""
 "\n"
 "ﾎﾞｷｨﾉ靹ﾃｰｲﾈｫﾉﾏﾏﾂﾎﾄ｣ｺ"
 
-# reorder if possible
 #, c-format
 msgid "Could not set security context %s for %s"
-msgstr "ﾎﾞｷｨﾉ靹ﾃｰｲﾈｫﾉﾏﾏﾂﾎﾄ %s｣ｺ%s"
+msgstr "ﾎﾞｷｨﾎｪ %2$s ﾉ靹ﾃｰｲﾈｫﾉﾏﾏﾂﾎﾄ %1$s"
 
-# reorder if possible
 #, c-format
 msgid "Could not get security context %s for %s. Removing it!"
-msgstr "ﾎﾞｷｨﾉ靹ﾃｰｲﾈｫﾉﾏﾏﾂﾎﾄ %s｣ｺ%s｡｣ﾉｾｵ�ﾋ�｣｡"
+msgstr "ﾎﾞｷｨﾎｪ %2$s ｻ�ﾈ｡ｰｲﾈｫﾉﾏﾏﾂﾎﾄ %1$s｡｣ﾉｾﾖｮ｣｡"
 
 msgid ""
 "\n"
@@ -2563,19 +2561,17 @@ msgstr "ﾎﾞｷｨｴ�ｿｪﾓﾃﾓﾚﾐｴﾈ�ｵﾄﾁﾙﾊｱﾈﾕﾖｾﾎﾄｼ�｣ｬﾏﾔﾊｾﾔﾚｱ�ﾗｼｴ�ﾎ�ﾉﾏﾁﾋ｡ｭ｡ｭ"
 
 #, c-format
 msgid " into \"%c"
-msgstr "ｽ� \"%c "
+msgstr "ｽ� \"%c"
 
-# reorder if possible
 #, c-format
 msgid "block of %ld line yanked%s"
 msgid_plural "block of %ld lines yanked%s"
-msgstr[0] "%ld ﾐﾐｵﾄｿ鮑ｴﾖﾆ%sﾁﾋ"
+msgstr[0] "%ld ﾐﾐｵﾄｿ鰓ﾑｸｴﾖﾆ%s"
 
-# reorder if possible
 #, c-format
 msgid "%ld line yanked%s"
 msgid_plural "%ld lines yanked%s"
-msgstr[0] "%ld ﾐﾐｸｴﾖﾆ%sﾁﾋ"
+msgstr[0] "%ld ﾐﾐﾒﾑｸｴﾖﾆ%s"
 
 msgid ""
 "\n"
@@ -3023,18 +3019,16 @@ msgstr "ﾐｴﾈ�ﾆｴﾐｴﾎﾄｼ� %s ｡ｭ｡ｭ"
 msgid "Done!"
 msgstr "ﾍ�ｳﾉ｣｡"
 
-# reorder if possible
 #, c-format
 msgid "Word '%.*s' removed from %s"
-msgstr "ｵ･ｴﾊ '%.*s' ｴﾓ %s ﾖﾐﾉｾｳ�ﾁﾋ"
+msgstr "ｴﾓ %3$s ﾖﾐﾉｾｳ�ﾁﾋｵ･ｴﾊ '%1$.*2s'"
 
 msgid "Seek error in spellfile"
 msgstr "ﾆｴﾐｴﾎﾄｼ�ﾖﾐｶｨﾎｻｴ�ﾎ�"
 
-# reorder if possible
 #, c-format
 msgid "Word '%.*s' added to %s"
-msgstr "ｵ･ｴﾊ '%.*s' ﾌ�ｼﾓｵｽﾁﾋ %s"
+msgstr "ﾏ� %3$s ﾖﾐﾌ�ｼﾓﾁﾋｵ･ｴﾊ '%1$.*2s'"
 
 msgid "Sorry, no suggestions"
 msgstr "ｱｧﾇｸ｣ｬﾃｻﾓﾐｽｨﾒ�"
@@ -4597,10 +4591,9 @@ msgstr "E242: ﾔﾚｹﾘｱﾕｴｰｿﾚﾊｱｲｻﾄﾜｷﾖｸ�ﾁ�ﾒｻｸ�ｴｰｿﾚ"
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
 msgstr "E243: ｲｻﾖｧｳﾖｵﾄｲﾎﾊ�: \"-%s\"｣ｻﾇ�ﾊｹﾓﾃ OLE ｰ豎ｾ｡｣"
 
-# reorder if possible
-#, fuzzy, c-format
-# msgid "E244: Illegal %s name \"%s\" in font name \"%s\""
-# msgstr "E244: ﾗﾖﾌ蠹� \"%3$s\" ﾖﾐﾓﾐｷﾇｷｨ %1$s ﾃ�ｳﾆ \"%2$s\""
+#, c-format
+msgid "E244: Illegal %s name \"%s\" in font name \"%s\""
+msgstr "E244: ﾗﾖﾌ蠹� \"%3$s\" ﾖﾐﾓﾐｷﾇｷｨ %1$s ﾃ�ｳﾆ \"%2$s\""
 
 #, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
@@ -4836,10 +4829,9 @@ msgstr "E314: ｱ｣ﾁ�ﾊｧｰﾜ"
 msgid "E315: ml_get: Invalid lnum: %ld"
 msgstr "E315: ml_get: ﾎﾞﾐｧｵﾄ lnum: %ld"
 
-# reorder if possible
-#, fuzzy, c-format
-# msgid "E316: ml_get: Cannot find line %ld in buffer %d %s"
-# msgstr "E316: ml_get: ﾔﾚｻｺｳ衂� %2$d %3$s ﾖﾐﾕﾒｲｻｵｽｵﾚ %1$ld ﾐﾐ"
+#, c-format
+msgid "E316: ml_get: Cannot find line %ld in buffer %d %s"
+msgstr "E316: ml_get: ﾔﾚｻｺｳ衂� %2$d %3$s ﾖﾐﾕﾒｲｻｵｽｵﾚ %1$ld ﾐﾐ"
 
 msgid "E317: Pointer block id wrong"
 msgstr "E317: ﾖｸﾕ�ｿ� id ｴ�ﾎ�"
@@ -6428,7 +6420,7 @@ msgstr "E804: ｲｻﾄﾜｶﾔｸ｡ｵ飜�ﾊｹﾓﾃ '%'"
 msgid "E805: Using a Float as a Number"
 msgstr "E805: ｽｫｸ｡ｵ飜�ﾗ�ﾕ�ﾊ�ﾊｹﾓﾃ"
 
-msgid "E806: Using a Float as a String"
+msgid "E806: Using Float as a String"
 msgstr "E806: ｽｫｸ｡ｵ飜�ﾗ�ﾗﾖｷ�ｴｮﾊｹﾓﾃ"
 
 msgid "E807: Expected Float argument for printf()"
@@ -7246,10 +7238,9 @@ msgstr "E1035: % ﾐ靨ｪﾕ�ﾊ�ｲﾎﾊ�"
 msgid "E1036: %c requires number or float arguments"
 msgstr "E1036: %c ﾐ靨ｪﾕ�ﾊ�ｻ�ﾕﾟｸ｡ｵ飜�ｲﾎﾊ�"
 
-# reorder if possible
-#, fuzzy, c-format
-# msgid "E1037: Cannot use \"%s\" with %s"
-# msgstr "E1037: ｲｻﾄﾜｶﾔ %2$s ﾊｹﾓﾃ \"%1$s\""
+#, c-format
+msgid "E1037: Cannot use \"%s\" with %s"
+msgstr "E1037: ｲｻﾄﾜｶﾔ %2$s ﾊｹﾓﾃ \"%1$s\""
 
 msgid "E1038: \"vim9script\" can only be used in a script"
 msgstr "E1038: \"vim9script\" ﾖｻﾄﾜﾔﾚｽﾅｱｾﾖﾐﾊｹﾓﾃ"
@@ -7511,8 +7502,8 @@ msgstr "E1112: ﾁﾐｱ�ﾏ� %d ｵ･ﾔｪｸ�ｿ�ｶﾈﾎﾞﾐｧ"
 msgid "E1113: Overlapping ranges for 0x%lx"
 msgstr "E1113: ﾖﾘｵ�ｷｶﾎｧﾎｪ 0x%lx"
 
-msgid "E1114: Only values of 0x80 and higher supported"
-msgstr "E1114: ﾖｻﾖｧｳﾖ 0x80 ｻ�ｸ�ｸﾟｵﾄﾖｵ"
+msgid "E1114: Only values of 0x100 and higher supported"
+msgstr "E1114: ﾖｻﾖｧｳﾖ 0x100 ｻ�ｸ�ｸﾟｵﾄﾖｵ"
 
 msgid "E1115: \"assert_fails()\" fourth argument must be a number"
 msgstr "E1115: \"assert_fails()\" ｵﾚﾋﾄｸ�ｲﾎﾊ�ｱﾘﾐ�ﾊﾇﾒｻｸ�ﾕ�ﾊ�"
@@ -7676,10 +7667,9 @@ msgstr "E1162: ｼﾄｴ貳�ﾃ�ｱﾘﾐ�ﾊﾇﾒｻｸ�ﾗﾖｷ�｣ｺ%s"
 msgid "E1163: Variable %d: type mismatch, expected %s but got %s"
 msgstr "E1163: ｱ菽ｿ %d: ﾀ獎ﾍｲｻﾆ･ﾅ茱ｬﾐ靨ｪ %s ｵｫｵﾃｵｽ %s"
 
-# reorder if possible
 #, c-format
 msgid "E1163: Variable %d: type mismatch, expected %s but got %s in %s"
-msgstr "E1163: ｱ菽ｿ %d: ﾀ獎ﾍｲｻﾆ･ﾅ茱ｬﾐ靨ｪ %s ｵｫｵﾃｵｽ %s ﾓﾚ %s ﾖﾐ"
+msgstr "E1163: %4$s ﾖﾐｱ菽ｿ %1$d: ﾀ獎ﾍｲｻﾆ･ﾅ茱ｬﾐ靨ｪ %2$s ｵｫｵﾃｵｽ %3$s"
 
 msgid "E1164: vim9cmd must be followed by a command"
 msgstr "E1164: vim9cmd ｺ�ｱﾟｱﾘﾐ�ﾊﾇﾃ�ﾁ�"