diff --git a/.gitignore b/.gitignore index c1726ede14..163140c6e1 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ compile_commands.json # Generated by scripts/vim-patch.sh /.vim-src +*.rej # Generated by old (Vim) tests. /src/nvim/testdir/del diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index 3bae4db57d..203165845e 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -442,6 +442,9 @@ This edits the same file again with 'fileformat' set to "unix". > :w ++enc=latin1 newfile This writes the current buffer to "newfile" in latin1 format. +The message given when writing a file will show "[converted]" when +'fileencoding' or the value specified with ++enc differs from 'encoding'. + There may be several ++opt arguments, separated by white space. They must all appear before any |+cmd| argument. @@ -1040,9 +1043,9 @@ The names can be in upper- or lowercase. *:q* *:quit* :q[uit] Quit the current window. Quit Vim if this is the last - window. This fails when changes have been made and - Vim refuses to |abandon| the current buffer, and when - the last file in the argument list has not been + |edit-window|. This fails when changes have been made + and Vim refuses to |abandon| the current buffer, and + when the last file in the argument list has not been edited. If there are other tab pages and quitting the last window in the current tab page the current tab page is @@ -1067,18 +1070,22 @@ The names can be in upper- or lowercase. code. See |:cq|. *:wq* -:wq [++opt] Write the current file and quit. Writing fails when - the file is read-only or the buffer does not have a - name. Quitting fails when the last file in the - argument list has not been edited. +:wq [++opt] Write the current file and close the window. If this + was the last |edit-window| Vim quits. + Writing fails when the file is read-only or the buffer + does not have a name. Quitting fails when the last + file in the argument list has not been edited. -:wq! [++opt] Write the current file and quit. Writing fails when - the current buffer does not have a name. +:wq! [++opt] Write the current file and close the window. If this + was the last |edit-window| Vim quits. Writing fails + when the current buffer does not have a name. -:wq [++opt] {file} Write to {file} and quit. Quitting fails when the +:wq [++opt] {file} Write to {file} and close the window. If this was the + last |edit-window| Vim quits. Quitting fails when the last file in the argument list has not been edited. -:wq! [++opt] {file} Write to {file} and quit. +:wq! [++opt] {file} Write to {file} and close the current window. Quit + Vim if this was the last |edit-window|. :[range]wq[!] [++opt] [file] Same as above, but only write the lines in [range]. @@ -1095,10 +1102,10 @@ The names can be in upper- or lowercase. Same as :xit. *ZZ* -ZZ Write current file, if modified, and quit (same as - ":x"). (Note: If there are several windows for the - current file, the file is written if it was modified - and the window is closed). +ZZ Write current file, if modified, and close the current + window (same as ":x"). + If there are several windows for the current file, + only the current window is closed. *ZQ* ZQ Quit without checking for changes (same as ":q!"). diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index cc8545862f..47a39926d4 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -353,8 +353,8 @@ tag char note action in Normal mode ~ register x] |Y| ["x]Y yank N lines [into register x]; synonym for "yy" -|ZZ| ZZ store current file if modified, and exit -|ZQ| ZQ exit current file always +|ZZ| ZZ write if buffer changed and close window +|ZQ| ZQ close window without writing |[| [{char} square bracket command (see |[| below) \ not used |]| ]{char} square bracket command (see |]| below) @@ -1676,7 +1676,7 @@ tag command action ~ |:wqall| :wqa[ll] write all changed buffers and quit Vim |:wshada| :wsh[ada] write to ShaDa file |:wundo| :wu[ndo] write undo information to a file -|:xit| :x[it] write if buffer changed and quit window or Vim +|:xit| :x[it] write if buffer changed and close window |:xall| :xa[ll] same as ":wqall" |:xmapclear| :xmapc[lear] remove all mappings for Visual mode |:xmap| :xm[ap] like ":map" but for Visual mode diff --git a/runtime/doc/recover.txt b/runtime/doc/recover.txt index 05b0071fd6..9a8caefb42 100644 --- a/runtime/doc/recover.txt +++ b/runtime/doc/recover.txt @@ -106,8 +106,9 @@ If you want to make sure that your changes are in the swap file use this command: *:pre* *:preserve* *E313* *E314* -:pre[serve] Write all text for all buffers into swap files. The - original file is no longer needed for recovery. +:pre[serve] Write all text for the current buffer into its swap + file. The original file is no longer needed for + recovery. This sets a flag in the current buffer. A Vim swap file can be recognized by the first six characters: "b0VIM ". After that comes the version number, e.g., "3.0". diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt index f3a1b6c7af..654714177d 100644 --- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -269,8 +269,9 @@ CTRL-W CTRL-Q *CTRL-W_CTRL-Q* Without {count}: Quit the current window. If {count} is given quit the {count} window - When quitting the last window (not counting a help window), - exit Vim. + *edit-window* + When quitting the last edit window (not counting help or + preview windows), exit Vim. When 'hidden' is set, and there is only one window for the current buffer, it becomes hidden. When 'hidden' is not set, @@ -287,8 +288,9 @@ CTRL-W CTRL-Q *CTRL-W_CTRL-Q* :+quit " quit the next window :+2quit " quit the second next window < - When closing a help window, Vim will try to restore the - previous window layout |:helpclose|. + When closing a help window, and this is not the only window, + Vim will try to restore the previous window layout, see + |:helpclose|. :q[uit]! :{count}q[uit]! @@ -309,9 +311,9 @@ CTRL-W c *CTRL-W_c* *:clo* *:close* [!] is used, the buffer becomes hidden (unless there is another window editing it). - When there is only one window in the current tab page and - there is another tab page, this closes the current tab page. - |tab-page|. + When there is only one |edit-window| in the current tab page + and there is another tab page, this closes the current tab + page. |tab-page|. This command fails when: *E444* - There is only one window on the screen. diff --git a/runtime/ftplugin/masm.vim b/runtime/ftplugin/masm.vim new file mode 100644 index 0000000000..235469ac32 --- /dev/null +++ b/runtime/ftplugin/masm.vim @@ -0,0 +1,19 @@ +" Vim filetype plugin file +" Language: Microsoft Macro Assembler (80x86) +" Maintainer: Wu Yongwei +" Last Change: 2020-05-09 23:02:05 +0800 + +if exists("b:did_ftplugin") + finish +endif +let b:did_ftplugin = 1 + +let s:cpo_save = &cpo +set cpo&vim + +let b:undo_ftplugin = "setl iskeyword<" + +setlocal iskeyword=@,48-57,_,36,60,62,63,@-@ + +let &cpo = s:cpo_save +unlet s:cpo_save diff --git a/runtime/indent/python.vim b/runtime/indent/python.vim index e53987a0de..f9236e63c7 100644 --- a/runtime/indent/python.vim +++ b/runtime/indent/python.vim @@ -28,6 +28,11 @@ set cpo&vim let s:maxoff = 50 " maximum number of lines to look backwards for () +" See if the specified line is already user-dedented from the expected value. +function s:Dedented(lnum, expected) + return indent(a:lnum) <= a:expected - shiftwidth() +endfunction + function GetPythonIndent(lnum) " If this line is explicitly joined: If the previous line was also joined, @@ -158,12 +163,12 @@ function GetPythonIndent(lnum) " If the previous line was a stop-execution statement... if getline(plnum) =~ '^\s*\(break\|continue\|raise\|return\|pass\)\>' " See if the user has already dedented - if indent(a:lnum) > indent(plnum) - shiftwidth() - " If not, recommend one dedent - return indent(plnum) - shiftwidth() + if s:Dedented(a:lnum, indent(plnum)) + " If so, trust the user + return -1 endif - " Otherwise, trust the user - return -1 + " If not, recommend one dedent + return indent(plnum) - shiftwidth() endif " If the current line begins with a keyword that lines up with "try" @@ -191,7 +196,7 @@ function GetPythonIndent(lnum) endif " Or the user has already dedented - if indent(a:lnum) <= plindent - shiftwidth() + if s:Dedented(a:lnum, plindent) return -1 endif @@ -203,7 +208,12 @@ function GetPythonIndent(lnum) " + c) " here if parlnum > 0 - return plindent + " ...unless the user has already dedented + if s:Dedented(a:lnum, plindent) + return -1 + else + return plindent + endif endif return -1 diff --git a/runtime/plugin/gzip.vim b/runtime/plugin/gzip.vim index ffc00f6fd6..7214488579 100644 --- a/runtime/plugin/gzip.vim +++ b/runtime/plugin/gzip.vim @@ -20,7 +20,7 @@ augroup gzip " " Set binary mode before reading the file. " Use "gzip -d", gunzip isn't always available. - autocmd BufReadPre,FileReadPre *.gz,*.bz2,*.Z,*.lzma,*.xz,*.lz,*.zst,*.br setlocal bin + autocmd BufReadPre,FileReadPre *.gz,*.bz2,*.Z,*.lzma,*.xz,*.lz,*.zst,*.br,*.lzo setlocal bin autocmd BufReadPost,FileReadPost *.gz call gzip#read("gzip -dn") autocmd BufReadPost,FileReadPost *.bz2 call gzip#read("bzip2 -d") autocmd BufReadPost,FileReadPost *.Z call gzip#read("uncompress") @@ -29,6 +29,7 @@ augroup gzip autocmd BufReadPost,FileReadPost *.lz call gzip#read("lzip -d") autocmd BufReadPost,FileReadPost *.zst call gzip#read("zstd -d --rm") autocmd BufReadPost,FileReadPost *.br call gzip#read("brotli -d --rm") + autocmd BufReadPost,FileReadPost *.lzo call gzip#read("lzop -d -U") autocmd BufWritePost,FileWritePost *.gz call gzip#write("gzip") autocmd BufWritePost,FileWritePost *.bz2 call gzip#write("bzip2") autocmd BufWritePost,FileWritePost *.Z call gzip#write("compress -f") @@ -37,6 +38,7 @@ augroup gzip autocmd BufWritePost,FileWritePost *.lz call gzip#write("lzip") autocmd BufWritePost,FileWritePost *.zst call gzip#write("zstd --rm") autocmd BufWritePost,FileWritePost *.br call gzip#write("brotli --rm") + autocmd BufWritePost,FileWritePost *.lzo call gzip#write("lzop -U") autocmd FileAppendPre *.gz call gzip#appre("gzip -dn") autocmd FileAppendPre *.bz2 call gzip#appre("bzip2 -d") autocmd FileAppendPre *.Z call gzip#appre("uncompress") @@ -45,6 +47,7 @@ augroup gzip autocmd FileAppendPre *.lz call gzip#appre("lzip -d") autocmd FileAppendPre *.zst call gzip#appre("zstd -d --rm") autocmd FileAppendPre *.br call gzip#appre("brotli -d --rm") + autocmd FileAppendPre *.lzo call gzip#appre("lzop -d -U") autocmd FileAppendPost *.gz call gzip#write("gzip") autocmd FileAppendPost *.bz2 call gzip#write("bzip2") autocmd FileAppendPost *.Z call gzip#write("compress -f") @@ -53,4 +56,5 @@ augroup gzip autocmd FileAppendPost *.lz call gzip#write("lzip") autocmd FileAppendPost *.zst call gzip#write("zstd --rm") autocmd FileAppendPost *.br call gzip#write("brotli --rm") + autocmd FileAppendPost *.lzo call gzip#write("lzop -U") augroup END diff --git a/runtime/syntax/gnuplot.vim b/runtime/syntax/gnuplot.vim index 7777cc9e46..9c98e67e58 100644 --- a/runtime/syntax/gnuplot.vim +++ b/runtime/syntax/gnuplot.vim @@ -3,7 +3,7 @@ " Maintainer: Josh Wainwright " Last Maintainer: Andrew Rasmussen andyras@users.sourceforge.net " Original Maintainer: John Hoelzel johnh51@users.sourceforge.net -" Last Change: 2015-08-25 +" Last Change: 2020 May 12 " Filenames: *.gnu *.plt *.gpi *.gih *.gp *.gnuplot scripts: #!*gnuplot " URL: http://www.vim.org/scripts/script.php?script_id=4873 " Original URL: http://johnh51.get.to/vim/syntax/gnuplot.vim @@ -479,7 +479,7 @@ syn keyword gnuplotKeyword terminal palette rgb rbg grb gbr brg bgr " ---- Macros ---- " -syn region gnuplotMacro start="@" end=" " +syn match gnuplotMacro "@[a-zA-Z0-9_]*" " ---- Todos ---- " diff --git a/runtime/syntax/masm.vim b/runtime/syntax/masm.vim index abee78b86d..c3b2a9bd63 100644 --- a/runtime/syntax/masm.vim +++ b/runtime/syntax/masm.vim @@ -2,7 +2,7 @@ " Language: Microsoft Macro Assembler (80x86) " Orig Author: Rob Brady " Maintainer: Wu Yongwei -" Last Change: 2020-05-07 17:04:10 +0800 +" Last Change: 2020-05-09 22:55:38 +0800 " Quit when a syntax file was already loaded if exists("b:current_syntax") @@ -12,7 +12,7 @@ endif let s:cpo_save = &cpo set cpo&vim -setlocal iskeyword=@,48-57,_,36,60,62,63,@-@ +syn iskeyword @,48-57,_,36,60,62,63,@-@ syn case ignore diff --git a/runtime/syntax/pamenv.vim b/runtime/syntax/pamenv.vim new file mode 100644 index 0000000000..90359daa61 --- /dev/null +++ b/runtime/syntax/pamenv.vim @@ -0,0 +1,28 @@ +" Vim syntax file +" Language: pam_env.conf(5) configuration file +" Latest Revision: 2020-05-10 + +if exists("b:current_syntax") + finish +endif + +syn keyword pamenvTodo contained TODO FIXME XXX NOTE +syn region pamenvComment start='^#' end='$' display oneline contains=pamenvTodo,@Spells + +syn match pamenvVars '^[A-Z_][A-Z_0-9]*' nextgroup=pamenvKeywords skipwhite + +syn keyword pamenvKeywords contained DEFAULT OVERRIDE nextgroup=pamenvVarEq + +syn match pamenvVarEq contained '=' nextgroup=pamenvValue,pamenvValueWithQuote + +syn match pamenvValue contained '[^ \t]*' skipwhite nextgroup=pamenvKeywords +syn region pamenvValueWithQuote contained start='"' end='"' skipwhite nextgroup=pamenvKeywords + +hi def link pamenvTodo Todo +hi def link pamenvComment Comment +hi def link pamenvKeywords Keyword +hi def link pamenvVars Identifier +hi def link pamenvValue String +hi def link pamenvValueWithQuote String + +let b:current_syntax = "pamenv" diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim index 0f4406d3e1..3a2a6e7b0e 100644 --- a/runtime/syntax/sh.vim +++ b/runtime/syntax/sh.vim @@ -2,8 +2,8 @@ " Language: shell (sh) Korn shell (ksh) bash (sh) " Maintainer: Charles E. Campbell " Previous Maintainer: Lennart Schultz -" Last Change: Oct 16, 2019 -" Version: 189 +" Last Change: Apr 14, 2020 +" Version: 190 " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH " For options and settings, please use: :help ft-sh-syntax " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr) @@ -357,19 +357,18 @@ elseif !exists("g:sh_no_error") syn region shExDoubleQuote matchGroup=Error start=+\$"+ skip=+\\\\\|\\.+ end=+"+ contains=shStringSpecial endif syn region shSingleQuote matchgroup=shQuote start=+'+ end=+'+ contains=@Spell nextgroup=shSpecialStart,shSpecialSQ -syn region shDoubleQuote matchgroup=shQuote start=+\%(\%(\\\\\)*\\\)\@\tSkriv alle indtastede kommandoer til filen " msgid "-x\t\t\tEdit encrypted files" msgstr "-x\t\t\tRediger krypterede filer" -msgid "-display \tConnect vim to this particular X-server" -msgstr "-display \tForbind vim til denne X-server" +msgid "-display \tConnect Vim to this particular X-server" +msgstr "-display \tForbind Vim til denne X-server" msgid "-X\t\t\tDo not connect to X server" msgstr "-X\t\t\tOpret ikke forbindelse til X-server" @@ -3203,11 +3200,11 @@ msgstr "" "\n" "Argumenter som genkendes af gvim (Athena-version):\n" -msgid "-display \tRun vim on " -msgstr "-display \tKør vim på " +msgid "-display \tRun Vim on " +msgstr "-display \tKør Vim på " -msgid "-iconic\t\tStart vim iconified" -msgstr "-iconic\t\tStart vim som ikon" +msgid "-iconic\t\tStart Vim iconified" +msgstr "-iconic\t\tStart Vim som ikon" msgid "-background \tUse for the background (also: -bg)" msgstr "-background \tBrug til baggrunden (også: -bg)" @@ -3253,8 +3250,8 @@ msgstr "" "\n" "Argumenter genkendt af gvim (GTK+-version):\n" -msgid "-display \tRun vim on (also: --display)" -msgstr "-display \tKør vim på (også: --display)" +msgid "-display \tRun Vim on (also: --display)" +msgstr "-display \tKør Vim på (også: --display)" msgid "--role \tSet a unique role to identify the main window" msgstr "--role \tSæt en unik rolle til at identificere hovedvinduet" @@ -6876,7 +6873,7 @@ msgid "list index out of range" msgstr "listeindeks udenfor område" #, c-format -msgid "internal error: failed to get vim list item %d" +msgid "internal error: failed to get Vim list item %d" msgstr "intern fejl: kunne ikke hente vim-listepunkt %d" msgid "slice step cannot be zero" @@ -6887,7 +6884,7 @@ msgid "attempt to assign sequence of size greater than %d to extended slice" msgstr "forsøg på at tildele sekvens som er større end %d til udvidet slice" #, c-format -msgid "internal error: no vim list item %d" +msgid "internal error: no Vim list item %d" msgstr "intern fejl: intet vim-listepunkt %d" msgid "internal error: not enough list items" @@ -6998,19 +6995,19 @@ msgstr "kunne ikke køre koden" msgid "E858: Eval did not return a valid python object" msgstr "E858: Eval returnerede ikke et gyldigt python-objekt" -msgid "E859: Failed to convert returned python object to vim value" +msgid "E859: Failed to convert returned python object to a Vim value" msgstr "E859: Kunne ikke konvertere returnerede python-objekt til vim-værdi" #, c-format -msgid "unable to convert %s to vim dictionary" +msgid "unable to convert %s to a Vim dictionary" msgstr "kan ikke konvertere %s til vim-ordbog" #, c-format -msgid "unable to convert %s to vim list" +msgid "unable to convert %s to a Vim list" msgstr "kan ikke konvertere %s til vim-liste" #, c-format -msgid "unable to convert %s to vim structure" +msgid "unable to convert %s to a Vim structure" msgstr "kan ikke konvertere %s til vim-struktur" msgid "internal error: NULL reference passed" diff --git a/src/nvim/po/eo.po b/src/nvim/po/eo.po index 554145f7a1..9c08e2b470 100644 --- a/src/nvim/po/eo.po +++ b/src/nvim/po/eo.po @@ -2659,9 +2659,6 @@ msgstr "nekonata vimOption" msgid "keyboard interrupt" msgstr "klavara interrompo" -msgid "vim error" -msgstr "eraro de Vim" - msgid "cannot create buffer/window command: object is being deleted" msgstr "ne eblas krei komandon de bufro/fenestro: objekto estas forviŝiĝanta" @@ -2986,7 +2983,7 @@ msgstr "" msgid "-x\t\t\tEdit encrypted files" msgstr "-x\t\t\tRedakti ĉifradan dosieron" -msgid "-display \tConnect vim to this particular X-server" +msgid "-display \tConnect Vim to this particular X-server" msgstr "-display \tKonekti Vim al tiu X-servilo" msgid "-X\t\t\tDo not connect to X server" @@ -3065,11 +3062,11 @@ msgstr "" "\n" "Argumentoj agnoskitaj de gvim (versio Athena):\n" -msgid "-display \tRun vim on " -msgstr "-display \tLanĉi vim sur " +msgid "-display \tRun Vim on " +msgstr "-display \tLanĉi Vim sur " -msgid "-iconic\t\tStart vim iconified" -msgstr "-iconic\t\tLanĉi vim piktograme" +msgid "-iconic\t\tStart Vim iconified" +msgstr "-iconic\t\tLanĉi Vim piktograme" msgid "-background \tUse for the background (also: -bg)" msgstr "-background \tUzi -n por la fona koloro (ankaŭ: -bg)" @@ -3117,7 +3114,7 @@ msgstr "" "\n" "Argumentoj agnoskitaj de gvim (versio GTK+):\n" -msgid "-display \tRun vim on (also: --display)" +msgid "-display \tRun Vim on (also: --display)" msgstr "-display \tLanĉi Vim sur tiu (ankaŭ: --display)" msgid "--role \tSet a unique role to identify the main window" @@ -6656,7 +6653,7 @@ msgid "list index out of range" msgstr "indekso de listo ekster limoj" #, c-format -msgid "internal error: failed to get vim list item %d" +msgid "internal error: failed to get Vim list item %d" msgstr "interna eraro: obteno de vim-a listero %d malsukcesis" msgid "slice step cannot be zero" @@ -6667,7 +6664,7 @@ msgid "attempt to assign sequence of size greater than %d to extended slice" msgstr "provis valorizi sekvencon kun pli ol %d eroj en etendita sekco" #, c-format -msgid "internal error: no vim list item %d" +msgid "internal error: no Vim list item %d" msgstr "interna eraro: neniu vim-a listero %d" msgid "internal error: not enough list items" @@ -6776,19 +6773,19 @@ msgstr "malsukcesis ruli la kodon" msgid "E858: Eval did not return a valid python object" msgstr "E858: Eval ne revenis kun valida python-objekto" -msgid "E859: Failed to convert returned python object to vim value" +msgid "E859: Failed to convert returned python object to a Vim value" msgstr "E859: Konverto de revena python-objekto al vim-valoro malsukcesis" #, c-format -msgid "unable to convert %s to vim dictionary" +msgid "unable to convert %s to a Vim dictionary" msgstr "ne povis konverti %s al vim-vortaro" #, c-format -msgid "unable to convert %s to vim list" +msgid "unable to convert %s to a Vim list" msgstr "ne povis konverti %s al vim-listo" #, c-format -msgid "unable to convert %s to vim structure" +msgid "unable to convert %s to a Vim structure" msgstr "ne povis konverti %s al vim-strukturo" msgid "internal error: NULL reference passed" diff --git a/src/nvim/po/fr.po b/src/nvim/po/fr.po index 79e70885a0..d1f9923fc5 100644 --- a/src/nvim/po/fr.po +++ b/src/nvim/po/fr.po @@ -2482,9 +2482,6 @@ msgstr "vimOption inconnue" msgid "keyboard interrupt" msgstr "interruption clavier" -msgid "vim error" -msgstr "erreur Vim" - msgid "cannot create buffer/window command: object is being deleted" msgstr "" "Impossible de crer commande de tampon/fentre : objet en cours d'effacement" @@ -2818,7 +2815,7 @@ msgstr "-W \t msgid "-x\t\t\tEdit encrypted files" msgstr "-x\t\t\tditer des fichiers chiffrs" -msgid "-display \tConnect vim to this particular X-server" +msgid "-display \tConnect Vim to this particular X-server" msgstr "-display \tConnecter Vim au serveur X spcifi" msgid "-X\t\t\tDo not connect to X server" @@ -2901,10 +2898,10 @@ msgstr "" "\n" "Arguments reconnus par gvim (version Athena) :\n" -msgid "-display \tRun vim on " +msgid "-display \tRun Vim on " msgstr "-display \tLancer Vim sur ce " -msgid "-iconic\t\tStart vim iconified" +msgid "-iconic\t\tStart Vim iconified" msgstr "-iconic\t\tIconifier Vim au dmarrage" msgid "-background \tUse for the background (also: -bg)" @@ -2954,7 +2951,7 @@ msgstr "" "\n" "Arguments reconnus par gvim (version GTK+) :\n" -msgid "-display \tRun vim on (also: --display)" +msgid "-display \tRun Vim on (also: --display)" msgstr "" "-display \tLancer Vim sur ce \t(galement : --display)" @@ -6734,7 +6731,7 @@ msgid "list index out of range" msgstr "index de liste hors limites" #, c-format -msgid "internal error: failed to get vim list item %d" +msgid "internal error: failed to get Vim list item %d" msgstr "erreur interne : accs un lment %d de liste a chou" msgid "slice step cannot be zero" @@ -6747,7 +6744,7 @@ msgstr "" "dcoupage en tranche tendu " #, c-format -msgid "internal error: no vim list item %d" +msgid "internal error: no Vim list item %d" msgstr "erreur interne : pas d'lment %d de liste vim" msgid "internal error: not enough list items" @@ -6858,19 +6855,19 @@ msgstr "ex msgid "E858: Eval did not return a valid python object" msgstr "E858: Eval n'a pas retourn un objet python valide" -msgid "E859: Failed to convert returned python object to vim value" +msgid "E859: Failed to convert returned python object to a Vim value" msgstr "E859: Conversion d'objet python une valeur de vim a chou" #, c-format -msgid "unable to convert %s to vim dictionary" +msgid "unable to convert %s to a Vim dictionary" msgstr "impossible de convertir %s un dictionnaire vim" #, c-format -msgid "unable to convert %s to vim list" +msgid "unable to convert %s to a Vim list" msgstr "impossible de convertir %s une liste de vim" #, c-format -msgid "unable to convert %s to vim structure" +msgid "unable to convert %s to a Vim structure" msgstr "impossible de convertir %s une structure de vim" msgid "internal error: NULL reference passed" diff --git a/src/nvim/po/ga.po b/src/nvim/po/ga.po index d2f8236994..7f71959902 100644 --- a/src/nvim/po/ga.po +++ b/src/nvim/po/ga.po @@ -2806,9 +2806,6 @@ msgstr "vimOption anaithnid" msgid "keyboard interrupt" msgstr "idirbhriseadh marchlir" -msgid "vim error" -msgstr "earrid vim" - msgid "cannot create buffer/window command: object is being deleted" msgstr "n fidir ord maolin/fuinneoige a chruth: rad scriosadh" @@ -3132,8 +3129,8 @@ msgstr "-W \tScr msgid "-x\t\t\tEdit encrypted files" msgstr "-x\t\t\tCuir comhaid chriptithe in eagar" -msgid "-display \tConnect vim to this particular X-server" -msgstr "-display \tNasc vim leis an bhfreastala-X seo" +msgid "-display \tConnect Vim to this particular X-server" +msgstr "-display \tNasc Vim leis an bhfreastala-X seo" msgid "-X\t\t\tDo not connect to X server" msgstr "-X\t\t\tN naisc leis an bhfreastala X" @@ -3215,11 +3212,11 @@ msgstr "" "\n" "Argint ar eolas do gvim (leagan Athena):\n" -msgid "-display \tRun vim on " -msgstr "-display \tRith vim ar " +msgid "-display \tRun Vim on " +msgstr "-display \tRith Vim ar " -msgid "-iconic\t\tStart vim iconified" -msgstr "-iconic\t\tTosaigh vim sa mhd oslaghdaithe" +msgid "-iconic\t\tStart Vim iconified" +msgstr "-iconic\t\tTosaigh Vim sa mhd oslaghdaithe" msgid "-background \tUse for the background (also: -bg)" msgstr "-background \tBain sid as don chlra (-bg fosta)" @@ -3270,8 +3267,8 @@ msgstr "" "\n" "Argint ar eolas do gvim (leagan GTK+):\n" -msgid "-display \tRun vim on (also: --display)" -msgstr "-display \tRith vim ar (fosta: --display)" +msgid "-display \tRun Vim on (also: --display)" +msgstr "-display \tRith Vim ar (fosta: --display)" msgid "--role \tSet a unique role to identify the main window" msgstr "--role \tSocraigh rl sainiil chun an phromhfhuinneog a aithint" @@ -6952,7 +6949,7 @@ msgstr "inn #. No more suitable format specifications in python-2.3 #, c-format -msgid "internal error: failed to get vim list item %d" +msgid "internal error: failed to get Vim list item %d" msgstr "earrid inmhenach: nl aon fhil ar mhr %d sa liosta vim" msgid "slice step cannot be zero" @@ -6963,7 +6960,7 @@ msgid "attempt to assign sequence of size greater than %d to extended slice" msgstr "iarracht ar sheicheamh nos m n %d a shannadh do shlisne fadaithe" #, c-format -msgid "internal error: no vim list item %d" +msgid "internal error: no Vim list item %d" msgstr "earrid inmhenach: nl aon mhr %d sa liosta vim" msgid "internal error: not enough list items" @@ -7072,19 +7069,19 @@ msgstr "n msgid "E858: Eval did not return a valid python object" msgstr "E858: N bhfuarthas rad bail python ar ais Eval" -msgid "E859: Failed to convert returned python object to vim value" +msgid "E859: Failed to convert returned python object to a Vim value" msgstr "E859: Norbh fhidir luach vim a dhanamh as an rad python" #, c-format -msgid "unable to convert %s to vim dictionary" +msgid "unable to convert %s to a Vim dictionary" msgstr "n fidir foclir vim a dhanamh as %s" #, c-format -msgid "unable to convert %s to vim list" +msgid "unable to convert %s to a Vim list" msgstr "n fidir liosta vim a dhanamh as %s" #, c-format -msgid "unable to convert %s to vim structure" +msgid "unable to convert %s to a Vim structure" msgstr "n fidir struchtr vim a dhanamh as %s" msgid "internal error: NULL reference passed" diff --git a/src/nvim/po/ja.euc-jp.po b/src/nvim/po/ja.euc-jp.po index e6d4e1cf3f..c4680c5054 100644 --- a/src/nvim/po/ja.euc-jp.po +++ b/src/nvim/po/ja.euc-jp.po @@ -2580,9 +2580,6 @@ msgstr "̤ msgid "keyboard interrupt" msgstr "ܡɳ" -msgid "vim error" -msgstr "vim 顼" - msgid "cannot create buffer/window command: object is being deleted" msgstr "" "Хåե/ɥޥɤǤޤ: ֥ȤõƤ" @@ -2903,7 +2900,7 @@ msgstr "-W \t msgid "-x\t\t\tEdit encrypted files" msgstr "-x\t\t\tŹ沽줿եԽ" -msgid "-display \tConnect vim to this particular X-server" +msgid "-display \tConnect Vim to this particular X-server" msgstr "-display \tvimꤷ X С³" msgid "-X\t\t\tDo not connect to X server" @@ -2978,10 +2975,10 @@ msgstr "" "\n" "gvimˤäƲᤵ(AthenaС):\n" -msgid "-display \tRun vim on " +msgid "-display \tRun Vim on " msgstr "-display \t vim¹Ԥ" -msgid "-iconic\t\tStart vim iconified" +msgid "-iconic\t\tStart Vim iconified" msgstr "-iconic\t\tǾ֤vimư" msgid "-background \tUse for the background (also: -bg)" @@ -3028,8 +3025,8 @@ msgstr "" "\n" "gvimˤäƲᤵ(GTK+С):\n" -msgid "-display \tRun vim on (also: --display)" -msgstr "-display \t vim¹Ԥ(Ʊ: --display)" +msgid "-display \tRun Vim on (also: --display)" +msgstr "-display \t Vim¹Ԥ(Ʊ: --display)" msgid "--role \tSet a unique role to identify the main window" msgstr "--role \tᥤ󥦥ɥ̤դ(role)ꤹ" @@ -6581,7 +6578,7 @@ msgid "list index out of range" msgstr "ꥹϰϳΥǥåǤ" #, c-format -msgid "internal error: failed to get vim list item %d" +msgid "internal error: failed to get Vim list item %d" msgstr "顼: vimΥꥹ %d μ˼Ԥޤ" msgid "slice step cannot be zero" @@ -6592,7 +6589,7 @@ msgid "attempt to assign sequence of size greater than %d to extended slice" msgstr "Ĺ %d γĥ饤ˡĹ饤Ƥ褦Ȥޤ" #, c-format -msgid "internal error: no vim list item %d" +msgid "internal error: no Vim list item %d" msgstr "顼: vimΥꥹ %d Ϥޤ" msgid "internal error: not enough list items" @@ -6701,19 +6698,19 @@ msgstr " msgid "E858: Eval did not return a valid python object" msgstr "E858: ɾͭpython֥Ȥ֤ޤǤ" -msgid "E859: Failed to convert returned python object to vim value" +msgid "E859: Failed to convert returned python object to a Vim value" msgstr "E859: ֤줿python֥ȤvimͤѴǤޤǤ" #, c-format -msgid "unable to convert %s to vim dictionary" +msgid "unable to convert %s to a Vim dictionary" msgstr "%s vimμ񷿤ѴǤޤ" #, c-format -msgid "unable to convert %s to vim list" +msgid "unable to convert %s to a Vim list" msgstr "%s vimΥꥹȤѴǤޤ" #, c-format -msgid "unable to convert %s to vim structure" +msgid "unable to convert %s to a Vim structure" msgstr "%s vimι¤ΤѴǤޤ" msgid "internal error: NULL reference passed" diff --git a/src/nvim/po/ja.po b/src/nvim/po/ja.po index 53921c0121..307e22f76d 100644 --- a/src/nvim/po/ja.po +++ b/src/nvim/po/ja.po @@ -2580,9 +2580,6 @@ msgstr "未知の vimOption です" msgid "keyboard interrupt" msgstr "キーボード割込み" -msgid "vim error" -msgstr "vim エラー" - msgid "cannot create buffer/window command: object is being deleted" msgstr "" "バッファ/ウィンドウ作成コマンドを作成できません: オブジェクトが消去されていま" @@ -2903,7 +2900,7 @@ msgstr "-W \t入力した全コマンドをファイル msgid "-x\t\t\tEdit encrypted files" msgstr "-x\t\t\t暗号化されたファイルを編集する" -msgid "-display \tConnect vim to this particular X-server" +msgid "-display \tConnect Vim to this particular X-server" msgstr "-display \tvimを指定した X サーバーに接続する" msgid "-X\t\t\tDo not connect to X server" @@ -2978,10 +2975,10 @@ msgstr "" "\n" "gvimによって解釈される引数(Athenaバージョン):\n" -msgid "-display \tRun vim on " +msgid "-display \tRun Vim on " msgstr "-display \t でvimを実行する" -msgid "-iconic\t\tStart vim iconified" +msgid "-iconic\t\tStart Vim iconified" msgstr "-iconic\t\t最小化した状態でvimを起動する" msgid "-background \tUse for the background (also: -bg)" @@ -3028,8 +3025,8 @@ msgstr "" "\n" "gvimによって解釈される引数(GTK+バージョン):\n" -msgid "-display \tRun vim on (also: --display)" -msgstr "-display \t でvimを実行する(同義: --display)" +msgid "-display \tRun Vim on (also: --display)" +msgstr "-display \t でVimを実行する(同義: --display)" msgid "--role \tSet a unique role to identify the main window" msgstr "--role \tメインウィンドウを識別する一意な役割(role)を設定する" @@ -6581,7 +6578,7 @@ msgid "list index out of range" msgstr "リスト範囲外のインデックスです" #, c-format -msgid "internal error: failed to get vim list item %d" +msgid "internal error: failed to get Vim list item %d" msgstr "内部エラー: vimのリスト要素 %d の取得に失敗しました" msgid "slice step cannot be zero" @@ -6592,7 +6589,7 @@ msgid "attempt to assign sequence of size greater than %d to extended slice" msgstr "長さ %d の拡張スライスに、より長いスライスを割り当てようとしました" #, c-format -msgid "internal error: no vim list item %d" +msgid "internal error: no Vim list item %d" msgstr "内部エラー: vimのリスト要素 %d はありません" msgid "internal error: not enough list items" @@ -6701,19 +6698,19 @@ msgstr "コードの実行に失敗しました" msgid "E858: Eval did not return a valid python object" msgstr "E858: 式評価は有効なpythonオブジェクトを返しませんでした" -msgid "E859: Failed to convert returned python object to vim value" +msgid "E859: Failed to convert returned python object to a Vim value" msgstr "E859: 返されたpythonオブジェクトをvimの値に変換できませんでした" #, c-format -msgid "unable to convert %s to vim dictionary" +msgid "unable to convert %s to a Vim dictionary" msgstr "%s vimの辞書型に変換できません" #, c-format -msgid "unable to convert %s to vim list" +msgid "unable to convert %s to a Vim list" msgstr "%s をvimのリストに変換できません" #, c-format -msgid "unable to convert %s to vim structure" +msgid "unable to convert %s to a Vim structure" msgstr "%s をvimの構造体に変換できません" msgid "internal error: NULL reference passed" diff --git a/src/nvim/po/sr.po b/src/nvim/po/sr.po index 95bdd37510..4a9941ae3e 100644 --- a/src/nvim/po/sr.po +++ b/src/nvim/po/sr.po @@ -3008,9 +3008,6 @@ msgstr "непозната vimОпција" msgid "keyboard interrupt" msgstr "прекид тастатуре" -msgid "vim error" -msgstr "vim грешка" - msgid "cannot create buffer/window command: object is being deleted" msgstr "бафер/прозор команда не може да се креира: објекат се брише" @@ -3558,11 +3555,11 @@ msgstr "" "\n" "Аргументи које препознаје gvim (Athena верзија):\n" -msgid "-display \tRun vim on " -msgstr "-display <дисплеј>\tПокрени vim на <дисплеј>" +msgid "-display \tRun Vim on " +msgstr "-display <дисплеј>\tПокрени Vim на <дисплеј>" -msgid "-iconic\t\tStart vim iconified" -msgstr "-iconic\t\tПокрени vim као икону" +msgid "-iconic\t\tStart Vim iconified" +msgstr "-iconic\t\tПокрени Vim као икону" msgid "-background \tUse for the background (also: -bg)" msgstr "-background <боја>\tКористи <боја> за позадину (такође: -bg)" @@ -3610,8 +3607,8 @@ msgstr "" "\n" "Аргументи које препознаје gvim (GTK+ верзија):\n" -msgid "-display \tRun vim on (also: --display)" -msgstr "-display <дисплеј>\tПокрени vim на <дисплеј> (такође: --display)" +msgid "-display \tRun Vim on (also: --display)" +msgstr "-display <дисплеј>\tПокрени Vim на <дисплеј> (такође: --display)" msgid "--role \tSet a unique role to identify the main window" msgstr "" @@ -7439,7 +7436,7 @@ msgid "list index out of range" msgstr "индекс листе је ван опсега" #, c-format -msgid "internal error: failed to get vim list item %d" +msgid "internal error: failed to get Vim list item %d" msgstr "интерна грешка: ставка %d vim листе није могла да се добије" msgid "slice step cannot be zero" @@ -7450,7 +7447,7 @@ msgid "attempt to assign sequence of size greater than %d to extended slice" msgstr "покушај доделе секвенце величине веће од %d како би се продужио slice" #, c-format -msgid "internal error: no vim list item %d" +msgid "internal error: no Vim list item %d" msgstr "интерна грешка: нема ставке %d у vim листи" msgid "internal error: not enough list items" @@ -7560,19 +7557,19 @@ msgstr "кôд није могао да се покрене" msgid "E858: Eval did not return a valid python object" msgstr "E858: Eval није вратио важећи python објекат" -msgid "E859: Failed to convert returned python object to vim value" +msgid "E859: Failed to convert returned python object to a Vim value" msgstr "E859: Конверзија враћеног python објекта у vim вредност није успела" #, c-format -msgid "unable to convert %s to vim dictionary" +msgid "unable to convert %s to a Vim dictionary" msgstr "%s не може да се конвертује у vim речник" #, c-format -msgid "unable to convert %s to vim list" +msgid "unable to convert %s to a Vim list" msgstr "%s не може да се конвертује у vim листу" #, c-format -msgid "unable to convert %s to vim structure" +msgid "unable to convert %s to a Vim structure" msgstr "%s не може да се конвертује у vim структуру" msgid "internal error: NULL reference passed" diff --git a/src/nvim/po/tr.po b/src/nvim/po/tr.po index 3f988b1ddb..04422fbd9c 100644 --- a/src/nvim/po/tr.po +++ b/src/nvim/po/tr.po @@ -2529,9 +2529,6 @@ msgstr "geçersiz vimOption" msgid "keyboard interrupt" msgstr "klavye araya girdi" -msgid "vim error" -msgstr "vim hatası" - msgid "cannot create buffer/window command: object is being deleted" msgstr "arabellek/pencere komutu oluşturulamadı: öge şu anda siliniyor" @@ -2991,7 +2988,7 @@ msgstr "-W \tGirilen tüm komutları dosyasına yaz" msgid "-x\t\t\tEdit encrypted files" msgstr "-x\t\t\tŞifrelenmiş dosyaları düzenle" -msgid "-display \tConnect vim to this particular X-server" +msgid "-display \tConnect Vim to this particular X-server" msgstr "-display \tVim'i bu belirtilen X sunucusuna bağla" msgid "-X\t\t\tDo not connect to X server" @@ -3069,10 +3066,10 @@ msgstr "" "\n" "gvim tarafından tanınan değişkenler (Athena sürümü):\n" -msgid "-display \tRun vim on " +msgid "-display \tRun Vim on " msgstr "-display \tVim'i 'da çalıştır" -msgid "-iconic\t\tStart vim iconified" +msgid "-iconic\t\tStart Vim iconified" msgstr "-iconic\t\tVim'i simge durumunda başlat" msgid "-background \tUse for the background (also: -bg)" @@ -3120,7 +3117,7 @@ msgstr "" "\n" "gvim tarafından tanınan değişkenler (GTK+ sürümü):\n" -msgid "-display \tRun vim on (also: --display)" +msgid "-display \tRun Vim on (also: --display)" msgstr "-display \tVim'i 'da çalıştır (veya: --display)" msgid "--role \tSet a unique role to identify the main window" @@ -7437,7 +7434,7 @@ msgid "list index out of range" msgstr "liste dizini erimin dışında" #, c-format -msgid "internal error: failed to get vim list item %d" +msgid "internal error: failed to get Vim list item %d" msgstr "iç hata: %d vim liste ögesi alınamadı" msgid "slice step cannot be zero" @@ -7448,7 +7445,7 @@ msgid "attempt to assign sequence of size greater than %d to extended slice" msgstr "genişletilmiş dilime %d boyuttan büyük bir sıralamayı atama denemesi" #, c-format -msgid "internal error: no vim list item %d" +msgid "internal error: no Vim list item %d" msgstr "iç hata: %d vim liste ögesi yok" msgid "internal error: not enough list items" @@ -7557,19 +7554,19 @@ msgstr "kod çalıştırılamadı" msgid "E858: Eval did not return a valid python object" msgstr "E858: Eval geçerli bir python nesnesi döndürmedi" -msgid "E859: Failed to convert returned python object to vim value" +msgid "E859: Failed to convert returned python object to a Vim value" msgstr "E859: Döndürülen python nesnesi vim değerine dönüştürülemedi" #, c-format -msgid "unable to convert %s to vim dictionary" +msgid "unable to convert %s to a Vim dictionary" msgstr "%s vim sözlüğüne dönüştürülemedi" #, c-format -msgid "unable to convert %s to vim list" +msgid "unable to convert %s to a Vim list" msgstr "%s vim listesine dönüştürülemedi" #, c-format -msgid "unable to convert %s to vim structure" +msgid "unable to convert %s to a Vim structure" msgstr "%s vim yapısına dönüştürülemedi" msgid "internal error: NULL reference passed"