0
0
mirror of https://github.com/vim/vim.git synced 2025-07-04 23:07:33 -04:00

Update runtime files.

This commit is contained in:
Bram Moolenaar 2018-09-02 21:07:30 +02:00
parent acca8df9d4
commit 20aac6c112
19 changed files with 504 additions and 338 deletions

View File

@ -1,7 +1,7 @@
" Vim completion script " Vim completion script
" Language: C " Language: C
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2012 Jun 20 " Last Change: 2018 Aug 20
let s:cpo_save = &cpo let s:cpo_save = &cpo
set cpo&vim set cpo&vim
@ -72,8 +72,10 @@ function! ccomplete#Complete(findstart, base)
" Split item in words, keep empty word after "." or "->". " Split item in words, keep empty word after "." or "->".
" "aa" -> ['aa'], "aa." -> ['aa', ''], "aa.bb" -> ['aa', 'bb'], etc. " "aa" -> ['aa'], "aa." -> ['aa', ''], "aa.bb" -> ['aa', 'bb'], etc.
" We can't use split, because we need to skip nested [...]. " We can't use split, because we need to skip nested [...].
" "aa[...]" -> ['aa', '[...]'], "aa.bb[...]" -> ['aa', 'bb', '[...]'], etc.
let items = [] let items = []
let s = 0 let s = 0
let arrays = 0
while 1 while 1
let e = match(base, '\.\|->\|\[', s) let e = match(base, '\.\|->\|\[', s)
if e < 0 if e < 0
@ -107,6 +109,7 @@ function! ccomplete#Complete(findstart, base)
endwhile endwhile
let e += 1 let e += 1
call add(items, strpart(base, s, e - s)) call add(items, strpart(base, s, e - s))
let arrays += 1
let s = e let s = e
endif endif
endwhile endwhile
@ -161,15 +164,26 @@ function! ccomplete#Complete(findstart, base)
endif endif
endif endif
let res = [{'match': match, 'tagline' : '', 'kind' : kind, 'info' : line}] let res = [{'match': match, 'tagline' : '', 'kind' : kind, 'info' : line}]
elseif len(items) == arrays + 1
" Completing one word and it's a local array variable: build tagline
" from declaration line
let match = items[0]
let kind = 'v'
let tagline = "\t/^" . line . '$/'
let res = [{'match': match, 'tagline' : tagline, 'kind' : kind, 'info' : line}]
else else
" Completing "var.", "var.something", etc. " Completing "var.", "var.something", etc.
let res = s:Nextitem(strpart(line, 0, col), items[1:], 0, 1) let res = s:Nextitem(strpart(line, 0, col), items[1:], 0, 1)
endif endif
endif endif
if len(items) == 1 if len(items) == 1 || len(items) == arrays + 1
" Only one part, no "." or "->": complete from tags file. " Only one part, no "." or "->": complete from tags file.
let tags = taglist('^' . base) if len(items) == 1
let tags = taglist('^' . base)
else
let tags = taglist('^' . items[0] . '$')
endif
" Remove members, these can't appear without something in front. " Remove members, these can't appear without something in front.
call filter(tags, 'has_key(v:val, "kind") ? v:val["kind"] != "m" : 1') call filter(tags, 'has_key(v:val, "kind") ? v:val["kind"] != "m" : 1')
@ -516,11 +530,24 @@ function! s:StructMembers(typename, items, all)
endif endif
endif endif
" Skip over [...] items
let idx = 0
while 1
if idx >= len(a:items)
let target = '' " No further items, matching all members
break
endif
if a:items[idx][0] != '['
let target = a:items[idx]
break
endif
let idx += 1
endwhile
" Put matching members in matches[]. " Put matching members in matches[].
let matches = [] let matches = []
for l in qflist for l in qflist
let memb = matchstr(l['text'], '[^\t]*') let memb = matchstr(l['text'], '[^\t]*')
if memb =~ '^' . a:items[0] if memb =~ '^' . target
" Skip matches local to another file. " Skip matches local to another file.
if match(l['text'], "\tfile:") < 0 || bufnr('%') == bufnr(matchstr(l['text'], '\t\zs[^\t]*')) if match(l['text'], "\tfile:") < 0 || bufnr('%') == bufnr(matchstr(l['text'], '\t\zs[^\t]*'))
let item = {'match': memb, 'tagline': l['text']} let item = {'match': memb, 'tagline': l['text']}
@ -540,8 +567,8 @@ function! s:StructMembers(typename, items, all)
endfor endfor
if len(matches) > 0 if len(matches) > 0
" Skip over [...] items " Skip over next [...] items
let idx = 1 let idx += 1
while 1 while 1
if idx >= len(a:items) if idx >= len(a:items)
return matches " No further items, return the result. return matches " No further items, return the result.

View File

@ -632,7 +632,7 @@ endfunc
" Choose context, plaintex, or tex (LaTeX) based on these rules: " Choose context, plaintex, or tex (LaTeX) based on these rules:
" 1. Check the first line of the file for "%&<format>". " 1. Check the first line of the file for "%&<format>".
" 2. Check the first 1000 non-comment lines for LaTeX or ConTeXt keywords. " 2. Check the first 1000 non-comment lines for LaTeX or ConTeXt keywords.
" 3. Default to "latex" or to g:tex_flavor, can be set in user's vimrc. " 3. Default to "plain" or to g:tex_flavor, can be set in user's vimrc.
func dist#ft#FTtex() func dist#ft#FTtex()
let firstline = getline(1) let firstline = getline(1)
if firstline =~ '^%&\s*\a\+' if firstline =~ '^%&\s*\a\+'

View File

@ -152,13 +152,16 @@ fun! tar#Browse(tarfile)
" assuming cygwin " assuming cygwin
let tarfile=substitute(system("cygpath -u ".shellescape(tarfile,0)),'\n$','','e') let tarfile=substitute(system("cygpath -u ".shellescape(tarfile,0)),'\n$','','e')
endif endif
let gzip_command = s:get_gzip_command(tarfile)
let curlast= line("$") let curlast= line("$")
if tarfile =~# '\.\(gz\|tgz\)$' if tarfile =~# '\.\(gz\|tgz\)$'
" call Decho("1: exe silent r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ") " call Decho("1: exe silent r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - " exe "sil! r! " . gzip_command . " -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
elseif tarfile =~# '\.lrp' elseif tarfile =~# '\.lrp'
" call Decho("2: exe silent r! cat -- ".shellescape(tarfile,1)."|gzip -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - ") " call Decho("2: exe silent r! cat -- ".shellescape(tarfile,1)."|gzip -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - ")
exe "sil! r! cat -- ".shellescape(tarfile,1)."|gzip -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - " exe "sil! r! cat -- ".shellescape(tarfile,1)."|" . gzip_command . " -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - "
elseif tarfile =~# '\.\(bz2\|tbz\|tb2\)$' elseif tarfile =~# '\.\(bz2\|tbz\|tb2\)$'
" call Decho("3: exe silent r! bzip2 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ") " call Decho("3: exe silent r! bzip2 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - " exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
@ -287,15 +290,18 @@ fun! tar#Read(fname,mode)
else else
let tar_secure= " " let tar_secure= " "
endif endif
let gzip_command = s:get_gzip_command(tarfile)
if tarfile =~# '\.bz2$' if tarfile =~# '\.bz2$'
" call Decho("7: exe silent r! bzip2 -d -c ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp) " call Decho("7: exe silent r! bzip2 -d -c ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp)
exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
elseif tarfile =~# '\.\(gz\|tgz\)$' elseif tarfile =~# '\.\(gz\|tgz\)$'
" call Decho("5: exe silent r! gzip -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd.' -'.g:tar_readoptions.' - '.tar_secure.shellescape(fname,1)) " call Decho("5: exe silent r! gzip -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd.' -'.g:tar_readoptions.' - '.tar_secure.shellescape(fname,1))
exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp exe "sil! r! " . gzip_command . " -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
elseif tarfile =~# '\.lrp$' elseif tarfile =~# '\.lrp$'
" call Decho("6: exe silent r! cat ".shellescape(tarfile,1)." | gzip -d -c - | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp) " call Decho("6: exe silent r! cat ".shellescape(tarfile,1)." | gzip -d -c - | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp)
exe "sil! r! cat -- ".shellescape(tarfile,1)." | gzip -d -c - | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp exe "sil! r! cat -- ".shellescape(tarfile,1)." | " . gzip_command . " -d -c - | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
elseif tarfile =~# '\.lzma$' elseif tarfile =~# '\.lzma$'
" call Decho("7: exe silent r! lzma -d -c ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp) " call Decho("7: exe silent r! lzma -d -c ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp)
exe "sil! r! lzma -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp exe "sil! r! lzma -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
@ -389,6 +395,8 @@ fun! tar#Write(fname)
let tarfile = substitute(b:tarfile,'tarfile:\(.\{-}\)::.*$','\1','') let tarfile = substitute(b:tarfile,'tarfile:\(.\{-}\)::.*$','\1','')
let fname = substitute(b:tarfile,'tarfile:.\{-}::\(.*\)$','\1','') let fname = substitute(b:tarfile,'tarfile:.\{-}::\(.*\)$','\1','')
let gzip_command = s:get_gzip_command(tarfile)
" handle compressed archives " handle compressed archives
if tarfile =~# '\.bz2' if tarfile =~# '\.bz2'
call system("bzip2 -d -- ".shellescape(tarfile,0)) call system("bzip2 -d -- ".shellescape(tarfile,0))
@ -396,12 +404,12 @@ fun! tar#Write(fname)
let compress= "bzip2 -- ".shellescape(tarfile,0) let compress= "bzip2 -- ".shellescape(tarfile,0)
" call Decho("compress<".compress.">") " call Decho("compress<".compress.">")
elseif tarfile =~# '\.gz' elseif tarfile =~# '\.gz'
call system("gzip -d -- ".shellescape(tarfile,0)) call system(gzip_command . " -d -- ".shellescape(tarfile,0))
let tarfile = substitute(tarfile,'\.gz','','e') let tarfile = substitute(tarfile,'\.gz','','e')
let compress= "gzip -- ".shellescape(tarfile,0) let compress= "gzip -- ".shellescape(tarfile,0)
" call Decho("compress<".compress.">") " call Decho("compress<".compress.">")
elseif tarfile =~# '\.tgz' elseif tarfile =~# '\.tgz'
call system("gzip -d -- ".shellescape(tarfile,0)) call system(gzip_command . " -d -- ".shellescape(tarfile,0))
let tarfile = substitute(tarfile,'\.tgz','.tar','e') let tarfile = substitute(tarfile,'\.tgz','.tar','e')
let compress= "gzip -- ".shellescape(tarfile,0) let compress= "gzip -- ".shellescape(tarfile,0)
let tgz = 1 let tgz = 1
@ -581,7 +589,9 @@ fun! tar#Vimuntar(...)
" if necessary, decompress the tarball; then, extract it " if necessary, decompress the tarball; then, extract it
if tartail =~ '\.tgz' if tartail =~ '\.tgz'
if executable("gunzip") if executable("bzip2")
silent exe "!bzip2 -d ".shellescape(tartail)
elseif executable("gunzip")
silent exe "!gunzip ".shellescape(tartail) silent exe "!gunzip ".shellescape(tartail)
elseif executable("gzip") elseif executable("gzip")
silent exe "!gzip -d ".shellescape(tartail) silent exe "!gzip -d ".shellescape(tartail)
@ -619,6 +629,15 @@ fun! tar#Vimuntar(...)
" call Dret("tar#Vimuntar") " call Dret("tar#Vimuntar")
endfun endfun
func s:get_gzip_command(file)
if a:file =~# 'z$' && executable('bzip2')
" Some .tgz files are actually compressed with bzip2. Since bzip2 can
" handle the format from gzip, use it if the command exists.
return 'bzip2'
endif
return 'gzip'
endfunc
" ===================================================================== " =====================================================================
" Modelines And Restoration: {{{1 " Modelines And Restoration: {{{1
let &cpo= s:keepcpo let &cpo= s:keepcpo

View File

@ -0,0 +1,37 @@
" Vim compiler file
" Compiler: Haskell Stack
" Maintainer: Daniel Campoverde <alx@sillybytes.net>
" Latest Revision: 2018-08-27
if exists("current_compiler")
finish
endif
let current_compiler = "stack"
let s:cpo_save = &cpo
set cpo&vim
CompilerSet errorformat=
\%-G%.%#:\ build\ %.%#,
\%-G%.%#:\ configure\ %.%#,
\%-G[%.%#]%.%#,
\%-G%.%#preprocessing\ %.%#,
\%-G%.%#configuring\ %.%#,
\%-G%.%#building\ %.%#,
\%-G%.%#linking\ %.%#,
\%-G%.%#installing\ %.%#,
\%-G%.%#registering\ %.%#,
\%-G%.%#:\ copy/register%.%#,
\%-G%.%#process\ exited\ %.%#,
\%-G%.%#--builddir=%.%#,
\%-G--%.%#,
\%-G%.%#\|%.%#,
\%E%f:%l:%c:\ error:,%+Z\ \ \ \ %m,
\%E%f:%l:%c:\ error:\ %m,%-Z,
\%W%f:%l:%c:\ warning:,%+Z\ \ \ \ %m,
\%W%f:%l:%c:\ warning:\ %m,%-Z,
let &cpo = s:cpo_save
unlet s:cpo_save

View File

@ -8013,7 +8013,7 @@ substitute({expr}, {pat}, {sub}, {flags}) *substitute()*
|submatch()| returns. Example: > |submatch()| returns. Example: >
:echo substitute(s, '%\(\x\x\)', {m -> '0x' . m[1]}, 'g') :echo substitute(s, '%\(\x\x\)', {m -> '0x' . m[1]}, 'g')
swapinfo({fname}) swapinfo() swapinfo({fname}) *swapinfo()*
The result is a dictionary, which holds information about the The result is a dictionary, which holds information about the
swapfile {fname}. The available fields are: swapfile {fname}. The available fields are:
version VIM version version VIM version

View File

@ -376,8 +376,8 @@ you might have to use the file ~/.gtkrc-2.0 instead, depending on your
distribution. distribution.
For GTK+ 3, an effect similar to the above can be obtained by adding the For GTK+ 3, an effect similar to the above can be obtained by adding the
following snippet of CSS code to $XDG_HOME_DIR/gtk-3.0/gtk.css (usually, following snippet of CSS code to $XDG_HOME_DIR/gtk-3.0/gtk.css (see the next
$HOME/.config/gtk-3.0/gtk.css): section):
For GTK+ 3 < 3.20: > For GTK+ 3 < 3.20: >
@ -408,6 +408,10 @@ stable support for GTK+ CSS:
GTK+ uses CSS for styling and layout of widgets. In this subsection, we'll GTK+ uses CSS for styling and layout of widgets. In this subsection, we'll
have a quick look at GTK+ CSS through simple, illustrative examples. have a quick look at GTK+ CSS through simple, illustrative examples.
You can usually edit the config with: >
vim $HOME/.config/gtk-3.0/gtk.css
Example 1. Empty Space Adjustment ~ Example 1. Empty Space Adjustment ~
By default, the toolbar and the tabline of the GTK+ 3 GUI are somewhat larger By default, the toolbar and the tabline of the GTK+ 3 GUI are somewhat larger
@ -492,6 +496,16 @@ unexpectedly less attractive or even deteriorates their usability. Keep this
in mind always when you try improving a theme. in mind always when you try improving a theme.
Example 3. border color
To eliminate borders when maximized: >
@define-color bg_color #1B2B34;
#vim-main-window {
background-color: @bg_color;
}
Using Vim as a GTK+ plugin ~ Using Vim as a GTK+ plugin ~
*gui-gtk-socketid* *gui-gtk-socketid*
When the GTK+ version of Vim starts up normally, it creates its own top level When the GTK+ version of Vim starts up normally, it creates its own top level

View File

@ -81,6 +81,18 @@ Examples:
> >
:pydo return "%s\t%d" % (line[::-1], len(line)) :pydo return "%s\t%d" % (line[::-1], len(line))
:pydo if line: return "%4d: %s" % (linenr, line) :pydo if line: return "%4d: %s" % (linenr, line)
<
One can use `:pydo` in possible conjunction with `:py` to filter a range using
python. For example: >
:py3 << EOF
needle = vim.eval('@a')
replacement = vim.eval('@b')
def py_vim_string_replace(str):
return str.replace(needle, replacement)
EOF
:'<,'>py3do return py_vim_string_replace(line)
< <
*:pyfile* *:pyf* *:pyfile* *:pyf*
:[range]pyf[ile] {file} :[range]pyf[ile] {file}

View File

@ -846,6 +846,8 @@ A jump table for the options with a short description can be found at |Q_op|.
'{A-Z0-9}, or `{A-Z0-9} command takes one to another file. '{A-Z0-9}, or `{A-Z0-9} command takes one to another file.
Note that for some commands the 'autowrite' option is not used, see Note that for some commands the 'autowrite' option is not used, see
'autowriteall' for that. 'autowriteall' for that.
Some buffers will not be written, specifically when 'buttype' is
"nowrite", "nofile", "terminal" or "prompt".
*'autowriteall'* *'awa'* *'noautowriteall'* *'noawa'* *'autowriteall'* *'awa'* *'noautowriteall'* *'noawa'*
'autowriteall' 'awa' boolean (default off) 'autowriteall' 'awa' boolean (default off)

View File

@ -5408,6 +5408,7 @@ catch-order eval.txt /*catch-order*
catch-text eval.txt /*catch-text* catch-text eval.txt /*catch-text*
cc change.txt /*cc* cc change.txt /*cc*
ceil() eval.txt /*ceil()* ceil() eval.txt /*ceil()*
cfilter-plugin quickfix.txt /*cfilter-plugin*
ch.vim syntax.txt /*ch.vim* ch.vim syntax.txt /*ch.vim*
ch_canread() eval.txt /*ch_canread()* ch_canread() eval.txt /*ch_canread()*
ch_close() eval.txt /*ch_close()* ch_close() eval.txt /*ch_close()*
@ -8659,6 +8660,7 @@ swap-file recover.txt /*swap-file*
swapchoice-variable eval.txt /*swapchoice-variable* swapchoice-variable eval.txt /*swapchoice-variable*
swapcommand-variable eval.txt /*swapcommand-variable* swapcommand-variable eval.txt /*swapcommand-variable*
swapfile-changed version4.txt /*swapfile-changed* swapfile-changed version4.txt /*swapfile-changed*
swapinfo() eval.txt /*swapinfo()*
swapname-variable eval.txt /*swapname-variable* swapname-variable eval.txt /*swapname-variable*
sybase ft_sql.txt /*sybase* sybase ft_sql.txt /*sybase*
syn-sync-grouphere syntax.txt /*syn-sync-grouphere* syn-sync-grouphere syntax.txt /*syn-sync-grouphere*
@ -9639,6 +9641,7 @@ windows98 os_win32.txt /*windows98*
windowsme os_win32.txt /*windowsme* windowsme os_win32.txt /*windowsme*
winheight() eval.txt /*winheight()* winheight() eval.txt /*winheight()*
winid windows.txt /*winid* winid windows.txt /*winid*
winlayout() eval.txt /*winlayout()*
winline() eval.txt /*winline()* winline() eval.txt /*winline()*
winnr() eval.txt /*winnr()* winnr() eval.txt /*winnr()*
winrestcmd() eval.txt /*winrestcmd()* winrestcmd() eval.txt /*winrestcmd()*

View File

@ -43,6 +43,7 @@ browser use: https://github.com/vim/vim/issues/1234
- :s/foo using CTRL-G moves to another line, should not happen, or use the - :s/foo using CTRL-G moves to another line, should not happen, or use the
correct line (it uses the last but one line) (Lifepillar, Aug 18, #3345) correct line (it uses the last but one line) (Lifepillar, Aug 18, #3345)
- Also support range: :/foo/,/bar/delete - Also support range: :/foo/,/bar/delete
- Also support for user command, e.g. Cfilter
- :%s/foo should take the first match below the cursor line, unless there - :%s/foo should take the first match below the cursor line, unless there
isn't one? isn't one?
Then :%s?foo should take the first match above the cursor line. Then :%s?foo should take the first match above the cursor line.
@ -109,27 +110,12 @@ Improve fallback for menu translations, to avoid having to create lots of
files that source the actual file. E.g. menu_da_de -> menu_da files that source the actual file. E.g. menu_da_de -> menu_da
Include part of #3242? Include part of #3242?
Using ":file" in quickfix window during an autocommand doesn't work.
(Jason Franklin, 2018 May 23) Allow for using it when there is no argument.
Patch should now work. (Jason Franklin, 2018 Aug 12)
Include Chinese-Taiwan translations. (bystar, #3261)
Screendump test fails even though characters are the same.
Some attribute difference that isn't included in the screenshot?
(Elimar Riesebieter, 2018 Aug 21)
Completion mixes results from the current buffer with tags and other files. Completion mixes results from the current buffer with tags and other files.
Happens when typing CTRL-N while still search for results. E.g., type "b_" in Happens when typing CTRL-N while still search for results. E.g., type "b_" in
terminal.c and then CTRL-N twice. terminal.c and then CTRL-N twice.
Should do current file first and not split it up when more results are found. Should do current file first and not split it up when more results are found.
(Also #1890) (Also #1890)
Patch to support VTP better. (Nobuhiro Takasaki, 2018 Aug 19, #3347)
Patch with improvement for ccomplete: #3350
Try it out. Perhaps write a test?
More warnings from static analysis: More warnings from static analysis:
https://lgtm.com/projects/g/vim/vim/alerts/?mode=list https://lgtm.com/projects/g/vim/vim/alerts/?mode=list
@ -195,8 +181,22 @@ Adjust windows installer explanation of behavior. (scootergrisen, #3310)
Set g:actual_curbuf when evaluating 'statusline', not just with an expression. Set g:actual_curbuf when evaluating 'statusline', not just with an expression.
(Daniel Hahler, 2018 Aug 8, #3299) (Daniel Hahler, 2018 Aug 8, #3299)
Using an external diff is inefficient. Not all systems have a good diff
program available (esp. MS-Windows). Would be nice to have in internal diff
implementation. Can then also use this for displaying changes within a line.
Olaf Dabrunz is working on this. (10 Jan 2016)
9 Instead invoking an external diff program, use builtin code. One can be
found here: http://www.ioplex.com/~miallen/libmba/dl/src/diff.c
It's complicated and badly documented.
Alternative: use the xdiff library. Unfinished Patch from Christian Brabandt,
2018 Mar 20, #2732)
Difference between two regexp engines: #3373 Difference between two regexp engines: #3373
Patch to add arguments to argc() and argv(). (Yegappan Lakshmanan, 2016 Jan
24, #832) Also need a way to get the global arg list? Update later on Jan 24
Update Mar 5. Update Apr 7. Update Jun 5.
When the last line wraps, selecting with the mouse below that line only When the last line wraps, selecting with the mouse below that line only
includes the first screen line. (2018 Aug 23, #3368) includes the first screen line. (2018 Aug 23, #3368)
@ -245,6 +245,9 @@ balloon_show() does not work properly in the terminal. (Ben Jackson, 2017 Dec
Also see #2352, want better control over balloon, perhaps set the position. Also see #2352, want better control over balloon, perhaps set the position.
Should also be possible to add highlighting, like in the status line? Should also be possible to add highlighting, like in the status line?
Patch to fix that executable() may fail on very long filename in MS-Windows.
(Ken Takata, 2016 Feb 1)
Try out background make plugin: Try out background make plugin:
https://github.com/AndrewVos/vim-make-background https://github.com/AndrewVos/vim-make-background
or asyncmake: or asyncmake:
@ -430,16 +433,6 @@ CTRL-X on zero gets stuck on 0xfffffffffffffffe. (Hengyang Zhao, #2746)
Invalid range error when using BufWinLeave for closing terminal. Invalid range error when using BufWinLeave for closing terminal.
(Gabriel Barta, 2017 Nov 15, #2339) (Gabriel Barta, 2017 Nov 15, #2339)
Using an external diff is inefficient. Not all systems have a good diff
program available (esp. MS-Windows). Would be nice to have in internal diff
implementation. Can then also use this for displaying changes within a line.
Olaf Dabrunz is working on this. (10 Jan 2016)
9 Instead invoking an external diff program, use builtin code. One can be
found here: http://www.ioplex.com/~miallen/libmba/dl/src/diff.c
It's complicated and badly documented.
Alternative: use the xdiff library. Unfinished Patch from Christian Brabandt,
2018 Mar 20, #2732)
ml_get errors with buggy script. (Dominique, 2017 Apr 30) ml_get errors with buggy script. (Dominique, 2017 Apr 30)
Error in emsg with buggy script. (Dominique, 2017 Apr 30) Error in emsg with buggy script. (Dominique, 2017 Apr 30)
@ -1128,9 +1121,6 @@ Patch to add <restore> to :windo, :bufdo, etc. (Christian Brabandt, 2015 Jan
6, 2nd message) 6, 2nd message)
Alternative: ":keeppos" command modifier: ":keeppos windo {cmd}". Alternative: ":keeppos" command modifier: ":keeppos windo {cmd}".
Patch to fix that executable() may fail on very long filename in MS-Windows.
(Ken Takata, 2016 Feb 1)
Patch to fix display of listchars on the cursorline. (Nayuri Aohime, 2013) Patch to fix display of listchars on the cursorline. (Nayuri Aohime, 2013)
Update suggested by Yasuhiro Matsumoto, 2014 Nov 25: Update suggested by Yasuhiro Matsumoto, 2014 Nov 25:
https://gist.github.com/presuku/d3d6b230b9b6dcfc0477 https://gist.github.com/presuku/d3d6b230b9b6dcfc0477
@ -1192,10 +1182,6 @@ I can't recommend it though.
Build with Python on Mac does not always use the right library. Build with Python on Mac does not always use the right library.
(Kazunobu Kuriyama, 2015 Mar 28) (Kazunobu Kuriyama, 2015 Mar 28)
Patch to add arguments to argc() and argv(). (Yegappan Lakshmanan, 2016 Jan
24) Also need a way to get the global arg list? Update later on Jan 24
Update Mar 5. Update Apr 7. Update Jun 5.
To support Thai (and other languages) word boundaries, include the ICU To support Thai (and other languages) word boundaries, include the ICU
library: http://userguide.icu-project.org/boundaryanalysis library: http://userguide.icu-project.org/boundaryanalysis

View File

@ -1,16 +1,34 @@
" Vim filetype plugin " Vim filetype plugin
" Language: CMake " Language: CMake
" Maintainer: Keith Smiley <keithbsmiley@gmail.com> " Maintainer: Keith Smiley <keithbsmiley@gmail.com>
" Last Change: 2017 Dec 24 " Last Change: 2018 Aug 30
" Only do this when not done yet for this buffer " Only do this when not done yet for this buffer
if exists("b:did_ftplugin") if exists("b:did_ftplugin")
finish finish
endif endif
" save 'cpo' for restoration at the end of this file
let s:cpo_save = &cpo
set cpo&vim
" Don't load another plugin for this buffer " Don't load another plugin for this buffer
let b:did_ftplugin = 1 let b:did_ftplugin = 1
let b:undo_ftplugin = "setl commentstring<" let b:undo_ftplugin = "setl commentstring<"
if exists('loaded_matchit')
let b:match_words = '\<if\>:\<elseif\>\|\<else\>:\<endif\>'
\ . ',\<foreach\>\|\<while\>:\<break\>:\<endforeach\>\|\<endwhile\>'
\ . ',\<macro\>:\<endmacro\>'
\ . ',\<function\>:\<endfunction\>'
let b:match_ignorecase = 1
let b:undo_ftplugin .= "| unlet b:match_words"
endif
setlocal commentstring=#\ %s setlocal commentstring=#\ %s
" restore 'cpo' and clean up buffer variable
let &cpo = s:cpo_save
unlet s:cpo_save

View File

@ -0,0 +1,59 @@
" Vim indent file
" Language: MSDOS batch file (with NT command extensions)
" Maintainer: Ken Takata
" URL: https://github.com/k-takata/vim-dosbatch-indent
" Last Change: 2017 May 10
" Filenames: *.bat
" License: VIM License
if exists("b:did_indent")
finish
endif
let b:did_indent = 1
setlocal nosmartindent
setlocal noautoindent
setlocal indentexpr=GetDosBatchIndent(v:lnum)
setlocal indentkeys=!^F,o,O
setlocal indentkeys+=0=)
if exists("*GetDosBatchIndent")
finish
endif
let s:cpo_save = &cpo
set cpo&vim
function! GetDosBatchIndent(lnum)
let l:prevlnum = prevnonblank(a:lnum-1)
if l:prevlnum == 0
" top of file
return 0
endif
" grab the previous and current line, stripping comments.
let l:prevl = substitute(getline(l:prevlnum), '\c^\s*\%(@\s*\)\?rem\>.*$', '', '')
let l:thisl = getline(a:lnum)
let l:previ = indent(l:prevlnum)
let l:ind = l:previ
if l:prevl =~? '^\s*@\=if\>.*(\s*$' ||
\ l:prevl =~? '\<do\>\s*(\s*$' ||
\ l:prevl =~? '\<else\>\s*\%(if\>.*\)\?(\s*$' ||
\ l:prevl =~? '^.*\(&&\|||\)\s*(\s*$'
" previous line opened a block
let l:ind += shiftwidth()
endif
if l:thisl =~ '^\s*)'
" this line closed a block
let l:ind -= shiftwidth()
endif
return l:ind
endfunction
let &cpo = s:cpo_save
unlet s:cpo_save
" vim: ts=8 sw=2 sts=2

View File

@ -1,9 +1,9 @@
" Vim indent file " Vim indent file
" Language: Tera Term Language (TTL) " Language: Tera Term Language (TTL)
" Based on Tera Term Version 4.92 " Based on Tera Term Version 4.100
" Maintainer: Ken Takata " Maintainer: Ken Takata
" URL: https://github.com/k-takata/vim-teraterm " URL: https://github.com/k-takata/vim-teraterm
" Last Change: 2017 Jun 13 " Last Change: 2018-08-31
" Filenames: *.ttl " Filenames: *.ttl
" License: VIM License " License: VIM License

View File

@ -1,9 +1,9 @@
" Vim syntax file " Vim syntax file
" Language: Tera Term Language (TTL) " Language: Tera Term Language (TTL)
" Based on Tera Term Version 4.92 " Based on Tera Term Version 4.100
" Maintainer: Ken Takata " Maintainer: Ken Takata
" URL: https://github.com/k-takata/vim-teraterm " URL: https://github.com/k-takata/vim-teraterm
" Last Change: 2016 Aug 17 " Last Change: 2018-08-31
" Filenames: *.ttl " Filenames: *.ttl
" License: VIM License " License: VIM License
@ -75,12 +75,13 @@ syn keyword ttlCommunicationCommand contained
\ logrotate logstart logwrite quickvanrecv \ logrotate logstart logwrite quickvanrecv
\ quickvansend recvln restoresetup scprecv scpsend \ quickvansend recvln restoresetup scprecv scpsend
\ send sendbreak sendbroadcast sendfile sendkcode \ send sendbreak sendbroadcast sendfile sendkcode
\ sendln sendlnbroadcast sendmulticast setbaud \ sendln sendlnbroadcast sendlnmulticast sendmulticast
\ setdebug setdtr setecho setmulticastname setrts \ setbaud setdebug setdtr setecho setflowctrl
\ setsync settitle showtt testlink unlink wait \ setmulticastname setrts setspeed setsync settitle
\ wait4all waitevent waitln waitn waitrecv waitregex \ showtt testlink unlink wait wait4all waitevent
\ xmodemrecv xmodemsend ymodemrecv ymodemsend \ waitln waitn waitrecv waitregex xmodemrecv
\ zmodemrecv zmodemsend \ xmodemsend ymodemrecv ymodemsend zmodemrecv
\ zmodemsend
syn keyword ttlStringCommand contained syn keyword ttlStringCommand contained
\ code2str expandenv int2str regexoption sprintf \ code2str expandenv int2str regexoption sprintf
\ sprintf2 str2code str2int strcompare strconcat \ sprintf2 str2code str2int strcompare strconcat

View File

@ -76,7 +76,7 @@ Nota: Las teclas de movimiento del cursor tambi
1. Mueva el cursor a la línea de abajo señalada con --->. 1. Mueva el cursor a la línea de abajo señalada con --->.
2. Para corregir los errores, mueva el cursor hasta que esté bajo el 2. Para corregir los errores, mueva el cursor hasta que esté bajo el
carácter que va aser borrado. carácter que va a ser borrado.
3. Pulse la tecla x para borrar el carácter sobrante. 3. Pulse la tecla x para borrar el carácter sobrante.

View File

@ -76,7 +76,7 @@ Nota: Las teclas de movimiento del cursor también funcionan. Pero usando
1. Mueva el cursor a la línea de abajo señalada con --->. 1. Mueva el cursor a la línea de abajo señalada con --->.
2. Para corregir los errores, mueva el cursor hasta que esté bajo el 2. Para corregir los errores, mueva el cursor hasta que esté bajo el
carácter que va aser borrado. carácter que va a ser borrado.
3. Pulse la tecla x para borrar el carácter sobrante. 3. Pulse la tecla x para borrar el carácter sobrante.

View File

@ -540,7 +540,7 @@
---> "ошшшибка" это не способ написания слова `ошибка'; ошшшибка это ошибка. ---> "ошшшибка" это не способ написания слова `ошибка'; ошшшибка это ошибка.
Замечание! Если при поиске будет достигнут конц файла, то поиск будет продолжен Замечание! Если при поиске будет достигнут конец файла, то поиск будет продолжен
с начала. с начала.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -607,15 +607,15 @@
парную скобку. парную скобку.
4. Для подстановки `стало' вместо первого `было' в строке, наберите 4. Для подстановки `стало' вместо первого `было' в строке, наберите
:s/old/new :s/было/стало
Для подстановки `стало' вместо всех `было' в строке, наберите Для подстановки `стало' вместо всех `было' в строке, наберите
:s/old/new/g :s/было/стало/g
Для замены в интервале между двумя строками, наберите Для замены в интервале между двумя строками, наберите
:#,#s/old/new/g :#,#s/было/стало/g
Для замены всех вхождений `было' на `стало' в файле, наберите Для замены всех вхождений `было' на `стало' в файле, наберите
:%s/old/new/g :%s/было/стало/g
Чтобы редактор каждый раз запрашивал подтверждение, добавьте 'c' Чтобы редактор каждый раз запрашивал подтверждение, добавьте 'c'
:%s/old/new/gc :%s/было/стало/gc
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Урок 5.1: КАК ВЫПОЛНИТЬ ВНЕШНЮЮ КОМАНДУ Урок 5.1: КАК ВЫПОЛНИТЬ ВНЕШНЮЮ КОМАНДУ

View File

@ -15,15 +15,15 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Vim(Esperanto)\n" "Project-Id-Version: Vim 8.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-30 19:32+0200\n" "POT-Creation-Date: 2018-09-01 18:15+0200\n"
"PO-Revision-Date: 2018-05-07 23:01+0200\n" "PO-Revision-Date: 2018-09-01 18:38+0200\n"
"Last-Translator: Dominique PELLÉ <dominique.pelle@gmail.com>\n" "Last-Translator: Dominique PELLÉ <dominique.pelle@gmail.com>\n"
"Language-Team: \n" "Language-Team: Esperanto\n"
"Language: eo\n" "Language: eo\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@ -73,26 +73,23 @@ msgstr "E516: Neniu bufro estis forviŝita"
msgid "E517: No buffers were wiped out" msgid "E517: No buffers were wiped out"
msgstr "E517: Neniu bufro estis detruita" msgstr "E517: Neniu bufro estis detruita"
msgid "1 buffer unloaded" #, c-format
msgstr "1 bufro malŝargita" msgid "%d buffer unloaded"
msgid_plural "%d buffers unloaded"
msgstr[0] "%d bufro malŝargita"
msgstr[1] "%d bufroj malŝargitaj"
#, c-format #, c-format
msgid "%d buffers unloaded" msgid "%d buffer deleted"
msgstr "%d bufroj malŝargitaj" msgid_plural "%d buffers deleted"
msgstr[0] "%d bufro forviŝita"
msgid "1 buffer deleted" msgstr[1] "%d bufroj forviŝitaj"
msgstr "1 bufro forviŝita"
#, c-format #, c-format
msgid "%d buffers deleted" msgid "%d buffer wiped out"
msgstr "%d bufroj forviŝitaj" msgid_plural "%d buffers wiped out"
msgstr[0] "%d bufro detruita"
msgid "1 buffer wiped out" msgstr[1] "%d bufroj detruitaj"
msgstr "1 bufro detruita"
#, c-format
msgid "%d buffers wiped out"
msgstr "%d bufroj detruitaj"
msgid "E90: Cannot unload last buffer" msgid "E90: Cannot unload last buffer"
msgstr "E90: Ne eblas malŝargi la lastan bufron" msgstr "E90: Ne eblas malŝargi la lastan bufron"
@ -168,12 +165,10 @@ msgid "[readonly]"
msgstr "[nurlegebla]" msgstr "[nurlegebla]"
#, c-format #, c-format
msgid "1 line --%d%%--" msgid "%ld line --%d%%--"
msgstr "1 linio --%d%%--" msgid_plural "%ld lines --%d%%--"
msgstr[0] "%ld linio --%d%%--"
#, c-format msgstr[1] "%ld linioj --%d%%--"
msgid "%ld lines --%d%%--"
msgstr "%ld linioj --%d%%--"
#, c-format #, c-format
msgid "line %ld of %ld --%d%%-- col " msgid "line %ld of %ld --%d%%-- col "
@ -210,6 +205,9 @@ msgstr ""
msgid "E382: Cannot write, 'buftype' option is set" msgid "E382: Cannot write, 'buftype' option is set"
msgstr "E382: Ne eblas skribi, opcio 'buftype' estas ŝaltita" msgstr "E382: Ne eblas skribi, opcio 'buftype' estas ŝaltita"
msgid "[Prompt]"
msgstr "[Invito]"
msgid "[Scratch]" msgid "[Scratch]"
msgstr "[Malneto]" msgstr "[Malneto]"
@ -747,6 +745,9 @@ msgstr "E916: nevalida tasko"
msgid "E701: Invalid type for len()" msgid "E701: Invalid type for len()"
msgstr "E701: Nevalida datumtipo de len()" msgstr "E701: Nevalida datumtipo de len()"
msgid "E957: Invalid window number"
msgstr "E957: Nevalida numero de vindozo"
#, c-format #, c-format
msgid "E798: ID is reserved for \":match\": %ld" msgid "E798: ID is reserved for \":match\": %ld"
msgstr "E798: ID estas rezervita por \":match\": %ld" msgstr "E798: ID estas rezervita por \":match\": %ld"
@ -844,12 +845,11 @@ msgstr "> %d, Deksesuma %08x, Okuma %o"
msgid "E134: Move lines into themselves" msgid "E134: Move lines into themselves"
msgstr "E134: Movas liniojn en ilin mem" msgstr "E134: Movas liniojn en ilin mem"
msgid "1 line moved"
msgstr "1 linio movita"
#, c-format #, c-format
msgid "%ld lines moved" msgid "%ld line moved"
msgstr "%ld linioj movitaj" msgid_plural "%ld lines moved"
msgstr[0] "%ld linio movita"
msgstr[1] "%ld linioj movitaj"
#, c-format #, c-format
msgid "%ld lines filtered" msgid "%ld lines filtered"
@ -1001,26 +1001,29 @@ msgstr "ĉu anstataŭigi per %s (y/n/a/q/l/^E/^Y)?"
msgid "(Interrupted) " msgid "(Interrupted) "
msgstr "(Interrompita) " msgstr "(Interrompita) "
msgid "1 match" #, c-format
msgstr "1 kongruo" msgid "%ld match on %ld line"
msgid_plural "%ld matches on %ld line"
msgid "1 substitution" msgstr[0] "%ld kongruo en %ld linio"
msgstr "1 anstataŭigo" msgstr[1] "%ld kongruoj en %ld linio"
#, c-format #, c-format
msgid "%ld matches" msgid "%ld substitution on %ld line"
msgstr "%ld kongruoj" msgid_plural "%ld substitutions on %ld line"
msgstr[0] "%ld anstataŭigo en %ld linio"
msgstr[1] "%ld anstataŭigoj en %ld linio"
#, c-format #, c-format
msgid "%ld substitutions" msgid "%ld match on %ld lines"
msgstr "%ld anstataŭigoj" msgid_plural "%ld matches on %ld lines"
msgstr[0] "%ld kongruo en %ld linioj"
msgid " on 1 line" msgstr[1] "%ld kongruoj en %ld linioj"
msgstr " en 1 linio"
#, c-format #, c-format
msgid " on %ld lines" msgid "%ld substitution on %ld lines"
msgstr " en %ld linioj" msgid_plural "%ld substitutions on %ld lines"
msgstr[0] "%ld anstataŭigo en %ld linioj"
msgstr[1] "%ld anstataŭigoj en %ld linioj"
msgid "E147: Cannot do :global recursive with a range" msgid "E147: Cannot do :global recursive with a range"
msgstr "E147: Ne eblas fari \":global\" rekursie kun amplekso" msgstr "E147: Ne eblas fari \":global\" rekursie kun amplekso"
@ -1333,19 +1336,17 @@ msgstr "E943: Tabulo de komandoj estas ĝisdatigenda, lanĉu 'make cmdidx'"
msgid "E319: Sorry, the command is not available in this version" msgid "E319: Sorry, the command is not available in this version"
msgstr "E319: Bedaŭrinde, tiu komando ne haveblas en tiu versio" msgstr "E319: Bedaŭrinde, tiu komando ne haveblas en tiu versio"
msgid "1 more file to edit. Quit anyway?" #, c-format
msgstr "1 plia redaktenda dosiero. Ĉu tamen eliri?" msgid "%d more file to edit. Quit anyway?"
msgid_plural "%d more files to edit. Quit anyway?"
msgstr[0] "%d plia redaktenda dosiero. Ĉu tamen eliri?"
msgstr[1] "%d pliaj redaktendaj dosieroj. Ĉu tamen eliri?"
#, c-format #, c-format
msgid "%d more files to edit. Quit anyway?" msgid "E173: %ld more file to edit"
msgstr "%d pliaj redaktendaj dosieroj. Ĉu tamen eliri?" msgid_plural "E173: %ld more files to edit"
msgstr[0] "E173: %ld plia redaktenda dosiero"
msgid "E173: 1 more file to edit" msgstr[1] "E173: %ld pliaj redaktendaj dosieroj"
msgstr "E173: 1 plia redaktenda dosiero"
#, c-format
msgid "E173: %ld more files to edit"
msgstr "E173: %ld pliaj redaktendaj dosieroj"
msgid "E174: Command already exists: add ! to replace it" msgid "E174: Command already exists: add ! to replace it"
msgstr "E174: La komando jam ekzistas: aldonu ! por anstataŭigi ĝin" msgstr "E174: La komando jam ekzistas: aldonu ! por anstataŭigi ĝin"
@ -1427,6 +1428,9 @@ msgstr "E784: Ne eblas fermi lastan langeton"
msgid "Already only one tab page" msgid "Already only one tab page"
msgstr "Jam nur unu langeto" msgstr "Jam nur unu langeto"
msgid "Edit File in new tab page"
msgstr "Redakti Dosieron en nova langeto"
msgid "Edit File in new window" msgid "Edit File in new window"
msgstr "Redakti Dosieron en nova fenestro" msgstr "Redakti Dosieron en nova fenestro"
@ -1726,9 +1730,6 @@ msgstr "Legado el stdin..."
msgid "E202: Conversion made file unreadable!" msgid "E202: Conversion made file unreadable!"
msgstr "E202: Konverto igis la dosieron nelegebla!" msgstr "E202: Konverto igis la dosieron nelegebla!"
msgid "[fifo/socket]"
msgstr "[rektvica memoro/kontaktoskatolo]"
msgid "[fifo]" msgid "[fifo]"
msgstr "[rektvica memoro]" msgstr "[rektvica memoro]"
@ -1904,19 +1905,17 @@ msgstr "[unikso]"
msgid "[unix format]" msgid "[unix format]"
msgstr "[formato unikso]" msgstr "[formato unikso]"
msgid "1 line, " #, c-format
msgstr "1 linio, " msgid "%ld line, "
msgid_plural "%ld lines, "
msgstr[0] "%ld linio, "
msgstr[1] "%ld linioj, "
#, c-format #, c-format
msgid "%ld lines, " msgid "%lld character"
msgstr "%ld linioj, " msgid_plural "%lld characters"
msgstr[0] "%lld signo"
msgid "1 character" msgstr[1] "%lld signoj"
msgstr "1 signo"
#, c-format
msgid "%lld characters"
msgstr "%lld signoj"
msgid "[noeol]" msgid "[noeol]"
msgstr "[sen EOL]" msgstr "[sen EOL]"
@ -2294,11 +2293,11 @@ msgstr "&Malfari"
msgid "Open tab..." msgid "Open tab..."
msgstr "Malfermi langeton..." msgstr "Malfermi langeton..."
msgid "Find string (use '\\\\' to find a '\\')" msgid "Find string"
msgstr "Trovi ĉenon (uzu '\\\\' por trovi '\\')" msgstr "Trovi ĉenon"
msgid "Find & Replace (use '\\\\' to find a '\\')" msgid "Find & Replace"
msgstr "Trovi kaj anstataŭigi (uzu '\\\\' por trovi '\\')" msgstr "Trovi & Anstataŭigi"
msgid "Not Used" msgid "Not Used"
msgstr "Ne uzata" msgstr "Ne uzata"
@ -3977,19 +3976,17 @@ msgstr ""
msgid "Type number and <Enter> (empty cancels): " msgid "Type number and <Enter> (empty cancels): "
msgstr "Tajpu nombron kaj <Enenklavon> (malpleno rezignas): " msgstr "Tajpu nombron kaj <Enenklavon> (malpleno rezignas): "
msgid "1 more line" #, c-format
msgstr "1 plia linio" msgid "%ld more line"
msgid_plural "%ld more lines"
msgid "1 line less" msgstr[0] "%ld plia linio"
msgstr "1 malplia linio" msgstr[1] "%ld pliaj linioj"
#, c-format #, c-format
msgid "%ld more lines" msgid "%ld line less"
msgstr "%ld pliaj linioj" msgid_plural "%ld fewer lines"
msgstr[0] "%ld malplia linio"
#, c-format msgstr[1] "%ld malpliaj linioj"
msgid "%ld fewer lines"
msgstr "%ld malpliaj linioj"
msgid " (Interrupted)" msgid " (Interrupted)"
msgstr " (Interrompita)" msgstr " (Interrompita)"
@ -4127,31 +4124,26 @@ msgstr ""
"Vim" "Vim"
#, c-format #, c-format
msgid "1 line %sed 1 time" msgid "%ld line %sed %d time"
msgstr "1 linio %sita 1 foje" msgid_plural "%ld line %sed %d times"
msgstr[0] "%ld linio %sita %d foje"
msgstr[1] "%ld linio %sita %d foje"
#, c-format #, c-format
msgid "1 line %sed %d times" msgid "%ld lines %sed %d time"
msgstr "1 linio %sita %d foje" msgid_plural "%ld lines %sed %d times"
msgstr[0] "%ld linioj %sitaj %d foje"
#, c-format msgstr[1] "%ld linioj %sitaj %d foje"
msgid "%ld lines %sed 1 time"
msgstr "%ld linio %sita 1 foje"
#, c-format
msgid "%ld lines %sed %d times"
msgstr "%ld linioj %sitaj %d foje"
#, c-format #, c-format
msgid "%ld lines to indent... " msgid "%ld lines to indent... "
msgstr "%ld krommarĝenendaj linioj... " msgstr "%ld krommarĝenendaj linioj... "
msgid "1 line indented "
msgstr "1 linio krommarĝenita "
#, c-format #, c-format
msgid "%ld lines indented " msgid "%ld line indented "
msgstr "%ld linioj krommarĝenitaj " msgid_plural "%ld lines indented "
msgstr[0] "%ld linio krommarĝenita "
msgstr[1] "%ld linioj krommarĝenitaj "
msgid "E748: No previously used register" msgid "E748: No previously used register"
msgstr "E748: Neniu reĝistro antaŭe uzata" msgstr "E748: Neniu reĝistro antaŭe uzata"
@ -4159,12 +4151,11 @@ msgstr "E748: Neniu reĝistro antaŭe uzata"
msgid "cannot yank; delete anyway" msgid "cannot yank; delete anyway"
msgstr "ne eblas kopii; tamen forviŝi" msgstr "ne eblas kopii; tamen forviŝi"
msgid "1 line changed"
msgstr "1 linio ŝanĝita"
#, c-format #, c-format
msgid "%ld lines changed" msgid "%ld line changed"
msgstr "%ld linioj ŝanĝitaj" msgid_plural "%ld lines changed"
msgstr[0] "%ld linio ŝanĝita"
msgstr[1] "%ld linioj ŝanĝitaj"
#, c-format #, c-format
msgid "freeing %ld lines" msgid "freeing %ld lines"
@ -4175,20 +4166,16 @@ msgid " into \"%c"
msgstr " en \"%c" msgstr " en \"%c"
#, c-format #, c-format
msgid "block of 1 line yanked%s" msgid "block of %ld line yanked%s"
msgstr "bloko de 1 linio kopiita%s" msgid_plural "block of %ld lines yanked%s"
msgstr[0] "bloko de %ld linio kopiita%s"
msgstr[1] "bloko de %ld linioj kopiitaj%s"
#, c-format #, c-format
msgid "1 line yanked%s" msgid "%ld line yanked%s"
msgstr "1 linio kopiita%s" msgid_plural "%ld lines yanked%s"
msgstr[0] "%ld linio kopiita%s"
#, c-format msgstr[1] "%ld linioj kopiitaj%s"
msgid "block of %ld lines yanked%s"
msgstr "bloko de %ld linioj kopiita%s"
#, c-format
msgid "%ld lines yanked%s"
msgstr "%ld linioj kopiitaj%s"
#, c-format #, c-format
msgid "E353: Nothing in register %s" msgid "E353: Nothing in register %s"
@ -4781,6 +4768,9 @@ msgstr "E69: Mankas ] malantaŭ %s%%["
msgid "E70: Empty %s%%[]" msgid "E70: Empty %s%%[]"
msgstr "E70: Malplena %s%%[]" msgstr "E70: Malplena %s%%[]"
msgid "E956: Cannot use pattern recursively"
msgstr "E956: Ne eblas uzi ŝablonon rekursie"
msgid "E65: Illegal back reference" msgid "E65: Illegal back reference"
msgstr "E65: Nevalida retro-referenco" msgstr "E65: Nevalida retro-referenco"
@ -4898,6 +4888,11 @@ msgstr "E879: (NFA-regulesprimo) tro da \\z("
msgid "E873: (NFA regexp) proper termination error" msgid "E873: (NFA regexp) proper termination error"
msgstr "E873: (NFA-regulesprimo) propra end-eraro" msgstr "E873: (NFA-regulesprimo) propra end-eraro"
msgid "Could not open temporary log file for writing, displaying on stderr... "
msgstr ""
"Ne povis malfermi provizoran protokolan dosieron por skribi, nun montras sur "
"stderr..."
msgid "E874: (NFA) Could not pop the stack!" msgid "E874: (NFA) Could not pop the stack!"
msgstr "E874: (NFA) Ne povis elpreni de la staplo!" msgstr "E874: (NFA) Ne povis elpreni de la staplo!"
@ -4914,19 +4909,6 @@ msgstr "E876: (NFA-regulesprimo) ne sufiĉa spaco por enmemorigi la tutan NFA "
msgid "E878: (NFA) Could not allocate memory for branch traversal!" msgid "E878: (NFA) Could not allocate memory for branch traversal!"
msgstr "E878: (NFA) Ne povis asigni memoron por traigi branĉojn!" msgstr "E878: (NFA) Ne povis asigni memoron por traigi branĉojn!"
msgid ""
"Could not open temporary log file for writing, displaying on stderr... "
msgstr ""
"Ne povis malfermi provizoran protokolan dosieron por skribi, nun montras sur "
"stderr..."
#, c-format
msgid "(NFA) COULD NOT OPEN %s !"
msgstr "(NFA) NE POVIS MALFERMI %s!"
msgid "Could not open temporary log file for writing "
msgstr "Ne povis malfermi la provizoran protokolan dosieron por skribi "
msgid " VREPLACE" msgid " VREPLACE"
msgstr " V-ANSTATAŬIGO" msgstr " V-ANSTATAŬIGO"
@ -5414,6 +5396,9 @@ msgstr "E783: ripetita signo en rikordo MAP"
msgid "No Syntax items defined for this buffer" msgid "No Syntax items defined for this buffer"
msgstr "Neniu sintaksa elemento difinita por tiu bufro" msgstr "Neniu sintaksa elemento difinita por tiu bufro"
msgid "'redrawtime' exceeded, syntax highlighting disabled"
msgstr "'redrawtime' transpasita, sintaksa emfazo malŝaltita"
msgid "syntax conceal on" msgid "syntax conceal on"
msgstr "sintakso de conceal ŝaltata" msgstr "sintakso de conceal ŝaltata"
@ -5443,6 +5428,9 @@ msgstr ""
msgid "syntax iskeyword " msgid "syntax iskeyword "
msgstr "sintakso iskeyword " msgstr "sintakso iskeyword "
msgid "syntax iskeyword not set"
msgstr "sintakso iskeyword ne ŝaltita"
#, c-format #, c-format
msgid "E391: No such syntax cluster: %s" msgid "E391: No such syntax cluster: %s"
msgstr "E391: Nenia sintaksa fasko: %s" msgstr "E391: Nenia sintaksa fasko: %s"
@ -5922,8 +5910,10 @@ msgid "number changes when saved"
msgstr "numero ŝanĝoj tempo konservita" msgstr "numero ŝanĝoj tempo konservita"
#, c-format #, c-format
msgid "%ld seconds ago" msgid "%ld second ago"
msgstr "antaŭ %ld sekundoj" msgid_plural "%ld seconds ago"
msgstr[0] "antaŭ %ld sekundo"
msgstr[1] "antaŭ %ld sekundoj"
msgid "E790: undojoin is not allowed after undo" msgid "E790: undojoin is not allowed after undo"
msgstr "E790: undojoin estas nepermesebla post malfaro" msgstr "E790: undojoin estas nepermesebla post malfaro"
@ -6062,6 +6052,10 @@ msgstr "E133: \":return\" ekster funkcio"
msgid "E107: Missing parentheses: %s" msgid "E107: Missing parentheses: %s"
msgstr "E107: Mankas krampoj: %s" msgstr "E107: Mankas krampoj: %s"
#, c-format
msgid "%s (%s, compiled %s)"
msgstr "%s (%s, kompilita %s)"
msgid "" msgid ""
"\n" "\n"
"MS-Windows 64-bit GUI version" "MS-Windows 64-bit GUI version"

View File

@ -10,15 +10,15 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Vim(Français)\n" "Project-Id-Version: Vim 8.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-08 09:00+0200\n" "POT-Creation-Date: 2018-09-01 14:20+0200\n"
"PO-Revision-Date: 2018-05-08 09:17+0200\n" "PO-Revision-Date: 2018-09-01 17:15+0200\n"
"Last-Translator: Dominique Pellé <dominique.pelle@gmail.com>\n" "Last-Translator: Dominique Pellé <dominique.pelle@gmail.com>\n"
"Language-Team: \n" "Language-Team: French\n"
"Language: fr\n" "Language: fr\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO_8859-15\n" "Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@ -73,26 +73,23 @@ msgstr "E516: Aucun tampon n'a
msgid "E517: No buffers were wiped out" msgid "E517: No buffers were wiped out"
msgstr "E517: Aucun tampon n'a été détruit" msgstr "E517: Aucun tampon n'a été détruit"
msgid "1 buffer unloaded" #, c-format
msgstr "1 tampon a été déchargé" msgid "%d buffer unloaded"
msgid_plural "%d buffers unloaded"
msgstr[0] "%d tampon a été déchargé"
msgstr[1] "%d tampons ont été déchargés"
#, c-format #, c-format
msgid "%d buffers unloaded" msgid "%d buffer deleted"
msgstr "%d tampons ont été déchargés" msgid_plural "%d buffers deleted"
msgstr[0] "%d tampon a été effacé"
msgid "1 buffer deleted" msgstr[1] "%d tampons ont été effacés"
msgstr "1 tampon a été effacé"
#, c-format #, c-format
msgid "%d buffers deleted" msgid "%d buffer wiped out"
msgstr "%d tampons ont été effacés" msgid_plural "%d buffers wiped out"
msgstr[0] "%d tampon a été détruit"
msgid "1 buffer wiped out" msgstr[1] "%d tampons ont été détruits"
msgstr "1 tampon a été détruit"
#, c-format
msgid "%d buffers wiped out"
msgstr "%d tampons ont été détruits"
msgid "E90: Cannot unload last buffer" msgid "E90: Cannot unload last buffer"
msgstr "E90: Impossible de décharger le dernier tampon" msgstr "E90: Impossible de décharger le dernier tampon"
@ -176,12 +173,10 @@ msgid "[readonly]"
msgstr "[lecture-seule]" msgstr "[lecture-seule]"
#, c-format #, c-format
msgid "1 line --%d%%--" msgid "%ld line --%d%%--"
msgstr "1 ligne --%d%%--" msgid_plural "%ld lines --%d%%--"
msgstr[0] "%ld ligne --%d%%--"
#, c-format msgstr[1] "%ld lignes --%d%%--"
msgid "%ld lines --%d%%--"
msgstr "%ld lignes --%d%%--"
# AB - Faut-il remplacer "sur" par "de" ? # AB - Faut-il remplacer "sur" par "de" ?
# DB - Mon avis : oui. # DB - Mon avis : oui.
@ -228,6 +223,9 @@ msgstr ""
msgid "E382: Cannot write, 'buftype' option is set" msgid "E382: Cannot write, 'buftype' option is set"
msgstr "E382: Écriture impossible, l'option 'buftype' est activée" msgstr "E382: Écriture impossible, l'option 'buftype' est activée"
msgid "[Prompt]"
msgstr "[Invite]"
msgid "[Scratch]" msgid "[Scratch]"
msgstr "[Brouillon]" msgstr "[Brouillon]"
@ -820,6 +818,9 @@ msgstr "E916: t
msgid "E701: Invalid type for len()" msgid "E701: Invalid type for len()"
msgstr "E701: Type invalide avec len()" msgstr "E701: Type invalide avec len()"
msgid "E957: Invalid window number"
msgstr "E957: numéro de fenêtre invalide"
#, c-format #, c-format
msgid "E798: ID is reserved for \":match\": %ld" msgid "E798: ID is reserved for \":match\": %ld"
msgstr "E798: ID est réservé pour \":match\": %ld" msgstr "E798: ID est réservé pour \":match\": %ld"
@ -921,12 +922,11 @@ msgstr "> %d, Hexa %08x, Octal %o"
msgid "E134: Move lines into themselves" msgid "E134: Move lines into themselves"
msgstr "E134: La destination est dans la plage d'origine" msgstr "E134: La destination est dans la plage d'origine"
msgid "1 line moved"
msgstr "1 ligne déplacée"
#, c-format #, c-format
msgid "%ld lines moved" msgid "%ld line moved"
msgstr "%ld lignes déplacées" msgid_plural "%ld lines moved"
msgstr[0] "%ld ligne déplacée"
msgstr[1] "%ld lignes déplacées"
#, c-format #, c-format
msgid "%ld lines filtered" msgid "%ld lines filtered"
@ -1134,26 +1134,29 @@ msgstr "remplacer par %s (y/n/a/q/l/^E/^Y)?"
msgid "(Interrupted) " msgid "(Interrupted) "
msgstr "(Interrompu) " msgstr "(Interrompu) "
msgid "1 match" #, c-format
msgstr "1 correspondance" msgid "%ld match on %ld line"
msgid_plural "%ld matches on %ld line"
msgid "1 substitution" msgstr[0] "%ld correspondance sur %ld ligne"
msgstr "1 substitution" msgstr[1] "%ld correspondances sur %ld ligne"
#, c-format #, c-format
msgid "%ld matches" msgid "%ld substitution on %ld line"
msgstr "%ld correspondances" msgid_plural "%ld substitutions on %ld line"
msgstr[0] "%ld substitution sur %ld ligne"
msgstr[1] "%ld substitutions sur %ld ligne"
#, c-format #, c-format
msgid "%ld substitutions" msgid "%ld match on %ld lines"
msgstr "%ld substitutions" msgid_plural "%ld matches on %ld lines"
msgstr[0] "%ld correspondance sur %ld lignes"
msgid " on 1 line" msgstr[1] "%ld correspondances sur %ld lignes"
msgstr " sur 1 ligne"
#, c-format #, c-format
msgid " on %ld lines" msgid "%ld substitution on %ld lines"
msgstr " sur %ld lignes" msgid_plural "%ld substitutions on %ld lines"
msgstr[0] "%ld substitution sur %ld lignes"
msgstr[1] "%ld substitutions sur %ld lignes"
# AB - Il faut respecter l'esprit plus que la lettre. # AB - Il faut respecter l'esprit plus que la lettre.
# AB - Ce message devrait contenir une référence à :vglobal. # AB - Ce message devrait contenir une référence à :vglobal.
@ -1503,19 +1506,17 @@ msgstr ""
msgid "E319: Sorry, the command is not available in this version" msgid "E319: Sorry, the command is not available in this version"
msgstr "E319: Désolé, cette commande n'est pas disponible dans cette version" msgstr "E319: Désolé, cette commande n'est pas disponible dans cette version"
msgid "1 more file to edit. Quit anyway?" #, c-format
msgstr "Encore 1 fichier à éditer. Quitter tout de même ?" msgid "%d more file to edit. Quit anyway?"
msgid_plural "%d more files to edit. Quit anyway?"
msgstr[0] "Encore %d fichier à éditer. Quitter tout de même ?"
msgstr[1] "Encore %d fichiers à éditer. Quitter tout de même ?"
#, c-format #, c-format
msgid "%d more files to edit. Quit anyway?" msgid "E173: %ld more file to edit"
msgstr "Encore %d fichiers à éditer. Quitter tout de même ?" msgid_plural "E173: %ld more files to edit"
msgstr[0] "E173: encore %ld fichier à éditer"
msgid "E173: 1 more file to edit" msgstr[1] "E173: encore %ld fichiers à éditer"
msgstr "E173: encore 1 fichier à éditer"
#, c-format
msgid "E173: %ld more files to edit"
msgstr "E173: encore %ld fichiers à éditer"
msgid "E174: Command already exists: add ! to replace it" msgid "E174: Command already exists: add ! to replace it"
msgstr "E174: La commande existe déjà : ajoutez ! pour la redéfinir" msgstr "E174: La commande existe déjà : ajoutez ! pour la redéfinir"
@ -1596,6 +1597,9 @@ msgstr "E784: Impossible de fermer le dernier onglet"
msgid "Already only one tab page" msgid "Already only one tab page"
msgstr "Il ne reste déjà plus qu'un seul onglet" msgstr "Il ne reste déjà plus qu'un seul onglet"
msgid "Edit File in new tab page"
msgstr "Ouvrir un fichier dans un nouvel onglet"
msgid "Edit File in new window" msgid "Edit File in new window"
msgstr "Ouvrir un fichier dans une nouvelle fenêtre - Vim" msgstr "Ouvrir un fichier dans une nouvelle fenêtre - Vim"
@ -1903,9 +1907,6 @@ msgstr "Lecture de stdin..."
msgid "E202: Conversion made file unreadable!" msgid "E202: Conversion made file unreadable!"
msgstr "E202: La conversion a rendu le fichier illisible !" msgstr "E202: La conversion a rendu le fichier illisible !"
msgid "[fifo/socket]"
msgstr "[fifo/socket]"
msgid "[fifo]" msgid "[fifo]"
msgstr "[fifo]" msgstr "[fifo]"
@ -2090,19 +2091,17 @@ msgstr "[unix]"
msgid "[unix format]" msgid "[unix format]"
msgstr "[format unix]" msgstr "[format unix]"
msgid "1 line, " #, c-format
msgstr "1 ligne, " msgid "%ld line, "
msgid_plural "%ld lines, "
msgstr[0] "%ld ligne, "
msgstr[1] "%ld lignes, "
#, c-format #, c-format
msgid "%ld lines, " msgid "%lld character"
msgstr "%ld lignes, " msgid_plural "%lld characters"
msgstr[0] "%lld caractère"
msgid "1 character" msgstr[1] "%lld caractères"
msgstr "1 caractère"
#, c-format
msgid "%lld characters"
msgstr "%lld caractères"
msgid "[noeol]" msgid "[noeol]"
msgstr "[noeol]" msgstr "[noeol]"
@ -2488,11 +2487,11 @@ msgstr "Ann&uler"
msgid "Open tab..." msgid "Open tab..."
msgstr "Ouvrir dans un onglet..." msgstr "Ouvrir dans un onglet..."
msgid "Find string (use '\\\\' to find a '\\')" msgid "Find string"
msgstr "Chercher une chaîne (utilisez '\\\\' pour chercher un '\\')" msgstr "Trouver une chaîne"
msgid "Find & Replace (use '\\\\' to find a '\\')" msgid "Find & Replace"
msgstr "Chercher et remplacer (utilisez '\\\\' pour trouver un '\\')" msgstr "Trouver & remplacer"
# DB - Traduction non indispensable puisque le code indique qu'il s'agit d'un # DB - Traduction non indispensable puisque le code indique qu'il s'agit d'un
# paramétrage bidon afin de sélectionner un répertoire plutôt qu'un # paramétrage bidon afin de sélectionner un répertoire plutôt qu'un
@ -4201,19 +4200,17 @@ msgstr "Tapez un nombre et <Entr
msgid "Type number and <Enter> (empty cancels): " msgid "Type number and <Enter> (empty cancels): "
msgstr "Tapez un nombre et <Entrée> (rien annule) :" msgstr "Tapez un nombre et <Entrée> (rien annule) :"
msgid "1 more line" #, c-format
msgstr "1 ligne en plus" msgid "%ld more line"
msgid_plural "%ld more lines"
msgid "1 line less" msgstr[0] "%ld ligne en plus"
msgstr "1 ligne en moins" msgstr[1] "%ld lignes en plus"
#, c-format #, c-format
msgid "%ld more lines" msgid "%ld line less"
msgstr "%ld lignes en plus" msgid_plural "%ld fewer lines"
msgstr[0] "%ld ligne en moins"
#, c-format msgstr[1] "%ld lignes en moins"
msgid "%ld fewer lines"
msgstr "%ld lignes en moins"
msgid " (Interrupted)" msgid " (Interrupted)"
msgstr " (Interrompu)" msgstr " (Interrompu)"
@ -4351,31 +4348,26 @@ msgstr ""
"Vim" "Vim"
#, c-format #, c-format
msgid "1 line %sed 1 time" msgid "%ld line %sed %d time"
msgstr "1 ligne %sée 1 fois" msgid_plural "%ld line %sed %d times"
msgstr[0] "%ld lignes %sées %d fois"
msgstr[1] "%ld lignes %sées %d fois"
#, c-format #, c-format
msgid "1 line %sed %d times" msgid "%ld lines %sed %d time"
msgstr "1 ligne %sée %d fois" msgid_plural "%ld lines %sed %d times"
msgstr[0] "%ld lignes %sées %d fois"
#, c-format msgstr[1] "%ld lignes %sées %d fois"
msgid "%ld lines %sed 1 time"
msgstr "%ld lignes %sées 1 fois"
#, c-format
msgid "%ld lines %sed %d times"
msgstr "%ld lignes %sées %d fois"
#, c-format #, c-format
msgid "%ld lines to indent... " msgid "%ld lines to indent... "
msgstr "%ld lignes à indenter... " msgstr "%ld lignes à indenter... "
msgid "1 line indented "
msgstr "1 ligne indentée "
#, c-format #, c-format
msgid "%ld lines indented " msgid "%ld line indented "
msgstr "%ld lignes indentées " msgid_plural "%ld lines indented "
msgstr[0] "%ld ligne indentée "
msgstr[1] "%ld lignes indentées "
msgid "E748: No previously used register" msgid "E748: No previously used register"
msgstr "E748: Aucun registre n'a été précédemment utilisé" msgstr "E748: Aucun registre n'a été précédemment utilisé"
@ -4384,12 +4376,11 @@ msgstr "E748: Aucun registre n'a
msgid "cannot yank; delete anyway" msgid "cannot yank; delete anyway"
msgstr "impossible de réaliser une copie ; effacer tout de même" msgstr "impossible de réaliser une copie ; effacer tout de même"
msgid "1 line changed"
msgstr "1 ligne modifiée"
#, c-format #, c-format
msgid "%ld lines changed" msgid "%ld line changed"
msgstr "%ld lignes modifiées" msgid_plural "%ld lines changed"
msgstr[0] "%ld ligne modifiée"
msgstr[1] "%ld lignes modifiées"
#, c-format #, c-format
msgid "freeing %ld lines" msgid "freeing %ld lines"
@ -4400,20 +4391,16 @@ msgid " into \"%c"
msgstr " dans \"%c" msgstr " dans \"%c"
#, c-format #, c-format
msgid "block of 1 line yanked%s" msgid "block of %ld line yanked%s"
msgstr "bloc de 1 ligne copié%s" msgid_plural "block of %ld lines yanked%s"
msgstr[0] "bloc de %ld ligne copié%s"
msgstr[1] "bloc de %ld lignes copié%s"
#, c-format #, c-format
msgid "1 line yanked%s" msgid "%ld line yanked%s"
msgstr "1 ligne copiée%s" msgid_plural "%ld lines yanked%s"
msgstr[0] "%ld ligne copiée%s"
#, c-format msgstr[1] "%ld lignes copiées%s"
msgid "block of %ld lines yanked%s"
msgstr "bloc de %ld lignes copié%s"
#, c-format
msgid "%ld lines yanked%s"
msgstr "%ld lignes copiées%s"
#, c-format #, c-format
msgid "E353: Nothing in register %s" msgid "E353: Nothing in register %s"
@ -5013,6 +5000,9 @@ msgstr "E69: ']' manquant apr
msgid "E70: Empty %s%%[]" msgid "E70: Empty %s%%[]"
msgstr "E70: %s%%[] vide" msgstr "E70: %s%%[] vide"
msgid "E956: Cannot use pattern recursively"
msgstr "E956: Impossible d'utiliser le motif récursivement"
msgid "E65: Illegal back reference" msgid "E65: Illegal back reference"
msgstr "E65: post-référence invalide" msgstr "E65: post-référence invalide"
@ -5128,6 +5118,11 @@ msgstr "E879: (regexp NFA) Trop de \\z("
msgid "E873: (NFA regexp) proper termination error" msgid "E873: (NFA regexp) proper termination error"
msgstr "E873: (NFA regexp) erreur de terminaison" msgstr "E873: (NFA regexp) erreur de terminaison"
msgid "Could not open temporary log file for writing, displaying on stderr... "
msgstr ""
"Impossible d'ouvrir le fichier de log temporaire en écriture, affichage sur "
"stderr... "
msgid "E874: (NFA) Could not pop the stack!" msgid "E874: (NFA) Could not pop the stack!"
msgstr "E874: (NFA) Impossible de dépiler !" msgstr "E874: (NFA) Impossible de dépiler !"
@ -5145,19 +5140,6 @@ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
msgstr "" msgstr ""
"E878: (NFA) Impossible d'allouer la mémoire pour parcourir les branches !" "E878: (NFA) Impossible d'allouer la mémoire pour parcourir les branches !"
msgid ""
"Could not open temporary log file for writing, displaying on stderr... "
msgstr ""
"Impossible d'ouvrir le fichier de log temporaire en écriture, affichage sur "
"stderr... "
#, c-format
msgid "(NFA) COULD NOT OPEN %s !"
msgstr "(NFA) IMPOSSIBLE D'OUVRIR %s !"
msgid "Could not open temporary log file for writing "
msgstr "Impossible d'ouvrir le fichier de log en écriture"
msgid " VREPLACE" msgid " VREPLACE"
msgstr " VREMPLACEMENT" msgstr " VREMPLACEMENT"
@ -5653,6 +5635,9 @@ msgstr "E783: caract
msgid "No Syntax items defined for this buffer" msgid "No Syntax items defined for this buffer"
msgstr "Aucun élément de syntaxe défini pour ce tampon" msgstr "Aucun élément de syntaxe défini pour ce tampon"
msgid "'redrawtime' exceeded, syntax highlighting disabled"
msgstr "'redrawtime' écoulé, surbrillance de syntaxe désactivée"
msgid "syntax conceal on" msgid "syntax conceal on"
msgstr "\"syntax conceal\" activée" msgstr "\"syntax conceal\" activée"
@ -5683,6 +5668,9 @@ msgstr ""
msgid "syntax iskeyword " msgid "syntax iskeyword "
msgstr "syntaxe iskeyword " msgstr "syntaxe iskeyword "
msgid "syntax iskeyword not set"
msgstr "iskeyword n'est pas activé"
#, c-format #, c-format
msgid "E391: No such syntax cluster: %s" msgid "E391: No such syntax cluster: %s"
msgstr "E391: Aucune grappe de syntaxe %s" msgstr "E391: Aucune grappe de syntaxe %s"
@ -6174,8 +6162,10 @@ msgid "number changes when saved"
msgstr "numéro modif. instant enregistré" msgstr "numéro modif. instant enregistré"
#, c-format #, c-format
msgid "%ld seconds ago" msgid "%ld second ago"
msgstr "il y a %ld secondes" msgid_plural "%ld seconds ago"
msgstr[0] "il y a %ld seconde"
msgstr[1] "il y a %ld secondes"
msgid "E790: undojoin is not allowed after undo" msgid "E790: undojoin is not allowed after undo"
msgstr "E790: undojoin n'est pas autorisé après une annulation" msgstr "E790: undojoin n'est pas autorisé après une annulation"
@ -6333,6 +6323,10 @@ msgstr "E133: :return en dehors d'une fonction"
msgid "E107: Missing parentheses: %s" msgid "E107: Missing parentheses: %s"
msgstr "E107: Parenthèses manquantes : %s" msgstr "E107: Parenthèses manquantes : %s"
#, c-format
msgid "%s (%s, compiled %s)"
msgstr "%s (%s, compilé %s)"
msgid "" msgid ""
"\n" "\n"
"MS-Windows 64-bit GUI version" "MS-Windows 64-bit GUI version"