To: vim-dev@vim.org Subject: Patch 6.1.470 (lang) Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1.470 (lang) Problem: Polish messages don't show up correctly on MS-Windows. Solution: Convert messages to cp 1250. (Mikolaj Machowski) Also add English message translations, because it got in the way of the patch. Files: Makefile, src/po/Makefile, src/po/en_gb.po, src/po/pl.po *** ../vim61.469/Makefile Sat Mar 15 21:09:58 2003 --- Makefile Fri Apr 18 11:32:20 2003 *************** *** 964,972 **** $(LANG_SRC) \ | (cd dist/$(VIMRTDIR); tar xf -) # Make sure ja.sjis.po is newer than ja.po to avoid it being regenerated. ! # Same for cs.cp1250.po and sk.cp1250.po. touch dist/$(VIMRTDIR)/src/po/ja.sjis.po touch dist/$(VIMRTDIR)/src/po/cs.cp1250.po touch dist/$(VIMRTDIR)/src/po/sk.cp1250.po cd dist && tar cf $(VIMVER)-lang.tar $(VIMRTDIR) gzip -9 dist/$(VIMVER)-lang.tar --- 964,973 ---- $(LANG_SRC) \ | (cd dist/$(VIMRTDIR); tar xf -) # Make sure ja.sjis.po is newer than ja.po to avoid it being regenerated. ! # Same for cs.cp1250.po, pl.cp1250.po and sk.cp1250.po. touch dist/$(VIMRTDIR)/src/po/ja.sjis.po touch dist/$(VIMRTDIR)/src/po/cs.cp1250.po + touch dist/$(VIMRTDIR)/src/po/pl.cp1250.po touch dist/$(VIMRTDIR)/src/po/sk.cp1250.po cd dist && tar cf $(VIMVER)-lang.tar $(VIMRTDIR) gzip -9 dist/$(VIMVER)-lang.tar *************** *** 1191,1200 **** mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR) find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -u no_title.vim -c ":set tx|wq" {} \; # Add the message translations. Trick: skip ja.mo and use ja.sjis.mo instead. ! # Same for cs.mo / cs.cp1250.mo, sk.mo / sk.cp1250.mo and zh_CN.mo / ! # zh_CN.cp936.mo. for i in $(LANG_DOS); do \ ! if test "$$i" != "src/po/ja.mo" -a "$$i" != "src/po/cs.mo" -a "$$i" != "src/po/sk.mo" -a "$$i" != "src/po/zh_CN.mo"; then \ n=`echo $$i | sed -e "s+src/po/\([-a-zA-Z0-9_]*\(.UTF-8\)*\)\(.sjis\)*\(.cp1250\)*\(.cp936\)*.mo+\1+"`; \ mkdir dist/vim/$(VIMRTDIR)/lang/$$n; \ mkdir dist/vim/$(VIMRTDIR)/lang/$$n/LC_MESSAGES; \ --- 1192,1201 ---- mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR) find dist/vim/$(VIMRTDIR) -type f -exec $(VIM) -u no_title.vim -c ":set tx|wq" {} \; # Add the message translations. Trick: skip ja.mo and use ja.sjis.mo instead. ! # Same for cs.mo / cs.cp1250.mo, pl.mo / pl.cp1250.mo, sk.mo / sk.cp1250.mo and ! # zh_CN.mo / zh_CN.cp936.mo. for i in $(LANG_DOS); do \ ! if test "$$i" != "src/po/ja.mo" -a "$$i" != "src/po/pl.mo" -a "$$i" != "src/po/cs.mo" -a "$$i" != "src/po/sk.mo" -a "$$i" != "src/po/zh_CN.mo"; then \ n=`echo $$i | sed -e "s+src/po/\([-a-zA-Z0-9_]*\(.UTF-8\)*\)\(.sjis\)*\(.cp1250\)*\(.cp936\)*.mo+\1+"`; \ mkdir dist/vim/$(VIMRTDIR)/lang/$$n; \ mkdir dist/vim/$(VIMRTDIR)/lang/$$n/LC_MESSAGES; \ *** ../vim61.469/src/po/Makefile Sat Feb 9 21:18:57 2002 --- src/po/Makefile Fri Apr 18 11:29:27 2003 *************** *** 1,11 **** # Makefile for the Vim message translations. # TODO make this configurable ! # Note: ja.sjis, cs.cp1250 and zh_CN.cp936 are only for MS-Windows, they are # not installed on Unix ! LANGUAGES = af cs de es fr it ja ko pl sk uk zh_TW zh_CN zh_CN.UTF-8 ! MOFILES = af.mo cs.mo de.mo es.mo fr.mo it.mo ja.mo \ ko.mo pl.mo sk.mo uk.mo zh_TW.mo zh_CN.mo zh_CN.UTF-8.mo PACKAGE = vim --- 1,11 ---- # Makefile for the Vim message translations. # TODO make this configurable ! # Note: ja.sjis, *.cp1250 and zh_CN.cp936 are only for MS-Windows, they are # not installed on Unix ! LANGUAGES = af cs de en_gb es fr it ja ko pl sk uk zh_TW zh_CN zh_CN.UTF-8 ! MOFILES = af.mo cs.mo de.mo en_gb.mo es.mo fr.mo it.mo ja.mo \ ko.mo pl.mo sk.mo uk.mo zh_TW.mo zh_CN.mo zh_CN.UTF-8.mo PACKAGE = vim *************** *** 53,59 **** rm -f $(LOCALEDIR)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ done ! converted: ja.sjis.mo cs.cp1250.mo sk.cp1250.mo zh_CN.cp936.mo # Convert ja.po to create ja.sjis.po. Requires doubling backslashes in the # second byte. Don't depend on sjiscorr, it should only be compiled when --- 53,59 ---- rm -f $(LOCALEDIR)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ done ! converted: ja.sjis.mo cs.cp1250.mo pl.cp1250.mo sk.cp1250.mo zh_CN.cp936.mo # Convert ja.po to create ja.sjis.po. Requires doubling backslashes in the # second byte. Don't depend on sjiscorr, it should only be compiled when *************** *** 69,74 **** --- 69,79 ---- cs.cp1250.po: cs.po iconv -f iso-8859-2 -t cp1250 cs.po | \ sed -e 's/charset=ISO-8859-2/charset=cp1250/' -e 's/# Original translations/# Generated from cs.po, DO NOT EDIT/' > cs.cp1250.po + + # Convert pl.po to create pl.cp1250.po. + pl.cp1250.po: pl.po + iconv -f iso-8859-2 -t cp1250 pl.po | \ + sed -e 's/charset=ISO-8859-2/charset=cp1250/' -e 's/# Original translations/# Generated from pl.po, DO NOT EDIT/' > pl.cp1250.po # Convert sk.po to create sk.cp1250.po. sk.cp1250.po: sk.po *** ../vim61.469/src/po/en_gb.po Fri Apr 18 11:42:01 2003 --- src/po/en_gb.po Tue Feb 25 21:06:40 2003 *************** *** 0 **** --- 1,48 ---- + # UK English Translation for Vim vim:set foldmethod=marker: + # + # Do ":help uganda" in Vim to read copying and usage conditions. + # Do ":help credits" in Vim to see a list of people who contributed. + # + # FIRST AUTHOR Mike Williams , 2003. + # + msgid "" + msgstr "" + "Project-Id-Version: Vim(UK English)\n" + "POT-Creation-Date: 2003-02-23 10:27+0000\n" + "PO-Revision-Date: 2003-02-25 11:05+0000\n" + "Last-Translator: Mike Williams \n" + "Language-Team: Mike Williams \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=ISO_8859-1\n" + "Content-Transfer-Encoding: 7bit\n" + + #, c-format + msgid "E185: Cannot find color scheme %s" + msgstr "E185: Cannot find colour scheme %s" + + #, c-format + msgid "E254: Cannot allocate color %s" + msgstr "E254: Cannot allocate colour %s" + + msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect" + msgstr "" + "Vim E458: Cannot allocate colourmap entry, some colours may be incorrect" + + msgid "-background \tUse for the background (also: -bg)" + msgstr "-background \tUse for the background (also: -bg)" + + msgid "-foreground \tUse for normal text (also: -fg)" + msgstr "-foreground \tUse for normal text (also: -fg)" + + msgid "Messages maintainer: Bram Moolenaar " + msgstr "Messages maintainer: Mike Williams " + + msgid "E419: FG color unknown" + msgstr "E419: FG colour unknown" + + msgid "E420: BG color unknown" + msgstr "E420: BG colour unknown" + + #, c-format + msgid "E421: Color name or number not recognized: %s" + msgstr "E421: Colour name or number not recognised: %s" *** ../vim61.469/src/po/pl.po Thu Feb 21 20:51:15 2002 --- src/po/pl.po Fri Apr 18 11:33:10 2003 *************** *** 11,17 **** "Last-Translator: Marcin Dalecki \n" "Language-Team: Marcin Dalecki \n" "MIME-Version: 1.0\n" ! "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" #: buffer.c:98 --- 11,17 ---- "Last-Translator: Marcin Dalecki \n" "Language-Team: Marcin Dalecki \n" "MIME-Version: 1.0\n" ! "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" #: buffer.c:98 *** ../vim61.469/src/version.c Wed Apr 16 21:23:36 2003 --- src/version.c Fri Apr 18 11:38:23 2003 *************** *** 613,614 **** --- 613,616 ---- { /* Add new patch number below this line */ + /**/ + 470, /**/ -- hundred-and-one symptoms of being an internet addict: 10. And even your night dreams are in HTML. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ \\\ Project leader for A-A-P -- http://www.A-A-P.org /// \\\ Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///