# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1485546303 -3600
# Node ID 4aa22b40321f7755506abce632649cc058d28657
# Parent  34574f1348731f17191cede5a8de6339f3375ce8
patch 8.0.0245: zh_CN.cp936.po has a conversion error

commit https://github.com/vim/vim/commit/16038d50c4309e8dee33c70ca2c9e7f73439c4df
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Jan 27 20:37:49 2017 +0100

    patch 8.0.0245: zh_CN.cp936.po has a conversion error

    Problem:    The generated zh_CN.cp936.po message file is not encoded properly.
    Solution:   Instead of using zh_CN.po as input, use zh_CN.UTF-8.po.

diff --git a/src/po/Makefile b/src/po/Makefile
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -232,12 +232,13 @@ 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.po to create zh_CN.cp936.po.
-# set 'charset' to gbk to avoid that msfmt generates a warning
-zh_CN.cp936.po: 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.
+zh_CN.cp936.po: zh_CN.UTF-8.po
 	rm -f zh_CN.cp936.po
-	iconv -f gb2312 -t cp936 zh_CN.po | \
-		sed -e 's/charset=gb2312/charset=gbk/' -e 's/# Original translations/# Generated from zh_CN.po, DO NOT EDIT/' > zh_CN.cp936.po
+	iconv -f UTF-8 -t cp936 zh_CN.UTF-8.po | \
+		sed -e 's/charset=utf-8/charset=gbk/' -e 's/# Original translations/# Generated from zh_CN.po, DO NOT EDIT/' > zh_CN.cp936.po
 
 # Convert ko.UTF-8.po to create ko.po.
 ko.po: ko.UTF-8.po
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    245,
+/**/
     244,
 /**/
     243,