Skip to content

Commit c36651b

Browse files
committed
patch 8.0.1773: dialog messages are not translated
Problem: Dialog messages are not translated. Solution: Add N_() and _() where needed. (Sergey Alyoshin)
1 parent 29ce409 commit c36651b

11 files changed

Lines changed: 26 additions & 19 deletions

File tree

‎src/diff.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,8 @@ ex_diffpatch(exarg_T *eap)
909909
if (cmdmod.browse)
910910
{
911911
browseFile = do_browse(0, (char_u *)_("Patch file"),
912-
eap->arg, NULL, NULL, BROWSE_FILTER_ALL_FILES, NULL);
912+
eap->arg, NULL, NULL,
913+
(char_u *)_(BROWSE_FILTER_ALL_FILES), NULL);
913914
if (browseFile == NULL)
914915
return; /* operation cancelled */
915916
eap->arg = browseFile;

‎src/ex_cmds2.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4140,7 +4140,8 @@ ex_source(exarg_T *eap)
41404140
char_u *fname = NULL;
41414141

41424142
fname = do_browse(0, (char_u *)_("Source Vim script"), eap->arg,
4143-
NULL, NULL, BROWSE_FILTER_MACROS, NULL);
4143+
NULL, NULL,
4144+
(char_u *)_(BROWSE_FILTER_MACROS), NULL);
41444145
if (fname != NULL)
41454146
{
41464147
cmd_source(fname, eap);

‎src/ex_docmd.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9619,7 +9619,8 @@ ex_redir(exarg_T *eap)
96199619

96209620
browseFile = do_browse(BROWSE_SAVE,
96219621
(char_u *)_("Save Redirection"),
9622-
fname, NULL, NULL, BROWSE_FILTER_ALL_FILES, curbuf);
9622+
fname, NULL, NULL,
9623+
(char_u *)_(BROWSE_FILTER_ALL_FILES), curbuf);
96239624
if (browseFile == NULL)
96249625
return; /* operation cancelled */
96259626
vim_free(fname);
@@ -9845,7 +9846,8 @@ ex_mkrc(
98459846
eap->cmdidx == CMD_mksession ? (char_u *)_("Save Session") :
98469847
# endif
98479848
(char_u *)_("Save Setup"),
9848-
fname, (char_u *)"vim", NULL, BROWSE_FILTER_MACROS, NULL);
9849+
fname, (char_u *)"vim", NULL,
9850+
(char_u *)_(BROWSE_FILTER_MACROS), NULL);
98499851
if (browseFile == NULL)
98509852
goto theend;
98519853
fname = browseFile;

‎src/message.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4057,7 +4057,7 @@ do_browse(
40574057
}
40584058
else
40594059
fname = gui_mch_browse(flags & BROWSE_SAVE,
4060-
title, dflt, ext, initdir, filter);
4060+
title, dflt, ext, initdir, (char_u *)_(filter));
40614061

40624062
/* We hang around in the dialog for a while, the user might do some
40634063
* things to our files. The Win32 dialog allows deleting or renaming

‎src/po/Make_cyg.mak‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,11 @@ all: $(MOFILES)
130130

131131
first_time:
132132
$(XGETTEXT) --default-domain=$(LANGUAGE) \
133-
--add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h
133+
--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
134134

135135
$(LANGUAGES):
136136
$(XGETTEXT) --default-domain=$(PACKAGE) \
137-
--add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h
137+
--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
138138
$(MV) $(PACKAGE).po $(PACKAGE).pot
139139
$(CP) $@.po $@.po.orig
140140
$(MV) $@.po $@.po.old

‎src/po/Make_ming.mak‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,11 @@ all: $(MOFILES)
139139

140140
first_time:
141141
$(XGETTEXT) --default-domain=$(LANGUAGE) \
142-
--add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h
142+
--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
143143

144144
$(LANGUAGES):
145145
$(XGETTEXT) --default-domain=$(PACKAGE) \
146-
--add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h
146+
--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
147147
$(MV) $(PACKAGE).po $(PACKAGE).pot
148148
$(CP) $@.po $@.po.orig
149149
$(MV) $@.po $@.po.old

‎src/po/Make_mvc.mak‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ INSTALLDIR = $(VIMRUNTIME)\lang\$(LANGUAGE)\LC_MESSAGES
119119
all: $(MOFILES)
120120

121121
files:
122-
$(LS) $(LSFLAGS) ..\*.c ..\if_perl.xs ..\GvimExt\gvimext.cpp ..\globals.h ..\if_py_both.h > .\files
122+
$(LS) $(LSFLAGS) ..\*.c ..\if_perl.xs ..\GvimExt\gvimext.cpp ..\globals.h ..\if_py_both.h ..\vim.h > .\files
123123

124124
first_time: files
125125
set OLD_PO_FILE_INPUT=yes

‎src/po/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,10 @@ distclean: clean
281281
checkclean:
282282
rm -f *.ck
283283

284-
$(PACKAGE).pot: ../*.c ../if_perl.xs ../GvimExt/gvimext.cpp ../globals.h ../if_py_both.h
284+
$(PACKAGE).pot: ../*.c ../if_perl.xs ../GvimExt/gvimext.cpp ../globals.h ../if_py_both.h ../vim.h
285285
cd ..; $(XGETTEXT) --default-domain=$(PACKAGE) \
286286
--add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 \
287-
*.c if_perl.xs GvimExt/gvimext.cpp globals.h if_py_both.h
287+
*.c if_perl.xs GvimExt/gvimext.cpp globals.h if_py_both.h vim.h
288288
mv -f ../$(PACKAGE).po $(PACKAGE).pot
289289

290290
update-po: $(LANGUAGES)

‎src/quickfix.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4115,7 +4115,8 @@ ex_cfile(exarg_T *eap)
41154115
if (cmdmod.browse)
41164116
{
41174117
char_u *browse_file = do_browse(0, (char_u *)_("Error file"), eap->arg,
4118-
NULL, NULL, BROWSE_FILTER_ALL_FILES, NULL);
4118+
NULL, NULL,
4119+
(char_u *)_(BROWSE_FILTER_ALL_FILES), NULL);
41194120
if (browse_file == NULL)
41204121
return;
41214122
set_string_option_direct((char_u *)"ef", -1, browse_file, OPT_FREE, 0);

‎src/version.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,8 @@ static char *(features[]) =
761761

762762
static int included_patches[] =
763763
{ /* Add new patch number below this line */
764+
/**/
765+
1773,
764766
/**/
765767
1772,
766768
/**/

0 commit comments

Comments
 (0)