diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-03-14 20:11:12 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-03-14 20:11:12 +0100 |
| commit | 228de1dfd2687af16dc7bc88942c65b5af9d7e04 (patch) | |
| tree | 5f5b9427d4a209f4c3037c67abd8c3c24650f5a6 | |
| parent | 012eb6629337fdf8afca78a24faa132e9b42e7b4 (diff) | |
| download | vim-git-228de1dfd2687af16dc7bc88942c65b5af9d7e04.tar.gz | |
patch 8.0.1606: singular/plural variants not translatedv8.0.1606
Problem: Singular/plural variants not translated.
Solution: Add NGETTEXT argument to xgettext. (Sergey Alyoshin)
| -rw-r--r-- | src/po/Make_cyg.mak | 4 | ||||
| -rw-r--r-- | src/po/Make_ming.mak | 4 | ||||
| -rw-r--r-- | src/po/Make_mvc.mak | 4 | ||||
| -rw-r--r-- | src/po/Makefile | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 9 insertions, 7 deletions
diff --git a/src/po/Make_cyg.mak b/src/po/Make_cyg.mak index f8e45badf..fe49a3429 100644 --- a/src/po/Make_cyg.mak +++ b/src/po/Make_cyg.mak @@ -128,11 +128,11 @@ all: $(MOFILES) first_time: $(XGETTEXT) --default-domain=$(LANGUAGE) \ - --add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h + --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h $(LANGUAGES): $(XGETTEXT) --default-domain=$(PACKAGE) \ - --add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h + --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h $(MV) $(PACKAGE).po $(PACKAGE).pot $(CP) $@.po $@.po.orig $(MV) $@.po $@.po.old diff --git a/src/po/Make_ming.mak b/src/po/Make_ming.mak index cd84c1b49..5dd2f2b1a 100644 --- a/src/po/Make_ming.mak +++ b/src/po/Make_ming.mak @@ -137,11 +137,11 @@ all: $(MOFILES) first_time: $(XGETTEXT) --default-domain=$(LANGUAGE) \ - --add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h + --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h $(LANGUAGES): $(XGETTEXT) --default-domain=$(PACKAGE) \ - --add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h + --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h $(MV) $(PACKAGE).po $(PACKAGE).pot $(CP) $@.po $@.po.orig $(MV) $@.po $@.po.old diff --git a/src/po/Make_mvc.mak b/src/po/Make_mvc.mak index 85013f497..23a6e733c 100644 --- a/src/po/Make_mvc.mak +++ b/src/po/Make_mvc.mak @@ -122,12 +122,12 @@ files: first_time: files set OLD_PO_FILE_INPUT=yes set OLD_PO_FILE_OUTPUT=yes - $(XGETTEXT) --default-domain=$(LANGUAGE) --add-comments --keyword=_ --keyword=N_ --files-from=.\files + $(XGETTEXT) --default-domain=$(LANGUAGE) --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 --files-from=.\files $(LANGUAGES): files set OLD_PO_FILE_INPUT=yes set OLD_PO_FILE_OUTPUT=yes - $(XGETTEXT) --default-domain=$(PACKAGE) --add-comments --keyword=_ --keyword=N_ --files-from=.\files + $(XGETTEXT) --default-domain=$(PACKAGE) --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 --files-from=.\files $(MV) $(PACKAGE).po $(PACKAGE).pot $(CP) $@.po $@.po.orig $(MV) $@.po $@.po.old diff --git a/src/po/Makefile b/src/po/Makefile index 8c4aaf364..fc78c4308 100644 --- a/src/po/Makefile +++ b/src/po/Makefile @@ -283,7 +283,7 @@ checkclean: $(PACKAGE).pot: ../*.c ../if_perl.xs ../GvimExt/gvimext.cpp ../globals.h ../if_py_both.h cd ..; $(XGETTEXT) --default-domain=$(PACKAGE) \ - --add-comments --keyword=_ --keyword=N_ \ + --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 \ *.c if_perl.xs GvimExt/gvimext.cpp globals.h if_py_both.h mv -f ../$(PACKAGE).po $(PACKAGE).pot diff --git a/src/version.c b/src/version.c index 3236096c1..4531c82c3 100644 --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1606, +/**/ 1605, /**/ 1604, |