IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.1716: options window has duplicate translations

Browse Source 
Problem:    Options window has duplicate translations.
Solution:   Make one entry for "global or local to buffer".  Fix wrong text.
            (closes vim/vim#6983)

b5cfff0b34

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq 2022-10-28 23:15:44 +08:00
parent fc6afdcf53
commit 3c0ad25854
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
runtime/optwin.vim
View File

@ -71,7 +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 = '(global or 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
@ -256,7 +256,7 @@ call <SID>OptionG("para", &para)
call <SID>AddOption("sections", gettext("nroff macro names that separate sections"))
call <SID>OptionG("sect", &sect)
call <SID>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 <SID>OptionG("pa", &pa)
call <SID>AddOption("cdhome", gettext(":cd without argument goes to the home directory"))
call <SID>BinOptionG("cdh", &cdh)
@ -283,7 +283,7 @@ call <SID>OptionG("cmp", &cmp)
call <SID>AddOption("maxmempattern", gettext("maximum amount of memory in Kbyte used for pattern matching"))
call append("$", " \tset mmp=" . &mmp)
call <SID>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 <SID>OptionG("def", &def)
if has("find_in_path")
call <SID>AddOption("include", gettext("pattern for an include-file line"))
@ -301,10 +301,10 @@ call <SID>BinOptionG("tbs", &tbs)
call <SID>AddOption("taglength", gettext("number of significant characters in a tag name or zero"))
call append("$", " \tset tl=" . &tl)
call <SID>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 <SID>OptionG("tag", &tag)
call <SID>AddOption("tagcase", gettext("how to handle case when searching in tags files:\n\"followic\" to follow 'ignorecase', \"ignore\" or \"match\""))
call append("$", gettext("\t(global or local to buffer)"))
call append("$", "\t" .. s:global_or_local)
call <SID>OptionG("tc", &tc)
call <SID>AddOption("tagrelative", gettext("file names in a tags file are relative to the tags file"))
call <SID>BinOptionG("tr", &tr)
@ -709,7 +709,7 @@ call <SID>OptionG("km", &km)
call <SID>Header(gettext("editing text"))
call <SID>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 <SID>AddOption("undofile", gettext("automatically save and restore undo history"))
call <SID>BinOptionG("udf", &udf)
@ -765,10 +765,10 @@ if has("insert_expand")
call append("$", "\t" .. s:local_to_buffer)
call <SID>OptionL("ofu")
call <SID>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 <SID>OptionG("dict", &dict)
call <SID>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 <SID>OptionG("tsr", &tsr)
call <SID>AddOption("thesaurusfunc", gettext("function used for thesaurus completion"))
call append("$", "\t" .. s:global_or_local)
@ -976,7 +976,7 @@ call <SID>BinOptionG("bk", &bk)
call <SID>AddOption("backupskip", gettext("patterns that specify for which files a backup is not made"))
call append("$", " \tset bsk=" . &bsk)
call <SID>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 <SID>AddOption("backupdir", gettext("list of directories to put backup files in"))
call <SID>OptionG("bdir", &bdir)
@ -989,7 +989,7 @@ call <SID>BinOptionG("awa", &awa)
call <SID>AddOption("writeany", gettext("always write without asking for confirmation"))
call <SID>BinOptionG("wa", &wa)
call <SID>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 <SID>BinOptionG("ar", &ar)
call <SID>AddOption("patchmode", gettext("keep oldest version of a file; specifies file name extension"))
call <SID>OptionG("pm", &pm)
@ -1063,7 +1063,7 @@ call <SID>OptionG("srr", &srr)
call <SID>AddOption("shelltemp", gettext("use a temp file for shell commands instead of using a pipe"))
call <SID>BinOptionG("stmp", &stmp)
call <SID>AddOption("equalprg", gettext("program used for \"=\" command"))
call append("$", gettext("\t(global or local to buffer)"))
call append("$", "\t" .. s:global_or_local)
call <SID>OptionG("ep", &ep)
call <SID>AddOption("formatprg", gettext("program used to format lines with \"gq\" command"))
call <SID>OptionG("fp", &fp)
@ -1078,22 +1078,22 @@ if has("quickfix")
call <SID>AddOption("errorfile", gettext("name of the file that contains error messages"))
call <SID>OptionG("ef", &ef)
call <SID>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 <SID>OptionG("efm", &efm)
call <SID>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 <SID>OptionG("mp", &mp)
call <SID>AddOption("shellpipe", gettext("string used to put the output of \":make\" in the error file"))
call <SID>OptionG("sp", &sp)
call <SID>AddOption("makeef", gettext("name of the errorfile for the 'makeprg' command"))
call <SID>OptionG("mef", &mef)
call <SID>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 <SID>OptionG("gp", &gp)
call <SID>AddOption("grepformat", gettext("list of formats for output of 'grepprg'"))
call <SID>OptionG("gfm", &gfm)
call <SID>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 <SID>OptionG("menc", &menc)
endif
@ -1276,9 +1276,9 @@ if has("syntax")
endif
endif
if exists("&mzschemedll")
call <SID>AddOption("mzschemedll", gettext("name of the Tcl dynamic library"))
call <SID>AddOption("mzschemedll", gettext("name of the MzScheme dynamic library"))
call <SID>OptionG("mzschemedll", &mzschemedll)
call <SID>AddOption("mzschemegcdll", gettext("name of the Tcl GC dynamic library"))
call <SID>AddOption("mzschemegcdll", gettext("name of the MzScheme GC dynamic library"))
call <SID>OptionG("mzschemegcdll", &mzschemegcdll)
endif
if has('pythonx')