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
diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
index f554976..cec4953 100644
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -2182,7 +2182,7 @@
msgid "line %4ld:"
msgstr "s %4ld:"
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "ú{êbZ[W|ó/ÄC: ºª ¾Y <koron.kaoriya@gmail.com>"
msgid "Interrupt: "
diff --git a/src/po/zh_CN.cp936.po b/src/po/zh_CN.cp936.po
index c38f166..ef3dfa8 100644
--- a/src/po/zh_CN.cp936.po
+++ b/src/po/zh_CN.cp936.po
@@ -514,22 +514,22 @@
#, 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 @@
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 @@
"\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 @@
#, 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 e88d496..4e34616 100644
--- a/src/po/zh_CN.po
+++ b/src/po/zh_CN.po
@@ -514,22 +514,22 @@
#, 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 @@
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 @@
"\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 @@
#, 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 ºó±ß±ØÐëÊÇÃüÁî"