diff options
author | Bram Moolenaar <Bram@vim.org> | 2018-04-29 12:22:56 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2018-04-29 12:22:56 +0200 |
commit | c36651b4b946333dce0a916326d821d2562cf39d (patch) | |
tree | 9bda30e7d6d0719595e66c123985c6d064fef793 /src | |
parent | 29ce409bfca52bb8a07e2975d06fd788458e9861 (diff) |
patch 8.0.1773: dialog messages are not translatedv8.0.1773
Problem: Dialog messages are not translated.
Solution: Add N_() and _() where needed. (Sergey Alyoshin)
Diffstat (limited to 'src')
-rw-r--r-- | src/diff.c | 3 | ||||
-rw-r--r-- | src/ex_cmds2.c | 3 | ||||
-rw-r--r-- | src/ex_docmd.c | 6 | ||||
-rw-r--r-- | src/message.c | 2 | ||||
-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 | 2 | ||||
-rw-r--r-- | src/po/Makefile | 4 | ||||
-rw-r--r-- | src/quickfix.c | 3 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/vim.h | 12 |
11 files changed, 26 insertions, 19 deletions
diff --git a/src/diff.c b/src/diff.c index b69b69e31d..cc9e6de8fd 100644 --- a/src/diff.c +++ b/src/diff.c @@ -909,7 +909,8 @@ ex_diffpatch(exarg_T *eap) if (cmdmod.browse) { browseFile = do_browse(0, (char_u *)_("Patch file"), - eap->arg, NULL, NULL, BROWSE_FILTER_ALL_FILES, NULL); + eap->arg, NULL, NULL, + (char_u *)_(BROWSE_FILTER_ALL_FILES), NULL); if (browseFile == NULL) return; /* operation cancelled */ eap->arg = browseFile; diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index 69283d693c..7fa4907bda 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -4140,7 +4140,8 @@ ex_source(exarg_T *eap) char_u *fname = NULL; fname = do_browse(0, (char_u *)_("Source Vim script"), eap->arg, - NULL, NULL, BROWSE_FILTER_MACROS, NULL); + NULL, NULL, + (char_u *)_(BROWSE_FILTER_MACROS), NULL); if (fname != NULL) { cmd_source(fname, eap); diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 29270ad488..66d2ad6d7b 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -9619,7 +9619,8 @@ ex_redir(exarg_T *eap) browseFile = do_browse(BROWSE_SAVE, (char_u *)_("Save Redirection"), - fname, NULL, NULL, BROWSE_FILTER_ALL_FILES, curbuf); + fname, NULL, NULL, + (char_u *)_(BROWSE_FILTER_ALL_FILES), curbuf); if (browseFile == NULL) return; /* operation cancelled */ vim_free(fname); @@ -9845,7 +9846,8 @@ ex_mkrc( eap->cmdidx == CMD_mksession ? (char_u *)_("Save Session") : # endif (char_u *)_("Save Setup"), - fname, (char_u *)"vim", NULL, BROWSE_FILTER_MACROS, NULL); + fname, (char_u *)"vim", NULL, + (char_u *)_(BROWSE_FILTER_MACROS), NULL); if (browseFile == NULL) goto theend; fname = browseFile; diff --git a/src/message.c b/src/message.c index 25c22f63e5..f9ae0e91f0 100644 --- a/src/message.c +++ b/src/message.c @@ -4057,7 +4057,7 @@ do_browse( } else fname = gui_mch_browse(flags & BROWSE_SAVE, - title, dflt, ext, initdir, filter); + 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 diff --git a/src/po/Make_cyg.mak b/src/po/Make_cyg.mak index 4ee21a1507..5f6f6cca35 100644 --- a/src/po/Make_cyg.mak +++ b/src/po/Make_cyg.mak @@ -130,11 +130,11 @@ all: $(MOFILES) 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 + --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 + --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) $@.po $@.po.orig $(MV) $@.po $@.po.old diff --git a/src/po/Make_ming.mak b/src/po/Make_ming.mak index 6973ad79c8..70b2c1efad 100644 --- a/src/po/Make_ming.mak +++ b/src/po/Make_ming.mak @@ -139,11 +139,11 @@ all: $(MOFILES) 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 + --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 + --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) $@.po $@.po.orig $(MV) $@.po $@.po.old diff --git a/src/po/Make_mvc.mak b/src/po/Make_mvc.mak index 0f0adebb6e..0748bdf06b 100644 --- a/src/po/Make_mvc.mak +++ b/src/po/Make_mvc.mak @@ -119,7 +119,7 @@ INSTALLDIR = $(VIMRUNTIME)\lang\$(LANGUAGE)\LC_MESSAGES all: $(MOFILES) files: - $(LS) $(LSFLAGS) ..\*.c ..\if_perl.xs ..\GvimExt\gvimext.cpp ..\globals.h ..\if_py_both.h > .\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 diff --git a/src/po/Makefile b/src/po/Makefile index fc78c43086..386cb64433 100644 --- a/src/po/Makefile +++ b/src/po/Makefile @@ -281,10 +281,10 @@ distclean: clean checkclean: rm -f *.ck -$(PACKAGE).pot: ../*.c ../if_perl.xs ../GvimExt/gvimext.cpp ../globals.h ../if_py_both.h +$(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 + *.c if_perl.xs GvimExt/gvimext.cpp globals.h if_py_both.h vim.h mv -f ../$(PACKAGE).po $(PACKAGE).pot update-po: $(LANGUAGES) diff --git a/src/quickfix.c b/src/quickfix.c index 19127027ff..acff1ec703 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -4115,7 +4115,8 @@ ex_cfile(exarg_T *eap) if (cmdmod.browse) { char_u *browse_file = do_browse(0, (char_u *)_("Error file"), eap->arg, - NULL, NULL, BROWSE_FILTER_ALL_FILES, NULL); + 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); diff --git a/src/version.c b/src/version.c index 40b5815b1f..5d75dabf57 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1773, +/**/ 1772, /**/ 1771, @@ -2186,16 +2186,16 @@ typedef enum { #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" + (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 *)"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" + (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 *)"Vim macro files (*.vim)\t*.vim\nAll Files (*)\t*\n" -# define BROWSE_FILTER_ALL_FILES (char_u *)"All Files (*)\t*\n" + (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 *)"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" + (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() */ |