patch 8.0.1606: singular/plural variants not translated

Problem:    Singular/plural variants not translated.
Solution:   Add NGETTEXT argument to xgettext. (Sergey Alyoshin)

diff --git a/src/po/Make_cyg.mak b/src/po/Make_cyg.mak
index f8e45badfeb95599207b94935101c52df1e80190..fe49a34295eac6222f7587fb7b25f8eb38f82d9e 100644 (file)
--- 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 cd84c1b49d4c5324f96a35c5948c94286c832afe..5dd2f2b1a15a3c1e642e81309fa07d4c6fe9d621 100644 (file)
--- 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 85013f497e60ad8a5bc913d6b2c1011cd4b09572..23a6e733cee9c9e77279a8e3233c3d24719d237a 100644 (file)
--- 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 8c4aaf3649d2335a58a8dbd76191a179d751380d..fc78c43086b9833dc7a5bc3f3ee2277b57278323 100644 (file)
--- 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 3236096c1c0925074ea8eb2cd4214f9b130d97d7..4531c82c3e6adce69953ed9a880709247df3b1a0 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -766,6 +766,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1606,
 /**/
     1605,
 /**/