Mercurial > vim
comparison runtime/optwin.vim @ 22335:8e535ffc8a38 v8.2.1716
patch 8.2.1716: options window has duplicate translations
Commit: https://github.com/vim/vim/commit/b5cfff0b34d1be87f7d0458e4b9addd71c5d5b1d
Author: Bram Moolenaar <Bram@vim.org>
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)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 20 Sep 2020 21:45:04 +0200 |
parents | 222f8e19ed01 |
children | 5b7ea82bc18f |
comparison
equal
deleted
inserted
replaced
22334:83341966da76 | 22335:8e535ffc8a38 |
---|---|
69 endif | 69 endif |
70 endfunc | 70 endfunc |
71 | 71 |
72 let s:local_to_window = gettext('(local to window)') | 72 let s:local_to_window = gettext('(local to window)') |
73 let s:local_to_buffer = gettext('(local to buffer)') | 73 let s:local_to_buffer = gettext('(local to buffer)') |
74 let s:global_or_local = gettext('(global or local to buffer)') | |
74 | 75 |
75 " find the window in which the option applies | 76 " find the window in which the option applies |
76 " returns 0 for global option, 1 for local option, -1 for error | 77 " returns 0 for global option, 1 for local option, -1 for error |
77 func <SID>Find(lnum) | 78 func <SID>Find(lnum) |
78 let line = getline(a:lnum - 1) | 79 let line = getline(a:lnum - 1) |
255 call <SID>AddOption("paragraphs", gettext("nroff macro names that separate paragraphs")) | 256 call <SID>AddOption("paragraphs", gettext("nroff macro names that separate paragraphs")) |
256 call <SID>OptionG("para", ¶) | 257 call <SID>OptionG("para", ¶) |
257 call <SID>AddOption("sections", gettext("nroff macro names that separate sections")) | 258 call <SID>AddOption("sections", gettext("nroff macro names that separate sections")) |
258 call <SID>OptionG("sect", §) | 259 call <SID>OptionG("sect", §) |
259 call <SID>AddOption("path", gettext("list of directory names used for file searching")) | 260 call <SID>AddOption("path", gettext("list of directory names used for file searching")) |
260 call append("$", gettext("\t(global or local to buffer)")) | 261 call append("$", "\t" .. s:global_or_local) |
261 call <SID>OptionG("pa", &pa) | 262 call <SID>OptionG("pa", &pa) |
262 call <SID>AddOption("cdpath", gettext("list of directory names used for :cd")) | 263 call <SID>AddOption("cdpath", gettext("list of directory names used for :cd")) |
263 call <SID>OptionG("cd", &cd) | 264 call <SID>OptionG("cd", &cd) |
264 if exists("+autochdir") | 265 if exists("+autochdir") |
265 call <SID>AddOption("autochdir", gettext("change to directory of file in buffer")) | 266 call <SID>AddOption("autochdir", gettext("change to directory of file in buffer")) |
280 call <SID>AddOption("casemap", gettext("what method to use for changing case of letters")) | 281 call <SID>AddOption("casemap", gettext("what method to use for changing case of letters")) |
281 call <SID>OptionG("cmp", &cmp) | 282 call <SID>OptionG("cmp", &cmp) |
282 call <SID>AddOption("maxmempattern", gettext("maximum amount of memory in Kbyte used for pattern matching")) | 283 call <SID>AddOption("maxmempattern", gettext("maximum amount of memory in Kbyte used for pattern matching")) |
283 call append("$", " \tset mmp=" . &mmp) | 284 call append("$", " \tset mmp=" . &mmp) |
284 call <SID>AddOption("define", gettext("pattern for a macro definition line")) | 285 call <SID>AddOption("define", gettext("pattern for a macro definition line")) |
285 call append("$", gettext("\t(global or local to buffer)")) | 286 call append("$", "\t" .. s:global_or_local) |
286 call <SID>OptionG("def", &def) | 287 call <SID>OptionG("def", &def) |
287 if has("find_in_path") | 288 if has("find_in_path") |
288 call <SID>AddOption("include", gettext("pattern for an include-file line")) | 289 call <SID>AddOption("include", gettext("pattern for an include-file line")) |
289 call append("$", "\t" .. s:local_to_buffer) | 290 call append("$", "\t" .. s:local_to_buffer) |
290 call <SID>OptionL("inc") | 291 call <SID>OptionL("inc") |
298 call <SID>AddOption("tagbsearch", gettext("use binary searching in tags files")) | 299 call <SID>AddOption("tagbsearch", gettext("use binary searching in tags files")) |
299 call <SID>BinOptionG("tbs", &tbs) | 300 call <SID>BinOptionG("tbs", &tbs) |
300 call <SID>AddOption("taglength", gettext("number of significant characters in a tag name or zero")) | 301 call <SID>AddOption("taglength", gettext("number of significant characters in a tag name or zero")) |
301 call append("$", " \tset tl=" . &tl) | 302 call append("$", " \tset tl=" . &tl) |
302 call <SID>AddOption("tags", gettext("list of file names to search for tags")) | 303 call <SID>AddOption("tags", gettext("list of file names to search for tags")) |
303 call append("$", gettext("\t(global or local to buffer)")) | 304 call append("$", "\t" .. s:global_or_local) |
304 call <SID>OptionG("tag", &tag) | 305 call <SID>OptionG("tag", &tag) |
305 call <SID>AddOption("tagcase", gettext("how to handle case when searching in tags files:\n\"followic\" to follow 'ignorecase', \"ignore\" or \"match\"")) | 306 call <SID>AddOption("tagcase", gettext("how to handle case when searching in tags files:\n\"followic\" to follow 'ignorecase', \"ignore\" or \"match\"")) |
306 call append("$", "\t(global or local to buffer)") | 307 call append("$", "\t" .. s:global_or_local) |
307 call <SID>OptionG("tc", &tc) | 308 call <SID>OptionG("tc", &tc) |
308 call <SID>AddOption("tagrelative", gettext("file names in a tags file are relative to the tags file")) | 309 call <SID>AddOption("tagrelative", gettext("file names in a tags file are relative to the tags file")) |
309 call <SID>BinOptionG("tr", &tr) | 310 call <SID>BinOptionG("tr", &tr) |
310 call <SID>AddOption("tagstack", gettext("a :tag command will use the tagstack")) | 311 call <SID>AddOption("tagstack", gettext("a :tag command will use the tagstack")) |
311 call <SID>BinOptionG("tgst", &tgst) | 312 call <SID>BinOptionG("tgst", &tgst) |
774 call <SID>OptionG("km", &km) | 775 call <SID>OptionG("km", &km) |
775 | 776 |
776 | 777 |
777 call <SID>Header(gettext("editing text")) | 778 call <SID>Header(gettext("editing text")) |
778 call <SID>AddOption("undolevels", gettext("maximum number of changes that can be undone")) | 779 call <SID>AddOption("undolevels", gettext("maximum number of changes that can be undone")) |
779 call append("$", gettext("\t(global or local to buffer)")) | 780 call append("$", "\t" .. s:global_or_local) |
780 call append("$", " \tset ul=" . s:old_ul) | 781 call append("$", " \tset ul=" . s:old_ul) |
781 call <SID>AddOption("undofile", gettext("automatically save and restore undo history")) | 782 call <SID>AddOption("undofile", gettext("automatically save and restore undo history")) |
782 call <SID>BinOptionG("udf", &udf) | 783 call <SID>BinOptionG("udf", &udf) |
783 call <SID>AddOption("undodir", gettext("list of directories for undo files")) | 784 call <SID>AddOption("undodir", gettext("list of directories for undo files")) |
784 call <SID>OptionG("udir", &udir) | 785 call <SID>OptionG("udir", &udir) |
834 call <SID>OptionL("cfu") | 835 call <SID>OptionL("cfu") |
835 call <SID>AddOption("omnifunc", gettext("function for filetype-specific Insert mode completion")) | 836 call <SID>AddOption("omnifunc", gettext("function for filetype-specific Insert mode completion")) |
836 call append("$", "\t" .. s:local_to_buffer) | 837 call append("$", "\t" .. s:local_to_buffer) |
837 call <SID>OptionL("ofu") | 838 call <SID>OptionL("ofu") |
838 call <SID>AddOption("dictionary", gettext("list of dictionary files for keyword completion")) | 839 call <SID>AddOption("dictionary", gettext("list of dictionary files for keyword completion")) |
839 call append("$", gettext("\t(global or local to buffer)")) | 840 call append("$", "\t" .. s:global_or_local) |
840 call <SID>OptionG("dict", &dict) | 841 call <SID>OptionG("dict", &dict) |
841 call <SID>AddOption("thesaurus", gettext("list of thesaurus files for keyword completion")) | 842 call <SID>AddOption("thesaurus", gettext("list of thesaurus files for keyword completion")) |
842 call append("$", gettext("\t(global or local to buffer)")) | 843 call append("$", "\t" .. s:global_or_local) |
843 call <SID>OptionG("tsr", &tsr) | 844 call <SID>OptionG("tsr", &tsr) |
844 endif | 845 endif |
845 call <SID>AddOption("infercase", gettext("adjust case of a keyword completion match")) | 846 call <SID>AddOption("infercase", gettext("adjust case of a keyword completion match")) |
846 call append("$", "\t" .. s:local_to_buffer) | 847 call append("$", "\t" .. s:local_to_buffer) |
847 call <SID>BinOptionL("inf") | 848 call <SID>BinOptionL("inf") |
1044 call <SID>AddOption("backup", gettext("keep a backup after overwriting a file")) | 1045 call <SID>AddOption("backup", gettext("keep a backup after overwriting a file")) |
1045 call <SID>BinOptionG("bk", &bk) | 1046 call <SID>BinOptionG("bk", &bk) |
1046 call <SID>AddOption("backupskip", gettext("patterns that specify for which files a backup is not made")) | 1047 call <SID>AddOption("backupskip", gettext("patterns that specify for which files a backup is not made")) |
1047 call append("$", " \tset bsk=" . &bsk) | 1048 call append("$", " \tset bsk=" . &bsk) |
1048 call <SID>AddOption("backupcopy", gettext("whether to make the backup as a copy or rename the existing file")) | 1049 call <SID>AddOption("backupcopy", gettext("whether to make the backup as a copy or rename the existing file")) |
1049 call append("$", gettext("\t(global or local to buffer)")) | 1050 call append("$", "\t" .. s:global_or_local) |
1050 call append("$", " \tset bkc=" . &bkc) | 1051 call append("$", " \tset bkc=" . &bkc) |
1051 call <SID>AddOption("backupdir", gettext("list of directories to put backup files in")) | 1052 call <SID>AddOption("backupdir", gettext("list of directories to put backup files in")) |
1052 call <SID>OptionG("bdir", &bdir) | 1053 call <SID>OptionG("bdir", &bdir) |
1053 call <SID>AddOption("backupext", gettext("file name extension for the backup file")) | 1054 call <SID>AddOption("backupext", gettext("file name extension for the backup file")) |
1054 call <SID>OptionG("bex", &bex) | 1055 call <SID>OptionG("bex", &bex) |
1057 call <SID>AddOption("autowriteall", gettext("as 'autowrite', but works with more commands")) | 1058 call <SID>AddOption("autowriteall", gettext("as 'autowrite', but works with more commands")) |
1058 call <SID>BinOptionG("awa", &awa) | 1059 call <SID>BinOptionG("awa", &awa) |
1059 call <SID>AddOption("writeany", gettext("always write without asking for confirmation")) | 1060 call <SID>AddOption("writeany", gettext("always write without asking for confirmation")) |
1060 call <SID>BinOptionG("wa", &wa) | 1061 call <SID>BinOptionG("wa", &wa) |
1061 call <SID>AddOption("autoread", gettext("automatically read a file when it was modified outside of Vim")) | 1062 call <SID>AddOption("autoread", gettext("automatically read a file when it was modified outside of Vim")) |
1062 call append("$", gettext("\t(global or local to buffer)")) | 1063 call append("$", "\t" .. s:global_or_local) |
1063 call <SID>BinOptionG("ar", &ar) | 1064 call <SID>BinOptionG("ar", &ar) |
1064 call <SID>AddOption("patchmode", gettext("keep oldest version of a file; specifies file name extension")) | 1065 call <SID>AddOption("patchmode", gettext("keep oldest version of a file; specifies file name extension")) |
1065 call <SID>OptionG("pm", &pm) | 1066 call <SID>OptionG("pm", &pm) |
1066 call <SID>AddOption("fsync", gettext("forcibly sync the file to disk after writing it")) | 1067 call <SID>AddOption("fsync", gettext("forcibly sync the file to disk after writing it")) |
1067 call <SID>BinOptionG("fs", &fs) | 1068 call <SID>BinOptionG("fs", &fs) |
1147 call <SID>AddOption("shellredir", gettext("used to redirect command output to a file")) | 1148 call <SID>AddOption("shellredir", gettext("used to redirect command output to a file")) |
1148 call <SID>OptionG("srr", &srr) | 1149 call <SID>OptionG("srr", &srr) |
1149 call <SID>AddOption("shelltemp", gettext("use a temp file for shell commands instead of using a pipe")) | 1150 call <SID>AddOption("shelltemp", gettext("use a temp file for shell commands instead of using a pipe")) |
1150 call <SID>BinOptionG("stmp", &stmp) | 1151 call <SID>BinOptionG("stmp", &stmp) |
1151 call <SID>AddOption("equalprg", gettext("program used for \"=\" command")) | 1152 call <SID>AddOption("equalprg", gettext("program used for \"=\" command")) |
1152 call append("$", gettext("\t(global or local to buffer)")) | 1153 call append("$", "\t" .. s:global_or_local) |
1153 call <SID>OptionG("ep", &ep) | 1154 call <SID>OptionG("ep", &ep) |
1154 call <SID>AddOption("formatprg", gettext("program used to format lines with \"gq\" command")) | 1155 call <SID>AddOption("formatprg", gettext("program used to format lines with \"gq\" command")) |
1155 call <SID>OptionG("fp", &fp) | 1156 call <SID>OptionG("fp", &fp) |
1156 call <SID>AddOption("keywordprg", gettext("program used for the \"K\" command")) | 1157 call <SID>AddOption("keywordprg", gettext("program used for the \"K\" command")) |
1157 call <SID>OptionG("kp", &kp) | 1158 call <SID>OptionG("kp", &kp) |
1162 if has("quickfix") | 1163 if has("quickfix") |
1163 call <SID>Header(gettext("running make and jumping to errors (quickfix)")) | 1164 call <SID>Header(gettext("running make and jumping to errors (quickfix)")) |
1164 call <SID>AddOption("errorfile", gettext("name of the file that contains error messages")) | 1165 call <SID>AddOption("errorfile", gettext("name of the file that contains error messages")) |
1165 call <SID>OptionG("ef", &ef) | 1166 call <SID>OptionG("ef", &ef) |
1166 call <SID>AddOption("errorformat", gettext("list of formats for error messages")) | 1167 call <SID>AddOption("errorformat", gettext("list of formats for error messages")) |
1167 call append("$", gettext("\t(global or local to buffer)")) | 1168 call append("$", "\t" .. s:global_or_local) |
1168 call <SID>OptionG("efm", &efm) | 1169 call <SID>OptionG("efm", &efm) |
1169 call <SID>AddOption("makeprg", gettext("program used for the \":make\" command")) | 1170 call <SID>AddOption("makeprg", gettext("program used for the \":make\" command")) |
1170 call append("$", gettext("\t(global or local to buffer)")) | 1171 call append("$", "\t" .. s:global_or_local) |
1171 call <SID>OptionG("mp", &mp) | 1172 call <SID>OptionG("mp", &mp) |
1172 call <SID>AddOption("shellpipe", gettext("string used to put the output of \":make\" in the error file")) | 1173 call <SID>AddOption("shellpipe", gettext("string used to put the output of \":make\" in the error file")) |
1173 call <SID>OptionG("sp", &sp) | 1174 call <SID>OptionG("sp", &sp) |
1174 call <SID>AddOption("makeef", gettext("name of the errorfile for the 'makeprg' command")) | 1175 call <SID>AddOption("makeef", gettext("name of the errorfile for the 'makeprg' command")) |
1175 call <SID>OptionG("mef", &mef) | 1176 call <SID>OptionG("mef", &mef) |
1176 call <SID>AddOption("grepprg", gettext("program used for the \":grep\" command")) | 1177 call <SID>AddOption("grepprg", gettext("program used for the \":grep\" command")) |
1177 call append("$", gettext("\t(global or local to buffer)")) | 1178 call append("$", "\t" .. s:global_or_local) |
1178 call <SID>OptionG("gp", &gp) | 1179 call <SID>OptionG("gp", &gp) |
1179 call <SID>AddOption("grepformat", gettext("list of formats for output of 'grepprg'")) | 1180 call <SID>AddOption("grepformat", gettext("list of formats for output of 'grepprg'")) |
1180 call <SID>OptionG("gfm", &gfm) | 1181 call <SID>OptionG("gfm", &gfm) |
1181 call <SID>AddOption("makeencoding", gettext("encoding of the \":make\" and \":grep\" output")) | 1182 call <SID>AddOption("makeencoding", gettext("encoding of the \":make\" and \":grep\" output")) |
1182 call append("$", gettext("\t(global or local to buffer)")) | 1183 call append("$", "\t" .. s:global_or_local) |
1183 call <SID>OptionG("menc", &menc) | 1184 call <SID>OptionG("menc", &menc) |
1184 call <SID>AddOption("quickfixtextfunc", gettext("function to display text in the quickfix window")) | 1185 call <SID>AddOption("quickfixtextfunc", gettext("function to display text in the quickfix window")) |
1185 call <SID>OptionG("qftf", &qftf) | 1186 call <SID>OptionG("qftf", &qftf) |
1186 endif | 1187 endif |
1187 | 1188 |
1402 if exists("&tcldll") | 1403 if exists("&tcldll") |
1403 call <SID>AddOption("tcldll", gettext("name of the Tcl dynamic library")) | 1404 call <SID>AddOption("tcldll", gettext("name of the Tcl dynamic library")) |
1404 call <SID>OptionG("tcldll", &tcldll) | 1405 call <SID>OptionG("tcldll", &tcldll) |
1405 endif | 1406 endif |
1406 if exists("&mzschemedll") | 1407 if exists("&mzschemedll") |
1407 call <SID>AddOption("mzschemedll", gettext("name of the Tcl dynamic library")) | 1408 call <SID>AddOption("mzschemedll", gettext("name of the MzScheme dynamic library")) |
1408 call <SID>OptionG("mzschemedll", &mzschemedll) | 1409 call <SID>OptionG("mzschemedll", &mzschemedll) |
1409 call <SID>AddOption("mzschemegcdll", gettext("name of the Tcl GC dynamic library")) | 1410 call <SID>AddOption("mzschemegcdll", gettext("name of the MzScheme GC dynamic library")) |
1410 call <SID>OptionG("mzschemegcdll", &mzschemegcdll) | 1411 call <SID>OptionG("mzschemegcdll", &mzschemegcdll) |
1411 endif | 1412 endif |
1412 | 1413 |
1413 set cpo&vim | 1414 set cpo&vim |
1414 | 1415 |