To: vim_dev@googlegroups.com Subject: Patch 8.2.4380 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4380 Problem: Small differences between Chinese translation files. Solution: Add rule for converting UTF-8 to gb2312. (closes #9773) Files: src/po/Makefile, src/po/Make_all.mak *** ../vim-8.2.4379/src/po/Makefile 2020-09-04 12:52:56.880114208 +0100 --- src/po/Makefile 2022-02-14 14:57:06.689123859 +0000 *************** *** 132,137 **** --- 132,143 ---- 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. *** ../vim-8.2.4379/src/po/Make_all.mak 2019-10-24 15:42:01.000000000 +0100 --- src/po/Make_all.mak 2022-02-14 15:00:25.500488860 +0000 *************** *** 134,139 **** --- 134,140 ---- ru.cp1251.mo \ sk.cp1250.mo \ uk.cp1251.mo \ + zh_CN.mo \ zh_CN.cp936.mo \ *** ../vim-8.2.4379/src/version.c 2022-02-14 14:50:44.529919531 +0000 --- src/version.c 2022-02-14 15:03:00.188050225 +0000 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 4380, /**/ -- A fine is a tax for doing wrong. A tax is a fine for doing well. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///