Patch 8.0.1773
Problem: Dialog messages are not translated.
Solution: Add N_() and _() where needed. (Sergey Alyoshin)
Files: src/diff.c, src/ex_cmds2.c, src/ex_docmd.c, src/message.c,
src/po/Make_cyg.mak, src/po/Make_ming.mak, src/po/Make_mvc.mak,
src/po/Makefile, src/quickfix.c, src/vim.h
*** ../vim-8.0.1772/src/diff.c 2018-03-04 20:14:08.236064419 +0100
--- src/diff.c 2018-04-29 12:16:29.167906316 +0200
***************
*** 909,915 ****
if (cmdmod.browse)
{
browseFile = do_browse(0, (char_u *)_("Patch file"),
! eap->arg, NULL, NULL, BROWSE_FILTER_ALL_FILES, NULL);
if (browseFile == NULL)
return; /* operation cancelled */
eap->arg = browseFile;
--- 909,916 ----
if (cmdmod.browse)
{
browseFile = do_browse(0, (char_u *)_("Patch file"),
! eap->arg, NULL, NULL,
! (char_u *)_(BROWSE_FILTER_ALL_FILES), NULL);
if (browseFile == NULL)
return; /* operation cancelled */
eap->arg = browseFile;
*** ../vim-8.0.1772/src/ex_cmds2.c 2018-04-24 21:58:46.732368268 +0200
--- src/ex_cmds2.c 2018-04-29 12:17:02.451901651 +0200
***************
*** 4140,4146 ****
char_u *fname = NULL;
fname = do_browse(0, (char_u *)_("Source Vim script"), eap->arg,
! NULL, NULL, BROWSE_FILTER_MACROS, NULL);
if (fname != NULL)
{
cmd_source(fname, eap);
--- 4140,4147 ----
char_u *fname = NULL;
fname = do_browse(0, (char_u *)_("Source Vim script"), eap->arg,
! NULL, NULL,
! (char_u *)_(BROWSE_FILTER_MACROS), NULL);
if (fname != NULL)
{
cmd_source(fname, eap);
*** ../vim-8.0.1772/src/ex_docmd.c 2018-04-27 22:53:03.926590734 +0200
--- src/ex_docmd.c 2018-04-29 12:17:20.891896146 +0200
***************
*** 9619,9625 ****
browseFile = do_browse(BROWSE_SAVE,
(char_u *)_("Save Redirection"),
! fname, NULL, NULL, BROWSE_FILTER_ALL_FILES, curbuf);
if (browseFile == NULL)
return; /* operation cancelled */
vim_free(fname);
--- 9619,9626 ----
browseFile = do_browse(BROWSE_SAVE,
(char_u *)_("Save Redirection"),
! fname, NULL, NULL,
! (char_u *)_(BROWSE_FILTER_ALL_FILES), curbuf);
if (browseFile == NULL)
return; /* operation cancelled */
vim_free(fname);
***************
*** 9845,9851 ****
eap->cmdidx == CMD_mksession ? (char_u *)_("Save Session") :
# endif
(char_u *)_("Save Setup"),
! fname, (char_u *)"vim", NULL, BROWSE_FILTER_MACROS, NULL);
if (browseFile == NULL)
goto theend;
fname = browseFile;
--- 9846,9853 ----
eap->cmdidx == CMD_mksession ? (char_u *)_("Save Session") :
# endif
(char_u *)_("Save Setup"),
! fname, (char_u *)"vim", NULL,
! (char_u *)_(BROWSE_FILTER_MACROS), NULL);
if (browseFile == NULL)
goto theend;
fname = browseFile;
*** ../vim-8.0.1772/src/message.c 2018-04-17 20:12:04.544244252 +0200
--- src/message.c 2018-04-29 12:18:04.035875606 +0200
***************
*** 4057,4063 ****
}
else
fname = gui_mch_browse(flags & BROWSE_SAVE,
! title, dflt, ext, initdir, filter);
/* We hang around in the dialog for a while, the user might do some
* things to our files. The Win32 dialog allows deleting or renaming
--- 4057,4063 ----
}
else
fname = gui_mch_browse(flags & BROWSE_SAVE,
! title, dflt, ext, initdir, (char_u *)_(filter));
/* We hang around in the dialog for a while, the user might do some
* things to our files. The Win32 dialog allows deleting or renaming
*** ../vim-8.0.1772/src/po/Make_cyg.mak 2018-03-14 20:10:36.925878904 +0100
--- src/po/Make_cyg.mak 2018-04-29 12:09:57.687268469 +0200
***************
*** 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]
--- 130,140 ----
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 ../vim.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 ../vim.h
$(MV) $(PACKAGE).po $(PACKAGE).pot
$(CP) [email protected] [email protected]
$(MV) [email protected] [email protected]
*** ../vim-8.0.1772/src/po/Make_ming.mak 2018-03-14 20:10:36.925878904
+0100
--- src/po/Make_ming.mak 2018-04-29 12:09:57.687268469 +0200
***************
*** 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]
--- 139,149 ----
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 ../vim.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 ../vim.h
$(MV) $(PACKAGE).po $(PACKAGE).pot
$(CP) [email protected] [email protected]
$(MV) [email protected] [email protected]
*** ../vim-8.0.1772/src/po/Make_mvc.mak 2018-03-14 20:10:36.925878904 +0100
--- src/po/Make_mvc.mak 2018-04-29 12:09:57.687268469 +0200
***************
*** 117,123 ****
all: $(MOFILES)
files:
! $(LS) $(LSFLAGS) ..\*.c ..\if_perl.xs ..\GvimExt\gvimext.cpp
..\globals.h ..\if_py_both.h > .\files
first_time: files
set OLD_PO_FILE_INPUT=yes
--- 119,125 ----
all: $(MOFILES)
files:
! $(LS) $(LSFLAGS) ..\*.c ..\if_perl.xs ..\GvimExt\gvimext.cpp
..\globals.h ..\if_py_both.h ..\vim.h > .\files
first_time: files
set OLD_PO_FILE_INPUT=yes
*** ../vim-8.0.1772/src/po/Makefile 2018-03-14 20:10:36.925878904 +0100
--- src/po/Makefile 2018-04-29 12:09:57.687268469 +0200
***************
*** 276,285 ****
checkclean:
rm -f *.ck
! $(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
update-po: $(LANGUAGES)
--- 281,290 ----
checkclean:
rm -f *.ck
! $(PACKAGE).pot: ../*.c ../if_perl.xs ../GvimExt/gvimext.cpp ../globals.h
../if_py_both.h ../vim.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 vim.h
mv -f ../$(PACKAGE).po $(PACKAGE).pot
update-po: $(LANGUAGES)
*** ../vim-8.0.1772/src/quickfix.c 2018-04-28 21:56:40.622297037 +0200
--- src/quickfix.c 2018-04-29 12:17:32.047891841 +0200
***************
*** 4115,4121 ****
if (cmdmod.browse)
{
char_u *browse_file = do_browse(0, (char_u *)_("Error file"), eap->arg,
! NULL, NULL, BROWSE_FILTER_ALL_FILES, NULL);
if (browse_file == NULL)
return;
set_string_option_direct((char_u *)"ef", -1, browse_file, OPT_FREE, 0);
--- 4115,4122 ----
if (cmdmod.browse)
{
char_u *browse_file = do_browse(0, (char_u *)_("Error file"), eap->arg,
! NULL, NULL,
! (char_u *)_(BROWSE_FILTER_ALL_FILES), NULL);
if (browse_file == NULL)
return;
set_string_option_direct((char_u *)"ef", -1, browse_file, OPT_FREE, 0);
*** ../vim-8.0.1772/src/vim.h 2018-04-27 22:53:03.922590759 +0200
--- src/vim.h 2018-04-29 12:09:19.547114113 +0200
***************
*** 2186,2201 ****
#ifdef FEAT_BROWSE
# ifdef BACKSLASH_IN_FILENAME
# define BROWSE_FILTER_MACROS \
! (char_u *)"Vim macro files (*.vim)\t*.vim\nAll Files (*.*)\t*.*\n"
! # define BROWSE_FILTER_ALL_FILES (char_u *)"All Files (*.*)\t*.*\n"
# define BROWSE_FILTER_DEFAULT \
! (char_u *)"All Files (*.*)\t*.*\nC source (*.c, *.h)\t*.c;*.h\nC++
source (*.cpp, *.hpp)\t*.cpp;*.hpp\nVB code (*.bas, *.frm)\t*.bas;*.frm\nVim
files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
# else
# define BROWSE_FILTER_MACROS \
! (char_u *)"Vim macro files (*.vim)\t*.vim\nAll Files (*)\t*\n"
! # define BROWSE_FILTER_ALL_FILES (char_u *)"All Files (*)\t*\n"
# define BROWSE_FILTER_DEFAULT \
! (char_u *)"All Files (*)\t*\nC source (*.c, *.h)\t*.c;*.h\nC++ source
(*.cpp, *.hpp)\t*.cpp;*.hpp\nVim files (*.vim, _vimrc,
_gvimrc)\t*.vim;_vimrc;_gvimrc\n"
# endif
# define BROWSE_SAVE 1 /* flag for do_browse() */
# define BROWSE_DIR 2 /* flag for do_browse() */
--- 2186,2201 ----
#ifdef FEAT_BROWSE
# ifdef BACKSLASH_IN_FILENAME
# define BROWSE_FILTER_MACROS \
! (char_u *)N_("Vim macro files (*.vim)\t*.vim\nAll Files (*.*)\t*.*\n")
! # define BROWSE_FILTER_ALL_FILES (char_u *)N_("All Files (*.*)\t*.*\n")
# define BROWSE_FILTER_DEFAULT \
! (char_u *)N_("All Files (*.*)\t*.*\nC source (*.c, *.h)\t*.c;*.h\nC++
source (*.cpp, *.hpp)\t*.cpp;*.hpp\nVB code (*.bas, *.frm)\t*.bas;*.frm\nVim
files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n")
# else
# define BROWSE_FILTER_MACROS \
! (char_u *)N_("Vim macro files (*.vim)\t*.vim\nAll Files (*)\t*\n")
! # define BROWSE_FILTER_ALL_FILES (char_u *)N_("All Files (*)\t*\n")
# define BROWSE_FILTER_DEFAULT \
! (char_u *)N_("All Files (*)\t*\nC source (*.c, *.h)\t*.c;*.h\nC++
source (*.cpp, *.hpp)\t*.cpp;*.hpp\nVim files (*.vim, _vimrc,
_gvimrc)\t*.vim;_vimrc;_gvimrc\n")
# endif
# define BROWSE_SAVE 1 /* flag for do_browse() */
# define BROWSE_DIR 2 /* flag for do_browse() */
*** ../vim-8.0.1772/src/version.c 2018-04-28 21:56:40.622297037 +0200
--- src/version.c 2018-04-29 12:12:18.103672961 +0200
***************
*** 763,764 ****
--- 763,766 ----
{ /* Add new patch number below this line */
+ /**/
+ 1773,
/**/
--
GALAHAD hurries to the door and pushes through it. As he leaves the room
we CUT TO the reverse to show that he is now in a room full of bathing
and romping GIRLIES, all innocent, wide-eyed and beautiful. They smile
enchantingly at him as he tries to keep walking without being diverted by
the lovely sights assaulting his eyeballs.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// 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.
