diff options
author | Ada <me@yuhaowen.com> | 2022-02-14 15:04:55 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-02-14 15:04:55 +0000 |
commit | 774e55702f236b0f16ef4a255a290dc87cfca67b (patch) | |
tree | 0aabf768715b97ff59ddfce8ff8d3a0e75884080 | |
parent | 55737c2a31ed450dd7bf2a9c587adfbb32b755bb (diff) |
patch 8.2.4380: small differences between Chinese translation filesv8.2.4380
Problem: Small differences between Chinese translation files.
Solution: Add rule for converting UTF-8 to gb2312. (closes #9773)
-rw-r--r-- | src/po/Make_all.mak | 1 | ||||
-rw-r--r-- | src/po/Makefile | 6 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/src/po/Make_all.mak b/src/po/Make_all.mak index b062bccafc..8f28dfad2d 100644 --- a/src/po/Make_all.mak +++ b/src/po/Make_all.mak @@ -134,6 +134,7 @@ MOCONVERTED = \ ru.cp1251.mo \ sk.cp1250.mo \ uk.cp1251.mo \ + zh_CN.mo \ zh_CN.cp936.mo \ diff --git a/src/po/Makefile b/src/po/Makefile index e46bceaf35..47064fd916 100644 --- a/src/po/Makefile +++ b/src/po/Makefile @@ -132,6 +132,12 @@ sk.cp1250.po: sk.po iconv -f iso-8859-2 -t cp1250 sk.po | \ sed -e 's/charset=ISO-8859-2/charset=cp1250/' -e 's/# Original translations/# Generated from sk.po, DO NOT EDIT/' > sk.cp1250.po +# Convert zh_CN.UTF-8.po to create zh_CN.po. +zh_CN.po: zh_CN.UTF-8.po + rm -f zh_CN.po + iconv -f UTF-8 -t gb2312 zh_CN.UTF-8.po | \ + sed -e 's/charset=[uU][tT][fF]-8/charset=gb2312/' -e 's/# Original translations/# Generated from zh_CN.UTF-8.po, DO NOT EDIT/' > zh_CN.po + # Convert zh_CN.UTF-8.po to create zh_CN.cp936.po. # Set 'charset' to gbk to avoid that msfmt generates a warning. # This used to convert from zh_CN.po, but that results in a conversion error. diff --git a/src/version.c b/src/version.c index 22f0a5a539..466206653a 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4380, +/**/ 4379, /**/ 4378, |