# HG changeset patch # User Bram Moolenaar # Date 1600631104 -7200 # Node ID 8e535ffc8a38b0fb268fec77162647ead814795c # Parent 83341966da760febdc7ddde6a9c000761ea68938 patch 8.2.1716: options window has duplicate translations Commit: https://github.com/vim/vim/commit/b5cfff0b34d1be87f7d0458e4b9addd71c5d5b1d Author: Bram Moolenaar Date: Sun Sep 20 21:32:03 2020 +0200 patch 8.2.1716: options window has duplicate translations Problem: Options window has duplicate translations. Solution: Make one entry for "global or local to buffer". Fix wrong text. (closes #6983) diff --git a/runtime/optwin.vim b/runtime/optwin.vim --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -71,6 +71,7 @@ endfunc let s:local_to_window = gettext('(local to window)') let s:local_to_buffer = gettext('(local to buffer)') +let s:global_or_local = gettext('(global or local to buffer)') " find the window in which the option applies " returns 0 for global option, 1 for local option, -1 for error @@ -257,7 +258,7 @@ call OptionG("para", ¶) call AddOption("sections", gettext("nroff macro names that separate sections")) call OptionG("sect", §) call AddOption("path", gettext("list of directory names used for file searching")) -call append("$", gettext("\t(global or local to buffer)")) +call append("$", "\t" .. s:global_or_local) call OptionG("pa", &pa) call AddOption("cdpath", gettext("list of directory names used for :cd")) call OptionG("cd", &cd) @@ -282,7 +283,7 @@ call OptionG("cmp", &cmp) call AddOption("maxmempattern", gettext("maximum amount of memory in Kbyte used for pattern matching")) call append("$", " \tset mmp=" . &mmp) call AddOption("define", gettext("pattern for a macro definition line")) -call append("$", gettext("\t(global or local to buffer)")) +call append("$", "\t" .. s:global_or_local) call OptionG("def", &def) if has("find_in_path") call AddOption("include", gettext("pattern for an include-file line")) @@ -300,10 +301,10 @@ call BinOptionG("tbs", &tbs) call AddOption("taglength", gettext("number of significant characters in a tag name or zero")) call append("$", " \tset tl=" . &tl) call AddOption("tags", gettext("list of file names to search for tags")) -call append("$", gettext("\t(global or local to buffer)")) +call append("$", "\t" .. s:global_or_local) call OptionG("tag", &tag) call AddOption("tagcase", gettext("how to handle case when searching in tags files:\n\"followic\" to follow 'ignorecase', \"ignore\" or \"match\"")) -call append("$", "\t(global or local to buffer)") +call append("$", "\t" .. s:global_or_local) call OptionG("tc", &tc) call AddOption("tagrelative", gettext("file names in a tags file are relative to the tags file")) call BinOptionG("tr", &tr) @@ -776,7 +777,7 @@ call OptionG("km", &km) call Header(gettext("editing text")) call AddOption("undolevels", gettext("maximum number of changes that can be undone")) -call append("$", gettext("\t(global or local to buffer)")) +call append("$", "\t" .. s:global_or_local) call append("$", " \tset ul=" . s:old_ul) call AddOption("undofile", gettext("automatically save and restore undo history")) call BinOptionG("udf", &udf) @@ -836,10 +837,10 @@ if has("insert_expand") call append("$", "\t" .. s:local_to_buffer) call OptionL("ofu") call AddOption("dictionary", gettext("list of dictionary files for keyword completion")) - call append("$", gettext("\t(global or local to buffer)")) + call append("$", "\t" .. s:global_or_local) call OptionG("dict", &dict) call AddOption("thesaurus", gettext("list of thesaurus files for keyword completion")) - call append("$", gettext("\t(global or local to buffer)")) + call append("$", "\t" .. s:global_or_local) call OptionG("tsr", &tsr) endif call AddOption("infercase", gettext("adjust case of a keyword completion match")) @@ -1046,7 +1047,7 @@ call BinOptionG("bk", &bk) call AddOption("backupskip", gettext("patterns that specify for which files a backup is not made")) call append("$", " \tset bsk=" . &bsk) call AddOption("backupcopy", gettext("whether to make the backup as a copy or rename the existing file")) -call append("$", gettext("\t(global or local to buffer)")) +call append("$", "\t" .. s:global_or_local) call append("$", " \tset bkc=" . &bkc) call AddOption("backupdir", gettext("list of directories to put backup files in")) call OptionG("bdir", &bdir) @@ -1059,7 +1060,7 @@ call BinOptionG("awa", &awa) call AddOption("writeany", gettext("always write without asking for confirmation")) call BinOptionG("wa", &wa) call AddOption("autoread", gettext("automatically read a file when it was modified outside of Vim")) -call append("$", gettext("\t(global or local to buffer)")) +call append("$", "\t" .. s:global_or_local) call BinOptionG("ar", &ar) call AddOption("patchmode", gettext("keep oldest version of a file; specifies file name extension")) call OptionG("pm", &pm) @@ -1149,7 +1150,7 @@ call OptionG("srr", &srr) call AddOption("shelltemp", gettext("use a temp file for shell commands instead of using a pipe")) call BinOptionG("stmp", &stmp) call AddOption("equalprg", gettext("program used for \"=\" command")) -call append("$", gettext("\t(global or local to buffer)")) +call append("$", "\t" .. s:global_or_local) call OptionG("ep", &ep) call AddOption("formatprg", gettext("program used to format lines with \"gq\" command")) call OptionG("fp", &fp) @@ -1164,22 +1165,22 @@ if has("quickfix") call AddOption("errorfile", gettext("name of the file that contains error messages")) call OptionG("ef", &ef) call AddOption("errorformat", gettext("list of formats for error messages")) - call append("$", gettext("\t(global or local to buffer)")) + call append("$", "\t" .. s:global_or_local) call OptionG("efm", &efm) call AddOption("makeprg", gettext("program used for the \":make\" command")) - call append("$", gettext("\t(global or local to buffer)")) + call append("$", "\t" .. s:global_or_local) call OptionG("mp", &mp) call AddOption("shellpipe", gettext("string used to put the output of \":make\" in the error file")) call OptionG("sp", &sp) call AddOption("makeef", gettext("name of the errorfile for the 'makeprg' command")) call OptionG("mef", &mef) call AddOption("grepprg", gettext("program used for the \":grep\" command")) - call append("$", gettext("\t(global or local to buffer)")) + call append("$", "\t" .. s:global_or_local) call OptionG("gp", &gp) call AddOption("grepformat", gettext("list of formats for output of 'grepprg'")) call OptionG("gfm", &gfm) call AddOption("makeencoding", gettext("encoding of the \":make\" and \":grep\" output")) - call append("$", gettext("\t(global or local to buffer)")) + call append("$", "\t" .. s:global_or_local) call OptionG("menc", &menc) call AddOption("quickfixtextfunc", gettext("function to display text in the quickfix window")) call OptionG("qftf", &qftf) @@ -1404,9 +1405,9 @@ if exists("&tcldll") call OptionG("tcldll", &tcldll) endif if exists("&mzschemedll") - call AddOption("mzschemedll", gettext("name of the Tcl dynamic library")) + call AddOption("mzschemedll", gettext("name of the MzScheme dynamic library")) call OptionG("mzschemedll", &mzschemedll) - call AddOption("mzschemegcdll", gettext("name of the Tcl GC dynamic library")) + call AddOption("mzschemegcdll", gettext("name of the MzScheme GC dynamic library")) call OptionG("mzschemegcdll", &mzschemegcdll) endif diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1716, +/**/ 1715, /**/ 1714,