patch 8.2.4380: small differences between Chinese translation files

Problem:    Small differences between Chinese translation files.
Solution:   Add rule for converting UTF-8 to gb2312. (closes #9773)

diff --git a/src/po/Make_all.mak b/src/po/Make_all.mak
index b062bccafce859523728da61625afd65ed287cb7..8f28dfad2d7a5465901172d60f118bc1960f9f0d 100644 (file)
--- 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 e46bceaf35a41d42e2a8437ccf1a8d9d2fa84107..47064fd916590ff8e48f62f5b27c3091c509265f 100644 (file)
--- 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 22f0a5a539546712fdbdb70c9df98a2dd1995e07..466206653a898069e96297858e3cd12f781070df 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4380,
 /**/
     4379,
 /**/