diff options
author | Yee Cheng Chin <ychin.git@gmail.com> | 2023-03-16 21:04:31 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2023-03-16 21:04:31 +0000 |
commit | 16110ccf11de7a41cb0db0ae1ecb829e5a1b98fc (patch) | |
tree | ab3982391974277533b1696ec0532d97450edce4 /src | |
parent | d11ac403db07b6eac43882485e98caeb5e83e2e5 (diff) |
patch 9.0.1410: MacOS: sed fails on .po filesv9.0.1410
Problem: MacOS: sed fails on .po files.
Solution: Set $LANG to "C". (Yee Cheng Chin, closes #12153)
Diffstat (limited to 'src')
-rw-r--r-- | src/po/Make_all.mak | 4 | ||||
-rw-r--r-- | src/po/Makefile | 35 | ||||
-rw-r--r-- | src/po/zh_TW.UTF-8.po | 4 | ||||
-rw-r--r-- | src/po/zh_TW.po | 19 | ||||
-rw-r--r-- | src/version.c | 2 |
5 files changed, 43 insertions, 21 deletions
diff --git a/src/po/Make_all.mak b/src/po/Make_all.mak index b2fa014290..89cbb151bb 100644 --- a/src/po/Make_all.mak +++ b/src/po/Make_all.mak @@ -105,7 +105,6 @@ MOFILES = \ it.mo \ ja.mo \ ko.UTF-8.mo \ - ko.mo \ lv.mo \ nb.mo \ nl.mo \ @@ -121,13 +120,13 @@ MOFILES = \ vi.mo \ zh_CN.UTF-8.mo \ zh_TW.UTF-8.mo \ - zh_TW.mo \ MOCONVERTED = \ cs.cp1250.mo \ ja.euc-jp.mo \ ja.sjis.mo \ + ko.mo \ pl.UTF-8.mo \ pl.cp1250.mo \ ru.cp1251.mo \ @@ -135,6 +134,7 @@ MOCONVERTED = \ uk.cp1251.mo \ zh_CN.mo \ zh_CN.cp936.mo \ + zh_TW.mo \ CHECKFILES = \ diff --git a/src/po/Makefile b/src/po/Makefile index ee67303de4..9dfbc34e74 100644 --- a/src/po/Makefile +++ b/src/po/Makefile @@ -13,6 +13,9 @@ PACKAGE = vim SHELL = /bin/sh VIM = ../vim +# MacOS sed is locale aware, set $LANG to avoid problems +SED = LANG=C sed + # The OLD_PO_FILE_INPUT and OLD_PO_FILE_OUTPUT are for the new GNU gettext # tools 0.10.37, which use a slightly different .po file format that is not # compatible with Solaris (and old gettext implementations) unless these are @@ -58,7 +61,7 @@ uninstall: @$(MAKE) prefixcheck for cat in $(MOFILES) $(MOCONVERTED); do \ cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + lang=`echo $$cat | $(SED) 's/\$(CATOBJEXT)$$//'`; \ rm -f $(LOCALEDIR)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ done @@ -106,37 +109,37 @@ sjiscorr: sjiscorr.c ja.euc-jp.po: ja.po iconv -f utf-8 -t euc-jp ja.po | \ - sed -e 's/charset=[uU][tT][fF]-8/charset=euc-jp/' -e 's/# Original translations/# Generated from ja.po, DO NOT EDIT/' > ja.euc-jp.po + $(SED) -e 's/charset=[uU][tT][fF]-8/charset=euc-jp/' -e 's/# Original translations/# Generated from ja.po, DO NOT EDIT/' > ja.euc-jp.po # Convert cs.po to create cs.cp1250.po. cs.cp1250.po: cs.po rm -f cs.cp1250.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 + $(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 rm -f pl.cp1250.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 + $(SED) -e 's/charset=ISO-8859-2/charset=cp1250/' -e 's/# Original translations/# Generated from pl.po, DO NOT EDIT/' > pl.cp1250.po # Convert pl.po to create pl.UTF-8.po. pl.UTF-8.po: pl.po rm -f pl.UTF-8.po iconv -f iso-8859-2 -t utf-8 pl.po | \ - sed -e 's/charset=ISO-8859-2/charset=UTF-8/' -e 's/# Original translations/# Generated from pl.po, DO NOT EDIT/' > pl.UTF-8.po + $(SED) -e 's/charset=ISO-8859-2/charset=UTF-8/' -e 's/# Original translations/# Generated from pl.po, DO NOT EDIT/' > pl.UTF-8.po # Convert sk.po to create sk.cp1250.po. sk.cp1250.po: sk.po rm -f sk.cp1250.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 + $(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 + $(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. @@ -144,13 +147,19 @@ zh_CN.po: zh_CN.UTF-8.po zh_CN.cp936.po: zh_CN.UTF-8.po rm -f zh_CN.cp936.po iconv -f UTF-8 -t cp936 zh_CN.UTF-8.po | \ - sed -e 's/charset=[uU][tT][fF]-8/charset=gbk/' -e 's/# Original translations/# Generated from zh_CN.UTF-8.po, DO NOT EDIT/' > zh_CN.cp936.po + $(SED) -e 's/charset=[uU][tT][fF]-8/charset=gbk/' -e 's/# Original translations/# Generated from zh_CN.UTF-8.po, DO NOT EDIT/' > zh_CN.cp936.po + +# Convert zh_TW.UTF-8.po to create zh_TW.po +zh_TW.po: zh_TW.UTF-8.po + rm -f zh_TW.po + iconv -f UTF-8 -t big5 zh_TW.UTF-8.po | \ + $(SED) -e 's/charset=[uU][tT][fF]-8/charset=big5/' -e 's/# Original translations/# Generated from zh_TW.UTF-8.po, DO NOT EDIT/' > zh_TW.po # Convert ko.UTF-8.po to create ko.po. ko.po: ko.UTF-8.po rm -f ko.po iconv -f UTF-8 -t euc-kr ko.UTF-8.po | \ - sed -e 's/charset=UTF-8/charset=euc-kr/' \ + $(SED) -e 's/charset=UTF-8/charset=euc-kr/' \ -e 's/# Korean translation for Vim/# Generated from ko.UTF-8.po, DO NOT EDIT/' \ > ko.po @@ -158,13 +167,13 @@ ko.po: ko.UTF-8.po ru.cp1251.po: ru.po rm -f ru.cp1251.po iconv -f utf-8 -t cp1251 ru.po | \ - sed -e 's/charset=[uU][tT][fF]-8/charset=cp1251/' -e 's/# Original translations/# Generated from ru.po, DO NOT EDIT/' > ru.cp1251.po + $(SED) -e 's/charset=[uU][tT][fF]-8/charset=cp1251/' -e 's/# Original translations/# Generated from ru.po, DO NOT EDIT/' > ru.cp1251.po # Convert uk.po to create uk.cp1251.po. uk.cp1251.po: uk.po rm -f uk.cp1251.po iconv -f utf-8 -t cp1251 uk.po | \ - sed -e 's/charset=[uU][tT][fF]-8/charset=cp1251/' -e 's/# Original translations/# Generated from uk.po, DO NOT EDIT/' > uk.cp1251.po + $(SED) -e 's/charset=[uU][tT][fF]-8/charset=cp1251/' -e 's/# Original translations/# Generated from uk.po, DO NOT EDIT/' > uk.cp1251.po prefixcheck: @if test "x" = "x$(prefix)"; then \ @@ -214,7 +223,7 @@ $(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST) rm *.js vim.desktop: vim.desktop.in $(POFILES) - echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS + echo $(LANGUAGES) | tr " " "\n" |$(SED) -e '/\./d' | sort > LINGUAS $(MSGFMT) --desktop -d . --template vim.desktop.in -o tmp_vim.desktop rm -f LINGUAS if command -v desktop-file-validate; then desktop-file-validate tmp_vim.desktop; fi @@ -223,7 +232,7 @@ vim.desktop: vim.desktop.in $(POFILES) # The dependency on vim.desktop is only to avoid the two targets are build at # the same time, which causes a race for the LINGUAS file. gvim.desktop: gvim.desktop.in $(POFILES) vim.desktop - echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS + echo $(LANGUAGES) | tr " " "\n" |$(SED) -e '/\./d' | sort > LINGUAS $(MSGFMT) --desktop -d . --template gvim.desktop.in -o tmp_gvim.desktop rm -f LINGUAS if command -v desktop-file-validate; then desktop-file-validate tmp_gvim.desktop; fi diff --git a/src/po/zh_TW.UTF-8.po b/src/po/zh_TW.UTF-8.po index d85d5e6db4..8ea35ed971 100644 --- a/src/po/zh_TW.UTF-8.po +++ b/src/po/zh_TW.UTF-8.po @@ -7,6 +7,8 @@ # FIRST RELEASE Thu Jun 14 14:24:17 CST 2001 # MAINTAINER: Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org> # +# Original translations. +# # Last update: $LastChangedDate: 2006-04-16 22:06:40 -0400 (dom, 16 apr 2006) $ # # XXX This file is in need of a new maintainer, Debian VIM Maintainers maintain @@ -2559,7 +2561,7 @@ msgstr "" "gvim 認得的參數 (Athena 版):\n" msgid "-display <display>\tRun Vim on <display>" -msgstr "-display <display>\t在視窗 <display> 執行 vim" +msgstr "-display <display>\t在視窗 <display> 執行 Vim" msgid "-iconic\t\tStart Vim iconified" msgstr "-iconic\t\t啟動後圖示化(iconified)" diff --git a/src/po/zh_TW.po b/src/po/zh_TW.po index 80053407bf..51589a7759 100644 --- a/src/po/zh_TW.po +++ b/src/po/zh_TW.po @@ -5,8 +5,17 @@ # # FIRST AUTHOR Francis S.Lin <piaip@csie.ntu.edu.tw>, 2000 # FIRST RELEASE Thu Jun 14 14:24:17 CST 2001 +# MAINTAINER: Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org> # -# Last update: 2005/01/27 07:03 (6.3) +# Generated from zh_TW.UTF-8.po, DO NOT EDIT. +# +# Last update: $LastChangedDate: 2006-04-16 22:06:40 -0400 (dom, 16 apr 2006) $ +# +# XXX This file is in need of a new maintainer, Debian VIM Maintainers maintain +# it only because patches have been submitted for it by Debian users and the +# former maintainer was MIA (Missing In Action), taking over its +# maintenance was thus the only way to include those patches. +# If you care about this file, and have time to maintain it please do so! # # To update, search pattern: /fuzzy\|^msgstr ""\(\n"\)\@! # @@ -2552,7 +2561,7 @@ msgstr "" "gvim {oѼ (Athena ):\n" msgid "-display <display>\tRun Vim on <display>" -msgstr "-display <display>\tb <display> vim" +msgstr "-display <display>\tb <display> Vim" msgid "-iconic\t\tStart Vim iconified" msgstr "-iconic\t\tҰʫϥܤ(iconified)" @@ -2620,7 +2629,7 @@ msgstr "" "gvim {oѼ (GTK+ ):\n" msgid "-display <display>\tRun Vim on <display> (also: --display)" -msgstr "-display <display>\tb <display> Vim (]i --display)" +msgstr "-display <display>\tb <display> vim (]i --display)" msgid "--role <role>\tSet a unique role to identify the main window" msgstr "--role <role>\t]wWS(role)HϤD" @@ -3281,11 +3290,11 @@ msgstr "֩@ " #, c-format msgid "%ld more lines" -msgstr "٦ %ld " +msgstr "hF %ld " #, c-format msgid "%ld fewer lines" -msgstr "u %ld " +msgstr "֤F %ld " msgid " (Interrupted)" msgstr " (w_)" diff --git a/src/version.c b/src/version.c index 27d4b128d9..8c69ef4adf 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1410, +/**/ 1409, /**/ 1408, |