updated for version 7.0114v7.0114

10 files changed, 67 insertions, 25 deletions

diff --git a/src/po/Makefile b/src/po/Makefile
index 7320a605d..617d4f970 100644
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -52,8 +52,49 @@ MOFILES = \
 		zh_TW.UTF-8.mo \
 		zh_TW.mo \
 
+CONVERTED = \
+		cs.cp1250.mo \
+		ja.sjis.mo \
+		pl.cp1250.mo \
+		ru.cp1251.mo \
+		sk.cp1250.mo \
+		uk.cp1251.mo \
+		zh_CN.cp936.mo \
+
+CHECKFILES = \
+		af.ck \
+		ca.ck \
+		cs.ck \
+		de.ck \
+		en_GB.ck \
+		es.ck \
+		fr.ck \
+		ga.ck \
+		it.ck \
+		ja.ck \
+		ko.ck \
+		no.ck \
+		pl.ck \
+		ru.ck \
+		sk.ck \
+		sv.ck \
+		uk.ck \
+		vi.ck \
+		zh_CN.UTF-8.ck \
+		zh_CN.ck \
+		zh_TW.UTF-8.ck \
+		zh_TW.ck \
+		cs.cp1250.ck \
+		ja.sjis.ck \
+		pl.cp1250.ck \
+		ru.cp1251.ck \
+		sk.cp1250.ck \
+		uk.cp1251.ck \
+		zh_CN.cp936.ck \
+
 PACKAGE = vim
 SHELL = /bin/sh
+VIM = ../vim
 
 # 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
@@ -64,16 +105,22 @@ XGETTEXT = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes xgettext
 MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes msgmerge
 
 .SUFFIXES:
-.SUFFIXES: .po .mo .pot
-.PHONY: all install uninstall check clean distclean $(LANGUAGES)
+.SUFFIXES: .po .mo .pot .ck
+.PHONY: all install uninstall prefixcheck check clean distclean $(LANGUAGES)
 
 .po.mo:
 	$(MSGFMT) -o $@ $<
 
+.po.ck:
+	$(VIM) -u NONE -e -S check.vim -c "if error == 0 | q | endif" -c cq $<
+	touch $@
+
 all: $(MOFILES)
 
+check: $(CHECKFILES)
+
 install: $(MOFILES)
-	@$(MAKE) check
+	@$(MAKE) prefixcheck
 	for lang in $(LANGUAGES); do \
 	  dir=$(LOCALEDIR)/$$lang/; \
 	  if test ! -x "$$dir"; then \
@@ -90,21 +137,14 @@ install: $(MOFILES)
 	done
 
 uninstall:
-	@$(MAKE) check
+	@$(MAKE) prefixcheck
 	for cat in $(MOFILES); do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 	  rm -f $(LOCALEDIR)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
 	done
 
-converted: \
-		cs.cp1250.mo \
-		ja.sjis.mo \
-		pl.cp1250.mo \
-		ru.cp1251.mo \
-		sk.cp1250.mo \
-		uk.cp1251.mo \
-		zh_CN.cp936.mo \
+converted: $(CONVERTED)
 
 # 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
@@ -154,7 +194,7 @@ uk.cp1251.po: uk.po
 	iconv -f koi8-u -t cp1251 uk.po | \
 		sed -e 's/charset=koi8-u/charset=cp1251/' -e 's/# Original translations/# Generated from uk.po, DO NOT EDIT/' > uk.cp1251.po
 
-check:
+prefixcheck:
 	@if test "x" = "x$(prefix)"; then \
 	  echo "******************************************"; \
 	  echo "  please use make from the src directory  "; \
@@ -163,7 +203,7 @@ check:
 	fi
 
 clean:
-	rm -f core core.* *.old.po *.mo *.pot sjiscorr
+	rm -f core core.* *.old.po *.mo *.ck *.pot sjiscorr
 
 distclean: clean
 
diff --git a/src/po/README.txt b/src/po/README.txt
index b023ef364..30afd9e6a 100644
--- a/src/po/README.txt
+++ b/src/po/README.txt
@@ -99,6 +99,7 @@ language.
 
 (4) Check:
 
+	vim -S check.vim xx.po
 	make xx.mo
 
     Look out for syntax errors and fix them.
diff --git a/src/po/README_mingw.txt b/src/po/README_mingw.txt
index 7ba98e607..267df246b 100644
--- a/src/po/README_mingw.txt
+++ b/src/po/README_mingw.txt
@@ -74,6 +74,7 @@ the same as in the Unix case, only the commands change):
 
 (4) Check:
 
+	vim -S check.vim xx.po
 	make -f Make_ming.mak xx.mo
 
     Look out for syntax errors and fix them.
diff --git a/src/po/cs.cp1250.po b/src/po/cs.cp1250.po
index 04370dc07..99a45023c 100644
--- a/src/po/cs.cp1250.po
+++ b/src/po/cs.cp1250.po
@@ -2351,12 +2351,12 @@ msgstr "umístìní kurzoru mimo buffer"
 #: if_python.c:1824
 #, c-format
 msgid "<window object (deleted) at %.8lX>"
-msgstr "<objekt okna (smazán) na %8lX>"
+msgstr "<objekt okna (smazán) na %.8lX>"
 
 #: if_python.c:1836
 #, c-format
 msgid "<window object (unknown) at %.8lX>"
-msgstr "<objekt okna (neznámý) na %8lX>"
+msgstr "<objekt okna (neznámý) na %.8lX>"
 
 #: if_python.c:1838
 #, c-format
diff --git a/src/po/cs.po b/src/po/cs.po
index e38c66527..d6e81d1f9 100644
--- a/src/po/cs.po
+++ b/src/po/cs.po
@@ -2351,12 +2351,12 @@ msgstr "umístìní kurzoru mimo buffer"
 #: if_python.c:1824
 #, c-format
 msgid "<window object (deleted) at %.8lX>"
-msgstr "<objekt okna (smazán) na %8lX>"
+msgstr "<objekt okna (smazán) na %.8lX>"
 
 #: if_python.c:1836
 #, c-format
 msgid "<window object (unknown) at %.8lX>"
-msgstr "<objekt okna (neznámý) na %8lX>"
+msgstr "<objekt okna (neznámý) na %.8lX>"
 
 #: if_python.c:1838
 #, c-format
diff --git a/src/po/uk.cp1251.po b/src/po/uk.cp1251.po
index 5df9b18d5..0cab121d0 100644
--- a/src/po/uk.cp1251.po
+++ b/src/po/uk.cp1251.po
@@ -729,7 +729,7 @@ msgstr "ͳ÷îãî äðóêóâàòè"
 
 #: ex_cmds2.c:2913
 msgid "Printing page %d (%d%%)"
-msgstr "Äðóêóºòüñÿ ñòîð³íêà %d (%d)"
+msgstr "Äðóêóºòüñÿ ñòîð³íêà %d (%d%%)"
 
 #: ex_cmds2.c:2922
 #, c-format
@@ -894,7 +894,7 @@ msgstr "E140: Âèêîðèñòîâóéòå ! äëÿ çàïèñó ÷àñòèíè áóôåðà"
 #: ex_cmds.c:2244
 #, c-format
 msgid "Overwrite existing file \"%.*s\"?"
-msgstr "Ïåðåçàïèñàòè ³ñíóþ÷èé ôàéë \"%*.s\"?"
+msgstr "Ïåðåçàïèñàòè ³ñíóþ÷èé ôàéë \"%.*s\"?"
 
 #: ex_cmds.c:2315
 #, c-format
diff --git a/src/po/uk.po b/src/po/uk.po
index f8223d3f2..92b3b2e42 100644
--- a/src/po/uk.po
+++ b/src/po/uk.po
@@ -729,7 +729,7 @@ msgstr "î¦ÞÏÇÏ ÄÒÕËÕ×ÁÔÉ"
 
 #: ex_cmds2.c:2913
 msgid "Printing page %d (%d%%)"
-msgstr "äÒÕËÕ¤ÔØÓÑ ÓÔÏÒ¦ÎËÁ %d (%d)"
+msgstr "äÒÕËÕ¤ÔØÓÑ ÓÔÏÒ¦ÎËÁ %d (%d%%)"
 
 #: ex_cmds2.c:2922
 #, c-format
@@ -894,7 +894,7 @@ msgstr "E140: ÷ÉËÏÒÉÓÔÏ×ÕÊÔÅ ! ÄÌÑ ÚÁÐÉÓÕ ÞÁÓÔÉÎÉ ÂÕÆÅÒÁ"
 #: ex_cmds.c:2244
 #, c-format
 msgid "Overwrite existing file \"%.*s\"?"
-msgstr "ðÅÒÅÚÁÐÉÓÁÔÉ ¦ÓÎÕÀÞÉÊ ÆÁÊÌ \"%*.s\"?"
+msgstr "ðÅÒÅÚÁÐÉÓÁÔÉ ¦ÓÎÕÀÞÉÊ ÆÁÊÌ \"%.*s\"?"
 
 #: ex_cmds.c:2315
 #, c-format
diff --git a/src/po/zh_CN.UTF-8.po b/src/po/zh_CN.UTF-8.po
index 956a82a5c..b63416a7f 100644
--- a/src/po/zh_CN.UTF-8.po
+++ b/src/po/zh_CN.UTF-8.po
@@ -2118,7 +2118,7 @@ msgstr "E256: Hangul automata 错误"
 #: if_cscope.c:26
 #, c-format
 msgid "Usage: cs[cope] %s"
-msgstr ""
+msgstr "Usage: cs[cope] %s"
 
 #: if_cscope.c:67
 msgid "Add a new database"
diff --git a/src/po/zh_CN.cp936.po b/src/po/zh_CN.cp936.po
index 53e6cbcb3..4f9102f82 100644
--- a/src/po/zh_CN.cp936.po
+++ b/src/po/zh_CN.cp936.po
@@ -2118,7 +2118,7 @@ msgstr "E256: Hangul automata ´íÎó"
 #: if_cscope.c:26
 #, c-format
 msgid "Usage: cs[cope] %s"
-msgstr ""
+msgstr "Usage: cs[cope] %s"
 
 #: if_cscope.c:67
 msgid "Add a new database"
diff --git a/src/po/zh_CN.po b/src/po/zh_CN.po
index 28fb5ad05..a049eabe9 100644
--- a/src/po/zh_CN.po
+++ b/src/po/zh_CN.po
@@ -2118,7 +2118,7 @@ msgstr "E256: Hangul automata ´íÎó"
 #: if_cscope.c:26
 #, c-format
 msgid "Usage: cs[cope] %s"
-msgstr ""
+msgstr "Usage: cs[cope] %s"
 
 #: if_cscope.c:67
 msgid "Add a new database"