Patch 8.0.1606
Problem:    Singular/plural variants not translated.
Solution:   Add NGETTEXT argument to xgettext. (Sergey Alyoshin)
Files:      src/po/Make_cyg.mak, src/po/Make_ming.mak, src/po/Make_mvc.mak,
            src/po/Makefile


*** ../vim-8.0.1605/src/po/Make_cyg.mak 2017-11-02 19:27:31.698785443 +0100
--- src/po/Make_cyg.mak 2018-03-14 20:05:10.119849194 +0100
***************
*** 128,138 ****
  
  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
  
  $(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
        $(MV) $(PACKAGE).po $(PACKAGE).pot
        $(CP) [email protected] [email protected]
        $(MV) [email protected] [email protected]
--- 128,138 ----
  
  first_time:
        $(XGETTEXT) --default-domain=$(LANGUAGE) \
!               --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_ --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) [email protected] [email protected]
        $(MV) [email protected] [email protected]
*** ../vim-8.0.1605/src/po/Make_ming.mak        2017-11-02 19:27:31.702785418 
+0100
--- src/po/Make_ming.mak        2018-03-14 20:05:10.119849194 +0100
***************
*** 137,147 ****
  
  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
  
  $(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
        $(MV) $(PACKAGE).po $(PACKAGE).pot
        $(CP) [email protected] [email protected]
        $(MV) [email protected] [email protected]
--- 137,147 ----
  
  first_time:
        $(XGETTEXT) --default-domain=$(LANGUAGE) \
!               --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_ --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) [email protected] [email protected]
        $(MV) [email protected] [email protected]
*** ../vim-8.0.1605/src/po/Make_mvc.mak 2017-11-02 19:27:31.702785418 +0100
--- src/po/Make_mvc.mak 2018-03-14 20:05:10.119849194 +0100
***************
*** 122,133 ****
  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
  
  $(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
        $(MV) $(PACKAGE).po $(PACKAGE).pot
        $(CP) [email protected] [email protected]
        $(MV) [email protected] [email protected]
--- 122,133 ----
  first_time: files
        set OLD_PO_FILE_INPUT=yes
        set OLD_PO_FILE_OUTPUT=yes
!       $(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_ --keyword=NGETTEXT:1,2 --files-from=.\files
        $(MV) $(PACKAGE).po $(PACKAGE).pot
        $(CP) [email protected] [email protected]
        $(MV) [email protected] [email protected]
*** ../vim-8.0.1605/src/po/Makefile     2017-01-27 20:37:45.592698326 +0100
--- src/po/Makefile     2018-03-14 20:05:10.119849194 +0100
***************
*** 238,244 ****
  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=utf-8/charset=gbk/' -e 's/# Original 
translations/# Generated from zh_CN.po, DO NOT EDIT/' > zh_CN.cp936.po
  
  # Convert ko.UTF-8.po to create ko.po.
  ko.po: ko.UTF-8.po
--- 243,249 ----
  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=utf-8/charset=gbk/' -e 's/# Original 
translations/# Generated from zh_CN.UTF-8.po, DO NOT EDIT/' > zh_CN.cp936.po
  
  # Convert ko.UTF-8.po to create ko.po.
  ko.po: ko.UTF-8.po
***************
*** 278,284 ****
  
  $(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_ \
                *.c if_perl.xs GvimExt/gvimext.cpp globals.h if_py_both.h
        mv -f ../$(PACKAGE).po $(PACKAGE).pot
  
--- 283,289 ----
  
  $(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_ --keyword=NGETTEXT:1,2 \
                *.c if_perl.xs GvimExt/gvimext.cpp globals.h if_py_both.h
        mv -f ../$(PACKAGE).po $(PACKAGE).pot
  
*** ../vim-8.0.1605/src/version.c       2018-03-13 17:55:23.933643839 +0100
--- src/version.c       2018-03-14 20:09:52.030149608 +0100
***************
*** 768,769 ****
--- 768,771 ----
  {   /* Add new patch number below this line */
+ /**/
+     1606,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
12. You turn off your modem and get this awful empty feeling, like you just
    pulled the plug on a loved one.

 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Raspunde prin e-mail lui