updated for version 7.0158
diff --git a/Filelist b/Filelist
index 5ed93d3..f586ad3 100644
--- a/Filelist
+++ b/Filelist
@@ -687,6 +687,7 @@
runtime/tutor/tutor.ko.* \
runtime/tutor/tutor.pl.* \
runtime/tutor/tutor.ru.* \
+ runtime/tutor/tutor.sk.* \
runtime/tutor/tutor.zh.* \
runtime/spell/README.txt \
runtime/spell/??/*.diff \
diff --git a/Makefile b/Makefile
index 7e916ed..6fa4e45 100644
--- a/Makefile
+++ b/Makefile
@@ -70,8 +70,8 @@
# compiled binaries.
# Before creating an archive first delete all backup files, *.orig, etc.
-MAJOR = 6
-MINOR = 3
+MAJOR = 7
+MINOR = 0aa
# Uncomment this line if the Win32s version is to be included.
#DOSBIN_S = dosbin_s
@@ -423,12 +423,15 @@
-rm -rf dist/vim$(VERSION)rt.zip
cd dist && zip -9 -rD -z vim$(VERSION)rt.zip vim <$(COMMENT_RT)
+# Split in two parts to avoid a "argument list too long" error.
dosrt_unix2dos: dist prepare no_title.vim
-rm -rf dist/vim
mkdir dist/vim
mkdir dist/vim/$(VIMRTDIR)
tar cf - \
$(RT_ALL) \
+ | (cd dist/vim/$(VIMRTDIR); tar xf -)
+ tar cf - \
$(RT_SCRIPTS) \
$(RT_DOS) \
$(RT_NO_UNIX) \
diff --git a/runtime/autoload/htmlcomplete.vim b/runtime/autoload/htmlcomplete.vim
index a773ff2..bd138e6 100644
--- a/runtime/autoload/htmlcomplete.vim
+++ b/runtime/autoload/htmlcomplete.vim
@@ -1,7 +1,7 @@
" Vim completion script
" Language: XHTML 1.0 Strict
" Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change: 2005 Oct 12
+" Last Change: 2005 Now 20
function! htmlcomplete#CompleteTags(findstart, base)
if a:findstart
@@ -52,10 +52,13 @@
if exists("b:entitiescompl")
unlet! b:entitiescompl
- " Very, very long line
- let values = ["AElig", "Aacute", "Acirc", "Agrave", "Alpha", "Aring", "Atilde", "Auml", "Beta", "Ccedil", "Chi", "Dagger", "Delta", "ETH", "Eacute", "Ecirc", "Egrave", "Epsilon", "Eta", "Euml", "Gamma", "Iacute", "Icirc", "Igrave", "Iota", "Iuml", "Kappa", "Lambda", "Mu", "Ntilde", "Nu", "OElig", "Oacute", "Ocirc", "Ograve", "Omega", "Omicron", "Oslash", "Otilde", "Ouml", "Phi", "Pi", "Prime", "Psi", "Rho", "Scaron", "Sigma", "THORN", "TITY", "Tau", "Theta", "Uacute", "Ucirc", "Ugrave", "Upsilon", "Uuml", "Xi", "Yacute", "Yuml", "Zeta", "amp", "aacute", "acirc", "acute", "aelig", "agrave", "alefsym", "alpha", "and", "ang", "apos", "aring", "asymp", "atilde", "auml", "bdquo", "beta", "brvbar", "bull", "cap", "ccedil", "cedil", "cent", "chi", "circ", "clubs", "copy", "cong", "crarr", "cup", "curren", "dArr", "dagger", "darr", "deg", "delta", "diams", "divide", "eacute", "ecirc", "egrave", "empty", "ensp", "emsp", "epsilon", "equiv", "eta", "eth", "euro", "euml", "exist", "fnof", "forall", "frac12", "frac14", "frac34", "frasl", "gt", "gamma", "ge", "hArr", "harr", "hearts", "hellip", "iacute", "icirc", "iexcl", "igrave", "image", "infin", "int", "iota", "iquest", "isin", "iuml", "kappa", "lt", "laquo", "lArr", "lambda", "lang", "larr", "lceil", "ldquo", "le", "lfloor", "lowast", "loz", "lrm", "lsaquo", "lsquo", "macr", "mdash", "micro", "middot", "minus", "mu", "nbsp", "nabla", "ndash", "ne", "ni", "not", "notin", "nsub", "ntilde", "nu", "oacute", "ocirc", "oelig", "ograve", "oline", "omega", "omicron", "oplus", "or", "ordf", "ordm", "oslash", "otilde", "otimes", "ouml", "para", "part", "permil", "perp", "phi", "pi", "piv", "plusmn", "pound", "prime", "prod", "prop", "psi", "quot", "rArr", "raquo", "radic", "rang", "rarr", "rceil", "rdquo", "real", "reg", "rfloor", "rho", "rlm", "rsaquo", "rsquo", "sbquo", "scaron", "sdot", "sect", "shy", "sigma", "sigmaf", "sim", "spades", "sub", "sube", "sum", "sup", "sup1", "sup2", "sup3", "supe", "szlig", "tau", "there4", "theta", "thetasym", "thinsp", "thorn", "tilde", "times", "trade", "uArr", "uacute", "uarr", "ucirc", "ugrave", "uml", "upsih", "upsilon", "uuml", "weierp", "xi", "yacute", "yen", "yuml", "zeta", "zwj", "zwnj"]
+ if !exists("g:xmldata_xhtml10s")
+ runtime! autoload/xml/xhtml10s.vim
+ endif
- for m in values
+ let entities = g:xmldata_xhtml10s['vimxmlentities']
+
+ for m in entities
if m =~ '^'.a:base
call add(res, m.';')
endif
@@ -114,6 +117,7 @@
let head = getline(search('<head\>'), search('<\/head>'))
let headjoined = join(copy(head), ' ')
if headjoined =~ '<style'
+ " Remove possibly confusing CSS operators
let stylehead = substitute(headjoined, '+>\*[,', ' ', 'g')
if search_for == 'class'
let styleheadlines = split(stylehead)
@@ -447,68 +451,18 @@
" Close tag
let b:unaryTagsStack = "base meta link hr br param img area input col"
if context =~ '^\/'
- let opentag = htmlcomplete#GetLastOpenTag("b:unaryTagsStack")
+ let opentag = xmlcomplete#GetLastOpenTag("b:unaryTagsStack")
return [opentag.">"]
endif
" Deal with tag completion.
- let opentag = htmlcomplete#GetLastOpenTag("b:unaryTagsStack")
- " Clusters
- let special = "br span bdo map object img"
- let phrase = "em strong dfn code q samp kbd var cite abbr acronym sub sup"
- let inlineforms = "input select textarea label button"
- let miscinline = "ins del script"
- let inline = "a ".special." ".phrase." ".inlineforms." tt i b big small"
- let misc = "noscript ".miscinline
- let block = "p h1 h2 h3 h4 h5 h6 div ul ol dl pre hr blockquote address fieldset table"
+ let opentag = xmlcomplete#GetLastOpenTag("b:unaryTagsStack")
- if opentag == 'a'
- let tags = split("tt i b big small ".special." ".phrase." ".inlineforms." ".miscinline)
- elseif opentag =~ '^\(abbr\|acronym\|address\|b\|p\|h\d\|dt\|span\|bdo\|em\|strong\|dfn\|code\|samp\|kbd\|var\|cite\|q\|sub\|sup\|tt\|i\|big\|small\|label\|caption\)$'
- let tags = split(inline." ".miscinline)
- elseif opentag == 'pre'
- let tags = split("a tt i b big small br span bdo map ".phrase." ".miscinline." ".inlineforms)
- elseif opentag == 'html'
- let tags = ["head", "body"]
- elseif opentag == 'legend'
- let tags = split(inline." ".miscinline)
- elseif opentag == 'head'
- let tags = ["title", "base", "scipt", "style", "meta", "link", "object"]
- elseif opentag =~ '^\(noscript\|body\|blockquote\)$'
- let tags = split("form ".block." ".misc)
- elseif opentag =~ '^\(ul\|ol\)$'
- let tags = ["li"]
- elseif opentag == 'dl'
- let tags = ["dt", "dd"]
- elseif opentag =~ '^\(ins\|del\|th\|td\|dd\|div\|li\)$'
- let tags = split("form ".block." ".inline." ".misc)
- elseif opentag == 'object'
- let tags = split("param form ".block." ".inline." ".misc)
- elseif opentag == 'fieldset'
- let tags = split("legend form ".block." ".inline." ".misc)
- elseif opentag == 'map'
- let tags = split("area form ".block." ".misc)
- elseif opentag == 'form'
- let tags = split(block." ".misc)
- elseif opentag == 'select'
- let tags = ["optgroup", "option"]
- elseif opentag == 'optgroup'
- let tags = ["option"]
- elseif opentag == 'colgroup'
- let tags = ["col"]
- elseif opentag == '^\(textarea\|option\|script\|style\|title\)$'
- let tags = ['empty']
- elseif opentag == 'button'
- let tags = ["p", "h1", "h2", "h3", "h4", "h5", "h6", "div", "ul", "ol", "dl", "table"]
- elseif opentag =~ '^\(thead\|tfoot\|tbody\)$'
- let tags = ["tr"]
- elseif opentag == 'tr'
- let tags = ["th", "td"]
- elseif opentag == 'table'
- let tags = ["caption", "col", "colgroup", "thead", "tfoot", "tbody", "tr"]
- else
- return []
+ if !exists("g:xmldata_xhtml10s")
+ runtime! autoload/xml/xhtml10s.vim
endif
+ let tags = g:xmldata_xhtml10s[opentag][0]
+
for m in tags
if m =~ '^'.context
call add(res, m)
@@ -521,133 +475,3 @@
endif
endfunction
-
-" MM: This is greatly reduced closetag.vim used with kind permission of Steven
-" Mueller
-" Changes: strip all comments; delete error messages
-" Author: Steven Mueller <diffusor@ugcs.caltech.edu>
-" Last Modified: Tue May 24 13:29:48 PDT 2005
-" Version: 0.9.1
-
-function! htmlcomplete#GetLastOpenTag(unaryTagsStack)
- let linenum=line('.')
- let lineend=col('.') - 1 " start: cursor position
- let first=1 " flag for first line searched
- let b:TagStack='' " main stack of tags
- let startInComment=s:InComment()
-
- let tagpat='</\=\(\k\|[-:]\)\+\|/>'
- while (linenum>0)
- let line=getline(linenum)
- if first
- let line=strpart(line,0,lineend)
- else
- let lineend=strlen(line)
- endif
- let b:lineTagStack=''
- let mpos=0
- let b:TagCol=0
- while (mpos > -1)
- let mpos=matchend(line,tagpat)
- if mpos > -1
- let b:TagCol=b:TagCol+mpos
- let tag=matchstr(line,tagpat)
-
- if exists('b:closetag_disable_synID') || startInComment==s:InCommentAt(linenum, b:TagCol)
- let b:TagLine=linenum
- call s:Push(matchstr(tag,'[^<>]\+'),'b:lineTagStack')
- endif
- let lineend=lineend-mpos
- let line=strpart(line,mpos,lineend)
- endif
- endwhile
- while (!s:EmptystackP('b:lineTagStack'))
- let tag=s:Pop('b:lineTagStack')
- if match(tag, '^/') == 0 "found end tag
- call s:Push(tag,'b:TagStack')
- elseif s:EmptystackP('b:TagStack') && !s:Instack(tag, a:unaryTagsStack) "found unclosed tag
- return tag
- else
- let endtag=s:Peekstack('b:TagStack')
- if endtag == '/'.tag || endtag == '/'
- call s:Pop('b:TagStack') "found a open/close tag pair
- elseif !s:Instack(tag, a:unaryTagsStack) "we have a mismatch error
- return ''
- endif
- endif
- endwhile
- let linenum=linenum-1 | let first=0
- endwhile
-return ''
-endfunction
-
-function! s:InComment()
- return synIDattr(synID(line('.'), col('.'), 0), 'name') =~ 'Comment'
-endfunction
-
-function! s:InCommentAt(line, col)
- return synIDattr(synID(a:line, a:col, 0), 'name') =~ 'Comment'
-endfunction
-
-function! s:SetKeywords()
- let g:IsKeywordBak=&iskeyword
- let &iskeyword='33-255'
-endfunction
-
-function! s:RestoreKeywords()
- let &iskeyword=g:IsKeywordBak
-endfunction
-
-function! s:Push(el, sname)
- if !s:EmptystackP(a:sname)
- exe 'let '.a:sname."=a:el.' '.".a:sname
- else
- exe 'let '.a:sname.'=a:el'
- endif
-endfunction
-
-function! s:EmptystackP(sname)
- exe 'let stack='.a:sname
- if match(stack,'^ *$') == 0
- return 1
- else
- return 0
- endif
-endfunction
-
-function! s:Instack(el, sname)
- exe 'let stack='.a:sname
- call s:SetKeywords()
- let m=match(stack, '\<'.a:el.'\>')
- call s:RestoreKeywords()
- if m < 0
- return 0
- else
- return 1
- endif
-endfunction
-
-function! s:Peekstack(sname)
- call s:SetKeywords()
- exe 'let stack='.a:sname
- let top=matchstr(stack, '\<.\{-1,}\>')
- call s:RestoreKeywords()
- return top
-endfunction
-
-function! s:Pop(sname)
- if s:EmptystackP(a:sname)
- return ''
- endif
- exe 'let stack='.a:sname
- call s:SetKeywords()
- let loc=matchend(stack,'\<.\{-1,}\>')
- exe 'let '.a:sname.'=strpart(stack, loc+1, strlen(stack))'
- let top=strpart(stack, match(stack, '\<'), loc)
- call s:RestoreKeywords()
- return top
-endfunction
-
-function! s:Clearstack(sname)
- exe 'let '.a:sname."=''"
-endfunction
diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index d989dc0..5a06bb0 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -1,96 +1,36 @@
" netrw.vim: Handles file transfer and remote directory listing across a network
" AUTOLOAD PORTION
-" Date: Oct 12, 2005
-" Version: 73
+" Last Change: Aug 31, 2005
" Maintainer: Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
" GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
" Copyright: Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1
" Permission is hereby granted to use and distribute this code,
" with or without modifications, provided that this copyright
" notice is copied with it. Like anything else that's free,
-" netrw.vim, netrwPlugin.vim, and netrwSettings.vim are provided
-" *as is* and comes with no warranty of any kind, either
-" expressed or implied. By using this plugin, you agree that
-" in no event will the copyright holder be liable for any damages
-" resulting from the use of this software.
+" netrw.vim is provided *as is* and comes with no warranty
+" of any kind, either expressed or implied. By using this
+" plugin, you agree that in no event will the copyright
+" holder be liable for any damages resulting from the use
" of this software.
"
" But be doers of the Word, and not only hearers, deluding your own selves {{{1
" (James 1:22 RSV)
" =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-
-" Exception for &cp: {{{1
-if &cp || exists("g:loaded_netrw")
- finish
-endif
-let g:loaded_netrw = "v73"
+let s:keepcpo= &cpo
+set cpo&vim
+" call Decho("doing autoload/netrw.vim")
if v:version < 700
echohl WarningMsg | echo "***netrw*** you need vim version 7.0 or later for version ".g:loaded_netrw." of netrw" | echohl None
finish
endif
-let s:keepcpo = &cpo
-set cpo&vim
-" call Decho("doing autoload/netrw.vim")
" ---------------------------------------------------------------------
-" Default values for netrw's global protocol variables {{{1
-if !exists("g:netrw_dav_cmd")
- let g:netrw_dav_cmd = "cadaver"
+" Default values for global netrw variables {{{1
+if !exists("g:netrw_ftpmode")
+ let g:netrw_ftpmode= "binary"
endif
-if !exists("g:netrw_fetch_cmd")
- if executable("fetch")
- let g:netrw_fetch_cmd = "fetch -o"
- else
- let g:netrw_fetch_cmd = ""
- endif
-endif
-if !exists("g:netrw_ftp_cmd")
- let g:netrw_ftp_cmd = "ftp"
-endif
-if !exists("g:netrw_http_cmd")
- if executable("wget")
- let g:netrw_http_cmd = "wget -q -O"
- elseif executable("fetch")
- let g:netrw_http_cmd = "fetch -o"
- else
- let g:netrw_http_cmd = ""
- endif
-endif
-if !exists("g:netrw_rcp_cmd")
- let g:netrw_rcp_cmd = "rcp"
-endif
-if !exists("g:netrw_rsync_cmd")
- let g:netrw_rsync_cmd = "rsync"
-endif
-if !exists("g:netrw_scp_cmd")
- let g:netrw_scp_cmd = "scp -q"
-endif
-if !exists("g:netrw_sftp_cmd")
- let g:netrw_sftp_cmd = "sftp"
-endif
-if !exists("g:netrw_ssh_cmd")
- let g:netrw_ssh_cmd= "ssh"
-endif
-
-if has("win32") || has("win95") || has("win64") || has("win16")
- \ && exists("g:netrw_use_nt_rcp")
- \ && g:netrw_use_nt_rcp
- \ && executable( $SystemRoot .'/system32/rcp.exe')
- let s:netrw_has_nt_rcp = 1
- let s:netrw_rcpmode = '-b'
- else
- let s:netrw_has_nt_rcp = 0
- let s:netrw_rcpmode = ''
-endif
-
-" ---------------------------------------------------------------------
-" Default values for netrw's global variables {{{1
-" Default values - a-c ---------- {{{2
-if !exists("g:netrw_alto")
- let g:netrw_alto= 0
-endif
-if !exists("g:netrw_altv")
- let g:netrw_altv= 0
+if !exists("g:netrw_win95ftp")
+ let g:netrw_win95ftp= 1
endif
if !exists("g:netrw_cygwin")
if has("win32") || has("win95") || has("win64") || has("win16")
@@ -103,15 +43,14 @@
let g:netrw_cygwin= 0
endif
endif
-" Default values - d-f ---------- {{{2
-if !exists("g:NETRW_DIRHIST_CNT")
- let g:NETRW_DIRHIST_CNT= 0
-endif
-if !exists("g:netrw_dirhistmax")
- let g:netrw_dirhistmax= 10
-endif
-if !exists("g:netrw_ftp_browse_reject")
- let g:netrw_ftp_browse_reject='^total\s\+\d\+$\|^Trying\s\+\d\+.*$\|^KERBEROS_V\d rejected\|^Security extensions not\|No such file\|: connect to address [0-9a-fA-F:]*: No route to host$'
+if !exists("g:netrw_list_cmd")
+ if executable("ssh")
+ " provide a default listing command
+ let g:netrw_list_cmd= "ssh HOSTNAME ls -FLa"
+ else
+" call Decho("ssh is not executable, can't do remote directory exploring with ssh")
+ let g:netrw_list_cmd= ""
+ endif
endif
if !exists("g:netrw_ftp_list_cmd")
if has("unix") || exists("g:netrw_cygwin")
@@ -120,96 +59,75 @@
let g:netrw_ftp_list_cmd= "dir"
endif
endif
-if !exists("g:netrw_ftpmode")
- let g:netrw_ftpmode= "binary"
-endif
-" Default values - h-lh ---------- {{{2
-if !exists("g:netrw_hide")
- let g:netrw_hide= 1
-endif
-if !exists("g:netrw_keepdir")
- let g:netrw_keepdir= 1
-endif
-if !exists("g:netrw_list_cmd")
- if executable(g:netrw_ssh_cmd)
- " provide a default listing command
- let g:netrw_list_cmd= g:netrw_ssh_cmd." HOSTNAME ls -FLa"
- else
-" call Decho(g:netrw_ssh_cmd." is not executable, can't do remote directory exploring)
- let g:netrw_list_cmd= ""
- endif
-endif
-if !exists("g:netrw_list_hide")
- let g:netrw_list_hide= ""
-endif
-" Default values - lh-lz ---------- {{{2
-if !exists("g:netrw_local_mkdir")
- let g:netrw_local_mkdir= "mkdir"
-endif
-if !exists("g:netrw_local_rmdir")
- let g:netrw_local_rmdir= "rmdir"
-endif
-if !exists("g:netrw_longlist")
- let g:netrw_longlist= 0
-endif
-if g:netrw_longlist < 0 || g:netrw_longlist > 2
- " sanity check
- let g:netrw_longlist= 0
-endif
-if g:netrw_longlist == 1
- let g:netrw_list_cmd= g:netrw_list_cmd." -l"
-endif
-" Default values - m-r ---------- {{{2
-if !exists("g:netrw_maxfilenamelen")
- let g:netrw_maxfilenamelen= 32
-endif
-if !exists("g:netrw_mkdir_cmd")
- let g:netrw_mkdir_cmd= g:netrw_ssh_cmd." HOSTNAME mkdir"
-endif
-if !exists("g:netrw_rename_cmd")
- let g:netrw_rename_cmd= g:netrw_ssh_cmd." HOSTNAME mv"
-endif
if !exists("g:netrw_rm_cmd")
- let g:netrw_rm_cmd = g:netrw_ssh_cmd." HOSTNAME rm"
-endif
-if !exists("g:netrw_rmdir_cmd")
- let g:netrw_rmdir_cmd = g:netrw_ssh_cmd." HOSTNAME rmdir"
+ let g:netrw_rm_cmd = "ssh HOSTNAME rm"
endif
if !exists("g:netrw_rmf_cmd")
- let g:netrw_rmf_cmd = g:netrw_ssh_cmd." HOSTNAME rm -f"
+ let g:netrw_rmf_cmd = "ssh HOSTNAME rm -f"
endif
-" Default values - s ---------- {{{2
+if !exists("g:netrw_rmdir_cmd")
+ let g:netrw_rmdir_cmd = "ssh HOSTNAME rmdir"
+endif
+if !exists("g:netrw_rename_cmd")
+ let g:netrw_rename_cmd= "ssh HOSTNAME mv"
+endif
if exists("g:netrw_silent") && g:netrw_silent != 0
let g:netrw_silentxfer= "silent "
else
let g:netrw_silentxfer= ""
endif
+if !exists("g:netrw_winsize")
+ let g:netrw_winsize= ""
+endif
+if !exists("g:netrw_list_hide")
+ let g:netrw_list_hide= ""
+endif
if !exists("g:netrw_sort_by")
" alternatives: date size
let g:netrw_sort_by= "name"
endif
+if !exists("g:netrw_sort_sequence")
+ let g:netrw_sort_sequence= '[\/]$,*,\.bak$,\.o$,\.h$,\.info$,\.swp$,\.obj$'
+endif
if !exists("g:netrw_sort_direction")
" alternative: reverse (z y x ...)
let g:netrw_sort_direction= "normal"
endif
-if !exists("g:netrw_sort_sequence")
- let g:netrw_sort_sequence= '[\/]$,*,\.bak$,\.o$,\.h$,\.info$,\.swp$,\.obj$'
+if !exists("g:netrw_longlist")
+ let g:netrw_longlist= 0
+endif
+if g:netrw_longlist == 0 || g:netrw_longlist == 2
+ let g:netrw_list_cmd= "ssh HOSTNAME ls -FLa"
+else
+ let g:netrw_longlist= 1
+ let g:netrw_list_cmd= "ssh HOSTNAME ls -FLa -l"
+endif
+if !exists("g:netrw_list_cmd")
+endif
+if !exists("g:netrw_timefmt")
+ let g:netrw_timefmt= "%c"
+endif
+if !exists("g:netrw_local_rmdir")
+ let g:netrw_local_rmdir= "rmdir"
+endif
+if !exists("g:netrw_local_mkdir")
+ let g:netrw_local_mkdir= "mkdir"
+endif
+if !exists("g:netrw_mkdir_cmd")
+ let g:netrw_mkdir_cmd= "ssh HOSTNAME mkdir"
+endif
+if !exists("g:netrw_hide")
+ let g:netrw_hide= 1
+endif
+if !exists("g:netrw_ftp_browse_reject")
+ let g:netrw_ftp_browse_reject='^total\s\+\d\+$\|^Trying\s\+\d\+.*$\|^KERBEROS_V\d rejected\|^Security extensions not\|No such file\|: connect to address [0-9a-fA-F:]*: No route to host$'
endif
if !exists("g:netrw_ssh_browse_reject")
let g:netrw_ssh_browse_reject='^total\s\+\d\+$'
endif
-" Default values - t-w ---------- {{{2
-if !exists("g:netrw_timefmt")
- let g:netrw_timefmt= "%c"
+if !exists("g:netrw_keepdir")
+ let g:netrw_keepdir= 1
endif
-if !exists("g:netrw_win95ftp")
- let g:netrw_win95ftp= 1
-endif
-if !exists("g:netrw_winsize")
- let g:netrw_winsize= ""
-endif
-" ---------------------------------------------------------------------
-" Default values for netrw's script variables: {{{1
if !exists("s:netrw_cd_escape")
if has("win32") || has("win95") || has("win64") || has("win16")
let s:netrw_cd_escape="#% "
@@ -224,12 +142,75 @@
let s:netrw_glob_escape= '[]*?`{~$'
endif
endif
+if !exists("g:netrw_alto")
+ let g:netrw_alto= 0
+endif
+if !exists("g:netrw_altv")
+ let g:netrw_altv= 0
+endif
+if !exists("g:netrw_maxfilenamelen")
+ let g:netrw_maxfilenamelen= 32
+endif
+if !exists("g:netrw_dirhistmax")
+ let g:netrw_dirhistmax= 10
+endif
+if !exists("g:NETRW_DIRHIST_CNT")
+ let g:NETRW_DIRHIST_CNT= 0
+endif
" BufEnter event ignored by decho when following variable is true
" Has a side effect that doau BufReadPost doesn't work, so
" files read by network transfer aren't appropriately highlighted.
"let g:decho_bufenter = 1 "Decho
+" ---------------------------------------------------------------------
+" Default values for global protocol variables {{{1
+if !exists("g:netrw_rcp_cmd")
+ let g:netrw_rcp_cmd = "rcp"
+endif
+if !exists("g:netrw_ftp_cmd")
+ let g:netrw_ftp_cmd = "ftp"
+endif
+if !exists("g:netrw_scp_cmd")
+ let g:netrw_scp_cmd = "scp -q"
+endif
+if !exists("g:netrw_sftp_cmd")
+ let g:netrw_sftp_cmd = "sftp"
+endif
+if !exists("g:netrw_http_cmd")
+ if executable("wget")
+ let g:netrw_http_cmd = "wget -q -O"
+ elseif executable("fetch")
+ let g:netrw_http_cmd = "fetch -o"
+ else
+ let g:netrw_http_cmd = ""
+ endif
+endif
+if !exists("g:netrw_dav_cmd")
+ let g:netrw_dav_cmd = "cadaver"
+endif
+if !exists("g:netrw_rsync_cmd")
+ let g:netrw_rsync_cmd = "rsync"
+endif
+if !exists("g:netrw_fetch_cmd")
+ if executable("fetch")
+ let g:netrw_fetch_cmd = "fetch -o"
+ else
+ let g:netrw_fetch_cmd = ""
+ endif
+endif
+
+if has("win32") || has("win95") || has("win64") || has("win16")
+ \ && exists("g:netrw_use_nt_rcp")
+ \ && g:netrw_use_nt_rcp
+ \ && executable( $SystemRoot .'/system32/rcp.exe')
+ let s:netrw_has_nt_rcp = 1
+ let s:netrw_rcpmode = '-b'
+ else
+ let s:netrw_has_nt_rcp = 0
+ let s:netrw_rcpmode = ''
+endif
+
" ------------------------------------------------------------------------
" NetSavePosn: saves position of cursor on screen {{{1
fun! netrw#NetSavePosn()
@@ -422,14 +403,12 @@
".........................................
" ftp + <.netrc>: NetRead Method #2
elseif b:netrw_method == 2 " read with ftp + <.netrc>
-" call Decho("read via ftp+.netrc (method #2)")
+" call Decho("read via ftp+.netrc (method #2)")
let netrw_fname= b:netrw_fname
new
setlocal ff=unix
exe "put ='".g:netrw_ftpmode."'"
-" call Decho("filter input: ".getline("."))
- exe "put ='".'get \"'.netrw_fname.'\" '.tmpfile."'"
-" call Decho("filter input: ".getline("."))
+ exe "put ='"."get ".netrw_fname." ".tmpfile."'"
if exists("g:netrw_port") && g:netrw_port != ""
" call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port)
exe g:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port
@@ -446,7 +425,7 @@
let &debug= debugkeep
endif
bd!
- let result = s:NetGetFile(readcmd, tmpfile, b:netrw_method)
+ let result = s:NetGetFile(readcmd, tmpfile, b:netrw_method)
let b:netrw_lastfile = choice
".........................................
@@ -459,33 +438,27 @@
setlocal ff=unix
if exists("g:netrw_port") && g:netrw_port != ""
put ='open '.g:netrw_machine.' '.g:netrw_port
-" call Decho("filter input: ".getline("."))
else
put ='open '.g:netrw_machine
-" call Decho("filter input: ".getline("."))
endif
if exists("g:netrw_ftp") && g:netrw_ftp == 1
put =g:netrw_uid
-" call Decho("filter input: ".getline("."))
- put ='\"'.g:netrw_passwd.'\"'
-" call Decho("filter input: ".getline("."))
+ put =g:netrw_passwd
else
- put ='user \"'.g:netrw_uid.'\" \"'.g:netrw_passwd.'\"'
-" call Decho("filter input: ".getline("."))
+ put ='user '.g:netrw_uid.' '.g:netrw_passwd
endif
if exists("g:netrw_ftpmode") && g:netrw_ftpmode != ""
put =g:netrw_ftpmode
-" call Decho("filter input: ".getline("."))
endif
- put ='get \"'.netrw_fname.'\" '.tmpfile
-" call Decho("filter input: ".getline("."))
+ put ='get '.netrw_fname.' '.tmpfile
" perform ftp:
" -i : turns off interactive prompting from ftp
" -n unix : DON'T use <.netrc>, even though it exists
" -n win32: quit being obnoxious about password
+" call Decho('performing ftp -i -n')
norm! 1Gdd
" call Decho("executing: %!".g:netrw_ftp_cmd." -i -n")
exe g:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i -n"
@@ -518,7 +491,7 @@
" call Decho("executing: !".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile)
exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile
endif
- let result = s:NetGetFile(readcmd, tmpfile, b:netrw_method)
+ let result = s:NetGetFile(readcmd, tmpfile, b:netrw_method)
let b:netrw_lastfile = choice
".........................................
@@ -529,8 +502,7 @@
echohl Error | echo "***netrw*** neither wget nor fetch command is available" | echohl None
call inputsave()|call input("Press <cr> to continue")|call inputrestore()
endif
-" call Dret("NetRead")
- return
+ exit
endif
if match(b:netrw_fname,"#") == -1
@@ -609,7 +581,7 @@
echohl Error | echo "***netrw*** fetch command not available" | echohl None
call inputsave()|call input("Press <cr> to continue")|call inputrestore()
endif
-" call Dret("NetRead")
+ exit
endif
if exists("g:netrw_option") && g:netrw_option == ":http"
let netrw_option= "http"
@@ -666,10 +638,6 @@
" NetGetFile: Function to read file "fname" with command "readcmd". {{{1
fun! s:NetGetFile(readcmd, fname, method)
" call Dfunc("NetGetFile(readcmd<".a:readcmd.">,fname<".a:fname."> method<".a:method.">)")
-
- " record remote filename
- let rfile= bufname("%")
-" call Decho("rfile<".rfile.">")
if exists("*NetReadFixup")
" for the use of NetReadFixup (not otherwise used internally)
@@ -687,12 +655,15 @@
endif
else
let fname= a:fname
-" call Decho("fname=a:fname<".fname.">")
+" call Decho("(copied) fname<".fname.">")
endif
if a:readcmd[0] == '0'
" get file into buffer
+ " record remote filename
+ let rfile= bufname(".")
+" call Decho("remotefile<".rfile.">")
" call Dredir("ls!","starting buffer list")
" rename the current buffer to the temp file (ie. fname)
@@ -717,12 +688,8 @@
exe a:readcmd." ".v:cmdarg." ".fname
let line1 = curline + 1
let line2 = line("$") - lastline + 1
-
else
" not readable
-" call Dfunc("NetGetFile(readcmd<".a:readcmd.">,fname<".a:fname."> method<".a:method.">)")
- echohl WarningMsg | echo "***netrw*** file <".fname."> not readable"| echohl None
- call inputsave()|call input("Press <cr> to continue")|call inputrestore()
" call Dret("NetGetFile : fname<".fname."> not readable")
return
endif
@@ -762,7 +729,7 @@
if !isdirectory(substitute(tmpfile,'[^/]\+$','','e'))
echohl Error | echo "***netrw*** your ".substitute(tmpfile,'[^/]\+$','','e')." directory is missing!"
call inputsave()|call input("Press <cr> to continue")|call inputrestore()
-" call Dret("NetWrite")
+" call Dret("NetRead")
return
endif
@@ -872,9 +839,9 @@
new
setlocal ff=unix
exe "put ='".g:netrw_ftpmode."'"
-" call Decho(" filter input: ".getline("."))
- exe "put ='"."put ".tmpfile.' \"'.netrw_fname.'\"'."'"
-" call Decho(" filter input: ".getline("."))
+" call Decho(" NetWrite: put ='".g:netrw_ftpmode."'")
+ exe "put ='"."put ".tmpfile." ".netrw_fname."'"
+" call Decho("put ='"."put ".tmpfile." ".netrw_fname."'")
if exists("g:netrw_port") && g:netrw_port != ""
" call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port)
exe g:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port
@@ -901,22 +868,16 @@
setlocal ff=unix
if exists("g:netrw_port") && g:netrw_port != ""
put ='open '.g:netrw_machine.' '.g:netrw_port
-" call Decho("filter input: ".getline("."))
else
put ='open '.g:netrw_machine
-" call Decho("filter input: ".getline("."))
endif
if exists("g:netrw_ftp") && g:netrw_ftp == 1
put =g:netrw_uid
-" call Decho("filter input: ".getline("."))
- put ='\"'.g:netrw_passwd.'\"'
-" call Decho("filter input: ".getline("."))
+ put =g:netrw_passwd
else
- put ='user \"'.g:netrw_uid.'\" \"'.g:netrw_passwd.'\"'
-" call Decho("filter input: ".getline("."))
+ put ='user '.g:netrw_uid.' '.g:netrw_passwd
endif
- put ='put '.tmpfile.' \"'.netrw_fname.'\"'
-" call Decho("filter input: ".getline("."))
+ put ='put '.tmpfile.' '.netrw_fname
" save choice/id/password for future use
let b:netrw_lastfile = choice
@@ -924,6 +885,7 @@
" -i : turns off interactive prompting from ftp
" -n unix : DON'T use <.netrc>, even though it exists
" -n win32: quit being obnoxious about password
+" call Decho('performing ftp -i -n')
norm! 1Gdd
" call Decho("executing: %!".g:netrw_ftp_cmd." -i -n")
exe g:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i -n"
@@ -1076,7 +1038,7 @@
endif
elseif !exists("g:netrw_list_cmd") || g:netrw_list_cmd == ''
if !exists("g:netrw_quiet")
- echohl Error | echo "***netrw*** this system doesn't support remote directory listing via ".g:netrw_list_cmd | echohl None
+ echohl Error | echo "***netrw*** this system doesn't support remote directory listing via ssh" | echohl None
call inputsave()|call input("Press <cr> to continue")|call inputrestore()
endif
@@ -1094,7 +1056,7 @@
" analyze a:dirname and g:netrw_list_cmd
let dirpat = '^\(\w\{-}\)://\(\w\+@\)\=\([^/]\+\)/\(.*\)$'
let dirname = substitute(a:dirname,'\\','/','ge')
-" call Decho("dirname<".dirname.">")
+" call Decho("dirpat<".dirpat.">")
if dirname !~ dirpat
if !exists("g:netrw_quiet")
echohl Error | echo "***netrw*** netrw doesn't understand your dirname<".dirname.">" | echohl None
@@ -1164,9 +1126,9 @@
" call Decho("new path<".path.">")
" remote-read the requested file into current buffer
- keepjumps keepalt enew!
+ enew!
set ma
-" call Decho("exe file ".method."://".user.machine."/".escape(path,s:netrw_cd_escape))
+" call Decho("exe file .method."://".user.machine."/".escape(path,s:netrw_cd_escape))
exe "file ".method."://".user.machine."/".escape(path,s:netrw_cd_escape)
exe "silent doau BufReadPre ".fname
silent call netrw#NetRead(method."://".user.machine."/".path)
@@ -1174,7 +1136,7 @@
keepjumps 1d
" save certain window-oriented variables into buffer-oriented variables
- call s:SetBufWinVars()
+ call s:BufWinVars()
call s:NetOptionRestore()
setlocal nomod
@@ -1200,7 +1162,7 @@
endif
else
" call Decho("generate a new buffer")
- keepjumps keepalt enew!
+ enew!
endif
" rename file to reflect where its from
@@ -1238,7 +1200,7 @@
nnoremap <buffer> <silent> U :<c-u>call <SID>NetBookmarkDir(5,expand("%"))<cr>
nnoremap <buffer> <silent> v :call <SID>NetSplit(1)<cr>
nnoremap <buffer> <silent> x :call <SID>NetBrowseX(<SID>NetBrowseChgDir(expand("%"),<SID>NetGetWord()),1)<cr>
- nnoremap <buffer> <silent> <2-leftmouse> :call <SID>NetBrowse(<SID>NetBrowseChgDir(expand("%"),<SID>NetGetWord()))<cr>
+ nnoremap <buffer> <silent> <2-leftmouse> :call <SID>NetBrowse(<SID>NetBrowseChgDir(expand("%"),<SID>NetGetWord()))<cr>
exe 'nnoremap <buffer> <silent> <del> :call <SID>NetBrowseRm("'.user.machine.'","'.path.'")<cr>'
exe 'vnoremap <buffer> <silent> <del> :call <SID>NetBrowseRm("'.user.machine.'","'.path.'")<cr>'
exe 'nnoremap <buffer> <silent> d :call <SID>NetMakeDir("'.user.machine.'")<cr>'
@@ -1298,7 +1260,6 @@
if g:netrw_ftp_browse_reject != ""
exe "silent! g/".g:netrw_ftp_browse_reject."/keepjumps d"
endif
- silent! keepjumps %s/\r$//e
" if there's no ../ listed, then put ./ and ../ in
let line1= line(".")
@@ -1313,9 +1274,9 @@
keepjumps norm! 0
" more cleanup
- exe 'silent! keepjumps '.w:netrw_bannercnt.',$s/^\(\%(\S\+\s\+\)\{7}\S\+\)\s\+\(\S.*\)$/\2/e'
- exe "silent! keepjumps ".w:netrw_bannercnt.',$g/ -> /s# -> .*/$#/#e'
- exe "silent! keepjumps ".w:netrw_bannercnt.',$g/ -> /s# -> .*$#/#e'
+ exe 'keepjumps silent! '.w:netrw_bannercnt.',$s/^\(\%(\S\+\s\+\)\{7}\S\+\)\s\+\(\S.*\)$/\2/e'
+ exe "keepjumps silent! ".w:netrw_bannercnt.',$g/ -> /s# -> .*/$#/#e'
+ exe "keepjumps silent! ".w:netrw_bannercnt.',$g/ -> /s# -> .*$#/#e'
endif
else
@@ -1372,33 +1333,33 @@
keepjumps norm! 0
endif
- exe 'silent keepjumps '.w:netrw_bannercnt.',$s/ -> .*$//e'
- exe 'silent keepjumps '.w:netrw_bannercnt.',$s/^\(\%(\S\+\s\+\)\{7}\S\+\)\s\+\(\S.*\)$/\2\t\1/e'
- exe 'silent keepjumps '.w:netrw_bannercnt
+ exe 'keepjumps silent '.w:netrw_bannercnt.',$s/ -> .*$//e'
+ exe 'keepjumps silent '.w:netrw_bannercnt.',$s/^\(\%(\S\+\s\+\)\{7}\S\+\)\s\+\(\S.*\)$/\2\t\1/e'
+ exe w:netrw_bannercnt
endif
if line("$") >= w:netrw_bannercnt
if g:netrw_sort_by =~ "^n"
call s:SetSort()
if g:netrw_sort_direction =~ 'n'
- exe 'silent keepjumps '.w:netrw_bannercnt.',$sort'
+ exe 'keepjumps silent '.w:netrw_bannercnt.',$sort'
else
- exe 'silent keepjumps '.w:netrw_bannercnt.',$sort!'
+ exe 'keepjumps silent '.w:netrw_bannercnt.',$sort!'
endif
- exe 'silent keepjumps '.w:netrw_bannercnt.',$s/^\d\{3}\///e'
+ exe 'keepjumps silent '.w:netrw_bannercnt.',$s/^\d\{3}\///e'
endif
if w:netrw_longlist == 1
" shorten the list to keep its width <= winwidth characters
- exe "silent keepjumps ".w:netrw_bannercnt.',$s/\t[-dstrwx]\+/\t/e'
+ exe "keepjumps silent ".w:netrw_bannercnt.',$s/\t[-dstrwx]\+/\t/e'
endif
endif
endif
+ " cleanup any windows mess at end-of-line
+ keepjumps silent! %s/\r$//e
call s:NetrwWideListing()
if line("$") >= w:netrw_bannercnt
- " place cursor on the top-left corner of the file listing
exe "keepjumps ".w:netrw_bannercnt
- norm! 0
endif
call s:NetOptionRestore()
@@ -1488,7 +1449,7 @@
let s:netrw_skipbrowse= 1
echo 'Pressing "a" also works'
elseif line("$") > w:netrw_bannercnt
- exe 'silent keepjumps '.w:netrw_bannercnt
+ exe w:netrw_bannercnt
endif
elseif w:netrw_longlist == 0
@@ -1552,9 +1513,6 @@
let ok= input("Confirm deletion of file<".rmfile."> ","[{y(es)},n(o),a(ll),q(uit)] ")
call inputrestore()
echohl NONE
- if ok == ""
- let ok="no"
- endif
let ok= substitute(ok,'\[{y(es)},n(o),a(ll),q(uit)]\s*','','e')
if ok =~ 'a\%[ll]'
let all= 1
@@ -1581,9 +1539,6 @@
call inputsave()
let ok= input("Confirm deletion of directory<".rmfile."> ","[{y(es)},n(o),a(ll),q(uit)] ")
call inputrestore()
- if ok == ""
- let ok="no"
- endif
let ok= substitute(ok,'\[{y(es)},n(o),a(ll),q(uit)]\s*','','e')
if ok =~ 'a\%[ll]'
let all= 1
@@ -1735,12 +1690,12 @@
" create a local copy
let fname= tempname().".".exten
" call Decho("create a local copy of <".a:fname."> as <".fname.">")
- exe "silent keepjumps bot 1new ".a:fname
+ exe "keepjumps silent bot 1new ".a:fname
set bh=delete
exe "w! ".fname
q
endif
-" call Decho("exten<".exten."> "."netrwFileHandlers#NFH_".exten."():exists=".exists("*netrwFileHandlers#NFH_".exten))
+" call Decho("exten<".exten."> "."NetrwFileHandler_".exten."():exists=".exists("*NetrwFileHandler_".exten))
" set up redirection
if &srr =~ "%s"
@@ -1756,22 +1711,19 @@
exe 'silent !start rundll32 url.dll,FileProtocolHandler "'.escape(fname, '%#').'"'
let ret= v:shell_error
- elseif has("unix") && executable("gnome-open")
-" call Decho("exe silent !gnome-open '".escape(fname,'%#')."' ".redir)
- exe "silent !gnome-open '".escape(fname,'%#')."'".redir
- let ret= v:shell_error
-
elseif has("unix") && executable("kfmclient")
" call Decho("exe silent !kfmclient exec '".escape(fname,'%#')."' ".redir)
exe "silent !kfmclient exec '".escape(fname,'%#')."' ".redir
let ret= v:shell_error
- else
- call netrwFileHandlers#Init()
- if exten != "" && exists("*netrwFileHandlers#NFH_".exten)
-" call Decho("let ret= netrwFileHandlers#NFH_".exten.'("'.fname.'")')
- exe "let ret= netrwFileHandlers#NFH_".exten.'("'.fname.'")'
- endif
+ elseif has("unix") && executable("gnome-open")
+" call Decho("exe silent !gnome-open '".escape(fname,'%#')."' ".redir)
+ exe "silent !gnome-open '".escape(fname,'%#')."'".redir
+ let ret= v:shell_error
+
+ elseif exten != "" && exists("*NetrwFileHandler_".exten)
+" call Decho("let ret= NetrwFileHandler_".exten.'("'.fname.'")')
+ exe "let ret= NetrwFileHandler_".exten.'("'.fname.'")'
endif
redraw!
@@ -1813,11 +1765,11 @@
if w:netrw_method == 2 || w:netrw_method == 5
" ftp + <.netrc>: Method #2
if a:path != ""
- put ='cd \"'.a:path.'\"'
-" call Decho('ftp: '.getline("."))
+ put ='cd '.a:path
+" call Decho("ftp: cd ".a:path)
endif
exe "put ='".a:cmd."'"
-" call Decho("ftp: ".getline("."))
+" call Decho("ftp: ".a:cmd)
" redraw!|call inputsave()|call input("Pausing...")|call inputrestore()
if exists("g:netrw_port") && g:netrw_port != ""
" call Decho("exe ".g:netrw_silentxfer.curline.",$!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port)
@@ -1839,13 +1791,13 @@
if exists("g:netrw_ftp") && g:netrw_ftp == 1
put =g:netrw_uid
- put ='\"'.g:netrw_passwd.'\"'
+ put =g:netrw_passwd
else
- put ='user \"'.g:netrw_uid.'\" \"'.g:netrw_passwd.'\"'
+ put ='user '.g:netrw_uid.' '.g:netrw_passwd
endif
if a:path != ""
- put ='cd \"'.a:path.'\"'
+ put ='cd '.a:path
endif
exe "put ='".a:cmd."'"
@@ -1863,14 +1815,14 @@
" cleanup for Windows
if has("win32") || has("win95") || has("win64") || has("win16")
- silent! keepjumps! %s/\r$//e
+ keepjumps silent!! %s/\r$//e
endif
if a:cmd == "dir"
" infer directory/link based on the file permission string
- silent! keepjumps g/d\%([-r][-w][-x]\)\{3}/s@$@/@
- silent! keepjumps g/l\%([-r][-w][-x]\)\{3}/s/$/@/
+ keepjumps silent! g/d\%([-r][-w][-x]\)\{3}/s@$@/@
+ keepjumps silent! g/l\%([-r][-w][-x]\)\{3}/s/$/@/
if w:netrw_longlist == 0 || w:netrw_longlist == 2
- exe "silent! keepjumps ".curline.',$s/^\%(\S\+\s\+\)\{8}//e'
+ exe "keepjumps silent! ".curline.',$s/^\%(\S\+\s\+\)\{8}//e'
endif
endif
@@ -1908,9 +1860,9 @@
" Prune the list by hiding any files which match
" call Decho("pruning <".hide."> listhide<".listhide.">")
if g:netrw_hide == 1
- exe 'silent keepjumps '.w:netrw_bannercnt.',$g~'.hide.'~d'
+ exe 'keepjumps silent '.w:netrw_bannercnt.',$g~'.hide.'~d'
elseif g:netrw_hide == 2
- exe 'silent keepjumps '.w:netrw_bannercnt.',$v~'.hide.'~d'
+ exe 'keepjumps silent '.w:netrw_bannercnt.',$v~'.hide.'~d'
endif
endwhile
@@ -2044,10 +1996,10 @@
exe "silent keepjumps norm! 0\<c-v>".newcolqty.'j$hx'.w:netrw_bannercnt.'G$p'
endif
exe "silent keepjumps ".newcolstart.','.newcolend.'d'
- exe 'silent keepjumps '.w:netrw_bannercnt
+ exe w:netrw_bannercnt
endwhile
exe "silent keepjumps ".w:netrw_bannercnt.',$s/\s\+$//e'
- setlocal noma nomod
+ set noma nomod
endif
" call Dret("NetrwWideListing")
@@ -2178,12 +2130,9 @@
if exists("w:netrw_bannercnt") && line(".") <= w:netrw_bannercnt
" looks like a "b" was pressed while in the banner region
if line("$") > w:netrw_bannercnt
- exe 'silent keepjumps '.w:netrw_bannercnt
+ exe w:netrw_bannercnt
endif
- if &ch > 1
- " "clear" the message
- echo ""
- endif
+ echo ""
" call Dret("NetBookmarkDir - ignoring")
return
endif
@@ -2280,10 +2229,12 @@
" ---------------------------------------------------------------------
" NetObtain: obtain file under cursor (for remote browsing support) {{{2
fun! s:NetObtain()
+ if !exists("s:netrw_users_stl")
+ let s:netrw_users_stl= &stl
+ endif
let fname= expand("<cWORD>")
-
- " NetrwStatusLine support - for obtaining support
- call s:SetupNetrwStatusLine('%f %h%m%r%=%9*Obtaining '.fname)
+ exe 'set stl=%f\ %h%m%r%=Obtaining\ '.escape(fname,' ')
+ redraw!
" call Dfunc("NetObtain() method=".w:netrw_method)
if exists("w:netrw_method") && w:netrw_method =~ '[235]'
@@ -2326,11 +2277,11 @@
if exists("g:netrw_ftp") && g:netrw_ftp == 1
put =g:netrw_uid
- put ='\"'.g:netrw_passwd.'\"'
+ put =g:netrw_passwd
" call Decho('ftp: g:netrw_uid')
" call Decho('ftp: g:netrw_passwd')
else
- put ='user \"'.g:netrw_uid.'\" \"'.g:netrw_passwd.'\"'
+ put ='user '.g:netrw_uid.' '.g:netrw_passwd
" call Decho('user '.g:netrw_uid.' '.g:netrw_passwd)
endif
@@ -2355,14 +2306,12 @@
" restore
exe "silent! ".endline.",$d"
exe "keepjumps ".curline
- setlocal noma nomod
+ set noma nomod
else
if !exists("g:netrw_quiet")
echohl Error | echo "***netrw*** this system doesn't support ftp" | echohl None
call inputsave()|call input("Press <cr> to continue")|call inputrestore()
endif
- let &stl = s:netrw_users_stl
- let &laststatus = s:netrw_users_ls
" call Dret("NetObtain")
return
endif
@@ -2370,8 +2319,6 @@
".........................................
else
" scp: Method#4
- let curdir = expand("%")
- let path = substitute(curdir,'scp://[^/]\+/','','e')
if exists("g:netrw_port") && g:netrw_port != ""
let useport= " -P ".g:netrw_port
else
@@ -2379,17 +2326,16 @@
endif
if g:netrw_cygwin == 1
let cygtmpfile=substitute(tmpfile,'^\(\a\):','/cygdrive/\1/','e')
-" call Decho("executing: !".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".path.escape(fname,' ?&')." .")
- exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".path.escape(fname,' ?&')." ."
+" call Decho("executing: !".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".escape(fname,' ?&')." .")
+ exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".escape(fname,' ?&')." ."
else
-" call Decho("executing: !".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".path.escape(fname,' ?&')." .")
- exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".path.escape(fname,' ?&')." ."
+" call Decho("executing: !".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".escape(fname,' ?&')." .")
+ exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".escape(fname,' ?&')." ."
endif
endif
" restore status line
- let &stl = s:netrw_users_stl
- let &laststatus = s:netrw_users_ls
+ let &stl= s:netrw_users_stl
redraw!
" call Dret("NetObtain")
@@ -2458,7 +2404,7 @@
" get cleared buffer
if bufnum < 0 || !bufexists(bufnum)
- keepjumps keepalt enew!
+ keepalt enew!
" call Decho("enew buffer")
else
exe "keepalt b ".bufnum
@@ -2550,7 +2496,7 @@
nnoremap <buffer> <silent> U :<c-u>call <SID>NetBookmarkDir(5,expand("%"))<cr>
nnoremap <buffer> <silent> v :call <SID>NetSplit(3)<cr>
nnoremap <buffer> <silent> x :call <SID>NetBrowseX(<SID>LocalBrowseChgDir(b:netrw_curdir,<SID>NetGetWord(),0),0)"<cr>
- nnoremap <buffer> <silent> <2-leftmouse> :call <SID>LocalBrowse(<SID>LocalBrowseChgDir(b:netrw_curdir,<SID>NetGetWord()))<cr>
+ nnoremap <buffer> <silent> <2-leftmouse> :exe "call <SID>LocalRefresh(<SID>LocalBrowseChgDir(b:netrw_curdir,<SID>NetGetWord()))"<cr>
nnoremap <buffer> <silent> <s-up> :Pexplore<cr>
nnoremap <buffer> <silent> <s-down> :Nexplore<cr>
exe 'nnoremap <buffer> <silent> <del> :call <SID>LocalBrowseRm("'.b:netrw_curdir.'")<cr>'
@@ -2628,19 +2574,19 @@
call s:SetSort()
if g:netrw_sort_direction =~ 'n'
- exe 'silent keepjumps '.w:netrw_bannercnt.',$sort'
+ exe 'keepjumps silent '.w:netrw_bannercnt.',$sort'
else
- exe 'silent keepjumps '.w:netrw_bannercnt.',$sort!'
+ exe 'keepjumps silent '.w:netrw_bannercnt.',$sort!'
endif
- exe 'silent keepjumps '.w:netrw_bannercnt.',$s/^\d\{3}\///e'
+ exe 'keepjumps silent '.w:netrw_bannercnt.',$s/^\d\{3}\///e'
else
if g:netrw_sort_direction =~ 'n'
- exe 'silent keepjumps '.w:netrw_bannercnt.',$sort'
+ exe 'keepjumps silent '.w:netrw_bannercnt.',$sort'
else
- exe 'silent keepjumps '.w:netrw_bannercnt.',$sort!'
+ exe 'keepjumps silent '.w:netrw_bannercnt.',$sort!'
endif
- exe 'silent keepjumps '.w:netrw_bannercnt.',$s/^\d\{-}\///e'
+ exe 'keepjumps silent '.w:netrw_bannercnt.',$s/^\d\{-}\///e'
endif
endif
@@ -2648,16 +2594,14 @@
call s:NetrwWideListing()
if exists("w:netrw_bannercnt") && line("$") > w:netrw_bannercnt
- " place cursor on the top-left corner of the file listing
- exe 'silent '.w:netrw_bannercnt
- norm! 0
+ exe w:netrw_bannercnt
endif
" record previous current directory
let w:netrw_prvdir= b:netrw_curdir
" save certain window-oriented variables into buffer-oriented variables
- call s:SetBufWinVars()
+ call s:BufWinVars()
call s:NetOptionRestore()
setlocal noma nomod nonu bh=hide nobl
@@ -2757,7 +2701,7 @@
endwhile
" cleanup any windows mess at end-of-line
- silent! keepjumps %s/\r$//e
+ keepjumps silent! %s/\r$//e
setlocal ts=32
" call Dret("LocalBrowseList")
@@ -2848,12 +2792,7 @@
let ok= input("Confirm deletion of file<".rmfile."> ","[{y(es)},n(o),a(ll),q(uit)] ")
call inputrestore()
echohl NONE
- if ok == ""
- let ok="no"
- endif
-" call Decho("response: ok<".ok.">")
let ok= substitute(ok,'\[{y(es)},n(o),a(ll),q(uit)]\s*','','e')
-" call Decho("response: ok<".ok."> (after sub)")
if ok =~ 'a\%[ll]'
let all= 1
endif
@@ -2874,9 +2813,6 @@
let ok= input("Confirm deletion of directory<".rmfile."> ","[{y(es)},n(o),a(ll),q(uit)] ")
call inputrestore()
let ok= substitute(ok,'\[{y(es)},n(o),a(ll),q(uit)]\s*','','e')
- if ok == ""
- let ok="no"
- endif
if ok =~ 'a\%[ll]'
let all= 1
endif
@@ -3065,7 +3001,6 @@
" call Decho("calling NetBrowse(newdir<".newdir.">)")
call s:NetBrowse(newdir)
else
- if newdir == ""|let newdir= "."|endif
" call Decho("calling LocalBrowse(newdir<".newdir.">)")
call s:LocalBrowse(newdir)
endif
@@ -3097,8 +3032,12 @@
endif
endif
- " NetrwStatusLine support - for exploring support
+ " NetrwStatusLine support
let w:netrw_explore_indx= indx
+ if !exists("s:netrw_users_stl")
+ let s:netrw_users_stl= &stl
+ endif
+ set stl=%f\ %h%m%r%=%{NetrwStatusLine()}
" call Decho("explorelist<".join(w:netrw_explore_list,',')."> len=".w:netrw_explore_listlen)
" sanity check
@@ -3111,21 +3050,15 @@
endif
exe "let dirfile= w:netrw_explore_list[".indx."]"
-" call Decho("dirfile=w:netrw_explore_list[indx=".indx."]= <".dirfile.">")
+" call Decho("dirfile<".dirfile."> indx=".indx)
let newdir= substitute(dirfile,'/[^/]*$','','e')
" call Decho("newdir<".newdir.">")
-
" call Decho("calling LocalBrowse(newdir<".newdir.">)")
call s:LocalBrowse(newdir)
- if w:netrw_longlist == 0 || w:netrw_longlist == 1
- call search('^'.substitute(dirfile,"^.*/","","").'\>',"W")
- else
- call search('\<'.substitute(dirfile,"^.*/","","").'\>',"w")
- endif
+ call search(substitute(dirfile,"^.*/","",""),"W")
let w:netrw_explore_mtchcnt = indx + 1
let w:netrw_explore_bufnr = bufnr(".")
let w:netrw_explore_line = line(".")
- call s:SetupNetrwStatusLine('%f %h%m%r%=%9*%{NetrwStatusLine()}')
" call Decho("explore: mtchcnt=".w:netrw_explore_mtchcnt." bufnr=".w:netrw_explore_bufnr." line#".w:netrw_explore_line)
else
@@ -3145,73 +3078,12 @@
endfun
" ---------------------------------------------------------------------
-" SetupNetrwStatusLine: {{{2
-fun! s:SetupNetrwStatusLine(statline)
-" call Dfunc("SetupNetrwStatusLine(statline<".a:statline.">)")
-
- if !exists("s:netrw_setup_statline")
- let s:netrw_setup_statline= 1
-" call Decho("do first-time status line setup")
-
- if !exists("s:netrw_users_stl")
- let s:netrw_users_stl= &stl
- endif
- if !exists("s:netrw_users_ls")
- let s:netrw_users_ls= &laststatus
- endif
-
- " set up User9 highlighting as needed
- let keepa= @a
- redir @a
- try
- hi User9
- catch /^Vim\%((\a\+)\)\=:E411/
- if &bg == "dark"
- hi User9 ctermfg=yellow ctermbg=blue guifg=yellow guibg=blue
- else
- hi User9 ctermbg=yellow ctermfg=blue guibg=yellow guifg=blue
- endif
- endtry
- redir END
- let @a= keepa
- endif
-
- " set up status line (may use User9 highlighting)
- " insure that windows have a statusline
- " make sure statusline is displayed
- let &stl=a:statline
- set laststatus=2
-" call Decho("stl=".&stl)
- redraw!
-
-" call Dret("SetupNetrwStatusLine : stl=".&stl)
-endfun
-
-" ---------------------------------------------------------------------
" NetrwStatusLine: {{{2
fun! NetrwStatusLine()
-
- " vvv NetrwStatusLine() debugging vvv
-" let g:stlmsg=""
-" if !exists("w:netrw_explore_bufnr")
-" let g:stlmsg="!X<explore_bufnr>"
-" elseif w:netrw_explore_bufnr != bufnr(".")
-" let g:stlmsg="explore_bufnr!=".bufnr(".")
-" endif
-" if !exists("w:netrw_explore_line")
-" let g:stlmsg=" !X<explore_line>"
-" elseif w:netrw_explore_line != line(".")
-" let g:stlmsg=" explore_line!={line(.)<".line(".").">"
-" endif
-" if !exists("w:netrw_explore_list")
-" let g:stlmsg=" !X<explore_list>"
-" endif
- " ^^^ NetrwStatusLine() debugging ^^^
-
+" let g:stlmsg= "Xbufnr=".w:netrw_explore_bufnr." bufnr=".bufnr(".")." Xline#".w:netrw_explore_line." line#".line(".")
if !exists("w:netrw_explore_bufnr") || w:netrw_explore_bufnr != bufnr(".") || !exists("w:netrw_explore_line") || w:netrw_explore_line != line(".") || !exists("w:netrw_explore_list")
" restore user's status line
- let &stl = s:netrw_users_stl
- let &laststatus = s:netrw_users_ls
+ let &stl= s:netrw_users_stl
if exists("w:netrw_explore_bufnr")|unlet w:netrw_explore_bufnr|endif
if exists("w:netrw_explore_line")|unlet w:netrw_explore_line|endif
return ""
@@ -3274,7 +3146,7 @@
let ftpurm = '^ftp://\(\([^/@]\{-}\)@\)\=\([^/#:]\{-}\)\([#:]\d\+\)\=/\(.*\)$'
let rcpurm = '^rcp://\%(\([^/@]\{-}\)@\)\=\([^/]\{-}\)/\(.*\)$'
let rcphf = '^\(\(\h\w*\)@\)\=\(\h\w*\):\([^@]\+\)$'
- let scpurm = '^scp://\([^/#:]\+\)\%([#:]\(\d\+\)\)\=/\(.*\)$'
+ let scpurm = '^scp://\([^/]\{-}\)\([#:]\d\+\)\=/\(.*\)$'
let httpurm = '^http://\([^/]\{-}\)\(/.*\)\=$'
let davurm = '^s\=dav://\([^/]\+\)/\(.*/\)\([-_.~[:alnum:]]\+\)$'
let rsyncurm = '^rsync://\([^/]\{-}\)/\(.*\)\=$'
@@ -3418,6 +3290,11 @@
let b:netrw_method = -1
endif
+ " surround password with double-quotes if it contains embedded blanks
+ if g:netrw_passwd !~ '^"' && g:netrw_passwd =~ ' '
+ let g:netrw_passwd= '"'.g:netrw_passwd.'"'
+ endif
+
" remove any leading [:#] from port number
if g:netrw_port != ""
let g:netrw_port = substitute(g:netrw_port,'[#:]\+','','')
@@ -3464,7 +3341,6 @@
" call Decho("a:0=".a:0." case >1: a:2<".a:2.">")
let g:netrw_passwd=a:2
endif
-
" call Dret("NetUserPass")
endfun
@@ -3486,21 +3362,20 @@
let w:acdkeep = &autochdir
set noautochdir
endif
- let w:cinkeep = &cin
- let w:cinokeep = &cino
- let w:comkeep = &com
- let w:cpokeep = &cpo
+ let w:cinkeep = &cin
+ let w:cinokeep = &cino
+ let w:comkeep = &com
+ let w:cpokeep = &cpo
if !g:netrw_keepdir
- let w:dirkeep = getcwd()
+ let w:dirkeep = getcwd()
endif
- let w:gdkeep = &gd
- let w:repkeep = &report
- let w:spellkeep = &spell
- let w:twkeep = &tw
+ let w:gdkeep = &gd
+ let w:repkeep = &report
+ let w:twkeep = &tw
setlocal cino =
setlocal com =
setlocal cpo -=aA
- setlocal nocin noai nospell
+ setlocal nocin noai
setlocal tw =0
setlocal report=10000
if has("win32") && !has("win95")
@@ -3522,22 +3397,22 @@
endif
unlet w:netoptionsave
- if exists("w:aikeep")| let &ai= w:aikeep|endif
- if (has("netbeans_intg") || has("sun_workshop")) && exists("w:acdkeep")
- let &acd= w:acdkeep
- unlet w:acdkeep
+ let &ai = w:aikeep
+ if has("netbeans_intg") || has("sun_workshop")
+ let &acd = w:acdkeep
endif
- if exists("w:cinkeep") |let &cin = w:cinkeep |unlet w:cinkeep |endif
- if exists("w:cinokeep") |let &cino = w:cinokeep |unlet w:cinokeep |endif
- if exists("w:comkeep") |let &com = w:comkeep |unlet w:comkeep |endif
- if exists("w:cpokeep") |let &cpo = w:cpokeep |unlet w:cpokeep |endif
- if exists("w:dirkeep") |exe "lcd ".w:dirkeep |unlet w:dirkeep |endif
- if exists("w:gdkeep") |let &gd = w:gdkeep |unlet w:gdkeep |endif
- if exists("w:repkeep") |let &report = w:repkeep |unlet w:repkeep |endif
- if exists("w:spellkeep")|let &spell = w:spellkeep |unlet w:spellkeep|endif
- if exists("w:twkeep") |let &tw = w:twkeep |unlet w:twkeep |endif
+ let &cin = w:cinkeep
+ let &cino = w:cinokeep
+ let &com = w:comkeep
+ let &cpo = w:cpokeep
+ if exists("w:dirkeep")
+ exe "lcd ".w:dirkeep
+ endif
+ let &gd = w:gdkeep
+ let &report = w:repkeep
+ let &tw = w:twkeep
if exists("w:swfkeep")
- if &directory == "" && exists("w:swfkeep")
+ if &directory == ""
" user hasn't specified a swapfile directory;
" netrw will temporarily make the swapfile
" directory the current local one.
@@ -3549,6 +3424,17 @@
endif
unlet w:swfkeep
endif
+ unlet w:aikeep
+ unlet w:cinkeep
+ unlet w:cinokeep
+ unlet w:comkeep
+ unlet w:cpokeep
+ unlet w:gdkeep
+ unlet w:repkeep
+ unlet w:twkeep
+ if exists("w:dirkeep")
+ unlet w:dirkeep
+ endif
" call Dret("NetOptionRestore")
endfun
@@ -3560,7 +3446,7 @@
" example and as a fix for a Windows 95 problem: in my
" experience, win95's ftp always dumped four blank lines
" at the end of the transfer.
-if has("win95") && exists("g:netrw_win95ftp") && g:netrw_win95ftp
+if has("win95") && g:netrw_win95ftp
fun! NetReadFixup(method, line1, line2)
" call Dfunc("NetReadFixup(method<".a:method."> line1=".a:line1." line2=".a:line2.")")
if method == 3 " ftp (no <.netrc>)
@@ -3661,14 +3547,14 @@
return
endif
if seq == '*'
- exe 'silent keepjumps '.w:netrw_bannercnt.',$v/^\d\{3}\//s/^/'.spriority.'/'
+ exe 'keepjumps silent '.w:netrw_bannercnt.',$v/^\d\{3}\//s/^/'.spriority.'/'
else
- exe 'silent keepjumps '.w:netrw_bannercnt.',$g/'.eseq.'/s/^/'.spriority.'/'
+ exe 'keepjumps silent '.w:netrw_bannercnt.',$g/'.eseq.'/s/^/'.spriority.'/'
endif
let priority = priority + 1
endwhile
- exe 'silent keepjumps '.w:netrw_bannercnt.',$s/^\(\d\{3}\/\)\%(\d\{3}\/\)\+/\1/e'
+ exe 'keepjumps silent '.w:netrw_bannercnt.',$s/^\(\d\{3}\/\)\%(\d\{3}\/\)\+/\1/e'
" call Dret("SetSort")
endfun
@@ -3706,14 +3592,14 @@
endfun
" ---------------------------------------------------------------------
-" SetBufWinVars: (used by NetBrowse() and LocalBrowse()) {{{1
+" BufWinVars: (used by NetBrowse() and LocalBrowse()) {{{1
" To allow separate windows to have their own activities, such as
" Explore **/pattern, several variables have been made window-oriented.
" However, when the user splits a browser window (ex: ctrl-w s), these
-" variables are not inherited by the new window. SetBufWinVars() and
+" variables are not inherited by the new window. BufWinVars() and
" UseBufWinVars() get around that.
-fun! s:SetBufWinVars()
-" call Dfunc("SetBufWinVars()")
+fun! s:BufWinVars()
+" call Dfunc("BufWinVars()")
if exists("w:netrw_longlist") |let b:netrw_longlist = w:netrw_longlist |endif
if exists("w:netrw_bannercnt") |let b:netrw_bannercnt = w:netrw_bannercnt |endif
if exists("w:netrw_method") |let b:netrw_method = w:netrw_method |endif
@@ -3724,7 +3610,7 @@
if exists("w:netrw_explore_bufnr") |let b:netrw_explore_bufnr = w:netrw_explore_bufnr |endif
if exists("w:netrw_explore_line") |let b:netrw_explore_line = w:netrw_explore_line |endif
if exists("w:netrw_explore_list") |let b:netrw_explore_list = w:netrw_explore_list |endif
-" call Dret("SetBufWinVars")
+" call Dret("BufWinVars")
endfun
" ---------------------------------------------------------------------
diff --git a/runtime/autoload/netrwSettings.vim b/runtime/autoload/netrwSettings.vim
new file mode 100644
index 0000000..368af55
--- /dev/null
+++ b/runtime/autoload/netrwSettings.vim
@@ -0,0 +1,161 @@
+" netrwSettings.vim: makes netrw settings simpler
+" Date: Oct 12, 2005
+" Maintainer: Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
+" Version: 4
+" Copyright: Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1
+" Permission is hereby granted to use and distribute this code,
+" with or without modifications, provided that this copyright
+" notice is copied with it. Like anything else that's free,
+" netrwSettings.vim is provided *as is* and comes with no
+" warranty of any kind, either expressed or implied. By using
+" this plugin, you agree that in no event will the copyright
+" holder be liable for any damages resulting from the use
+" of this software.
+"
+" Mat 4:23 (WEB) Jesus went about in all Galilee, teaching in their {{{1
+" synagogues, preaching the gospel of the kingdom, and healing
+" every disease and every sickness among the people.
+" Load Once: {{{1
+if exists("g:loaded_netrwSettings") || &cp
+ finish
+endif
+let g:loaded_netrwSettings = "v4"
+
+" ---------------------------------------------------------------------
+" NetrwSettings: {{{1
+fun! netrwSettings#NetrwSettings()
+ " this call is here largely just to insure that netrw has been loaded
+ call netrw#NetSavePosn()
+ if !exists("g:loaded_netrw")
+ echohl WarningMsg | echomsg "***sorry*** netrw needs to be loaded prior to using NetrwSettings" | echohl None
+ return
+ endif
+
+ above wincmd s
+ enew
+ setlocal noswapfile bh=wipe
+ set ft=vim
+ file Netrw\ Settings
+
+ " these variables have the following default effects when they don't
+ " exist (ie. have not been set by the user in his/her .vimrc)
+ if !exists("g:netrw_longlist")
+ let g:netrw_longlist= 0
+ let g:netrw_list_cmd= "ssh HOSTNAME ls -FLa"
+ endif
+ if !exists("g:netrw_silent")
+ let g:netrw_silent= 0
+ endif
+ if !exists("g:netrw_use_nt_rcp")
+ let g:netrw_use_nt_rcp= 0
+ endif
+ if !exists("g:netrw_ftp")
+ let g:netrw_ftp= 0
+ endif
+ if !exists("g:netrw_ignorenetrc")
+ let g:netrw_ignorenetrc= 0
+ endif
+
+ put ='+ ---------------------------------------------'
+ put ='+ NetrwSettings: (by Charles E. Campbell, Jr.)'
+ put ='+ Press ? with cursor atop any line for help '
+ put ='+ ---------------------------------------------'
+ let s:netrw_settings_stop= line(".")
+
+ put =''
+ put ='+ Netrw Protocol Commands'
+ put = 'let g:netrw_dav_cmd = '.g:netrw_dav_cmd
+ put = 'let g:netrw_fetch_cmd = '.g:netrw_fetch_cmd
+ put = 'let g:netrw_ftp_cmd = '.g:netrw_ftp_cmd
+ put = 'let g:netrw_http_cmd = '.g:netrw_http_cmd
+ put = 'let g:netrw_rcp_cmd = '.g:netrw_rcp_cmd
+ put = 'let g:netrw_rsync_cmd = '.g:netrw_rsync_cmd
+ put = 'let g:netrw_scp_cmd = '.g:netrw_scp_cmd
+ put = 'let g:netrw_sftp_cmd = '.g:netrw_sftp_cmd
+ put = 'let g:netrw_ssh_cmd = '.g:netrw_ssh_cmd
+ let s:netrw_protocol_stop= line(".")
+ put = ''
+
+ put ='+Netrw Transfer Control'
+ put = 'let g:netrw_cygwin = '.g:netrw_cygwin
+ put = 'let g:netrw_ftp = '.g:netrw_ftp
+ put = 'let g:netrw_ftpmode = '.g:netrw_ftpmode
+ put = 'let g:netrw_ignorenetrc = '.g:netrw_ignorenetrc
+ put = 'let g:netrw_use_nt_rcp = '.g:netrw_use_nt_rcp
+ put = 'let g:netrw_win95ftp = '.g:netrw_win95ftp
+ let s:netrw_xfer_stop= line(".")
+
+ put = ''
+ put ='+ Netrw Browser Control'
+ put = 'let g:netrw_alto = '.g:netrw_alto
+ put = 'let g:netrw_altv = '.g:netrw_altv
+ put = 'let g:netrw_dirhistmax = '.g:netrw_dirhistmax
+ put = 'let g:netrw_ftp_browse_reject = '.g:netrw_ftp_browse_reject
+ put = 'let g:netrw_ftp_list_cmd = '.g:netrw_ftp_list_cmd
+ put = 'let g:netrw_hide = '.g:netrw_hide
+ put = 'let g:netrw_keepdir = '.g:netrw_keepdir
+ put = 'let g:netrw_list_cmd = '.g:netrw_list_cmd
+ put = 'let g:netrw_list_hide = '.g:netrw_list_hide
+ put = 'let g:netrw_local_mkdir = '.g:netrw_local_mkdir
+ put = 'let g:netrw_local_rmdir = '.g:netrw_local_rmdir
+ put = 'let g:netrw_longlist = '.g:netrw_longlist
+ put = 'let g:netrw_maxfilenamelen = '.g:netrw_maxfilenamelen
+ put = 'let g:netrw_mkdir_cmd = '.g:netrw_mkdir_cmd
+ put = 'let g:netrw_rename_cmd = '.g:netrw_rename_cmd
+ put = 'let g:netrw_rm_cmd = '.g:netrw_rm_cmd
+ put = 'let g:netrw_rmdir_cmd = '.g:netrw_rmdir_cmd
+ put = 'let g:netrw_rmf_cmd = '.g:netrw_rmf_cmd
+ put = 'let g:netrw_silent = '.g:netrw_silent
+ put = 'let g:netrw_sort_by = '.g:netrw_sort_by
+ put = 'let g:netrw_sort_direction = '.g:netrw_sort_direction
+ put = 'let g:netrw_sort_sequence = '.g:netrw_sort_sequence
+ put = 'let g:netrw_ssh_browse_reject = '.g:netrw_ssh_browse_reject
+ put = 'let g:netrw_timefmt = '.g:netrw_timefmt
+ put = 'let g:netrw_winsize = '.g:netrw_winsize
+
+ put =''
+ put ='+ For help, place cursor on line and press ?'
+
+ 1d
+ silent %s/^+/"/e
+ res 99
+ silent %s/= \([^0-9].*\)$/= '\1'/e
+ silent %s/= $/= ''/e
+ 1
+
+ set nomod
+
+ map <buffer> <silent> ? :call NetrwSettingHelp()<cr>
+ let tmpfile= tempname()
+ exe 'au BufWriteCmd Netrw\ Settings silent w! '.tmpfile.'|so '.tmpfile.'|call delete("'.tmpfile.'")|set nomod'
+endfun
+
+" ---------------------------------------------------------------------
+" NetrwSettingHelp: {{{2
+fun! NetrwSettingHelp()
+" call Dfunc("NetrwSettingHelp()")
+ let curline = getline(".")
+ if curline =~ '='
+ let varhelp = substitute(curline,'^\s*let ','','e')
+ let varhelp = substitute(varhelp,'\s*=.*$','','e')
+" call Decho("trying help ".varhelp)
+ try
+ exe "he ".varhelp
+ catch /^Vim\%((\a\+)\)\=:E149/
+ echo "***sorry*** no help available for <".varhelp.">"
+ endtry
+ elseif line(".") < s:netrw_settings_stop
+ he netrw-settings
+ elseif line(".") < s:netrw_protocol_stop
+ he netrw-externapp
+ elseif line(".") < s:netrw_xfer_stop
+ he netrw-variables
+ else
+ he netrw-browse-var
+ endif
+" call Dret("NetrwSettingHelp")
+endfun
+
+" ---------------------------------------------------------------------
+" Modelines: {{{1
+" vim:ts=8 fdm=marker
diff --git a/runtime/autoload/tar.vim b/runtime/autoload/tar.vim
index 0234059..66d2eb5 100644
--- a/runtime/autoload/tar.vim
+++ b/runtime/autoload/tar.vim
@@ -1,79 +1,172 @@
+" tar.vim: Handles browsing tarfiles
+" AUTOLOAD PORTION
+" Date: Nov 18, 2005
+" Version: 4
+" Maintainer: Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
+" License: Vim License (see vim's :help license)
"
-" tar.vim -- a Vim plugin for browsing tarfiles
-" Copyright (c) 2002, Michael C. Toren <mct@toren.net>
-" Distributed under the GNU General Public License.
+" Contains many ideas from Michael Toren's <tar.vim>
"
-" Version: 2
-" Date: Sep 14, 2005
-" Modified By: Charles E. Campbell, Jr.
-"
-" Updates are available from <http://michael.toren.net/code/>. If you
-" find this script useful, or have suggestions for improvements, please
-" let me know.
-" Also look there for further comments and documentation.
-"
-" This part defines the functions. The autocommands are in plugin/tar.vim.
-if exists("g:loaded_tar") || &cp
- finish
-endif
-let g:loaded_tar= "v2"
+" Copyright: Copyright (C) 2005 Charles E. Campbell, Jr. {{{1
+" Permission is hereby granted to use and distribute this code,
+" with or without modifications, provided that this copyright
+" notice is copied with it. Like anything else that's free,
+" tarPlugin.vim is provided *as is* and comes with no warranty
+" of any kind, either expressed or implied. By using this
+" plugin, you agree that in no event will the copyright
+" holder be liable for any damages resulting from the use
+" of this software.
" ---------------------------------------------------------------------
-" tar#Read: {{{1
-fun! tar#Read(argument, cleanup)
-" call Dfunc("tar#Read(argument<".a:argument."> cleanup=".a:cleanup.")")
- let l:argument = a:argument
- let l:argument = substitute(l:argument, '^tarfile:', '', '')
- let l:argument = substitute(l:argument, '^\~', $HOME, '')
+" Initialization: {{{1
+let s:keepcpo= &cpo
+set cpo&vim
+if exists("g:loaded_tar")
+ finish
+endif
+let g:loaded_tar= "v4"
- let l:tarfile = l:argument
- while 1
- if (l:tarfile == "" || l:tarfile == "/")
- echo "***error*** (tar#Read) Could not find a readable tarfile in path:" l:argument
-" call Dret("tar#Read")
- return
- endif
+" ---------------------------------------------------------------------
+" Default Settings: {{{1
+if !exists("g:tar_browseoptions")
+ let g:tar_browseoptions= "Ptf"
+endif
+if !exists("g:tar_readoptions")
+ let g:tar_readoptions= "OPxf"
+endif
+if !exists("g:tar_writeoptions")
+ let g:tar_writeoptions= "uf"
+endif
- if filereadable(l:tarfile) " found it!
- break
- endif
+" ----------------
+" Functions: {{{1
+" ----------------
- let l:tarfile = fnamemodify(l:tarfile, ":h")
- endwhile
+" ---------------------------------------------------------------------
+" tar#Browse: {{{2
+fun! tar#Browse(tarfile)
+" call Dfunc("tar#Browse(tarfile<".a:tarfile.">)")
- let l:toextract = strpart(l:argument, strlen(l:tarfile) + 1)
+ " sanity checks
+ if !executable("tar")
+ echohl Error | echo '***error*** (tar#Browse) "tar" not available on your system'
+ call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+" call Dret("tar#Browse")
+ return
+ endif
+ if !filereadable(a:tarfile)
+ if a:tarfile !~# '^\a\+://'
+ " if its an url, don't complain, let url-handlers such as vim do its thing
+ echohl Error | echo "***error*** (tar#Browse) File not readable<".a:tarfile.">" | echohl None
+ call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+ endif
+" call Dret("tar#Browse : file<".a:tarfile."> not readable")
+ return
+ endif
+ if &ma != 1
+ set ma
+ endif
+ let w:tarfile= a:tarfile
- if (l:toextract == "")
-" call Dret("tar#Read")
- return
- endif
+ setlocal noswapfile
+ setlocal buftype=nofile
+ setlocal bufhidden=hide
+ setlocal nobuflisted
+ setlocal nowrap
+ set ft=tar
- let l:cat = s:TarCatCommand(l:tarfile)
- execute "r !" . l:cat . " < '" . l:tarfile . "'"
- \ " | tar OPxf - '" . l:toextract . "'"
+ " give header
+ exe "$put ='".'\"'." tar.vim version ".g:loaded_tar."'"
+ exe "$put ='".'\"'." Browsing tarfile ".a:tarfile."'"
+ exe "$put ='".'\"'." Select a file with cursor and press ENTER"."'"
+ 0d
+ $
- if (a:cleanup)
- 0d "blank line
- execute "doautocmd BufReadPost " . expand("%")
- setlocal nomod
- silent preserve
- endif
-" call Dret("tar#Read")
+ if a:tarfile =~# '\.\(gz\|tgz\)$'
+ exe "silent r! gzip -d -c '".a:tarfile."'| tar -".g:tar_browseoptions." - "
+ elseif a:tarfile =~# '\.bz2$'
+ exe "silent r! bzip2 -d -c '".a:tarfile."'| tar -".g:tar_browseoptions." - "
+ else
+ exe "silent r! tar -".g:tar_browseoptions." '".a:tarfile."'"
+ endif
+ %g@/$@d
+
+ setlocal noma nomod ro
+ noremap <silent> <buffer> <cr> :call <SID>TarBrowseSelect()<cr>
+
+" call Dret("tar#Browse : w:tarfile<".w:tarfile.">")
endfun
" ---------------------------------------------------------------------
-" tar#Write: {{{1
-fun! tar#Write(argument)
-" call Dfunc("tar#Write(argument<".a:argument.">)")
-"
+" TarBrowseSelect: {{{2
+fun! s:TarBrowseSelect()
+" call Dfunc("TarBrowseSelect() w:tarfile<".w:tarfile."> curfile<".expand("%").">")
+ let fname= getline(".")
+" call Decho("fname<".fname.">")
+
+ " sanity check
+ if fname =~ '^"'
+" call Dret("TarBrowseSelect")
+ return
+ endif
+
+ " about to make a new window, need to use w:tarfile
+ let tarfile= w:tarfile
+ let curfile= expand("%")
+
+ new
+ wincmd _
+ let s:tblfile_{winnr()}= curfile
+" call Decho("exe e tarfile:".tarfile.':'.fname)
+ exe "e tarfile:".tarfile.':'.fname
+ filetype detect
+
+" call Dret("TarBrowseSelect : s:tblfile_".winnr()."<".s:tblfile_{winnr()}.">")
+endfun
+
+" ---------------------------------------------------------------------
+" tar#Read: {{{2
+fun! tar#Read(fname,mode)
+" call Dfunc("tar#Read(fname<".a:fname.">,mode=".a:mode.")")
+ let tarfile = substitute(a:fname,'tarfile:\(.\{-}\):.*$','\1','')
+ let fname = substitute(a:fname,'tarfile:.\{-}:\(.*\)$','\1','')
+" call Decho("tarfile<".tarfile."> fname<".fname.">")
+
+ if tarfile =~# '\.\(gz\|tgz\)$'
+" call Decho("exe silent r! gzip -d -c '".tarfile."'| tar -OPxf - '".fname."'")
+ exe "silent r! gzip -d -c '".tarfile."'| tar -".g:tar_readoptions." - '".fname."'"
+ elseif a:fname =~# '\.bz2$'
+" call Decho("exe silent r! bzip2 -d -c '".tarfile."'| tar -".g:tar_readoptions." - '".fname."'")
+ exe "silent r! bzip2 -d -c '".tarfile."'| tar -".g:tar_readoptions." - '".fname."'"
+ else
+" call Decho("exe silent r! tar -".g:tar_readoptions." '".tarfile."' '".fname."'")
+ exe "silent r! tar -".g:tar_readoptions." '".tarfile."' '".fname."'"
+ endif
+ let w:tarfile= a:fname
+ exe "file tarfile:".fname
+
+ " cleanup
+ 0d
+ set nomod
+
+" call Dret("tar#Read : w:tarfile<".w:tarfile.">")
+endfun
+
+" ---------------------------------------------------------------------
+" tar#Write: {{{2
+fun! tar#Write(fname)
+" call Dfunc("tar#Write(fname<".a:fname.">) w:tarfile<".w:tarfile."> tblfile_".winnr()."<".s:tblfile_{winnr()}.">")
+
" sanity checks
if !executable("tar")
- echo "***error*** (TarWrite) sorry, your system doesn't appear to have the tar pgm"
+ echohl Error | echo '***error*** (tar#Browse) "tar" not available on your system'
+ call inputsave()|call input("Press <cr> to continue")|call inputrestore()
" call Dret("tar#Write")
return
endif
if !exists("*mkdir")
- echo "***error*** (TarWrite) sorry, mkdir() doesn't work on your system"
+ echohl Error | echo "***error*** (tar#Write) sorry, mkdir() doesn't work on your system" | echohl None
+ call inputsave()|call input("Press <cr> to continue")|call inputrestore()
" call Dret("tar#Write")
return
endif
@@ -91,44 +184,104 @@
try
exe "cd ".escape(tmpdir,' \')
catch /^Vim\%((\a\+)\)\=:E344/
- echo "***error*** (TarWrite) cannot cd to temporary directory"
+ echohl Error | echo "***error*** (tar#Write) cannot cd to temporary directory" | Echohl None
+ call inputsave()|call input("Press <cr> to continue")|call inputrestore()
" call Dret("tar#Write")
return
endtry
" call Decho("current directory now: ".getcwd())
- " place temporary files under .../_TARVIM_/
- if isdirectory("_TARVIM_")
- call s:Rmdir("_TARVIM_")
+ " place temporary files under .../_ZIPVIM_/
+ if isdirectory("_ZIPVIM_")
+ call s:Rmdir("_ZIPVIM_")
endif
- call mkdir("_TARVIM_")
- cd _TARVIM_
+ call mkdir("_ZIPVIM_")
+ cd _ZIPVIM_
" call Decho("current directory now: ".getcwd())
- let tarfile = curdir."/".substitute(a:argument,'tarfile:\([^/]\{-}\)/.*$','\1','')
- let path = substitute(a:argument,'^.\{-}/','','')
- let dirpath = substitute(path,'/\=[^/]\+$','','')
-" call Decho("path <".path.">")
-" call Decho("dirpath<".dirpath.">")
- call mkdir(dirpath,"p")
- exe "w! ".path
- if executable("cygpath")
- let path = substitute(system("cygpath ".path),'\n','','e')
- let tarfile = substitute(system("cygpath ".tarfile),'\n','','e')
+ let tarfile = substitute(w:tarfile,'tarfile:\(.\{-}\):.*$','\1','')
+ let fname = substitute(w:tarfile,'tarfile:.\{-}:\(.*\)$','\1','')
+
+ " handle compressed archives
+ if tarfile =~# '\.gz'
+ call system("gzip -d ".tarfile)
+ let tarfile = substitute(tarfile,'\.gz','','e')
+ let compress= "gzip '".tarfile."'"
+ elseif tarfile =~# '\.tgz'
+ call system("gzip -d ".tarfile)
+ let tarfile = substitute(tarfile,'\.tgz','.tar','e')
+ let compress= "gzip '".tarfile."'"
+ let tgz = 1
+ elseif tarfile =~# '\.bz2'
+ call system("bzip2 -d ".tarfile)
+ let tarfile = substitute(tarfile,'\.bz2','','e')
+ let compress= "bzip2 '".tarfile."'"
endif
-" call Decho("tar --delete -f ".tarfile." ".path)
- call system("tar --delete -f ".tarfile." ".path)
if v:shell_error != 0
- echo "***error*** (TarWrite) sorry, your tar pgm doesn't support deletion of ".path
+ echohl Error | echo "***error*** (tar#Write) sorry, unable to update ".tarfile." with ".fname | echohl None
+ call inputsave()|call input("Press <cr> to continue")|call inputrestore()
else
-" call Decho("tar -rf ".tarfile." ".path)
- call system("tar -rf ".tarfile." ".path)
+
+" call Decho("tarfile<".tarfile."> fname<".fname.">")
+
+ let dirpath = substitute(fname,'/[^/]\+$','','e')
+ if tarfile !~ '/'
+ let tarfile= curdir.'/'.tarfile
+ endif
+" call Decho("tarfile<".tarfile."> fname<".fname.">")
+
+ call mkdir(dirpath,"p")
+ exe "w! ".fname
+ if executable("cygpath")
+ let dirpath = substitute(system("cygpath ".dirpath),'\n','','e')
+ let tarfile = substitute(system("cygpath ".tarfile),'\n','','e')
+ endif
+
+ " delete old file from tarfile
+" call Decho("tar --delete -f '".tarfile."' '".fname."'")
+ call system("tar --delete -f '".tarfile."' '".fname."'")
+ if v:shell_error != 0
+ echohl Error | echo "***error*** (tar#Write) sorry, unable to update ".tarfile." with ".fname | echohl None
+ call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+ else
+
+ " update tarfile with new file
+" call Decho("tar -".g:tar_writeoptions." '".tarfile."' '".fname."'")
+ call system("tar -".g:tar_writeoptions." '".tarfile."' '".fname."'")
+ if v:shell_error != 0
+ echohl Error | echo "***error*** (tar#Write) sorry, unable to update ".tarfile." with ".fname | echohl None
+ call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+ elseif exists("compress")
+" call Decho("call system(".compress.")")
+ call system(compress)
+ if exists("tgz")
+" call Decho("rename(".tarfile.".gz,".substitute(tarfile,'\.tar$','.tgz','e').")")
+ call rename(tarfile.".gz",substitute(tarfile,'\.tar$','.tgz','e'))
+ endif
+ endif
+ endif
+
+ " support writing tarfiles across a network
+ if s:tblfile_{winnr()} =~ '^\a\+://'
+" call Decho("handle writing <".tarfile."> across network to <".s:tblfile_{winnr()}.">")
+ let tblfile= s:tblfile_{winnr()}
+ 1split|enew
+ let binkeep= &binary
+ let eikeep = &ei
+ set binary ei=all
+ exe "e! ".tarfile
+ call netrw#NetWrite(tblfile)
+ let &ei = eikeep
+ let &binary = binkeep
+ q!
+ unlet s:tblfile_{winnr()}
+ endif
endif
" cleanup and restore current directory
cd ..
- call s:Rmdir("_TARVIM_")
+ call s:Rmdir("_ZIPVIM_")
exe "cd ".escape(curdir,' \')
setlocal nomod
@@ -136,91 +289,7 @@
endfun
" ---------------------------------------------------------------------
-" tar#Browse: {{{1
-fun! tar#Browse(tarfile)
-" call Dfunc("tar#Browse(tarfile<".a:tarfile.">)")
- setlocal noswapfile
- setlocal buftype=nofile
- setlocal bufhidden=hide
- setlocal filetype=
- setlocal nobuflisted
- setlocal buftype=nofile
- setlocal wrap
- setlocal syntax=tar
-
- let l:tarfile = a:tarfile
- let b:tarfile = l:tarfile
- let l:cat = s:TarCatCommand(l:tarfile)
-
- if ! filereadable(l:tarfile)
- let l:tarfile = substitute(l:tarfile, '^tarfile:', '', '')
- endif
-
- if ! filereadable(l:tarfile)
- echo "***error*** (tar#Browse) File not readable:" l:tarfile
-" call Dret("tar#Browse")
- return
- endif
-
- call s:Say("\" tar.vim version " . g:loaded_tar)
- call s:Say("\" Browsing tarfile " . l:tarfile)
- call s:Say("\" Hit ENTER to view a file in a new window")
- call s:Say("")
-
- silent execute "r!" . l:cat . "<'" . l:tarfile . "'| tar Ptf - "
- 0d "blank line
- /^$/1
-
- setlocal noma nomod ro
-
- noremap <silent> <buffer> <cr> :call <SID>TarBrowseSelect()<cr>
-" call Dret("tar#Browse")
-endfun
-
-" ---------------------------------------------------------------------
-" TarBrowseSelect: {{{1
-fun! s:TarBrowseSelect()
- let l:line = getline(".")
-
- if (l:line =~ '^" ')
- return
- endif
-
- if (l:line =~ '/$')
- echo "Please specify a file, not a directory"
- return
- endif
-
- let l:selection = "tarfile:" . b:tarfile . "/" . l:line
- new
- wincmd _
- execute "e " . l:selection
-endfun
-
-" ---------------------------------------------------------------------
-" TarCatCommand: kludge to deal with compressed archives {{{1
-fun! s:TarCatCommand(tarfile)
-" call Dfunc("s:TarCatCommand(tarfile<".a:tarfile.">)")
- if a:tarfile =~# '\.\(gz\|tgz\|Z\)$'
- let l:cat = "gzip -d -c"
- elseif a:tarfile =~# '\.bz2$'
- let l:cat = "bzip2 -d -c"
- else
- let l:cat = "cat"
- endif
-" call Dret("s:TarCatCommand ".l:cat)
- return l:cat
-endfun
-
-" ---------------------------------------------------------------------
-" Say: {{{1
-fun! s:Say(string)
- let @" = a:string
- $ put
-endfun
-
-" ---------------------------------------------------------------------
-" Rmdir: {{{1
+" Rmdir: {{{2
fun! s:Rmdir(fname)
" call Dfunc("Rmdir(fname<".a:fname.">)")
if has("unix")
@@ -235,6 +304,8 @@
" call Dret("Rmdir")
endfun
-" ---------------------------------------------------------------------
-" Modelines: {{{1
-" vim:set ts=8 sts=4 sw=4 fdm=marker:
+" ------------------------------------------------------------------------
+" Modelines And Restoration: {{{1
+let &cpo= s:keepcpo
+unlet s:keepcpo
+" vim:ts=8 fdm=marker
diff --git a/runtime/autoload/xmlcomplete.vim b/runtime/autoload/xmlcomplete.vim
new file mode 100644
index 0000000..3cd4c71
--- /dev/null
+++ b/runtime/autoload/xmlcomplete.vim
@@ -0,0 +1,428 @@
+" Vim completion script
+" Language: XHTML 1.0 Strict
+" Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
+" Last Change: 2005 Nov 22
+
+" This function will create Dictionary with users namespace strings and values
+" canonical (system) names of data files. Names should be lowercase,
+" descriptive to avoid any future conflicts. For example 'xhtml10s' should be
+" name for data of XHTML 1.0 Strict and 'xhtml10t' for XHTML 1.0 Transitional
+" User interface will be provided by XMLns command defined ...
+" Currently supported canonicals are:
+" xhtml10s - XHTML 1.0 Strict
+" xsl - XSL
+function! xmlcomplete#CreateConnection(canonical, ...)
+
+ " When only one argument provided treat name as default namespace (without
+ " 'prefix:').
+ if exists("a:1")
+ let users = a:1
+ else
+ let users = 'DEFAULT'
+ endif
+
+ " Source data file. Due to suspected errors in autoload do it with
+ " :runtime.
+ " TODO: make it properly (using autoload, that is) later
+ exe "runtime autoload/xml/".a:canonical.".vim"
+
+ " Remove all traces of unexisting files to return [] when trying
+ " omnicomplete something
+ " TODO: give warning about non-existing canonicals - should it be?
+ if !exists("g:xmldata_".a:canonical)
+ unlet! g:xmldata_connection
+ return 0
+ endif
+
+ " We need to initialize Dictionary to add key-value pair
+ if !exists("g:xmldata_connection")
+ let g:xmldata_connection = {}
+ endif
+
+ let g:xmldata_connection[users] = a:canonical
+
+endfunction
+
+function! xmlcomplete#CreateEntConnection(...)
+ if a:0 > 0
+ let g:xmldata_entconnect = a:1
+ else
+ let g:xmldata_entconnect = 'DEFAULT'
+ endif
+endfunction
+
+function! xmlcomplete#CompleteTags(findstart, base)
+ if a:findstart
+ " locate the start of the word
+ let line = getline('.')
+ let start = col('.') - 1
+ let compl_begin = col('.') - 2
+
+ while start >= 0 && line[start - 1] =~ '\(\k\|[:.-]\)'
+ let start -= 1
+ endwhile
+
+ if start >= 0 && line[start - 1] =~ '&'
+ let b:entitiescompl = 1
+ let b:compl_context = ''
+ return start
+ endif
+
+ let b:compl_context = getline('.')[0:(compl_begin)]
+ let b:compl_context = matchstr(b:compl_context, '.*<\zs.*')
+
+ " Make sure we will have only current namespace
+ unlet! b:xml_namespace
+ let b:xml_namespace = matchstr(b:compl_context, '^\k*\ze:')
+ if b:xml_namespace == ''
+ let b:xml_namespace = 'DEFAULT'
+ endif
+
+ return start
+
+ else
+ " There is no connction of namespace and data file. Abandon action
+ if !exists("g:xmldata_connection") || g:xmldata_connection == {}
+ return []
+ endif
+ " Initialize base return lists
+ let res = []
+ let res2 = []
+ " a:base is very short - we need context
+ let context = b:compl_context
+ unlet! b:compl_context
+
+ " Make entities completion
+ if exists("b:entitiescompl")
+ unlet! b:entitiescompl
+
+ if !exists("g:xmldata_entconnect") || g:xmldata_entconnect == 'DEFAULT'
+ let values = g:xmldata{'_'.g:xmldata_connection['DEFAULT']}['vimxmlentities']
+ else
+ let values = g:xmldata{'_'.g:xmldata_entconnect}['vimxmlentities']
+ endif
+
+ " Get only lines with entity declarations but throw out
+ " parameter-entities - they may be completed in future
+ let entdecl = filter(getline(1, "$"), 'v:val =~ "<!ENTITY\\s\\+[^%]"')
+
+ if len(entdecl) > 0
+ let intent = map(copy(entdecl), 'matchstr(v:val, "<!ENTITY\\s\\+\\zs\\(\\k\\|[.-:]\\)\\+\\ze")')
+ let values = intent + values
+ endif
+
+ for m in values
+ if m =~ '^'.a:base
+ call add(res, m.';')
+ endif
+ endfor
+
+ return res
+
+ endif
+ if context =~ '>'
+ " Generally if context contains > it means we are outside of tag and
+ " should abandon action
+ return []
+ endif
+
+ " find tags matching with "a:base"
+ " If a:base contains white space it is attribute.
+ " It could be also value of attribute...
+ " We have to get first word to offer
+ " proper completions
+ if context == ''
+ let tag = ''
+ else
+ let tag = split(context)[0]
+ endif
+ " Get rid of namespace
+ let tag = substitute(tag, '^'.b:xml_namespace.':', '', '')
+
+
+ " Get last word, it should be attr name
+ let attr = matchstr(context, '.*\s\zs.*')
+ " Possible situations where any prediction would be difficult:
+ " 1. Events attributes
+ if context =~ '\s'
+
+ " If attr contains =\s*[\"'] we catched value of attribute
+ if attr =~ "=\s*[\"']"
+ " Let do attribute specific completion
+ let attrname = matchstr(attr, '.*\ze\s*=')
+ let entered_value = matchstr(attr, ".*=\\s*[\"']\\zs.*")
+
+ if tag =~ '^[?!]'
+ " Return nothing if we are inside of ! or ? tag
+ return []
+ else
+ let values = g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}[tag][1][attrname]
+ endif
+
+ if len(values) == 0
+ return []
+ endif
+
+ " We need special version of sbase
+ let attrbase = matchstr(context, ".*[\"']")
+ let attrquote = matchstr(attrbase, '.$')
+
+ for m in values
+ " This if is needed to not offer all completions as-is
+ " alphabetically but sort them. Those beginning with entered
+ " part will be as first choices
+ if m =~ '^'.entered_value
+ call add(res, m . attrquote.' ')
+ elseif m =~ entered_value
+ call add(res2, m . attrquote.' ')
+ endif
+ endfor
+
+ return res + res2
+
+ endif
+
+ if tag =~ '?xml'
+ " Two possible arguments for <?xml> plus variation
+ let attrs = ['encoding', 'version="1.0"', 'version']
+ elseif tag =~ '^!'
+ " Don't make completion at all
+ return []
+ else
+ let attrs = keys(g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}[tag][1])
+ endif
+
+ for m in sort(attrs)
+ if m =~ '^'.attr
+ if tag !~ '^[?!]' && len(g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}[tag][1][m]) > 0 && g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}[tag][1][m][0] =~ '^BOOL$'
+ call add(res, m)
+ elseif m =~ '='
+ call add(res, m)
+ else
+ call add(res, m.'="')
+ endif
+ elseif m =~ attr
+ if tag !~ '^[?!]' && len(g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}[tag][1][m]) > 0 && g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}[tag][1][m][0] =~ '^BOOL$'
+ call add(res, m)
+ elseif m =~ '='
+ call add(res, m)
+ else
+ call add(res2, m.'="')
+ endif
+ endif
+ endfor
+
+ return res + res2
+
+ endif
+ " Close tag
+ let b:unaryTagsStack = "base meta link hr br param img area input col"
+ if context =~ '^\/'
+ let opentag = xmlcomplete#GetLastOpenTag("b:unaryTagsStack")
+ return [opentag.">"]
+ endif
+
+ " Complete elements of XML structure
+ " TODO: #REQUIRED, #IMPLIED, #FIXED, #PCDATA - but these should be detected like
+ " entities - in first run
+ " keywords: CDATA, ID, IDREF, IDREFS, ENTITY, ENTITIES, NMTOKEN, NMTOKENS
+ " are hardly recognizable but keep it in reserve
+ " also: EMPTY ANY SYSTEM PUBLIC DATA
+ if context =~ '^!'
+ let tags = ['!ELEMENT', '!DOCTYPE', '!ATTLIST', '!ENTITY', '!NOTATION', '![CDATA[', '![INCLUDE[', '![IGNORE[']
+
+ for m in tags
+ if m =~ '^'.context
+ let m = substitute(m, '^!\[\?', '', '')
+ call add(res, m)
+ elseif m =~ context
+ let m = substitute(m, '^!\[\?', '', '')
+ call add(res2, m)
+ endif
+ endfor
+
+ return res + res2
+
+ endif
+
+ " Complete text declaration
+ let g:co = context
+ if context =~ '^?'
+ let tags = ['?xml']
+
+ for m in tags
+ if m =~ '^'.context
+ call add(res, substitute(m, '^?', '', ''))
+ elseif m =~ context
+ call add(res, substitute(m, '^?', '', ''))
+ endif
+ endfor
+
+ return res + res2
+
+ endif
+
+ " Deal with tag completion.
+ let opentag = xmlcomplete#GetLastOpenTag("b:unaryTagsStack")
+ let opentag = substitute(opentag, '^\k*:', '', '')
+
+ let tags = g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}[opentag][0]
+ let context = substitute(context, '^\k*:', '', '')
+
+ if b:xml_namespace == 'DEFAULT'
+ let b:xml_namespace = ''
+ else
+ let b:xml_namespace .= ':'
+ endif
+
+ for m in tags
+ if m =~ '^'.context
+ call add(res, b:xml_namespace.m)
+ elseif m =~ context
+ call add(res2, b:xml_namespace.m)
+ endif
+ endfor
+
+ return res + res2
+
+ endif
+endfunction
+
+" MM: This is greatly reduced closetag.vim used with kind permission of Steven
+" Mueller
+" Changes: strip all comments; delete error messages; add checking for
+" namespace
+" Author: Steven Mueller <diffusor@ugcs.caltech.edu>
+" Last Modified: Tue May 24 13:29:48 PDT 2005
+" Version: 0.9.1
+
+function! xmlcomplete#GetLastOpenTag(unaryTagsStack)
+ let linenum=line('.')
+ let lineend=col('.') - 1 " start: cursor position
+ let first=1 " flag for first line searched
+ let b:TagStack='' " main stack of tags
+ let startInComment=s:InComment()
+
+ if exists("b:xml_namespace")
+ if b:xml_namespace == 'DEFAULT'
+ let tagpat='</\=\(\k\|[.-]\)\+\|/>'
+ else
+ let tagpat='</\='.b:xml_namespace.':\(\k\|[.-]\)\+\|/>'
+ endif
+ else
+ let tagpat='</\=\(\k\|[.-:]\)\+\|/>'
+ endif
+ while (linenum>0)
+ let line=getline(linenum)
+ if first
+ let line=strpart(line,0,lineend)
+ else
+ let lineend=strlen(line)
+ endif
+ let b:lineTagStack=''
+ let mpos=0
+ let b:TagCol=0
+ while (mpos > -1)
+ let mpos=matchend(line,tagpat)
+ if mpos > -1
+ let b:TagCol=b:TagCol+mpos
+ let tag=matchstr(line,tagpat)
+
+ if exists('b:closetag_disable_synID') || startInComment==s:InCommentAt(linenum, b:TagCol)
+ let b:TagLine=linenum
+ call s:Push(matchstr(tag,'[^<>]\+'),'b:lineTagStack')
+ endif
+ let lineend=lineend-mpos
+ let line=strpart(line,mpos,lineend)
+ endif
+ endwhile
+ while (!s:EmptystackP('b:lineTagStack'))
+ let tag=s:Pop('b:lineTagStack')
+ if match(tag, '^/') == 0 "found end tag
+ call s:Push(tag,'b:TagStack')
+ elseif s:EmptystackP('b:TagStack') && !s:Instack(tag, a:unaryTagsStack) "found unclosed tag
+ return tag
+ else
+ let endtag=s:Peekstack('b:TagStack')
+ if endtag == '/'.tag || endtag == '/'
+ call s:Pop('b:TagStack') "found a open/close tag pair
+ elseif !s:Instack(tag, a:unaryTagsStack) "we have a mismatch error
+ return ''
+ endif
+ endif
+ endwhile
+ let linenum=linenum-1 | let first=0
+ endwhile
+return ''
+endfunction
+
+function! s:InComment()
+ return synIDattr(synID(line('.'), col('.'), 0), 'name') =~ 'Comment'
+endfunction
+
+function! s:InCommentAt(line, col)
+ return synIDattr(synID(a:line, a:col, 0), 'name') =~ 'Comment'
+endfunction
+
+function! s:SetKeywords()
+ let g:IsKeywordBak=&iskeyword
+ let &iskeyword='33-255'
+endfunction
+
+function! s:RestoreKeywords()
+ let &iskeyword=g:IsKeywordBak
+endfunction
+
+function! s:Push(el, sname)
+ if !s:EmptystackP(a:sname)
+ exe 'let '.a:sname."=a:el.' '.".a:sname
+ else
+ exe 'let '.a:sname.'=a:el'
+ endif
+endfunction
+
+function! s:EmptystackP(sname)
+ exe 'let stack='.a:sname
+ if match(stack,'^ *$') == 0
+ return 1
+ else
+ return 0
+ endif
+endfunction
+
+function! s:Instack(el, sname)
+ exe 'let stack='.a:sname
+ call s:SetKeywords()
+ let m=match(stack, '\<'.a:el.'\>')
+ call s:RestoreKeywords()
+ if m < 0
+ return 0
+ else
+ return 1
+ endif
+endfunction
+
+function! s:Peekstack(sname)
+ call s:SetKeywords()
+ exe 'let stack='.a:sname
+ let top=matchstr(stack, '\<.\{-1,}\>')
+ call s:RestoreKeywords()
+ return top
+endfunction
+
+function! s:Pop(sname)
+ if s:EmptystackP(a:sname)
+ return ''
+ endif
+ exe 'let stack='.a:sname
+ call s:SetKeywords()
+ let loc=matchend(stack,'\<.\{-1,}\>')
+ exe 'let '.a:sname.'=strpart(stack, loc+1, strlen(stack))'
+ let top=strpart(stack, match(stack, '\<'), loc)
+ call s:RestoreKeywords()
+ return top
+endfunction
+
+function! s:Clearstack(sname)
+ exe 'let '.a:sname."=''"
+endfunction
diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim
index 751b1a1..50a6002 100644
--- a/runtime/autoload/zip.vim
+++ b/runtime/autoload/zip.vim
@@ -1,7 +1,7 @@
" zip.vim: Handles browsing zipfiles
" AUTOLOAD PORTION
-" Date: Sep 16, 2005
-" Version: 2
+" Date: Nov 14, 2005
+" Version: 4
" Maintainer: Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
" License: Vim License (see vim's :help license)
" Copyright: Copyright (C) 2005 Charles E. Campbell, Jr. {{{1
@@ -22,7 +22,7 @@
finish
endif
-let g:loaded_zip= "v2"
+let g:loaded_zip= "v4"
" ----------------
" Functions: {{{1
@@ -41,9 +41,12 @@
return
endif
if !filereadable(a:zipfile)
- echohl Error | echo "***error*** (zip#Browse) File not readable<".a:zipfile.">" | echohl None
- call inputsave()|call input("Press <cr> to continue")|call inputrestore()
-" call Dret("zip#Browse")
+ if a:zipfile !~# '^\a\+://'
+ " if its an url, don't complain, let url-handlers such as vim do its thing
+ echohl Error | echo "***error*** (zip#Browse) File not readable<".a:zipfile.">" | echohl None
+ call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+ endif
+" call Dret("zip#Browse : file<".a:zipfile."> not readable")
return
endif
if &ma != 1
@@ -80,7 +83,7 @@
" ---------------------------------------------------------------------
" ZipBrowseSelect: {{{2
fun! s:ZipBrowseSelect()
-" call Dfunc("ZipBrowseSelect() zipfile<".w:zipfile.">")
+" call Dfunc("ZipBrowseSelect() zipfile<".w:zipfile."> curfile<".expand("%").">")
let fname= getline(".")
" sanity check
@@ -99,13 +102,15 @@
" get zipfile to the new-window
let zipfile= substitute(w:zipfile,'.zip$','','e')
+ let curfile= expand("%")
new
wincmd _
+ let s:zipfile_{winnr()}= curfile
exe "e zipfile:".zipfile.':'.fname
filetype detect
-" call Dret("ZipBrowseSelect")
+" call Dret("ZipBrowseSelect : s:zipfile_".winnr()."<".s:zipfile_{winnr()}.">")
endfun
" ---------------------------------------------------------------------
@@ -128,7 +133,7 @@
" ---------------------------------------------------------------------
" zip#Write: {{{2
fun! zip#Write(fname)
-" call Dfunc("zip#Write(fname<".a:fname.")")
+" call Dfunc("zip#Write(fname<".a:fname.") zipfile_".winnr()."<".s:zipfile_{winnr()}.">")
" sanity checks
if !executable("zip")
@@ -192,6 +197,21 @@
if v:shell_error != 0
echohl Error | echo "***error*** (zip#Write) sorry, unable to update ".zipfile." with ".fname | echohl None
call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+
+ elseif s:zipfile_{winnr()} =~ '^\a\+://'
+ " support writing zipfiles across a network
+ let netzipfile= s:zipfile_{winnr()}
+" call Decho("handle writing <".zipfile.".zip> across network as <".netzipfile.">")
+ 1split|enew
+ let binkeep= &binary
+ let eikeep = &ei
+ set binary ei=all
+ exe "e! ".zipfile.".zip"
+ call netrw#NetWrite(netzipfile)
+ let &ei = eikeep
+ let &binary = binkeep
+ q!
+ unlet s:zipfile_{winnr()}
endif
" cleanup and restore current directory
diff --git a/runtime/compiler/eruby.vim b/runtime/compiler/eruby.vim
index 77292bc..474dafe 100644
--- a/runtime/compiler/eruby.vim
+++ b/runtime/compiler/eruby.vim
@@ -2,14 +2,8 @@
" Language: eRuby
" Maintainer: Doug Kearns <djkea2 at gus.gscit.monash.edu.au>
" Info: $Id$
-" URL: http://vim-ruby.sourceforge.net
+" URL: http://vim-ruby.rubyforge.org
" Anon CVS: See above site
-" Licence: GPL (http://www.gnu.org)
-" Disclaimer:
-" This program is distributed in the hope that it will be useful,
-" but WITHOUT ANY WARRANTY; without even the implied warranty of
-" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-" GNU General Public License for more details.
" ----------------------------------------------------------------------------
if exists("current_compiler")
diff --git a/runtime/compiler/fpc.vim b/runtime/compiler/fpc.vim
new file mode 100644
index 0000000..fb4f424
--- /dev/null
+++ b/runtime/compiler/fpc.vim
@@ -0,0 +1,17 @@
+" Vim compiler file
+" Compiler: FPC 2.1
+" Maintainer: Jaroslaw Blasiok <jaro3000@o2.pl>
+" Last Change: 2005 October 07
+
+if exists("current_compiler")
+ finish
+endif
+let current_compiler = "fpc"
+
+if exists(":CompilerSet") != 2 " older Vim always used :setlocal
+ command -nargs=* CompilerSet setlocal <args>
+endif
+
+" NOTE: compiler must be runned with -vb to write whole source path, not only file
+" name.
+CompilerSet errorformat=%f(%l\\,%c)\ %m
diff --git a/runtime/compiler/hp_acc.vim b/runtime/compiler/hp_acc.vim
index eaf61b2..685bd5b 100644
--- a/runtime/compiler/hp_acc.vim
+++ b/runtime/compiler/hp_acc.vim
@@ -1,8 +1,8 @@
" Vim compiler file
" Compiler: HP aCC
" Maintainer: Matthias Ulrich <matthias-ulrich@web.de>
-" URL: http://www.subhome.de/vim/hp_acc.vim
-" Last Change: 2004 Mar 27
+" URL: http://www.subhome.de/vim/hp_acc.vim
+" Last Change: 2005 Nov 19
"
" aCC --version says: "HP ANSI C++ B3910B A.03.13"
" This compiler has been tested on:
@@ -10,6 +10,10 @@
"
" Tim Brown's aCC is: "HP ANSI C++ B3910B A.03.33"
" and it also works fine...
+"
+" Now suggestions by aCC are supported (compile flag aCC +w).
+" Thanks to Tim Brown again!!
+"
if exists("current_compiler")
finish
@@ -21,6 +25,7 @@
endif
CompilerSet errorformat=%A%trror\ %n\:\ \"%f\"\\,\ line\ %l\ \#\ %m,
+ \%A%tarning\ (suggestion)\ %n\:\ \"%f\"\\,\ line\ %l\ \#\ %m\ %#,
\%A%tarning\ %n\:\ \"%f\"\\,\ line\ %l\ \#\ %m\ %#,
\%Z\ \ \ \ %p^%.%#,
\%-C%.%#
diff --git a/runtime/compiler/ruby.vim b/runtime/compiler/ruby.vim
index 88b683f..d34b37e 100644
--- a/runtime/compiler/ruby.vim
+++ b/runtime/compiler/ruby.vim
@@ -5,12 +5,6 @@
" Info: $Id$
" URL: http://vim-ruby.rubyforge.org
" Anon CVS: See above site
-" Licence: GPL (http://www.gnu.org)
-" Disclaimer:
-" This program is distributed in the hope that it will be useful,
-" but WITHOUT ANY WARRANTY; without even the implied warranty of
-" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-" GNU General Public License for more details.
" ----------------------------------------------------------------------------
"
" Changelog:
diff --git a/runtime/compiler/rubyunit.vim b/runtime/compiler/rubyunit.vim
index ba5ddf4..9111178 100644
--- a/runtime/compiler/rubyunit.vim
+++ b/runtime/compiler/rubyunit.vim
@@ -2,14 +2,8 @@
" Language: Test::Unit - Ruby Unit Testing Framework
" Maintainer: Doug Kearns <djkea2 at gus.gscit.monash.edu.au>
" Info: $Id$
-" URL: http://vim-ruby.sourceforge.net
+" URL: http://vim-ruby.rubyforge.org
" Anon CVS: See above site
-" Licence: GPL (http://www.gnu.org)
-" Disclaimer:
-" This program is distributed in the hope that it will be useful,
-" but WITHOUT ANY WARRANTY; without even the implied warranty of
-" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-" GNU General Public License for more details.
" ----------------------------------------------------------------------------
if exists("current_compiler")
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index e2ca67a..390afad 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt* For Vim version 7.0aa. Last change: 2005 Oct 10
+*autocmd.txt* For Vim version 7.0aa. Last change: 2005 Nov 21
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -812,6 +812,10 @@
autocommands for that group. Note: if you use an
undefined group name, Vim gives you an error message.
+ After applying the autocommands the modelines are
+ processed, so that their overrule the settings from
+ autocommands, like what happens when editing a file.
+
*:doautoa* *:doautoall*
:doautoa[ll] [group] {event} [fname]
Like ":doautocmd", but apply the autocommands to each
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 1ea512e..ec354ec 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1,4 +1,4 @@
-*cmdline.txt* For Vim version 7.0aa. Last change: 2005 Sep 17
+*cmdline.txt* For Vim version 7.0aa. Last change: 2005 Nov 21
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -562,7 +562,7 @@
"name"
==============================================================================
-4. Ex command-line ranges *cmdline-ranges* *[range]* *E16* *E493*
+4. Ex command-line ranges *cmdline-ranges* *[range]* *E16*
Some Ex commands accept a line range in front of them. This is noted as
[range]. It consists of one or more line specifiers, separated with ',' or
@@ -648,11 +648,15 @@
closed fold. See |fold-behavior|.
-Reverse Range
+Reverse Range *E493*
A range should have the lower line number first. If this is not the case, Vim
-will ask you if it should swap the line numbers. This is not done within the
-global command ":g".
+will ask you if it should swap the line numbers.
+ Backwards range given, OK to swap ~
+This is not done within the global command ":g".
+
+You can use ":silent" before a command to avoid the question, the range will
+always be swapped then.
Count and Range *N:*
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index cb7ed6e..adcf451 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt* For Vim version 7.0aa. Last change: 2005 Oct 12
+*eval.txt* For Vim version 7.0aa. Last change: 2005 Nov 20
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -5050,6 +5050,9 @@
:let l = foo#bar#lvar
+However, when the autoload script was already loaded it won't be loaded again
+for an unknown variable.
+
When assigning a value to such a variable nothing special happens. This can
be used to pass settings to the autoload script before it's loaded: >
diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt
index ef0763d..6e0a3e4 100644
--- a/runtime/doc/if_perl.txt
+++ b/runtime/doc/if_perl.txt
@@ -1,4 +1,4 @@
-*if_perl.txt* For Vim version 7.0aa. Last change: 2005 Mar 29
+*if_perl.txt* For Vim version 7.0aa. Last change: 2005 Oct 14
VIM REFERENCE MANUAL by Sven Verdoolaege
@@ -9,6 +9,7 @@
1. Editing Perl files |perl-editing|
2. Compiling VIM with Perl interface |perl-compiling|
3. Using the Perl interface |perl-using|
+4. Dynamic loading |perl-dynamic|
{Vi does not have any of these commands}
@@ -259,4 +260,22 @@
endif
Note that "EOF" must be at the start of the line.
+==============================================================================
+4. Dynamic loading *perl-dynamic*
+
+On MS-Windows the Perl library can be loaded dynamically. The |:version|
+output then includes |+perl/dyn|.
+
+This means that Vim will search for the Perl DLL file only when needed. When
+you don't use the Perl interface you don't need it, thus you can use Vim
+without this DLL file.
+
+To use the Perl interface the Perl DLL must be in your search path. In a
+console window type "path" to see what directories are used.
+
+The name of the DLL must match the Perl version Vim was compiled with.
+Currently the name is "perl58.dll". That is for Perl 5.8. To know for
+sure edit "gvim.exe" and search for "perl\d*.dll\c".
+
+==============================================================================
vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index 1a2a33d..3ceeff8 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -1,4 +1,4 @@
-*if_pyth.txt* For Vim version 7.0aa. Last change: 2005 Mar 29
+*if_pyth.txt* For Vim version 7.0aa. Last change: 2005 Oct 14
VIM REFERENCE MANUAL by Paul Moore
@@ -11,6 +11,7 @@
3. Buffer objects |python-buffer|
4. Range objects |python-range|
5. Window objects |python-window|
+6. Dynamic loading |python-dynamic|
{Vi does not have any of these commands}
@@ -300,4 +301,21 @@
The width attribute is writable only if the screen is split vertically.
==============================================================================
+6. Dynamic loading *python-dynamic*
+
+On MS-Windows the Python library can be loaded dynamically. The |:version|
+output then includes |+python/dyn|.
+
+This means that Vim will search for the Python DLL file only when needed.
+When you don't use the Python interface you don't need it, thus you can use
+Vim without this DLL file.
+
+To use the Python interface the Python DLL must be in your search path. In a
+console window type "path" to see what directories are used.
+
+The name of the DLL must match the Python version Vim was compiled with.
+Currently the name is "python24.dll". That is for Python 2.4. To know for
+sure edit "gvim.exe" and search for "python\d*.dll\c".
+
+==============================================================================
vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/if_ruby.txt b/runtime/doc/if_ruby.txt
index 1efb6ce..a70d32a 100644
--- a/runtime/doc/if_ruby.txt
+++ b/runtime/doc/if_ruby.txt
@@ -1,4 +1,4 @@
-*if_ruby.txt* For Vim version 7.0aa. Last change: 2005 Aug 31
+*if_ruby.txt* For Vim version 7.0aa. Last change: 2005 Oct 14
VIM REFERENCE MANUAL by Shugo Maeda
@@ -11,6 +11,7 @@
3. VIM::Buffer objects |ruby-buffer|
4. VIM::Window objects |ruby-window|
5. Global variables |ruby-globals|
+6. Dynamic loading |ruby-dynamic|
{Vi does not have any of these commands}
*E266* *E267* *E268* *E269* *E270* *E271* *E272* *E273*
@@ -166,7 +167,7 @@
Sets the cursor position to {row} and {col}.
==============================================================================
-4. Global variables *ruby-globals*
+5. Global variables *ruby-globals*
There are two global variables.
@@ -174,4 +175,21 @@
$curbuf The current buffer object.
==============================================================================
+6. Dynamic loading *ruby-dynamic*
+
+On MS-Windows the Ruby library can be loaded dynamically. The |:version|
+output then includes |+ruby/dyn|.
+
+This means that Vim will search for the Ruby DLL file only when needed. When
+you don't use the Ruby interface you don't need it, thus you can use Vim
+without this DLL file.
+
+To use the Ruby interface the Ruby DLL must be in your search path. In a
+console window type "path" to see what directories are used.
+
+The name of the DLL must match the Ruby version Vim was compiled with.
+Currently the name is "ruby18.dll". That is for Ruby 1.8. To know for sure
+edit "gvim.exe" and search for "ruby\d*.dll\c".
+
+==============================================================================
vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/if_tcl.txt b/runtime/doc/if_tcl.txt
index 1195ed5..79c43f5 100644
--- a/runtime/doc/if_tcl.txt
+++ b/runtime/doc/if_tcl.txt
@@ -1,4 +1,4 @@
-*if_tcl.txt* For Vim version 7.0aa. Last change: 2005 Mar 29
+*if_tcl.txt* For Vim version 7.0aa. Last change: 2005 Oct 14
VIM REFERENCE MANUAL by Ingo Wilken
@@ -14,6 +14,7 @@
6. Miscellaneous; Output from Tcl |tcl-misc| |tcl-output|
7. Known bugs & problems |tcl-bugs|
8. Examples |tcl-examples|
+9. Dynamic loading |tcl-dynamic|
{Vi does not have any of these commands} *E280* *E281*
@@ -509,4 +510,21 @@
endif
==============================================================================
+9. Dynamic loading *tcl-dynamic*
+
+On MS-Windows the Tcl library can be loaded dynamically. The |:version|
+output then includes |+tcl/dyn|.
+
+This means that Vim will search for the Tcl DLL file only when needed. When
+you don't use the Tcl interface you don't need it, thus you can use Vim
+without this DLL file.
+
+To use the Tcl interface the Tcl DLL must be in your search path. In a
+console window type "path" to see what directories are used.
+
+The name of the DLL must match the Tcl version Vim was compiled with.
+Currently the name is "tcl83.dll". That is for Tcl 8.3. To know for sure
+edit "gvim.exe" and search for "tcl\d*.dll\c".
+
+==============================================================================
vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 4b6d0eb..9d8e4e6 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt* For Vim version 7.0aa. Last change: 2005 Oct 02
+*insert.txt* For Vim version 7.0aa. Last change: 2005 Nov 22
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -975,6 +975,7 @@
Filetype-specific remarks for omni completion *compl-omni-filetypes*
+
C *ft-c-omni*
Completion of C code requires a tags file. You should use Exuberant ctags,
@@ -1007,7 +1008,14 @@
are included.
+CSS *ft-css-omni*
+
+Complete properties and their appropriate values according to CSS 2.1
+specification.
+
+
(X)HTML *ft-html-omni*
+ *ft-xhtml-omni*
CTRL-X CTRL-O provides completion of various elements of (X)HTML files.
It is designed to support writing of XHTML 1.0 Strict files but will
@@ -1019,23 +1027,124 @@
a tag)
- when attribute has limited number of possible values help to complete
them
+- complete names of entities
- complete values of "class" and "id" attributes with data obtained from
style tag and included CSS files
- when completing "style" attribute or working inside of "style" tag
switch to |ft-css-omni| completion
- when used after "</" CTRL-X CTRL-O will close the last opened tag
-File htmlcomplete.vim provides through |autoload| mechanism
+Note: When used first time completion menu will be shown with little delay
+- this is time needed for loading of data file.
+
+
+XML *ft-xml-omni*
+
+Vim 7 provides mechanism to context aware completion of XML files. It depends
+on special |xml-data-file| and two commands: |:XMLns| and |:XMLent|. Features
+are:
+
+- after "<" complete tag name depending on context (no div suggest
+ inside of an a tag)
+- inside of tag complete proper attributes (no width attribute for an
+ a tag)
+- when attribute has limited number of possible values help to complete
+ them
+- complete names of entities (defined in |xml-data-file| and in current file
+ with "<!ENTITY" declarations
+- when used after "</" CTRL-X CTRL-O will close the last opened tag
+
+Format of XML data file *xml-omni-datafile*
+
+Vim distribution provides two data files as examples (xhtml10s.vim, xsl.vim)
+
+XML data files are stored in "autoload/xml" directory in 'runtimepath'. They
+have meaningful name which will be used in commands. It should be unique name
+which will not create conflicts in future. For example name xhtml10s.vim means
+it is data file for XHTML 1.0 Strict.
+
+File contains one variable with fixed name: g:xmldata_xhtml10s . It is
+compound from two parts:
+
+1. "g:xmldata_" general prefix
+2. "xhtml10s" name of file and name of described XML dialect
+
+Part two must be exactly the same as name of file.
+
+Variable is data structure in form of |Dictionary|. Keys are tag names and
+values are two element |List|. First element of List is also List with
+names of possible children, second element is |Dictionary| with names of
+attributes as keys and possible values of attributes as values. Example: >
+
+ let g:xmldata_crippledhtml = {
+ \ "html":
+ \ [ ["body", "head"], {"id": [], "xmlns": ["http://www.w3.org/1999/xhtml"],
+ \ "lang": [], "xml:lang": [], "dir": ["ltr", "rtl"]}],
+ \ "script":
+ \ [ [], {"id": [], "charset": [], "type": ["text/javascript"], "src": [],
+ \ "defer": ["BOOL"], "xml:space": ["preserve"]}],
+ \ "meta":
+ \ [ [], {"id": [], "http-equiv": [], "name": [], "content": [], "scheme":
+ \ [], "lang": [], "xml:lang": [], "dir": ["ltr", "rtl"]}]
+ \ "vimxmlentities": ["amp", "lt", "gt", "apos", "quot"]}
+
+This example should be put in "autoload/xml/crippledhtml.vim" file.
+
+In example are visible two special elements:
+
+1. "vimxmlentities" - special key with List containing entities of this XML
+ dialect.
+2. "BOOL" - value of attribute key showing if attribute should be inserted
+ bare ("defer" vs. 'defer="'). It can be the only element of List of
+ attribute values.
+
+Note: Tag names in data file MUST not contain namespace description. Check
+xsl.vim for example.
+
+Commands
+
+:XMLns {name} [{namespace}] *:XMLns*
+
+Vim has to know which data file should be used and with which namespace. For
+loading of data file and connecting data with prope namespace use |:XMLns|
+command. First (obligatory) argument is name of data (xhtml10s, xsl). Second
+argument is code of namespace (h, xsl). When used without second argument
+dialect will be used as default - without namespace declaration. For example
+to use XML completion in .xsl files: >
+
+ :XMLns xhtml10s
+ :XMLns xsl xsl
+
+
+:XMLent {name} *:XMLent*
+
+By default entities will be completed from data file of default
+namespace. XMLent command should be used in case when there is no
+default namespace: >
+
+ :XMLent xhtml10s
+
+Usage
+
+While used in situation (after declarations from previous part, | is
+cursor position): >
+
+ <|
+
+Will complete to appropriate XHTML tag, and in this situation: >
+
+ <xsl:|
+
+Will complete to appropriate XSL tag.
+
+File xmlcomplete.vim provides through |autoload| mechanism
GetLastOpenTag function which can be used in XML files to get name of
last open tag with (b:unaryTagsStack has to be defined): >
- :echo htmlcomplete#GetLastOpenTag("b:unaryTagsStack")
+ :echo xmlcomplete#GetLastOpenTag("b:unaryTagsStack")
-CSS *ft-css-omni*
-Complete properties and their appropriate values according to CSS 2.1
-specification.
==============================================================================
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 618c767..a5f6d0c 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1,4 +1,4 @@
-*map.txt* For Vim version 7.0aa. Last change: 2005 Sep 22
+*map.txt* For Vim version 7.0aa. Last change: 2005 Oct 14
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -966,8 +966,10 @@
-complete=custom,{func} custom completion, defined via {func}
-complete=customlist,{func} custom completion, defined via {func}
-Custom completion *:command-completion-custom*
- *E467* *E468*
+
+Custom completion *:command-completion-custom*
+ *:command-completion-customlist*
+ *E467* *E468*
It is possible to define customized completion schemes via the "custom,{func}"
or the "customlist,{func}" completion argument. The {func} part should be a
function with the following prototype >
@@ -981,13 +983,13 @@
candidates one per line in a newline separated string.
For the "customlist" argument, the function should return the completion
-candidates as a Vim List. Non-string items in the list are ignored.
+candidates as a Vim List. Non-string items in the list are ignored.
The function arguments are:
ArgLead the leading portion of the argument currently being
completed on
CmdLine the entire command line
- CursorPos the cursor position in it
+ CursorPos the cursor position in it (byte index)
The function may use these for determining context. For the "custom"
argument, it is not necessary to filter candidates against the (implicit
pattern in) ArgLead. Vim will do filter the candidates with its regexp engine
@@ -1009,6 +1011,7 @@
: return split(globpath(&path, a:ArgLead), "\n")
:endfun
<
+
Range handling *E177* *E178*
By default, user-defined commands do not accept a line number range. However,
diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt
index 7f6a972..ead91ab 100644
--- a/runtime/doc/mbyte.txt
+++ b/runtime/doc/mbyte.txt
@@ -1,4 +1,4 @@
-*mbyte.txt* For Vim version 7.0aa. Last change: 2005 Jul 09
+*mbyte.txt* For Vim version 7.0aa. Last change: 2005 Oct 14
VIM REFERENCE MANUAL by Bram Moolenaar et al.
@@ -484,6 +484,12 @@
request a very large buffer, more than Vim is willing to provide).
Try getting another iconv() implementation.
+ *iconv-dynamic*
+On MS-Windows Vim can be compiled with the |+iconv/dyn| feature. This means
+Vim will search for the "iconv.dll" and "libiconv.dll" libraries. When
+neither of them can be found Vim will still work but some conversions won't be
+possible.
+
==============================================================================
4. Using a terminal *mbyte-terminal*
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index fcbd445..0631d45 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 7.0aa. Last change: 2005 Oct 05
+*options.txt* For Vim version 7.0aa. Last change: 2005 Nov 23
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -76,10 +76,8 @@
comma separated list, a comma is added, unless the
value was empty.
If the option is a list of flags, superfluous flags
- are removed. Otherwise there is no check for doubled
- values. You can avoid this by removing a value first.
- Example: >
- :set guioptions-=T guioptions+=T
+ are removed. When adding a flag that was already
+ present the option value doesn't change.
< Also see |:set-args| above.
{not in Vi}
@@ -988,6 +986,9 @@
Watch out for special characters, see |option-backslash|.
When $TMPDIR, $TMP or $TEMP is not defined, it is not used for the
default value. "/tmp/*" is only used for Unix.
+ Note that the default also makes sure that "crontab -e" works (when a
+ backup would be made by renaming the original file crontab won't see
+ the newly created file). Also see 'backupcopy' and |crontab|.
*'balloondelay'* *'bdlay'*
'balloondelay' 'bdlay' number (default: 600)
@@ -2927,10 +2928,11 @@
The name of an external program that will be used to format the lines
selected with the "gq" command. The program must take the input on
stdin and produce the output on stdout. The Unix program "fmt" is
- such a program. If this option is an empty string, the internal
- format function will be used |C-indenting|. Environment variables are
- expanded |:set_env|. See |option-backslash| about including spaces
- and backslashes.
+ such a program.
+ If this option is an empty string, the internal format function will
+ be used |C-indenting|.
+ Environment variables are expanded |:set_env|. See |option-backslash|
+ about including spaces and backslashes.
This option cannot be set from a |modeline| or in the |sandbox|, for
security reasons.
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index 5bce52c..850dccb 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -1,8 +1,8 @@
-*pi_netrw.txt* For Vim version 7.0. Last change: Oct 03, 2005
+*pi_netrw.txt* For Vim version 7.0. Last change: Aug 31, 2005
+
VIM REFERENCE MANUAL by Charles E. Campbell, Jr.
-
*dav* *http* *network* *rcp* *scp*
*fetch* *netrw* *Nread* *rsync* *sftp*
*ftp* *netrw.vim* *Nwrite* *netrw-file*
@@ -25,7 +25,7 @@
4. Transparent File Transfer............................|netrw-transparent|
5. Ex Commands..........................................|netrw-ex|
6. Variables and Options................................|netrw-var|
-7. Directory Browsing...................................|netrw-browse| {{{1
+7. Directory Browser....................................|netrw-browse| {{{1
Maps...............................................|netrw-maps|
Exploring..........................................|netrw-explore-cmds|
Quick Reference Commands Table.....................|netrw-browse-cmds|
@@ -194,8 +194,8 @@
2. Network-Oriented File Transfer *netrw-xfer*
Network-oriented file transfer under Vim is implemented by a VimL-based script
-(<netrw.vim>) using plugin techniques. It currently supports both reading and
-writing across networks using rcp, scp, ftp or ftp+<.netrc>, scp, fetch,
+(<netrw.vim>) using plugin techniques. It currently supports both reading
+and writing across networks using rcp, scp, ftp or ftp+<.netrc>, scp, fetch,
dav/cadaver, rsync, or sftp.
http is currently supported read-only via use of wget or fetch.
@@ -206,23 +206,24 @@
ex. vim ftp://hostname/path/to/file
<
-The characters preceding the colon specify the protocol to use; in the
-example, its ftp. The <netrw.vim> script then formulates a command or a
-series of commands (typically ftp) which it issues to an external program
-(ftp, scp, etc) which does the actual file transfer/protocol. Files are read
-from/written to a temporary file (under Unix/Linux, /tmp/...) which the
-<netrw.vim> script will clean up.
+The characters preceding the colon specify the protocol to use;
+in the example, its ftp. The <netrw.vim> script then formulates
+a command or a series of commands (typically ftp) which it issues
+to an external program (ftp, scp, etc) which does the actual file
+transfer/protocol. Files are read from/written to a temporary file
+(under Unix/Linux, /tmp/...) which the <netrw.vim> script will
+clean up.
-One may modify any protocol's implementing external application by setting a
-variable (ex. scp uses the variable g:netrw_scp_cmd, which is defaulted to
-"scp -q").
+One may modify any protocol's implementing external application
+by setting a variable (ex. scp uses the variable g:netrw_scp_cmd,
+which is defaulted to "scp -q").
Ftp, an old protocol, seems to be blessed by numerous implementations.
-Unfortunately, some implementations are noisy (ie., add junk to the end of the
-file). Thus, concerned users may decide to write a NetReadFixup() function
-that will clean up after reading with their ftp. Some Unix systems (ie.,
-FreeBSD) provide a utility called "fetch" which uses the ftp protocol but is
-not noisy and more convenient, actually, for <netrw.vim> to use.
+Unfortunately, some implementations are noisy (ie., add junk to the end
+of the file). Thus, concerned users may decide to write a NetReadFixup()
+function that will clean up after reading with their ftp. Some Unix systems
+(ie., FreeBSD) provide a utility called "fetch" which uses the ftp protocol
+but is not noisy and more convenient, actually, for <netrw.vim> to use.
Consequently, if "fetch" is executable, it will be used to do reads for
ftp://... (and http://...) . See |netrw-var| for more about this.
@@ -331,9 +332,8 @@
a built-in Vim function. See |netrw-uidpass| for how to change the password
after one has set it.
-Unfortunately there doesn't appear to be a way for netrw to feed a password to
-scp. Thus every transfer via scp will require re-entry of the password.
-However, |netrw-listhack| can help with this problem.
+Unfortunately there doesn't appear to be a way for netrw to feed a password
+to scp. Thus every transfer via scp will require re-entry of the password.
==============================================================================
@@ -341,28 +341,21 @@
Network-oriented file transfers are available by default whenever
|'nocompatible'| mode is enabled. The <netrw.vim> file resides in your
-system's vim-plugin directory and is sourced automatically whenever you bring
-up vim. I suggest that, at a minimum, you have at least the following in your
-<.vimrc> customization file: >
- set nocp
- if version >= 600
- filetype plugin indent on
- endif
-<
+system's vim-plugin directory and is sourced automatically whenever you
+bring up vim.
+
==============================================================================
4. Transparent File Transfer *netrw-transparent*
Transparent file transfers occur whenever a regular file read or write
(invoked via an |:autocmd| for |BufReadCmd| or |BufWriteCmd| events) is made.
-Thus one may use files across networks just as simply as if they were local. >
+Thus one may use files across networks as if they were local. >
vim ftp://[user@]machine/path
...
:wq
-See |netrw-activate| for more on how to encourage your vim to use plugins
-such as netrw.
==============================================================================
5. Ex Commands *netrw-ex*
@@ -376,7 +369,8 @@
:[range]Nw {netfile} [{netfile}]...
Write the specified lines to the {netfile}.
-:Nread Read the specified lines into the current
+:Nread
+ Read the specified lines into the current
buffer from the file specified in
b:netrw_lastfile.
@@ -407,11 +401,10 @@
The script <netrw.vim> uses several variables which can affect <netrw.vim>'s
behavior. These variables typically may be set in the user's <.vimrc> file:
-(also see |netrw-settings|) >
-
- -------------
- Netrw Options
- -------------
+>
+ -------------
+ Netrw Options
+ -------------
Option Meaning
-------------- -----------------------------------------------
<
@@ -488,12 +481,12 @@
-------------------------------------------------------------------------
<
*netrw-ftp*
-The first two options both help with certain ftp's that give trouble
-otherwise. In order to best understand how to use these options if ftp is
-giving you troubles, a bit of discussion follows on how netrw does ftp reads.
+The first two options both help with certain ftp's that give trouble otherwise.
+In order to best understand how to use these options if ftp is giving you
+troubles, a bit of discussion follows on how netrw does ftp reads.
-The g:netrw_..._cmd variables specify the external program to use handle the
-associated protocol (rcp, ftp, etc), plus any options.
+The g:netrw_..._cmd variables specify the external program to use handle
+the associated protocol (rcp, ftp, etc), plus any options.
The g:netrw_list_cmd's HOSTNAME entry will be changed via substitution with
whatever the current request is for a hostname.
@@ -526,8 +519,8 @@
The temporary file is then read into the main editing session window that
requested it and the temporary file deleted.
-If your ftp doesn't accept the "user" command and immediately just demands a
-userid, then try putting "let netrw_ftp=1" in your <.vimrc>.
+If your ftp doesn't accept the "user" command and immediately just demands
+a userid, then try putting "let netrw_ftp=1" in your <.vimrc>.
*netrw-cadaver*
To handle the SSL certificate dialog for untrusted servers, one may pull
@@ -554,12 +547,12 @@
endif
endfunction
>
-The NetReadFixup() function will be called if it exists and thus allows you to
-customize your reading process. As a further example, <netrw.vim> contains
-just such a function to handle Windows 95 ftp. For whatever reason, Windows
-95's ftp dumps four blank lines at the end of a transfer, and so it is
-desirable to automate their removal. Here's some code taken from <netrw.vim>
-itself:
+The NetReadFixup() function will be called if it exists and thus allows
+you to customize your reading process. As a further example, <netrw.vim>
+contains just such a function to handle Windows 95 ftp. For whatever
+reason, Windows 95's ftp dumps four blank lines at the end of a transfer,
+and so it is desirable to automate their removal. Here's some code taken
+from <netrw.vim> itself:
>
if has("win95") && g:netrw_win95ftp
fun! NetReadFixup(method, line1, line2)
@@ -572,7 +565,7 @@
>
==============================================================================
-7. Directory Browsing *netrw-browse* *netrw-dir* *netrw-list* *netrw-help*
+7. Directory Browser *netrw-browse* *netrw-dir* *netrw-list* *netrw-help*
MAPS *netrw-maps*
?................Help.......................................|netrw-help|
@@ -663,13 +656,12 @@
: connect to address [0-9a-fA-F:]*
: No route to host$'
- *g:netrw_ftp_list_cmd* options for passing along to ftp for directory
- listing. Defaults:
- unix or g:netrw_cygwin set: : "ls -lF"
- otherwise "dir"
-
- *g:netrw_hide* if true, the hiding list is used
- default: =0
+ *g:netrw_ssh_browse_reject* ssh can sometimes produce unwanted lines,
+ messages, banners, and whatnot that one doesn't
+ want masquerading as "directories" and "files".
+ Use this pattern to remove such embedded
+ messages. By default its value is:
+ '^total\s\+\d\+$'
*g:netrw_keepdir* =1 (default) keep current directory immune from
the browsing directory.
@@ -684,11 +676,16 @@
*g:netrw_longlist* if =1, then long listing will be default
+ *g:netrw_ftp_list_cmd* options for passing along to ftp for directory
+ listing. Defaults:
+ unix or g:netrw_cygwin set: : "ls -lF"
+ otherwise "dir"
+
*g:netrw_list_hide* comma separated pattern list for hiding files
default: ""
*g:netrw_local_mkdir* command for making a local directory
- default: "mkdir"
+ default: "ssh HOSTNAME mkdir"
*g:netrw_local_rmdir* remove directory command (rmdir)
default: "rmdir"
@@ -712,6 +709,9 @@
*g:netrw_rmf_cmd* command for removing softlinks
default: "ssh HOSTNAME rm -f"
+ *g:netrw_hide* if true, the hiding list is used
+ default: =0
+
*g:netrw_sort_by* sort by "name", "time", or "size"
default: "name"
@@ -723,18 +723,6 @@
default: '[\/]$,*,\.bak$,\.o$,\.h$,
\.info$,\.swp$,\.obj$'
- *g:netrw_ssh_cmd* One may specify an executable command
- to use instead of ssh for remote actions
- such as listing, file removal, etc.
- default: ssh
-
- *g:netrw_ssh_browse_reject* ssh can sometimes produce unwanted lines,
- messages, banners, and whatnot that one doesn't
- want masquerading as "directories" and "files".
- Use this pattern to remove such embedded
- messages. By default its value is:
- '^total\s\+\d\+$'
-
*g:netrw_timefmt* specify format string to strftime() (%c)
default: "%c"
@@ -744,7 +732,7 @@
INTRODUCTION TO DIRECTORY BROWSING *netrw-browse-intro*
Netrw supports the browsing of directories on the local system and on remote
-hosts, including listing files and directories, entering directories, editing
+hosts, including generating listing directories, entering directories, editing
files therein, deleting files/directories, making new directories, and moving
(renaming) files and directories. The Netrw browser generally implements the
previous explorer maps and commands for remote directories, although details
@@ -755,15 +743,13 @@
in its remote browsing. Any other protocol will be used for file transfers,
but otherwise the ssh protocol will be used to do remote directory browsing.
-To use Netrw's remote directory browser, simply attempt to read a "file" with a
+To enter the netrw directory browser, simply attempt to read a "file" with a
trailing slash and it will be interpreted as a request to list a directory:
vim [protocol]://[user@]hostname/path/
-For local directories, the trailing slash is not required.
-
-If you'd like to avoid entering the password in for remote directory listings
-with ssh or scp, see |netrw-listhack|.
+If you'd like to avoid entering the password in for directory listings, scp,
+ssh interaction, etc, see |netrw-listhack|.
*netrw-explore* *netrw-pexplore*
*netrw-hexplore* *netrw-sexplore*
@@ -797,8 +783,7 @@
may explicitly provide a directory (path) to use.
(Following needs v7.0 or later) *netrw-starstar*
-When Explore, Sexplore, Hexplore, or Vexplore are used with a **,
-such as:
+When Explore, Sexplore, Hexplore, or Vexplore are used like
>
:Explore **/filename_pattern
<
@@ -812,8 +797,7 @@
matching file. One may then proceed to the next (or previous) matching files'
directories by using Nexplore or Pexplore, respectively. If your console or
gui produces recognizable shift-up or shift-down sequences, then you'll likely
-find using shift-downarrow and shift-uparrow convenient. They're mapped by
-netrw:
+find the following mappings convenient:
<s-down> == Nexplore, and
<s-up> == Pexplore.
@@ -838,12 +822,11 @@
GOING UP *netrw--*
-To go up a directory, press "-" or press the <cr> when atop the ../ directory
+To go up a directory, press - or his the <cr> when atop the ../ directory
entry in the listing.
-Netrw will use the command in |g:netrw_list_cmd| to perform the directory
-listing operation after changing HOSTNAME to the host specified by the
-user-provided url. By default netrw provides the command as:
+Netrw will modify the command in |g:netrw_list_cmd| to perform the directory
+listing operation. By default the command is:
ssh HOSTNAME ls -FLa
@@ -858,13 +841,7 @@
Browsing is simple: move the cursor onto a file or directory of interest.
Hitting the <cr> (the return key) will select the file or directory.
Directories will themselves be listed, and files will be opened using the
-protocol given in the original read request.
-
- CAVEAT: There are three forms of listing (see |netrw-i|). Netrw assumes
- that two or more spaces delimit filenames and directory names for the long
- and wide listing formats. Thus, if your filename or directory name has two
- or more spaces embedded in it, or any trailing spaces, then you'll need to
- use the "thin" format to select it.
+protocol given in the original read request.
OBTAINING A FILE *netrw-O*
@@ -872,21 +849,7 @@
When browsing a remote directory, one may obtain a file under the cursor (ie.
get a copy on your local machine, but not edit it) by pressing the O key.
Only ftp and scp are supported for this operation (but since these two are
-available for browsing, that shouldn't be a problem). The status bar
-will then show, on its right hand side, a message like "Obtaining filename".
-The statusline will be restored after the transfer is complete.
-
-Netrw can also "obtain" a file using the local browser. Netrw's display
-of a directory is not necessarily the same as Vim's "current directory",
-unless |g:netrw_keepdir| is set to 0 in the user's <.vimrc>. One may select
-a file using the local browser (by putting the cursor on it) and pressing
-"O" will then "obtain" the file; ie. copy it to Vim's current directory.
-
-Related topics:
- * To see what the current directory is, use |:pwd|
- * To make the currently browsed directory the current directory, see |netrw-c|
- * To automatically make the currently browsed directory the current
- directory, see |g:netrw_keepdir|.
+available for browsing, that shouldn't be a problem).
THIN, LONG, AND WIDE LISTINGS *netrw-i*
@@ -896,27 +859,21 @@
The short listing format gives just the files' and directories' names.
The long listing is either based on the "ls" command via ssh for remote
-directories or displays the filename, file size (in bytes), and the time and
-date of last modification for local directories. With the long listing
-format, netrw is not able to recognize filenames which have trailing spaces.
-Use the thin listing format for such files.
+directories or displays the filename, file size (in bytes), and the
+time and date of last modification for local directories.
-The wide listing format has a multi-column display of the various files in the
-netrw current directory, rather like the Unix "ls" presents. In this mode the
-"b" and "B" maps are not available; instead, use Nb (|netrw-Nb|) and NB
-(|netrw-NB|). The wide listing format uses two or more contiguous spaces to
-delineate filenames; when using that format, netrw won't be able to recognize
-or use filenames which have two or more contiguous spaces embedded in the name
-or any trailing spaces. The thin listing format will, however, work with such
-files.
+The wide listing format has a multi-column display of the various
+files in the netrw current directory, rather like the Unix "ls" presents.
+In this mode the "b" and "B" maps are not available; instead, use
+Nb (|netrw-Nb|) and NB (|netrw-NB|).
MAKING A NEW DIRECTORY *netrw-d*
-With the "d" map one may make a new directory either remotely (which depends
-on the global variable g:netrw_mkdir_cmd) or locally (which depends on the
-global variable g:netrw_local_mkdir). Netrw will issue a request for the new
-directory's name. A bare <CR> at that point will abort the making of the
+With the "d" map one may make a new directory either remotely (which
+depends on the global variable g:netrw_mkdir_cmd) or locally (which depends on
+the global variable g:netrw_local_mkdir). Netrw will issue a request for the
+new directory's name. A bare <CR> at that point will abort the making of the
directory. Attempts to make a local directory that already exists (as either
a file or a directory) will be detected, reported on, and ignored.
@@ -924,12 +881,12 @@
DELETING FILES OR DIRECTORIES *netrw-delete* *netrw-D*
Deleting/removing files and directories involves moving the cursor to the
-file/directory to be deleted and pressing "D". Directories must be empty
-first before they can be successfully removed. If the directory is a softlink
-to a directory, then netrw will make two requests to remove the directory
-before succeeding. Netrw will ask for confirmation before doing the
-removal(s). You may select a range of lines with the "V" command (visual
-selection), and then pressing "D".
+file/directory to be deleted and pressing "D". Directories must be empty first
+before they can be successfully removed. If the directory is a softlink to a
+directory, then netrw will make two requests to remove the directory before
+succeeding. Netrw will ask for confirmation before doing the removal(s).
+You may select a range of lines with the "V" command (visual selection),
+and then pressing "D".
The g:netrw_rm_cmd, g:netrw_rmf_cmd, and g:netrw_rmdir_cmd variables are used
to control the attempts to remove files and directories. The g:netrw_rm_cmd
@@ -966,17 +923,17 @@
HIDING FILES OR DIRECTORIES *netrw-a*
-Netrw's browsing facility allows one to use the hiding list in one of three
-ways: ignore it, hide files which match, and show only those files which
-match. The "a" map allows the user to cycle about these three ways.
+Netrw's browsing facility allows one to use the hiding list in one of
+three ways: ignore it, hide files which match, and show only those files
+which match. The "a" map allows the user to cycle about these three ways.
-The g:netrw_list_hide variable holds a comma delimited list of patterns (ex.
-\.obj) which specify the hiding list. (also see |netrw-h|) To set the hiding
-list, use the <c-h> map. As an example, to hide files which begin with a ".",
-one may use the <c-h> map to set the hiding list to '^\..*' (or one may put
-let g:netrw_list_hide= '^\..*' in one's <.vimrc>). One may then use the "a"
-key to show all files, hide matching files, or to show only the matching
-files.
+The g:netrw_list_hide variable holds a comma delimited list of patterns
+(ex. \.obj) which specify the hiding list. (also see |netrw-h|) To
+set the hiding list, use the <c-h> map. As an example, to hide files
+which begin with a ".", one may use the <c-h> map to set the hiding
+list to '^\..*' (or one may put let g:netrw_list_hide= '^\..*' in
+one's <.vimrc>). One may then use the "a" key to show all files,
+hide matching files, or to show only the matching files.
EDIT FILE OR DIRECTORY HIDING LIST *netrw-h* *netrw-edithide*
@@ -984,8 +941,7 @@
The "<ctrl-h>" map brings up a requestor allowing the user to change the
file/directory hiding list. The hiding list consists of one or more patterns
delimited by commas. Files and/or directories satisfying these patterns will
-either be hidden (ie. not shown) or be the only ones displayed (see
-|netrw-a|).
+either be hidden (ie. not shown) or be the only ones displayed (see |netrw-a|).
BROWSING WITH A HORIZONTALLY SPLIT WINDOW *netrw-o* *netrw-horiz*
@@ -994,9 +950,9 @@
allows one to open a new window to hold the new directory listing or file. A
horizontal split is used. (for vertical splitting, see |netrw-v|)
-Normally, the o key splits the window horizontally with the new window and
-cursor at the top. To change to splitting the window horizontally with the
-new window and cursor at the bottom, have
+Normally, the o key splits the window horizontally with the new window
+and cursor at the top. To change to splitting the window horizontally
+with the new window and cursor at the bottom, have
let g:netrw_alto = 1
@@ -1005,30 +961,30 @@
PREVIEW WINDOW *netrw-p* *netrw-preview*
-One may use a preview window (currently only for local browsing) by using the
-"p" key when the cursor is atop the desired filename to be previewed.
+One may use a preview window (currently only for local browsing) by using
+the "p" key when the cursor is atop the desired filename to be previewed.
SELECTING SORTING STYLE *netrw-s* *netrw-sort*
-One may select the sorting style by name, time, or (file) size. The "s" map
-allows one to circulate amongst the three choices; the directory listing will
-automatically be refreshed to reflect the selected style.
+One may select the sorting style by name, time, or (file) size. The
+"s" map allows one to circulate amongst the three choices; the directory
+listing will automatically be refreshed to reflect the selected style.
EDITING THE SORTING SEQUENCE *netrw-S* *netrw-sortsequence*
-When "Sorted by" is name, one may specify priority via the sorting sequence
-(g:netrw_sort_sequence). The sorting sequence typically prioritizes the
-name-listing by suffix, although any pattern will do. Patterns are delimited
-by commas. The default sorting sequence is:
+When "Sorted by" is name, one may specify priority via the sorting
+sequence (g:netrw_sort_sequence). The sorting sequence typically
+prioritizes the name-listing by suffix, although any pattern will do.
+Patterns are delimited by commas. The default sorting sequence is:
>
[\/]$,*,\.bak$,\.o$,\.h$,\.info$,\.swp$,\.obj$
<
-The lone * is where all filenames not covered by one of the other patterns
-will end up. One may change the sorting sequence by modifying the
-g:netrw_sort_sequence variable (either manually or in your <.vimrc>) or by
-using the "S" map.
+The lone * is where all filenames not covered by one of the other
+patterns will end up. One may change the sorting sequence by modifying
+the g:netrw_sort_sequence variable (either manually or in your <.vimrc>)
+or by using the "S" map.
REVERSING SORTING ORDER *netrw-r* *netrw-reverse*
@@ -1055,13 +1011,13 @@
BROWSING WITH A VERTICALLY SPLIT WINDOW *netrw-v*
-Normally one enters a file or directory using the <cr>. However, the "v" map
-allows one to open a new window to hold the new directory listing or file. A
-vertical split is used. (for horizontal splitting, see |netrw-o|)
+Normally one enters a file or directory using the <cr>. However, the "v"
+map allows one to open a new window to hold the new directory listing or
+file. A vertical split is used. (for horizontal splitting, see |netrw-o|)
-Normally, the v key splits the window vertically with the new window and
-cursor at the left. To change to splitting the window vertically with the new
-window and cursor at the right, have
+Normally, the v key splits the window vertically with the new window
+and cursor at the left. To change to splitting the window vertically
+with the new window and cursor at the right, have
let g:netrw_altv = 1
@@ -1077,24 +1033,24 @@
* for Windows 32 or 64, the url and FileProtocolHandler dlls are used.
* for KDE (with kfmclient): kfmclient is used.
* for Gnome (with gnome-open): gnome-open is used.
- * otherwise the netrwFileHandler plugin is used.
+ * otherwise the NetrwFileHandler plugin is used.
The file's suffix is used by these various approaches to determine an
-appropriate application to use to "handle" these files. Such things as
-OpenOffice (*.sfx), visualization (*.jpg, *.gif, etc), and PostScript (*.ps,
-*.eps) can be handled.
+appropriate application to use to "handle" these files. Such things
+as OpenOffice (*.sfx), visualization (*.jpg, *.gif, etc), and PostScript
+(*.ps, *.eps) can be handled.
-The netrwFileHandler applies a user-defined function to a file, based on its
+The NetrwFileHandler applies a user-defined function to a file, based on its
extension. Of course, the handler function must exist for it to be called!
>
Ex. mypgm.html x ->
- netrwFileHandler_html("scp://user@host/some/path/mypgm.html")
+ NetrwFileHandler_html("scp://user@host/some/path/mypgm.html")
<
-See the <plugin/netrwFileHandlers.vim> for an example of how to handle an html
+See the <plugin/NetrwFileHandlers.vim> for an example of how to handle an html
file with mozilla.
-One may write custom netrwFileHandlers; please look at the
-plugin/netrwFileHandlers.vim script for examples. If its likely to be
+One may write custom NetrwFileHandlers; please look at the
+plugin/NetrwFileHandlers.vim script for examples. If its likely to be
generally useful, please feel free to forward a copy to me for future
inclusion in the distribution.
@@ -1107,8 +1063,8 @@
currently browsed directory be the current directory.
With the default setting for g:netrw_keepdir, in order to make the two
-directories the same, use the "c" map (just type c). That map will set the
-current directory to the current browsing directory.
+directories the same, use the "c" map (just type c). That map will set
+the current directory to the current browsing directory.
BOOKMARKING A DIRECTORY *netrw-b* *netrw-bookmark* *netrw-bookmarks*
@@ -1131,8 +1087,8 @@
{cnt}B
-Any count may be used to reference any of the bookmarks. See |netrw-b| on
-how to bookmark a directory and |netrw-q| on how to list bookmarks.
+Any count may be used to reference any of the bookmarks. See |netrw-b|
+for how to bookmark a directory and |netrw-q| for how to list them.
When wide listing is in use (see |netrw-i|), then the B map is not available;
instead, use {cnt}NB.
@@ -1162,9 +1118,9 @@
With the NetrwSettings.vim plugin, >
:NetrwSettings
will bring up a window with the many variables that netrw uses for its
-settings. You may change any of their values; when you save the file, the
-settings therein will be used. One may also press "?" on any of the lines for
-help on what each of the variables do.
+settings. You may change any of their values; when you save the file,
+the settings therein will be used. One may also press "?" on any of
+the lines for help on what each of the variables do.
==============================================================================
@@ -1284,33 +1240,6 @@
==============================================================================
10. History *netrw-history*
- v73: * bugfix -- scp://host/path/file was getting named incorrectly
- * netrw detects use of earlier-than-7.0 version of vim and issues
- a pertinent error message.
- * netrwSettings.vim is now uses autoloading. Only
- <netrwPlugin.vim> is needed as a pure plugin
- (ie. always loaded).
- v72: * bugfix -- formerly, one could prevent the loading of netrw
- by "let g:loaded_netrw=1"; when autoloading became supported,
- this feature was lost. It is now restored.
- v71: * bugfix -- made some "set nomodifiable"s into setlocal variants
- (allows :e somenewfile to be modifiable as usual)
- * NetrwSettings calls a netrw function, thereby assuring that
- netrw has loaded. However, if netrw does not load for whatever
- reason, then NetrwSettings will now issue a warning message.
- * For what reason I don't recall, when wget and fetch are both
- not present, and an attempt to read a http://... url is made,
- netrw exited. It now only returns.
- * When ch=1, on the second and subsequent uses of browsing Netrw
- would issue a blank line to clear the echo'd messages. This
- caused an annoying "Hit-Enter" prompt; now a blank line message
- is echo'd only if &ch>1.
- v70: * when using |netrw-O|, the "Obtaining filename" message is now
- shown using |hl-User9|. If User9 has not been defined, netrw
- will define it.
- v69: * Bugfix: win95/98 machines were experiencing a
- "E121: Undefined variable: g:netrw_win95ftp" message
- v68: * double-click-leftmouse selects word under mouse
v67: * Passwords which contain blanks will now be surrounded by
double-quotes automatically (Yongwei)
v66: * Netrw now seems to work with a few more Windows situations
@@ -1426,7 +1355,7 @@
* special file viewing with:
(windows) rundll32 url.dll (gnome) gnome-open (kde)
kfmclient If none of these are on the executable path, then
- netrwFileHandlers.vim is used.
+ NetrwFileHandlers.vim is used.
* directory bookmarking during both local and remote browsing
implemented
* one may view all, use the hiding list to suppress, or use the
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 35f00c3..2fb97ba 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -1062,6 +1062,7 @@
+gettext various.txt /*+gettext*
+hangul_input various.txt /*+hangul_input*
+iconv various.txt /*+iconv*
++iconv/dyn various.txt /*+iconv\/dyn*
+insert_expand various.txt /*+insert_expand*
+jumplist various.txt /*+jumplist*
+keymap various.txt /*+keymap*
@@ -1090,13 +1091,16 @@
+osfiletype various.txt /*+osfiletype*
+path_extra various.txt /*+path_extra*
+perl various.txt /*+perl*
++perl/dyn various.txt /*+perl\/dyn*
+postscript various.txt /*+postscript*
+printer various.txt /*+printer*
+profile various.txt /*+profile*
+python various.txt /*+python*
++python/dyn various.txt /*+python\/dyn*
+quickfix various.txt /*+quickfix*
+rightleft various.txt /*+rightleft*
+ruby various.txt /*+ruby*
++ruby/dyn various.txt /*+ruby\/dyn*
+scrollbind various.txt /*+scrollbind*
+signs various.txt /*+signs*
+smartindent various.txt /*+smartindent*
@@ -1109,6 +1113,7 @@
+tag_binary various.txt /*+tag_binary*
+tag_old_static various.txt /*+tag_old_static*
+tcl various.txt /*+tcl*
++tcl/dyn various.txt /*+tcl\/dyn*
+terminfo various.txt /*+terminfo*
+termresponse various.txt /*+termresponse*
+textobjects various.txt /*+textobjects*
@@ -1663,6 +1668,8 @@
:TOhtml syntax.txt /*:TOhtml*
:Vexplore pi_netrw.txt /*:Vexplore*
:X editing.txt /*:X*
+:XMLent insert.txt /*:XMLent*
+:XMLns insert.txt /*:XMLns*
:\bar cmdline.txt /*:\\bar*
:_! cmdline.txt /*:_!*
:_# cmdline.txt /*:_#*
@@ -1839,6 +1846,7 @@
:command map.txt /*:command*
:command-completion map.txt /*:command-completion*
:command-completion-custom map.txt /*:command-completion-custom*
+:command-completion-customlist map.txt /*:command-completion-customlist*
:command-verbose map.txt /*:command-verbose*
:comment eval.txt /*:comment*
:comp quickfix.txt /*:comp*
@@ -5007,6 +5015,7 @@
ft-ksh-syntax syntax.txt /*ft-ksh-syntax*
ft-lace-syntax syntax.txt /*ft-lace-syntax*
ft-lex-syntax syntax.txt /*ft-lex-syntax*
+ft-lisp-syntax syntax.txt /*ft-lisp-syntax*
ft-lite-syntax syntax.txt /*ft-lite-syntax*
ft-lpc-syntax syntax.txt /*ft-lpc-syntax*
ft-lua-syntax syntax.txt /*ft-lua-syntax*
@@ -5059,6 +5068,8 @@
ft-vim-indent indent.txt /*ft-vim-indent*
ft-vim-syntax syntax.txt /*ft-vim-syntax*
ft-xf86conf-syntax syntax.txt /*ft-xf86conf-syntax*
+ft-xhtml-omni insert.txt /*ft-xhtml-omni*
+ft-xml-omni insert.txt /*ft-xml-omni*
ft-xml-syntax syntax.txt /*ft-xml-syntax*
ft-xpm-syntax syntax.txt /*ft-xpm-syntax*
ftdetect filetype.txt /*ftdetect*
@@ -5302,6 +5313,7 @@
hebrew.txt hebrew.txt /*hebrew.txt*
help various.txt /*help*
help-context help.txt /*help-context*
+help-tags tags 1
help-translated various.txt /*help-translated*
help-xterm-window various.txt /*help-xterm-window*
help.txt help.txt /*help.txt*
@@ -5513,6 +5525,7 @@
iconise starting.txt /*iconise*
iconize starting.txt /*iconize*
iconv() eval.txt /*iconv()*
+iconv-dynamic mbyte.txt /*iconv-dynamic*
ident-search tips.txt /*ident-search*
if_cscop.txt if_cscop.txt /*if_cscop.txt*
if_mzsch.txt if_mzsch.txt /*if_mzsch.txt*
@@ -5658,6 +5671,7 @@
linewise motion.txt /*linewise*
linewise-register change.txt /*linewise-register*
linewise-visual visual.txt /*linewise-visual*
+lisp.vim syntax.txt /*lisp.vim*
lispindent() eval.txt /*lispindent()*
list-identity eval.txt /*list-identity*
list-index eval.txt /*list-index*
@@ -6111,6 +6125,7 @@
perl-SetOption if_perl.txt /*perl-SetOption*
perl-Windows if_perl.txt /*perl-Windows*
perl-compiling if_perl.txt /*perl-compiling*
+perl-dynamic if_perl.txt /*perl-dynamic*
perl-editing if_perl.txt /*perl-editing*
perl-overview if_perl.txt /*perl-overview*
perl-patterns pattern.txt /*perl-patterns*
@@ -6174,6 +6189,7 @@
python-command if_pyth.txt /*python-command*
python-commands if_pyth.txt /*python-commands*
python-current if_pyth.txt /*python-current*
+python-dynamic if_pyth.txt /*python-dynamic*
python-error if_pyth.txt /*python-error*
python-eval if_pyth.txt /*python-eval*
python-examples if_pyth.txt /*python-examples*
@@ -6310,6 +6326,7 @@
ruby-buffer if_ruby.txt /*ruby-buffer*
ruby-command if_ruby.txt /*ruby-command*
ruby-commands if_ruby.txt /*ruby-commands*
+ruby-dynamic if_ruby.txt /*ruby-dynamic*
ruby-evaluate if_ruby.txt /*ruby-evaluate*
ruby-globals if_ruby.txt /*ruby-globals*
ruby-message if_ruby.txt /*ruby-message*
@@ -6774,6 +6791,7 @@
tcl-bugs if_tcl.txt /*tcl-bugs*
tcl-command if_tcl.txt /*tcl-command*
tcl-commands if_tcl.txt /*tcl-commands*
+tcl-dynamic if_tcl.txt /*tcl-dynamic*
tcl-ex-commands if_tcl.txt /*tcl-ex-commands*
tcl-examples if_tcl.txt /*tcl-examples*
tcl-expr if_tcl.txt /*tcl-expr*
@@ -7266,6 +7284,7 @@
xim-input-style mbyte.txt /*xim-input-style*
xiterm syntax.txt /*xiterm*
xml-folding syntax.txt /*xml-folding*
+xml-omni-datafile insert.txt /*xml-omni-datafile*
xml.vim syntax.txt /*xml.vim*
xpm.vim syntax.txt /*xpm.vim*
xterm-8-bit term.txt /*xterm-8-bit*
@@ -7337,13 +7356,6 @@
zg spell.txt /*zg*
zh scroll.txt /*zh*
zi fold.txt /*zi*
-zip zip.txt /*zip*
-zip-contents zip.txt /*zip-contents*
-zip-copyright zip.txt /*zip-copyright*
-zip-history zip.txt /*zip-history*
-zip-manual zip.txt /*zip-manual*
-zip-usage zip.txt /*zip-usage*
-zip.txt zip.txt /*zip.txt*
zj fold.txt /*zj*
zk fold.txt /*zk*
zl scroll.txt /*zl*
diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt
index fbecaa2..522eb2a 100644
--- a/runtime/doc/tagsrch.txt
+++ b/runtime/doc/tagsrch.txt
@@ -1,4 +1,4 @@
-*tagsrch.txt* For Vim version 7.0aa. Last change: 2005 Jul 12
+*tagsrch.txt* For Vim version 7.0aa. Last change: 2005 Oct 15
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -440,7 +440,7 @@
will be searched for the tag.
This can be switched off by including the 'd' flag in 'cpoptions', to make
-it Vi compatible. "./tags" will than be the tags file in the current
+it Vi compatible. "./tags" will then be the tags file in the current
directory, instead of the tags file in the directory where the current file
is.
diff --git a/runtime/doc/tar.txt b/runtime/doc/tar.txt
new file mode 100644
index 0000000..f43140d
--- /dev/null
+++ b/runtime/doc/tar.txt
@@ -0,0 +1,37 @@
+*tar.txt* Tar File Interface Nov 03, 2005
+
+Author: Charles E. Campbell, Jr. <NdrOchip@ScampbellPfamily.AbizM>
+ (remove NOSPAM from Campbell's email first)
+Copyright: The GPL (gnu public license) applies to *tar-copyright*
+ tarPlugin.vim, and tar.txt.
+ No warranty, express or implied. Use At-Your-Own-Risk.
+
+==============================================================================
+1. Contents *tar* *tar-contents*
+ 1. Contents..................................................|tar-contents|
+ 2. Usage.....................................................|tar-usage|
+ 3. History...................................................|tar-history|
+
+==============================================================================
+2. Usage *tar-usage* *tar-manual*
+
+ When one edits a *.tar file, this plugin will handle displaying a
+ contents page. Select a file to edit by moving the cursor atop
+ the desired file, then hit the <return> key. After editing, one may
+ also write to the file. Currently, one may not make a new file in
+ tar archives via the plugin.
+
+==============================================================================
+3. History *tar-history*
+ v3 Sep 16, 2005 * handles writing files in an archive back to the
+ archive
+ Oct 18, 2005 * <amatch> used instead of <afile> in autocmds
+ Oct 18, 2005 * handles writing to compressed archives
+ Nov 03, 2005 * handles writing tarfiles across a network using
+ netrw#NetWrite()
+ v2 * converted to use Vim7's new autoload feature by
+ Bram Moolenaar
+ v1 (original release) * Michael Toren (see http://michael.toren.net/code/)
+
+==============================================================================
+vim:tw=78:ts=8:ft=help
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index e856a56..14097a9 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 7.0aa. Last change: 2005 Oct 12
+*todo.txt* For Vim version 7.0aa. Last change: 2005 Nov 23
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -30,18 +30,66 @@
*known-bugs*
-------------------- Known bugs and current work -----------------------
+Using chown() is unsafe. (Jinpeng Wei)
+ ex_cmds.c: viminfo tempfile: use mch_open(O_EXCL) and fdopen()
+ fileio.c: use fchown() instead of chown()
+ vim.h: define O_NOFOLLOW if needed. Not in Vim 6.4?
+
+Go over all changes between 6.3 and 6.4 and make sure they are included in 7.
+
+'statusline' is drawn over the Omni menu.
+
+Cygwin and Mac OS/X may preserve case for file names but ignore case
+differences. Use Amiga code?
+
+"make unixall": remove split in floppy-size archives.
+
+To support mapping <F4> to be used as <F4>{motion}: Add operator that
+executes a user defined function. '[ and '] marks are at start and end of
+text. ":map <F4> :set opfunc=MyOp<CR>gy".
+
+Patch from Yasuhiro Matsumoto: ":e ++enc=xxx" keeps encoding for conversion
+errors and illegal bytes. How about replacing bytes with '?' or not?
+
ccomplete:
- When an option is set: In completion mode and the user types (identifier)
characters, advance to the first match instead of removing the popup menu.
If there is no match remove the selection. (Yegappan Lakshmanan)
+- Complete the longest common match instead of the first match?
+- !_TAG_FILE_FORMAT and it's ilk are listed in the global completions
- When completing something that is a structure, add the "." or "->".
- When a typedef or struct is local to a file only use it in that file?
+- Window resize when poup is displayed
+- page-up / page-down
spelling:
- When a recognized word ends in a . don't have 'spellcapcheck" match it.
-- Use KEEPCASE instead of "KEP". applies to affixes too.
+- Use KEEPCASE instead of "KEP". It applies to the word including affixes
+ Hunspell also uses it.
+- Hunspell has NOSUGGEST flag (use for obscene words?)
+- Check out Hunspell 1.1.2.
- Look into hungarian dictionary:
http://magyarispell.sourceforge.net/rc3-beta2.zip
+- Support breakpoint character · 0xb7 and ignore it?
+- Dutch word list should be available here: http://www.woordenlijst.org/
+8 Alternate Dutch word list at www.nederlandsewoorden.nl (use script to
+ obtain). But new Myspell wordlist will come (Hagen)
+- Finding suggestions with sound folding is slow. Somehow store the
+ sound-folded words and link to the words it comes from?
+
+When editing a file "a" that is a symbolic link to "b", while another Vim is
+editing "b", there is no warning. Follow symlink to make swap file name?
+Patch from Stefano Zacchiroli.
+
+In diff mode deleting lines is very slow. E.g., when diffing two .po files
+and then sourcing po/cleaup.vim.
+
+7 Add plugins for formatting. Should be able to make a choice depending on
+ the language of a file (English/Korean/Japanese/etc.).
+ Setting the 'langformat' option to "chinese" would load the
+ "format/chinese.vim" plugin.
+Edward L. Fox explains how it should be done for most Asian languages. (2005
+Nov 24)
Mac unicode patch (Da Woon Jung):
- selecting proportional font breaks display
@@ -52,10 +100,15 @@
- With 'nopaste' pasting is wrong, with 'paste' Command-V doesn't work.
(Alan Schmitt)
+Patch to add a few flags to search(). (Benji Fisher, Nov 22)
+
Win32: Use the free downloadable compiler 7.1. Figure out how to do debugging
(with Agide?) and describe it. (George Reilly)
Try out using the free MS compiler and debugger, using Make_mvc.mak.
+Win32: Check that installer puts menu items in "all users" dir when possible,
+not administrator dir.
+
Autoload:
- Add a Vim script in $VIMRUNTIME/tools that takes a file with a list of
script names and a help file and produces a script that can be sourced to
@@ -67,7 +120,8 @@
helpfile doc/myscript.txt
For the "helpfile" item ":helptags" is run.
-Add ":smap", Select mode mapping?
+Add ":smap", Select mode mapping? Otherwise: ":sunmap", so that Visual mode
+mappings for normal keys can be removed from Select mode.
Awaiting response:
- Win32: tearoff menu window should have a scrollbar when it's taller than
@@ -88,6 +142,10 @@
make it work for all completion methods.
UI:
+ - Complete longest common string first, like 'wildmode' "longest:full".
+ - Add an "auto" mode: after typing a character (or string) completion is
+ done for the longest common string. plugin defines the possible
+ characters/strings. (Martin Stubenschrott)
- GUI implementation of the popup menu.
- When using tags, show match in preview window (function prototype,
struct member, etc.).
@@ -191,9 +249,9 @@
For GTK Neil Bird has a patch to use Vim like a widget.
- Add COLUMN NUMBERS to ":" commands ":line1,line2[col1,col2]cmd". Block
can be selected with CTRL-V. Allow '$' (end of line) for col2.
-- Add DEBUGGER INTERFACE. Implementation for gdb by Xavier de Gaye,
- assisted by Mikolaj Machowski. Should work like an IDE. Try to keep it
- generic. Also found here: http://skawina.eu.org/mikolaj/vimgdb
+- Add DEBUGGER INTERFACE. Implementation for gdb by Xavier de Gaye.
+ Should work like an IDE. Try to keep it generic. Now found here:
+ http://clewn.sf.net.
And the idevim plugin/script.
To be able to start the debugger from inside Vim: For GUI run a program
with a netbeans connection; for console: start a program that splits the
@@ -207,6 +265,7 @@
implement part in Java and then connect to Vim. Some hints from Alexandru
Roman, 2004 Dec 15. Should then also work with Oracle Jdeveloper, see JSR
198 standard http://www.jcp.org/en/jsr/detail?id=198.
+ Eclim does it: http://eclim.sourceforge.net/ (Eric Van Dewoestine)
- STICKY CURSOR: Add a way of scrolling that leaves the cursor where it is.
Especially when using the scrollbar. Typing a cursor-movement command
scrolls back to where the cursor is.
@@ -353,7 +412,9 @@
How does this work? Missing comments.
gettext() Translate a message. (Patch from Yasuhiro Matsumoto)
Update 2004 Sep 10
- More docs. Search in 'runtimepath'?
+ Another patch from Edward L. Fox (2005 Nov 24)
+ Search in 'runtimepath'?
+ More docs about how to use this.
How to get the messages into the .po files?
--- did not respond (yet) --
- Patch for 'breakindent' option: repeat indent for wrapped line. (Vaclav
@@ -395,7 +456,7 @@
7 When 'rightleft' is set, the search pattern should be displayed right
to left as well? See patch of Dec 26. (Nadim Shaikli)
8 Lock all used memory so that it doesn't get swapped to disk (uncrypted).
- Patch by Jason Holt, 2003 May 23.
+ Patch by Jason Holt, 2003 May 23. Uses mlock.
7 Support a stronger encryption. Jason Holt implemented AES (May 6 2003).
7 Add ! register, for shell commands. (patch from Grenie)
8 In the gzip plugin, also recognize *.gz.orig, *.gz.bak, etc. Like it's
@@ -791,7 +852,16 @@
8 OS/2: Add Extended Attributes support and define HAVE_ACL.
8 OS/2: When editing a file name "foo.txt" that is actually called FOO.txt,
writing uses "foo.txt". Should obtain the real file name.
-8 Should $USERPROFILE be preferred above $HOMEDRIVE/$HOMEPATH?
+8 Should $USERPROFILE be preferred above $HOMEDRIVE/$HOMEPATH? No, but it's
+ a good fallback, thus use:
+ $HOME
+ $HOMEDRIVE$HOMEPATH
+ SHGetSpecialFolderPath(NULL, lpzsPath, CSIDL_APPDATA, FALSE);
+ $USERPROFILE
+ SHGetSpecialFolderPath(NULL, lpzsPath, CSIDL_COMMON_APPDATA, FALSE);
+ $ALLUSERSPROFILE
+ $SYSTEMDRIVE\
+ C:\
8 Win32 console: <M-Up> and <M-Down> don't work. (Geddes) We don't have
special keys for these. Should use modifier + key.
8 Win32 console: caps-lock makes non-alpha keys work like with shift.
@@ -1382,22 +1452,19 @@
8 Make "en-rare" spell file? Ask Charles Campbell.
8 The English dictionaries for different regions are not consistent in their
use of words with a dash.
-8 Alternate Dutch word list at www.nederlandsewoorden.nl (use script to
- obtain). But new Myspell wordlist will come (Hagen)
7 Insert mode completion mechanism that uses the spell word lists.
8 Add hl groups to 'spelllang'?
:set spelllang=en_us,en-rare/SpellRare,en-math/SpellMath
More complicated: Regions with different languages? E.g., comments
in English, strings in German (po file).
-8 Implement compound words when it works for Myspell. Current idea has the
- problem that "foo/X" always allows "foofoo", there is no way to specify a
- word can only be at the start or end, or that only certain words combine.
Diff mode:
8 Use diff mode to show the changes made in a buffer (compared to the file).
Use an unnamed buffer, like doing:
new | set bt=nofile | r # | 0d_ | diffthis | wincmd p | diffthis
+ Also show difference with the file when editing started? Should show what
+ can be undone. (Tom Popovich)
7 Add cursor-binding: when moving the cursor in one diff'ed buffer, also
move it in other diff'ed buffers, so that CTRL-W commands go to the same
location.
@@ -1575,6 +1642,11 @@
re-insert the [] if possible.
8 Make it possible to use color of text for Visual highlight group (like for
the Cursor).
+8 It would be useful to make the highlight group name an expression. Then
+ when there is a match, the expression would be evaluated to find out what
+ highlight group to use. Could be used to check if the shell used in a
+ password file appears in /etc/shells. (Nikolai Weibull)
+ syn match =s:checkShell(v:match) contained 'pattern'
8 Make it possible to only highlight a sub-expression of a match. Like
using "\1" in a ":s" command.
8 Support for deleting syntax items:
@@ -3020,8 +3092,6 @@
7 There is 'titleold', why is there no 'iconold'? (Chazelas)
7 Make 'scrolloff' a global-local option, so that it can be different in the
quickfix window, for example. (Gary Holloway)
-7 Add plugins for formatting. Should be able to make a choice depending on
- the language of a file (English/Korean/Japanese/etc.).
External commands:
@@ -3349,7 +3419,8 @@
7 Add a way to define an item list with a pattern in 'formatoptions'. The
'n' flag doesn't work for "6.3" or "6a.".
8 Add 'formatexpr' option: Used for formatting operator "gq" instead of the
- builtin formatting or 'formatprg'.
+ builtin formatting or 'formatprg'. Or use a string that starts with "="
+ in 'formatprg': "=MyFormat()".
8 Allow using a trailing space to signal a paragraph that continues on the
next line (MIME text/plain; format=flowed, RFC 2646). Can be used for
continuous formatting. Could use 'autoformat' option, which specifies a
diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt
index 751c0b4..d126f8b 100644
--- a/runtime/doc/uganda.txt
+++ b/runtime/doc/uganda.txt
@@ -1,4 +1,4 @@
-*uganda.txt* For Vim version 7.0aa. Last change: 2005 Aug 12
+*uganda.txt* For Vim version 7.0aa. Last change: 2005 Oct 15
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -211,9 +211,26 @@
Check the ICCF web site for the latest information! See |iccf| for the URL.
-USA and Canada: Contact Kibaale Children's Fund (KCF) in Surrey, Canada. They
+USA: The methods mentioned below can be used. Alternatively, you
+ can send a check to the Nehemiah Group Outreach Society
+ (NGOS). This will reduce banking costs and you can get an IRS
+ tax receipt. The NGOS forwards the funds directly to the
+ Kibaale project in Uganda. Checks must be made payable to
+ NGOS but please note on the check "donation Kibaale". Mail
+ checks to:
+ NGOS
+ P.O. Box 50862
+ Indianapolis, IN 45250
+ Questions regarding the Nehemiah Group Outreach Society (NGOS)
+ should be directed to: Ross deMerchant, Executive Director -
+ r.demerchant AT sbcglobal DOT net.
+ For sponsoring a child contact KCF in Canada (see below) and
+ send the check to NGOS in Indianapolis.
+
+Canada: Contact Kibaale Children's Fund (KCF) in Surrey, Canada. They
take care of the Canadian sponsors for the children in
- Kibaale. You can send them a one time donation directly.
+ Kibaale. KCF forwards 100% of the money to the project in
+ Uganda. You can send them a one time donation directly.
Please send me a note so that I know what has been donated
because of Vim. Ask KCF for information about sponsorship.
Kibaale Children's Fund c/o Pacific Academy
@@ -223,12 +240,10 @@
Phone: 604-581-5353
If you make a donation to Kibaale Children's Fund (KCF) you
will receive a tax receipt which can be submitted with your
- tax return (under the Free Trade Agreement tax receipts issued
- by an organization registered in Canada are fully accepted by
- the IRS in the USA, with a few conditions).
+ tax return.
Holland: Transfer to the account of "Stichting ICCF Holland" in Venlo.
- This will allow for tax deduction (if you live in Holland)!
+ This will allow for tax deduction if you live in Holland.
Postbank, nr. 4548774
Germany: It is possible to make donations that allow for a tax return.
@@ -252,7 +267,7 @@
https://www.paypal.com/affil/pal=Bram%40iccf-holland.org
The e-mail address for sending the money to is:
Bram@iccf-holland.org
- For amounts above 400 Euro ($500) sending a cheque is
+ For amounts above 400 Euro ($500) sending a check is
preferred.
Others: Transfer to one of these accounts if possible:
@@ -264,11 +279,11 @@
Rabobank Venlo, account 3765.05.117
Swift code: RABO NL 2U
under the name "Bram Moolenaar", Venlo
- Otherwise, send a cheque in euro or US dollars to the address
+ Otherwise, send a check in euro or US dollars to the address
below. Minimal amount: $70 (my bank does not accept smaller
- amounts for foreign cheques, sorry)
+ amounts for foreign check, sorry)
-Address to send cheques to:
+Address to send checks to:
stichting ICCF Holland
Bram Moolenaar
Clematisstraat 30
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 3f075d8..b4172cc 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt* For Vim version 7.0aa. Last change: 2005 Aug 27
+*various.txt* For Vim version 7.0aa. Last change: 2005 Oct 14
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -295,7 +295,8 @@
*+GUI_Motif* Unix only: Motif |GUI|
*+GUI_Photon* QNX only: Photon |GUI|
m *+hangul_input* Hangul input support |hangul|
- *+iconv* Compiled with the |iconv()| function, may have |/dyn|
+ *+iconv* Compiled with the |iconv()| function
+ *+iconv/dyn* Likewise |iconv-dynamic| |/dyn|
N *+insert_expand* |insert_expand| Insert mode completion
N *+jumplist* |jumplist|
B *+keymap* |'keymap'|
@@ -325,14 +326,17 @@
*+osfiletype* Support for the 'osfiletype' option and filetype
checking in automatic commands. |autocmd-osfiletypes|
N *+path_extra* Up/downwards search in 'path' and 'tags'
-m *+perl* Perl interface |perl|, may have |/dyn|
+m *+perl* Perl interface |perl|
+m *+perl/dyn* Perl interface |perl-dynamic| |/dyn|
*+postscript* |:hardcopy| writes a PostScript file
N *+printer* |:hardcopy| command
H *+profile* |:profile| command
-m *+python* Python interface |python|, may have |/dyn|
+m *+python* Python interface |python|
+m *+python/dyn* Python interface |python-dynamic| |/dyn|
N *+quickfix* |:make| and |quickfix| commands
B *+rightleft* Right to left typing |'rightleft'|
-m *+ruby* Ruby interface |ruby|, may have |/dyn|
+m *+ruby* Ruby interface |ruby|
+m *+ruby/dyn* Ruby interface |ruby-dynamic| |/dyn|
N *+scrollbind* |'scrollbind'|
B *+signs* |:sign|
N *+smartindent* |'smartindent'|
@@ -345,7 +349,8 @@
N *+tag_binary* binary searching in tags file |tag-binary-search|
N *+tag_old_static* old method for static tags |tag-old-static|
m *+tag_any_white* any white space allowed in tags file |tag-any-white|
-m *+tcl* Tcl interface |tcl|, may have |/dyn|
+m *+tcl* Tcl interface |tcl|
+m *+tcl/dyn* Tcl interface |tcl-dynamic| |/dyn|
*+terminfo* uses |terminfo| instead of termcap
N *+termresponse* support for |t_RV| and |v:termresponse|
N *+textobjects* |text-objects| selection
diff --git a/runtime/doc/version6.txt b/runtime/doc/version6.txt
index 3f17ebb..7490a45 100644
--- a/runtime/doc/version6.txt
+++ b/runtime/doc/version6.txt
@@ -1,4 +1,4 @@
-*version6.txt* For Vim version 7.0aa. Last change: 2005 Oct 09
+*version6.txt* For Vim version 7.0aa. Last change: 2005 Oct 17
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -13863,16 +13863,36 @@
Changed *changed-6.4*
-------
-Nothing relevant.
+Removed runtime/tools/tcltags, Exuberant ctags does it better.
Added *added-6.4*
-----
-Netrc syntax file. (Nikolai Weibull)
-Sudoers syntax file. (Nikolai Weibull)
-SMTPrc syntax file. (Kornel Kielczewski)
-Esterel syntax file. (Maurizio Tranchero)
+Alsaconf syntax file (Nikolai Weibull)
+Eruby syntax, indent, compiler and ftplugin file (Doug Kearns)
+Esterel syntax file (Maurizio Tranchero)
+Mathematica indent file (Steve Layland)
+Netrc syntax file (Nikolai Weibull)
+PHP compiler file (Doug Kearns)
+Pascal indent file (Neil Carter)
+Prescribe syntax file (Klaus Muth)
+Rubyunit compiler file (Doug Kearns)
+SMTPrc syntax file (Kornel Kielczewski)
+Sudoers syntax file (Nikolai Weibull)
+TPP syntax file (Gerfried Fuchs)
+VHDL ftplugin file (R. Shankar)
+Verilog-AMS syntax file (S. Myles Prather)
+
+Bulgarian keymap (Alberto Mardegan)
+Canadian keymap (Eric Joanis)
+
+Hungarian menu translations in UTF-8 (Kantra Gergely)
+Ukrainian menu translations (Bohdan Vlasyuk)
+
+Irish message translations (Kevin Patrick Scannell)
+
+Configure also checks for tclsh8.4.
Fixed *fixed-6.4*
@@ -13888,6 +13908,10 @@
Gcc would warn "dereferencing type-punned pointer will break strict -aliasing
rules". Avoid using typecasts for variable pointers.
+Gcc 3.x interprets the -MM argument differently. Change "-I /path" to
+"-isystem /path" for "make depend".
+
+
Patch 6.3.001
Problem: ":browse split" gives the file selection dialog twice. (Gordon
Bazeley) Same problem for ":browse diffpatch".
@@ -14056,7 +14080,7 @@
Patch 6.3.026
Problem: When ~/.vim/after/syntax/syncolor.vim contains a command that
- reloads the colors an enless loop and/or a crash may occur.
+ reloads the colors an endless loop and/or a crash may occur.
Solution: Only free the old value of an option when it was originally
allocated. Limit recursiveness of init_highlight() to 5 levels.
Files: src/option.c, src/syntax.c
@@ -14471,5 +14495,36 @@
Solution: Limit the values to 10000 and 1000.
Files: src/option.c
+Patch 6.4a.001
+Problem: The Unix Makefile contained too many dependencies and a few
+ uncommented lines.
+Solution: Run "make depend" with manual changes to avoid a gcc
+ incompatibility. Comment a few lines.
+Files: src/Makefile
+
+Patch 6.4b.001
+Problem: Vim reports "Vim 6.4a" in the ":version" output.
+Solution: Change "a" to "b". (Tony Mechelynck)
+Files: src/version.h
+
+Patch 6.4b.002
+Problem: In Insert mode, pasting a multi-byte character after the end of
+ the line leaves the cursor just before that character.
+Solution: Make sure "gP" leaves the cursor in the right place when
+ 'virtualedit' is set.
+Files: src/ops.c
+
+Patch 6.4b.003 (after 6.4b.002)
+Problem: The problem still exists when 'encoding' is set to "cp936".
+Solution: Fix the problem in getvvcol(), compute the coladd field correctly.
+Files: src/charset.c, src/ops.c
+
+Patch 6.4b.004
+Problem: Selecting a {} block with "viB" includes the '}' when there is an
+ empty line before it.
+Solution: Don't advance the cursor to include a line break when it's already
+ at the line break.
+Files: src/search.c
+
vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index a7f1201..65ecbc8 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt* For Vim version 7.0aa. Last change: 2005 Oct 11
+*version7.txt* For Vim version 7.0aa. Last change: 2005 Nov 23
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -429,7 +429,7 @@
Lakshmanan).
-New functions: ~
+New and extended functions: ~
|add()| append an item to a List
|append()| append List of lines to the buffer
@@ -570,7 +570,7 @@
Also fixes the problem that setting 'clipboard' to "unnamed" breaks using
"yyp".
-Mac: GUI font selector. (Peter "Rain Dog" Cucka)
+Mac: GUI font selector. (Peter Cucka)
Mac: support for multi-byte characters. (Da Woon Jung)
@@ -619,6 +619,9 @@
Move the help for printing to a separate help file. It's quite a lot now.
+When ":silent" is used and a backwards range is given for an Ex command the
+range is swapped automatically instead of asking if that is OK.
+
The pattern matching code was changed from a recursive function to an
iterative mechanism. This avoids out-of-stack errors. State is stored in
allocated memory, running out of memory can always be detected. Allows
@@ -636,7 +639,7 @@
Added "nbsp" in 'listchars'. (David Blanchet)
Added the "acwrite" value for the 'buftype' option. This is for a buffer that
-doesn not have a name that refers to a file and is written with BufWriteCmd
+does not have a name that refers to a file and is written with BufWriteCmd
autocommands.
For lisp indenting and matching parenthesis: (Sergey Khorev)
@@ -816,7 +819,7 @@
sorted: user commands, variables, syntax names, etc.
When no locale is set, thus using the "C" locale, Vim will work with latin1
-characters, using it's own isupper()/toupper()/etc. functions.
+characters, using its own isupper()/toupper()/etc. functions.
When using an rxvt terminal emulator guess the value of 'background' using the
COLORFGBG environment variable. (Ciaran McCreesh)
@@ -1395,4 +1398,13 @@
Columns. Fixed bad effects when running out of memory (command line would be
reversed, ":qa!" resulted in ":!aq").
+Motif: "gvim -iconic" opened the window anyway. (David Harrison)
+
+There is a tiny chance that a symlink gets created between checking for an
+existing file and creating a file. Use the O_NOFOLLOW for open() if it's
+available.
+
+In an empty line "ix<CTRL-O>0" moved the cursor to after the line instead of
+sticking to the first column.
+
vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/zip.txt b/runtime/doc/zip.txt
index aa95460..3ca3683 100644
--- a/runtime/doc/zip.txt
+++ b/runtime/doc/zip.txt
@@ -1,4 +1,4 @@
-*zip.txt* Zip File Interface Sep 16, 2005
+*zip.txt* Zip File Interface Nov 03, 2005
Author: Charles E. Campbell, Jr. <NdrOchip@ScampbellPfamily.AbizM>
(remove NOSPAM from Campbell's email first)
@@ -20,12 +20,21 @@
==============================================================================
2. Usage *zip-usage* *zip-manual*
+ When one edits a *.zip file, this plugin will handle displaying a
+ contents page. Select a file to edit by moving the cursor atop
+ the desired file, then hit the <return> key. After editing, one may
+ also write to the file. Currently, one may not make a new file in
+ zip archives via the plugin.
+
==============================================================================
3. History *zip-history*
+ v3 Oct 18, 2005 * <amatch> used instead of <afile> in autocmds
v2 Sep 16, 2005 * silenced some commands (avoiding hit-enter prompt)
* began testing under Windows; works thus far
* filetype detection fixed
- v1 Sep 15, 2005 * Initial release, had browsin, reading, and writing
+ Nov 03, 2005 * handles writing zipfiles across a network using
+ netrw#NetWrite()
+ v1 Sep 15, 2005 * Initial release, had browsing, reading, and writing
==============================================================================
vim:tw=78:ts=8:ft=help
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index edbe718..e2b1d10 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
" Vim support file to detect file types
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2005 Oct 12
+" Last Change: 2005 Nov 23
" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
@@ -1349,6 +1349,9 @@
" Ruby
au BufNewFile,BufRead *.rb,*.rbw,*.gem,*.gemspec setf ruby
+" Rantfile is like Ruby
+au BufNewFile,BufRead [rR]antfile,*.rant setf ruby
+
" S-lang (or shader language!)
au BufNewFile,BufRead *.sl setf slang
@@ -1612,9 +1615,19 @@
" Sudoers
au BufNewFile,BufRead /etc/sudoers,sudoers.tmp setf sudoers
-" Tads (or Nroff)
+" If the first line starts with '#' and contains 'perl' it's probably a Perl
+" file.
+fun! s:FTperl()
+ if getline(1)[0] == '#' && getline(1) =~ 'perl'
+ setf perl
+ return 1
+ endif
+ return 0
+endfun
+
+" Tads (or Nroff or Perl test file)
au BufNewFile,BufRead *.t
- \ if !s:FTnroff() | setf tads | endif
+ \ if !s:FTnroff() && !s:FTperl() | setf tads | endif
" Tags
au BufNewFile,BufRead tags setf tags
@@ -1622,8 +1635,8 @@
" TAK
au BufNewFile,BufRead *.tak setf tak
-" Tcl
-au BufNewFile,BufRead *.tcl,*.tk,*.itcl,*.itk setf tcl
+" Tcl (JACL too)
+au BufNewFile,BufRead *.tcl,*.tk,*.itcl,*.itk,*.jacl setf tcl
" TealInfo
au BufNewFile,BufRead *.tli setf tli
diff --git a/runtime/ftplugin/eruby.vim b/runtime/ftplugin/eruby.vim
index ed010d0..d256831 100644
--- a/runtime/ftplugin/eruby.vim
+++ b/runtime/ftplugin/eruby.vim
@@ -2,14 +2,8 @@
" Language: eRuby
" Maintainer: Doug Kearns <djkea2 at gus.gscit.monash.edu.au>
" Info: $Id$
-" URL: http://vim-ruby.sourceforge.net
+" URL: http://vim-ruby.rubyforge.org
" Anon CVS: See above site
-" Licence: GPL (http://www.gnu.org)
-" Disclaimer:
-" This program is distributed in the hope that it will be useful,
-" but WITHOUT ANY WARRANTY; without even the implied warranty of
-" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-" GNU General Public License for more details.
" ----------------------------------------------------------------------------
" Only do this when not done yet for this buffer
diff --git a/runtime/ftplugin/ocaml.vim b/runtime/ftplugin/ocaml.vim
index c2bc20e..322be55 100644
--- a/runtime/ftplugin/ocaml.vim
+++ b/runtime/ftplugin/ocaml.vim
@@ -1,38 +1,36 @@
-" Vim settings file
-" Language: OCaml
-" Maintainers: Mike Leary <leary@nwlink.com>
-" Markus Mottl <markus@oefai.at>
-" Stefano Zacchiroli <zack@bononia.it>
-" URL: http://www.oefai.at/~markus/vim/ftplugin/ocaml.vim
-" Last Change: 2004 Apr 12 - better .ml/.mli-switching without Python (SZ)
-" 2003 Nov 21 - match_words-patterns and .ml/.mli-switching (MM)
-" 2003 Oct 16 - re-entered variable 'did_ocaml_dtypes' (MM)
-" 2003 Oct 15 - added Stefano Zacchirolis (SZ) Python-code for
-" displaying type annotations (MM)
+" Language: OCaml
+" Maintainer: David Baelde <firstname.name@ens-lyon.org>
+" Mike Leary <leary@nwlink.com>
+" Markus Mottl <markus.mottl@gmail.com>
+" Stefano Zacchiroli <zack@bononia.it>
+" URL: http://www.ocaml.info/vim/ftplugin/ocaml.vim
+" Last Change: 2005 Oct 13 - removed GPL; better matchit support (MM, SZ)
+"
+" if exists("b:did_ftplugin")
+" finish
+" endif
+let b:did_ftplugin=1
-" Only do these settings when not done yet for this buffer
-if exists("b:did_ftplugin")
- finish
-endif
-
-" Don't do other file type settings for this buffer
-let b:did_ftplugin = 1
-
+" Error handling -- helps moving where the compiler wants you to go
+let s:cposet=&cpoptions
set cpo-=C
-
-" Error formats
setlocal efm=
- \%EFile\ \"%f\"\\,\ line\ %l\\,\ characters\ %c-%*\\d:,
- \%EFile\ \"%f\"\\,\ line\ %l\\,\ character\ %c:%m,
- \%+EReference\ to\ unbound\ regexp\ name\ %m,
- \%Eocamlyacc:\ e\ -\ line\ %l\ of\ \"%f\"\\,\ %m,
- \%Wocamlyacc:\ w\ -\ %m,
- \%-Zmake%.%#,
- \%C%m
+ \%EFile\ \"%f\"\\,\ line\ %l\\,\ characters\ %c-%*\\d:,
+ \%EFile\ \"%f\"\\,\ line\ %l\\,\ character\ %c:%m,
+ \%+EReference\ to\ unbound\ regexp\ name\ %m,
+ \%Eocamlyacc:\ e\ -\ line\ %l\ of\ \"%f\"\\,\ %m,
+ \%Wocamlyacc:\ w\ -\ %m,
+ \%-Zmake%.%#,
+ \%C%m,
+ \%D%*\\a[%*\\d]:\ Entering\ directory\ `%f',
+ \%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',
+ \%D%*\\a:\ Entering\ directory\ `%f',
+ \%X%*\\a:\ Leaving\ directory\ `%f',
+ \%DMaking\ %*\\a\ in\ %f
" Add mappings, unless the user didn't want this.
if !exists("no_plugin_maps") && !exists("no_ocaml_maps")
- " Uncommenting
+ " (un)commenting
if !hasmapto('<Plug>Comment')
nmap <buffer> <LocalLeader>c <Plug>LUncomOn
vmap <buffer> <LocalLeader>c <Plug>BUncomOn
@@ -41,46 +39,141 @@
endif
nnoremap <buffer> <Plug>LUncomOn mz0i(* <ESC>$A *)<ESC>`z
- nnoremap <buffer> <Plug>LUncomOff <ESC>:s/^(\* \(.*\) \*)/\1/<CR>
+ nnoremap <buffer> <Plug>LUncomOff :s/^(\* \(.*\) \*)/\1/<CR>:noh<CR>
vnoremap <buffer> <Plug>BUncomOn <ESC>:'<,'><CR>`<O<ESC>0i(*<ESC>`>o<ESC>0i*)<ESC>`<
vnoremap <buffer> <Plug>BUncomOff <ESC>:'<,'><CR>`<dd`>dd`<
if !hasmapto('<Plug>Abbrev')
- iabbrev <buffer> ASS (assert false)
+ iabbrev <buffer> ASS (assert false (* XXX *))
endif
endif
" Let % jump between structure elements (due to Issac Trotts)
-let b:mw='\<let\>:\<and\>:\(\<in\>\|;;\),'
-let b:mw=b:mw . '\<if\>:\<then\>:\<else\>,\<do\>:\<done\>,'
-let b:mw=b:mw . '\<\(object\|sig\|struct\|begin\)\>:\<end\>'
-let b:match_words=b:mw
+let b:mw = ''
+let b:mw = b:mw . ',\<let\>:\<and\>:\(\<in\>\|;;\)'
+let b:mw = b:mw . ',\<if\>:\<then\>:\<else\>'
+let b:mw = b:mw . ',\<\(for\|while\)\>:\<do\>:\<done\>,'
+let b:mw = b:mw . ',\<\(object\|sig\|struct\|begin\)\>:\<end\>'
+let b:mw = b:mw . ',\<\(match\|try\)\>:\<with\>'
+let b:match_words = b:mw
+
+let b:match_ignorecase=0
" switching between interfaces (.mli) and implementations (.ml)
if !exists("g:did_ocaml_switch")
let g:did_ocaml_switch = 1
- map ,s :call OCaml_switch(0)<CR>
- map ,S :call OCaml_switch(1)<CR>
+ map <LocalLeader>s :call OCaml_switch(0)<CR>
+ map <LocalLeader>S :call OCaml_switch(1)<CR>
fun OCaml_switch(newwin)
if (match(bufname(""), "\\.mli$") >= 0)
let fname = substitute(bufname(""), "\\.mli$", ".ml", "")
if (a:newwin == 1)
- exec "new " . fname
+ exec "new " . fname
else
- exec "arge " . fname
+ exec "arge " . fname
endif
elseif (match(bufname(""), "\\.ml$") >= 0)
let fname = bufname("") . "i"
if (a:newwin == 1)
- exec "new " . fname
+ exec "new " . fname
else
- exec "arge " . fname
+ exec "arge " . fname
endif
endif
endfun
endif
-" Vim support for OCaml 3.07 .annot files (requires Vim with python support)
+" Folding support
+
+" Get the modeline because folding depends on indentation
+let s:s = line2byte(line('.'))+col('.')-1
+if search('^\s*(\*:o\?caml:')
+ let s:modeline = getline(".")
+else
+ let s:modeline = ""
+endif
+if s:s > 0
+ exe 'goto' s:s
+endif
+
+" Get the indentation params
+let s:m = matchstr(s:modeline,'default\s*=\s*\d\+')
+if s:m != ""
+ let s:idef = matchstr(s:m,'\d\+')
+elseif exists("g:omlet_indent")
+ let s:idef = g:omlet_indent
+else
+ let s:idef = 2
+endif
+let s:m = matchstr(s:modeline,'struct\s*=\s*\d\+')
+if s:m != ""
+ let s:i = matchstr(s:m,'\d\+')
+elseif exists("g:omlet_indent_struct")
+ let s:i = g:omlet_indent_struct
+else
+ let s:i = s:idef
+endif
+
+" Set the folding method
+if exists("g:ocaml_folding")
+ setlocal foldmethod=expr
+ setlocal foldexpr=OMLetFoldLevel(v:lnum)
+endif
+
+" - Only definitions below, executed once -------------------------------------
+
+if exists("*OMLetFoldLevel")
+ finish
+endif
+
+function s:topindent(lnum)
+ let l = a:lnum
+ while l > 0
+ if getline(l) =~ '\s*\%(\<struct\>\|\<sig\>\|\<object\>\)'
+ return indent(l)
+ endif
+ let l = l-1
+ endwhile
+ return -s:i
+endfunction
+
+function OMLetFoldLevel(l)
+
+ " This is for not merging blank lines around folds to them
+ if getline(a:l) !~ '\S'
+ return -1
+ endif
+
+ " We start folds for modules, classes, and every toplevel definition
+ if getline(a:l) =~ '^\s*\%(\<val\>\|\<module\>\|\<class\>\|\<type\>\|\<method\>\|\<initializer\>\|\<inherit\>\|\<exception\>\|\<external\>\)'
+ exe 'return ">' (indent(a:l)/s:i)+1 '"'
+ endif
+
+ " Toplevel let are detected thanks to the indentation
+ if getline(a:l) =~ '^\s*let\>' && indent(a:l) == s:i+s:topindent(a:l)
+ exe 'return ">' (indent(a:l)/s:i)+1 '"'
+ endif
+
+ " We close fold on end which are associated to struct, sig or object.
+ " We use syntax information to do that.
+ if getline(a:l) =~ '^\s*end\>' && synIDattr(synID(a:l, indent(a:l)+1, 0), "name") != "ocamlKeyword"
+ return (indent(a:l)/s:i)+1
+ endif
+
+ " Folds end on ;;
+ if getline(a:l) =~ '^\s*;;'
+ exe 'return "<' (indent(a:l)/s:i)+1 '"'
+ endif
+
+ " Comments around folds aren't merged to them.
+ if synIDattr(synID(a:l, indent(a:l)+1, 0), "name") == "ocamlComment"
+ return -1
+ endif
+
+ return '='
+endfunction
+
+" Vim support for OCaml .annot files (requires Vim with python support)
"
" Executing OCamlPrintType(<mode>) function will display in the Vim bottom
" line(s) the type of an ocaml value getting it from the corresponding .annot
@@ -92,37 +185,15 @@
" .annot files are parsed lazily the first time OCamlPrintType is invoked; is
" also possible to force the parsing using the OCamlParseAnnot() function.
"
-" Hitting the <F3> key will cause OCamlPrintType function to be invoked with
+" Typing ',3' will cause OCamlPrintType function to be invoked with
" the right argument depending on the current mode (visual or not).
"
-" Copyright (C) <2003> Stefano Zacchiroli <zack@bononia.it>
+" Copyright (C) <2003-2004> Stefano Zacchiroli <zack@bononia.it>
"
" Created: Wed, 01 Oct 2003 18:16:22 +0200 zack
-" LastModified: Mon, 06 Oct 2003 11:05:39 +0200 zack
-"
-" This program is free software; you can redistribute it and/or modify
-" it under the terms of the GNU General Public License as published by
-" the Free Software Foundation; either version 2 of the License, or
-" (at your option) any later version.
-"
-" This program is distributed in the hope that it will be useful,
-" but WITHOUT ANY WARRANTY; without even the implied warranty of
-" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-" GNU General Public License for more details.
-"
-" You should have received a copy of the GNU General Public License
-" along with this program; if not, write to the Free Software
-" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-"
+" LastModified: Wed, 25 Aug 2004 18:28:39 +0200 zack
if !has("python")
- echo "Python support not found: OCaml .annot support disabled"
- finish
-endif
-
-if !exists("g:did_ocaml_dtypes")
- let g:did_ocaml_dtypes = 1
-else
finish
endif
@@ -166,7 +237,7 @@
at least two space characters.
- in each block, the two positions are respectively the start and the
- - end of the range described by the block.
+ end of the range described by the block.
- in a position, the filename is the name of the file, the first num
is the line number, the second num is the offset of the beginning
of the line, the third num is the offset of the position itself.
@@ -182,7 +253,7 @@
self.__timestamp = None # last parse action timestamp
self.__annot = {}
self.__re = re.compile(
- '^"[^"]+"\s+(\d+)\s+(\d+)\s+(\d+)\s+"[^"]+"\s+(\d+)\s+(\d+)\s+(\d+)$')
+ '^"[^"]*"\s+(\d+)\s+(\d+)\s+(\d+)\s+"[^"]*"\s+(\d+)\s+(\d+)\s+(\d+)$')
def __parse(self, fname):
try:
@@ -210,7 +281,9 @@
lineno += 1
if (line == ""): raise malformed_annotations(lineno)
type = string.join(type, "\n")
- self.__annot[(line1, col1), (line2, col2)] = type
+ key = ((line1, col1), (line2, col2))
+ if not self.__annot.has_key(key):
+ self.__annot[key] = type
line = f.readline() # position line
f.close()
self.__filename = fname
@@ -285,7 +358,7 @@
EOF
-fun OCamlPrintType(current_mode)
+fun! OCamlPrintType(current_mode)
if (a:current_mode == "visual")
python printOCamlType("visual")
else
@@ -293,9 +366,15 @@
endif
endfun
-fun OCamlParseAnnot()
+fun! OCamlParseAnnot()
python parseOCamlAnnot()
endfun
-map <F3> :call OCamlPrintType("normal")<RETURN>
-vmap <F3> :call OCamlPrintType("visual")<RETURN>
+map <LocalLeader>t :call OCamlPrintType("normal")<RETURN>
+vmap <LocalLeader>t :call OCamlPrintType("visual")<RETURN>
+
+let &cpoptions=s:cposet
+unlet s:cposet
+
+" vim:sw=2
+
diff --git a/runtime/ftplugin/ruby.vim b/runtime/ftplugin/ruby.vim
index 6f06561..4c8db85 100644
--- a/runtime/ftplugin/ruby.vim
+++ b/runtime/ftplugin/ruby.vim
@@ -2,14 +2,8 @@
" Language: Ruby
" Maintainer: Gavin Sinclair <gsinclair at soyabean.com.au>
" Info: $Id$
-" URL: http://vim-ruby.sourceforge.net
+" URL: http://vim-ruby.rubyforge.org
" Anon CVS: See above site
-" Licence: GPL (http://www.gnu.org)
-" Disclaimer:
-" This program is distributed in the hope that it will be useful,
-" but WITHOUT ANY WARRANTY; without even the implied warranty of
-" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-" GNU General Public License for more details.
" ----------------------------------------------------------------------------
"
" Original matchit support thanks to Ned Konz. See his ftplugin/ruby.vim at
diff --git a/runtime/ftplugin/xml.vim b/runtime/ftplugin/xml.vim
index 7bde8e7..8cff537 100644
--- a/runtime/ftplugin/xml.vim
+++ b/runtime/ftplugin/xml.vim
@@ -32,6 +32,15 @@
\ '<\@<=\%([^ \t>/]\+\)\%(\s\+[^/>]*\|$\):/>'
endif
+"
+" For Omni completion, by Mikolaj Machowski.
+if exists('&ofu')
+ setlocal ofu=xmlcomplete#CompleteTags
+endif
+command! -nargs=+ XMLns call xmlcomplete#CreateConnection(<f-args>)
+command! -nargs=? XMLent call xmlcomplete#CreateEntConnection(<f-args>)
+
+
" Change the :browse e filter to primarily show xml-related files.
if has("gui_win32")
let b:browsefilter="XML Files (*.xml)\t*.xml\n" .
diff --git a/runtime/indent/d.vim b/runtime/indent/d.vim
new file mode 100644
index 0000000..b5dd5e8
--- /dev/null
+++ b/runtime/indent/d.vim
@@ -0,0 +1,22 @@
+" Vim indent file for the D programming language (version 0.137).
+"
+" Language: D
+" Maintainer: Jason Mills<jmills@cs.mun.ca>
+" Last Change: 2005 Nov 22
+" Version: 0.1
+"
+" Please email me with bugs, comments, and suggestion. Put vim in the subject
+" to ensure the email will not be marked has spam.
+"
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+ finish
+endif
+
+let b:did_indent = 1
+
+" D indenting is a lot like the built-in C indenting.
+setlocal cindent
+
+" vim: ts=8 noet
diff --git a/runtime/indent/eruby.vim b/runtime/indent/eruby.vim
index 81f7c1a..b62a024 100644
--- a/runtime/indent/eruby.vim
+++ b/runtime/indent/eruby.vim
@@ -2,14 +2,8 @@
" Language: Ruby
" Maintainer: Doug Kearns <djkea2 at gus.gscit.monash.edu.au>
" Info: $Id$
-" URL: http://vim-ruby.rubyforge.org/
+" URL: http://vim-ruby.rubyforge.org
" Anon CVS: See above site
-" Licence: GPL (http://www.gnu.org)
-" Disclaimer:
-" This program is distributed in the hope that it will be useful,
-" but WITHOUT ANY WARRANTY; without even the implied warranty of
-" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-" GNU General Public License for more details.
" ----------------------------------------------------------------------------
" Only load this indent file when no other was loaded.
diff --git a/runtime/indent/php.vim b/runtime/indent/php.vim
index 22210ce..8d05b03 100644
--- a/runtime/indent/php.vim
+++ b/runtime/indent/php.vim
@@ -2,17 +2,19 @@
" Language: PHP
" Author: John Wellesz <John.wellesz (AT) teaser (DOT) fr>
" URL: http://www.2072productions.com/vim/indent/php.vim
-" Last Change: 2005 September 22th
-" Version: 1.181
+" Last Change: 2005 Nobember 21st
+" Version: 1.20
"
-" The change log and all the comments have been removed from this file.
+" The change log and all the comments have been removed from this file.
"
-" For a complete change log and fully commented code, download the script on
-" 2072productions.com at the URI provided above.
-"
-"
+" For a complete change log and fully commented code, download the script on
+" 2072productions.com at the URI provided above.
+"
" If you find a bug, please e-mail me at John.wellesz (AT) teaser (DOT) fr
-" with an example of code that breaks the algorithm.
+" with an example of code that break the algorithm.
+"
+"
+" Thanks a lot for using this script.
"
"
" NOTE: This script must be used with PHP syntax ON and with the php syntax
@@ -23,6 +25,7 @@
" tags not at col 1 you'll have to indent your file 2 times (This script
" will automatically put HereDoc end tags at col 1).
"
+"
" NOTE: If you are editing file in Unix file format and that (by accident)
" there are '\r' before new lines, this script won't be able to proceed
" correctly and will make many mistakes because it won't be able to match
@@ -34,31 +37,36 @@
" or simply 'let' the option PHP_removeCRwhenUnix to 1 and the script will
" silently remove them when VIM load this script (at each bufread).
+
+" Options: PHP_autoformatcomment = 0 to not enable autoformating of comment by
+" default, if set to 0, this script will let the 'formatoptions' setting intact.
+"
" Options: PHP_default_indenting = # of sw (default is 0), # of sw will be
-" added to the indent of each line of PHP code.
+" added to the indent of each line of PHP code.
"
" Options: PHP_removeCRwhenUnix = 1 to make the script automatically remove CR
-" at end of lines (by default this option is unset), NOTE that you
-" MUST remove CR when the fileformat is UNIX else the indentation
-" won't be correct...
+" at end of lines (by default this option is unset), NOTE that you
+" MUST remove CR when the fileformat is UNIX else the indentation
+" won't be correct...
"
" Options: PHP_BracesAtCodeLevel = 1 to indent the '{' and '}' at the same
-" level than the code they contain.
-" Exemple:
-" Instead of:
-" if ($foo)
-" {
-" foo();
-" }
-"
-" You will write:
-" if ($foo)
+" level than the code they contain.
+" Exemple:
+" Instead of:
+" if ($foo)
" {
-" foo();
+" foo();
" }
"
-" NOTE: The script will be a bit slower if you use this option because
-" some optimizations won't be available.
+" You will write:
+" if ($foo)
+" {
+" foo();
+" }
+"
+" NOTE: The script will be a bit slower if you use this option because
+" some optimizations won't be available.
+
if exists("b:did_indent")
@@ -82,6 +90,11 @@
let b:PHP_BracesAtCodeLevel = 0
endif
+if exists("PHP_autoformatcomment")
+ let b:PHP_autoformatcomment = PHP_autoformatcomment
+else
+ let b:PHP_autoformatcomment = 1
+endif
let b:PHP_lastindented = 0
let b:PHP_indentbeforelast = 0
@@ -114,12 +127,12 @@
endif
if exists("*GetPhpIndent")
- finish " XXX
+ finish " XXX
endif
let s:endline= '\s*\%(//.*\|#.*\|/\*.*\*/\s*\)\=$'
let s:PHP_startindenttag = '<?\%(.*?>\)\@!\|<script[^>]*>\%(.*<\/script>\)\@!'
-"setlocal debug=msg " XXX
+" setlocal debug=msg " XXX
function! GetLastRealCodeLNum(startline) " {{{
@@ -141,7 +154,7 @@
if lastline !~ '^\*/'
call search('\*/', 'W')
endif
- let lnum = searchpair('/\*', '', '\*/', s:searchpairflags)
+ let lnum = searchpair('/\*', '', '\*/', s:searchpairflags, 'Skippmatch2()')
let lastline = getline(lnum)
if lastline =~ '^\s*/\*'
@@ -184,6 +197,17 @@
return lnum
endfunction " }}}
+function! Skippmatch2()
+
+ let line = getline(".")
+
+ if line =~ '\%(".*\)\@<=/\*\%(.*"\)\@=' || line =~ '\%(//.*\)\@<=/\*'
+ return 1
+ else
+ return 0
+ endif
+endfun
+
function! Skippmatch() " {{{
let synname = synIDattr(synID(line("."), col("."), 0), "name")
if synname == "Delimiter" || synname == "phpParent" || synname == "javaScriptBraces" || synname == "phpComment" && b:UserIsTypingComment
@@ -245,7 +269,7 @@
let cline = getline(a:lnum)
if a:tofind==""
- let tofind = "^\\s*[\"']*\s*\\zs\\S"
+ let tofind = "^\\s*[\"']*\\s*\\zs\\S"
else
let tofind = a:tofind
endif
@@ -264,17 +288,28 @@
endfunction " }}}
let s:notPhpHereDoc = '\%(break\|return\|continue\|exit\);'
-let s:blockstart = '\%(\%(\%(}\s*\)\=else\%(\s\+\)\=\)\=if\>\|else\>\|while\>\|switch\>\|for\%(each\)\=\>\|declare\>\|class\>\|[|&]\)'
+let s:blockstart = '\%(\%(\%(}\s*\)\=else\%(\s\+\)\=\)\=if\>\|else\>\|while\>\|switch\>\|for\%(each\)\=\>\|declare\>\|class\>\|interface\>\|abstract\>\|[|&]\)'
let s:autorestoptions = 0
if ! s:autorestoptions
- au BufWinEnter,Syntax *.php,*.php3,*.php4,*.php5 call ResetOptions()
+ au BufWinEnter,Syntax *.php,*.php3,*.php4,*.php5 call ResetOptions()
let s:autorestoptions = 1
endif
function! ResetOptions()
if ! b:optionsset
- setlocal formatoptions=qroc
+ if b:PHP_autoformatcomment
+
+ setlocal comments=s1:/*,mb:*,ex:*/,://,:#
+
+ setlocal formatoptions-=t
+ setlocal formatoptions+=q
+ setlocal formatoptions+=r
+ setlocal formatoptions+=o
+ setlocal formatoptions+=w
+ setlocal formatoptions+=c
+ setlocal formatoptions+=b
+ endif
let b:optionsset = 1
endif
endfunc
@@ -376,7 +411,7 @@
if cline !~ '^\*/'
call search('\*/', 'W')
endif
- let lnum = searchpair('/\*', '', '\*/', s:searchpairflags)
+ let lnum = searchpair('/\*', '', '\*/', s:searchpairflags, 'Skippmatch2()')
let b:PHP_CurrentIndentLevel = b:PHP_default_indenting
@@ -493,7 +528,7 @@
if cline !~ '^\*/'
call search('\*/', 'W')
endif
- let lnum = searchpair('/\*', '', '\*/', s:searchpairflags)
+ let lnum = searchpair('/\*', '', '\*/', s:searchpairflags, 'Skippmatch2()')
let b:PHP_CurrentIndentLevel = b:PHP_default_indenting
diff --git a/runtime/indent/ruby.vim b/runtime/indent/ruby.vim
index e5946eb..5d48a79 100644
--- a/runtime/indent/ruby.vim
+++ b/runtime/indent/ruby.vim
@@ -1,16 +1,10 @@
" Vim indent file
-" Language: Ruby
-" Maintainer: Gavin Sinclair <gsinclair at soyabean.com.au>
-" Developer: Nikolai Weibull <source at pcppopper.org>
-" Info: $Id$
-" URL: http://vim-ruby.rubyforge.org/
-" Anon CVS: See above site
-" Licence: GPL (http://www.gnu.org)
-" Disclaimer:
-" This program is distributed in the hope that it will be useful,
-" but WITHOUT ANY WARRANTY; without even the implied warranty of
-" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-" GNU General Public License for more details.
+" Language: Ruby
+" Maintainer: Gavin Sinclair <gsinclair at soyabean.com.au>
+" Developer: Nikolai Weibull <source at pcppopper.org>
+" Info: $Id$
+" URL: http://vim-ruby.rubyforge.org
+" Anon CVS: See above site
" ----------------------------------------------------------------------------
" 0. Initialization {{{1
@@ -42,17 +36,13 @@
let s:syng_strcom = '\<ruby\%(String\|StringDelimiter\|ASCIICode' .
\ '\|Interpolation\|NoInterpolation\|Escape\|Comment\|Documentation\)\>'
-" Regex of syntax group names that are strings or comments.
-let s:syng_strcom2 = '\<ruby\%(String' .
- \ '\|Interpolation\|NoInterpolation\|Escape\|Comment\|Documentation\)\>'
-
" Regex of syntax group names that are strings.
let s:syng_string =
- \ '\<ruby\%(String\|Interpolation\|NoInterpolation\|Escape\)\>'
+ \ '\<ruby\%(String\|StringDelimiter\|Interpolation\|NoInterpolation\|Escape\)\>'
" Regex of syntax group names that are strings or documentation.
let s:syng_stringdoc =
- \'\<ruby\%(String\|Interpolation\|NoInterpolation\|Escape\|Documentation\)\>'
+ \'\<ruby\%(String\|StringDelimiter\|Interpolation\|NoInterpolation\|Escape\|Documentation\)\>'
" Expression used to check whether we should skip a match with searchpair().
let s:skip_expr =
@@ -109,11 +99,6 @@
return synIDattr(synID(a:lnum, a:col, 0), 'name') =~ s:syng_strcom
endfunction
-" Check if the character at lnum:col is inside a string or comment.
-function s:IsInStringOrComment2(lnum, col)
- return synIDattr(synID(a:lnum, a:col, 0), 'name') =~ s:syng_strcom2
-endfunction
-
" Check if the character at lnum:col is inside a string.
function s:IsInString(lnum, col)
return synIDattr(synID(a:lnum, a:col, 0), 'name') =~ s:syng_string
@@ -134,14 +119,14 @@
let line = getline(lnum)
if line =~ '^=begin$'
if in_block
- let in_block = 0
+ let in_block = 0
else
- break
+ break
endif
elseif !in_block && line =~ '^=end$'
let in_block = 1
elseif !in_block && line !~ '^\s*#.*$' && !(s:IsInStringOrComment(lnum, 1)
- \ && s:IsInStringOrComment(lnum, strlen(line)))
+ \ && s:IsInStringOrComment(lnum, strlen(line)))
break
endif
let lnum = prevnonblank(lnum - 1)
@@ -160,7 +145,7 @@
let line = getline(lnum)
let col = match(line, s:continuation_regex2) + 1
if (col > 0 && !s:IsInStringOrComment(lnum, col))
- \ || s:IsInString(lnum, strlen(line))
+ \ || s:IsInString(lnum, strlen(line))
let msl = lnum
else
break
@@ -181,9 +166,9 @@
if !s:IsInStringOrComment(a:lnum, pos + 1)
let idx = stridx('(){}[]', line[pos])
if idx % 2 == 0
- let open_{idx} = open_{idx} + 1
+ let open_{idx} = open_{idx} + 1
else
- let open_{idx - 1} = open_{idx - 1} - 1
+ let open_{idx - 1} = open_{idx - 1} - 1
endif
endif
let pos = match(line, '[][(){}]', pos + 1)
@@ -246,13 +231,13 @@
if s:Match(v:lnum, s:ruby_deindent_keywords)
call cursor(v:lnum, 1)
if searchpair(s:end_start_regex, s:end_middle_regex, s:end_end_regex, 'bW',
- \ s:end_skip_expr) > 0
+ \ s:end_skip_expr) > 0
let line = getline('.')
if strpart(line, 0, col('.') - 1) =~ '=\s*$' &&
\ strpart(line, col('.') - 1, 2) !~ 'do'
- let ind = virtcol('.') - 1
+ let ind = virtcol('.') - 1
else
- let ind = indent('.')
+ let ind = indent('.')
endif
endif
return ind
@@ -302,12 +287,12 @@
if col > 0
call cursor(lnum, col)
if searchpair(s:end_start_regex, '', s:end_end_regex, 'bW',
- \ s:end_skip_expr) > 0
+ \ s:end_skip_expr) > 0
let n = line('.')
let ind = indent('.')
let msl = s:GetMSL(n)
if msl != n
- let ind = indent(msl)
+ let ind = indent(msl)
end
return ind
endif
diff --git a/runtime/plugin/NetrwPlugin.vim b/runtime/plugin/NetrwPlugin.vim
new file mode 100644
index 0000000..f28c2eb
--- /dev/null
+++ b/runtime/plugin/NetrwPlugin.vim
@@ -0,0 +1,156 @@
+" netrw.vim: Handles file transfer and remote directory listing across a network
+" PLUGIN PORTION
+" Last Change: Aug 31, 2005
+" Maintainer: Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
+" Version: 67
+" License: Vim License (see vim's :help license)
+" GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
+" Copyright: Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1
+" Permission is hereby granted to use and distribute this code,
+" with or without modifications, provided that this copyright
+" notice is copied with it. Like anything else that's free,
+" netrw.vim is provided *as is* and comes with no warranty
+" of any kind, either expressed or implied. By using this
+" plugin, you agree that in no event will the copyright
+" holder be liable for any damages resulting from the use
+" of this software.
+"
+" But be doers of the Word, and not only hearers, deluding your own selves {{{1
+" (James 1:22 RSV)
+" =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+" ---------------------------------------------------------------------
+" Load Once: {{{1
+if exists("g:loaded_netrw") || &cp
+ finish
+endif
+if v:version < 600
+ echoerr "***netrw*** doesn't support Vim version ".v:version
+ finish
+endif
+let g:loaded_netrw = "v67"
+if v:version < 700
+ let loaded_explorer = 1
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
+" ---------------------------------------------------------------------
+" Public Interface: {{{1
+
+" Local Browsing: {{{2
+augroup FileExplorer
+ au!
+ au BufEnter * call s:LocalBrowse(expand("<amatch>"))
+augroup END
+
+" Network Browsing Reading Writing: {{{2
+augroup Network
+ au!
+ if has("win32") || has("win95") || has("win64") || has("win16")
+ au BufReadCmd file://* exe "silent doau BufReadPre ".expand("<amatch>")|exe 'e '.substitute(expand("<amatch>"),"file:/*","","")|exe "silent doau BufReadPost ".expand("<amatch>")
+ else
+ au BufReadCmd file:///* exe "silent doau BufReadPre ".expand("<amatch>")|exe 'e /'.substitute(expand("<amatch>"),"file:/*","","")|exe "silent doau BufReadPost ".expand("<amatch>")
+ au BufReadCmd file://localhost/* exe "silent doau BufReadPre ".expand("<amatch>")|exe 'e /'.substitute(expand("<amatch>"),"file:/*","","")|exe "silent doau BufReadPost ".expand("<amatch>")
+ endif
+ au BufReadCmd ftp://*,rcp://*,scp://*,http://*,dav://*,rsync://*,sftp://* exe "silent doau BufReadPre ".expand("<amatch>")|exe "Nread 0r ".expand("<amatch>")|exe "silent doau BufReadPost ".expand("<amatch>")
+ au FileReadCmd ftp://*,rcp://*,scp://*,http://*,dav://*,rsync://*,sftp://* exe "silent doau BufReadPre ".expand("<amatch>")|exe "Nread " .expand("<amatch>")|exe "silent doau FileReadPost ".expand("<amatch>")
+ au BufWriteCmd ftp://*,rcp://*,scp://*,dav://*,rsync://*,sftp://* exe "silent doau BufWritePre ".expand("<amatch>")|exe "Nwrite " .expand("<amatch>")|exe "silent doau BufWritePost ".expand("<amatch>")
+ au FileWriteCmd ftp://*,rcp://*,scp://*,dav://*,rsync://*,sftp://* exe "silent doau BufWritePre ".expand("<amatch>")|exe "'[,']Nwrite " .expand("<amatch>")|exe "silent doau FileWritePost ".expand("<amatch>")
+augroup END
+
+" Commands: :Nread, :Nwrite, :NetUserPass {{{2
+com! -nargs=* Nread call netrw#NetSavePosn()<bar>call netrw#NetRead(<f-args>)<bar>call netrw#NetRestorePosn()
+com! -range=% -nargs=* Nwrite call netrw#NetSavePosn()<bar><line1>,<line2>call netrw#NetWrite(<f-args>)<bar>call netrw#NetRestorePosn()
+com! -nargs=* NetUserPass call NetUserPass(<f-args>)
+
+" Commands: :Explore, :Sexplore, Hexplore, Vexplore {{{2
+com! -nargs=? -bar -bang -count=0 Explore call netrw#Explore(<count>,0,0+<bang>0,<q-args>)
+com! -nargs=? -bar -bang -count=0 Sexplore call netrw#Explore(<count>,1,0+<bang>0,<q-args>)
+com! -nargs=? -bar -bang -count=0 Hexplore call netrw#Explore(<count>,1,2+<bang>0,<q-args>)
+com! -nargs=? -bar -bang -count=0 Vexplore call netrw#Explore(<count>,1,4+<bang>0,<q-args>)
+com! -nargs=? -bar -bang Nexplore call netrw#Explore(-1,0,0,<q-args>)
+com! -nargs=? -bar -bang Pexplore call netrw#Explore(-2,0,0,<q-args>)
+
+" Commands: NetrwSettings {{{2
+com! -nargs=0 NetrwSettings :call NetrwSettings#NetrwSettings()
+
+" ---------------------------------------------------------------------
+" LocalBrowse: {{{2
+fun! s:LocalBrowse(dirname)
+ " unfortunate interaction -- debugging calls can't be used here;
+ " the BufEnter event causes triggering when attempts to write to
+ " the DBG buffer are made.
+ if isdirectory(a:dirname)
+ call netrw#DirBrowse(a:dirname)
+ endif
+ " not a directory, ignore it
+endfun
+
+" ---------------------------------------------------------------------
+" NetrwStatusLine: {{{1
+fun! NetrwStatusLine()
+" let g:stlmsg= "Xbufnr=".w:netrw_explore_bufnr." bufnr=".bufnr(".")." Xline#".w:netrw_explore_line." line#".line(".")
+ if !exists("w:netrw_explore_bufnr") || w:netrw_explore_bufnr != bufnr(".") || !exists("w:netrw_explore_line") || w:netrw_explore_line != line(".") || !exists("w:netrw_explore_list")
+ let &stl= s:netrw_explore_stl
+ if exists("w:netrw_explore_bufnr")|unlet w:netrw_explore_bufnr|endif
+ if exists("w:netrw_explore_line")|unlet w:netrw_explore_line|endif
+ return ""
+ else
+ return "Match ".w:netrw_explore_mtchcnt." of ".w:netrw_explore_listlen
+ endif
+endfun
+
+" ------------------------------------------------------------------------
+" NetUserPass: set username and password for subsequent ftp transfer {{{1
+" Usage: :call NetUserPass() -- will prompt for userid and password
+" :call NetUserPass("uid") -- will prompt for password
+" :call NetUserPass("uid","password") -- sets global userid and password
+fun! NetUserPass(...)
+
+ " get/set userid
+ if a:0 == 0
+" call Dfunc("NetUserPass(a:0<".a:0.">)")
+ if !exists("g:netrw_uid") || g:netrw_uid == ""
+ " via prompt
+ let g:netrw_uid= input('Enter username: ')
+ endif
+ else " from command line
+" call Dfunc("NetUserPass(a:1<".a:1.">) {")
+ let g:netrw_uid= a:1
+ endif
+
+ " get password
+ if a:0 <= 1 " via prompt
+" call Decho("a:0=".a:0." case <=1:")
+ let g:netrw_passwd= inputsecret("Enter Password: ")
+ else " from command line
+" call Decho("a:0=".a:0." case >1: a:2<".a:2.">")
+ let g:netrw_passwd=a:2
+ endif
+" call Dret("NetUserPass")
+endfun
+
+" ------------------------------------------------------------------------
+" NetReadFixup: this sort of function is typically written by the user {{{1
+" to handle extra junk that their system's ftp dumps
+" into the transfer. This function is provided as an
+" example and as a fix for a Windows 95 problem: in my
+" experience, win95's ftp always dumped four blank lines
+" at the end of the transfer.
+if has("win95") && g:netrw_win95ftp
+ fun! NetReadFixup(method, line1, line2)
+" call Dfunc("NetReadFixup(method<".a:method."> line1=".a:line1." line2=".a:line2.")")
+ if method == 3 " ftp (no <.netrc>)
+ let fourblanklines= line2 - 3
+ silent fourblanklines.",".line2."g/^\s*/d"
+ endif
+" call Dret("NetReadFixup")
+ endfun
+endif
+
+let &cpo= s:keepcpo
+unlet s:keepcpo
+" ------------------------------------------------------------------------
+" Modelines: {{{1
+" vim:ts=8 fdm=marker
diff --git a/runtime/plugin/NetrwSettings.vim b/runtime/plugin/NetrwSettings.vim
new file mode 100644
index 0000000..eecdcd2
--- /dev/null
+++ b/runtime/plugin/NetrwSettings.vim
@@ -0,0 +1,157 @@
+" NetrwSettings.vim: makes netrw settings simpler
+" Last Change: Aug 16, 2005
+" Maintainer: Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
+" Version: 3
+" Copyright: Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1
+" Permission is hereby granted to use and distribute this code,
+" with or without modifications, provided that this copyright
+" notice is copied with it. Like anything else that's free,
+" NetrwSettings.vim is provided *as is* and comes with no
+" warranty of any kind, either expressed or implied. By using
+" this plugin, you agree that in no event will the copyright
+" holder be liable for any damages resulting from the use
+" of this software.
+"
+" Mat 4:23 (WEB) Jesus went about in all Galilee, teaching in their {{{1
+" synagogues, preaching the gospel of the kingdom, and healing
+" every disease and every sickness among the people.
+" Load Once: {{{1
+if exists("g:loaded_NetrwSettings") || &cp
+ finish
+endif
+let g:loaded_NetrwSettings = "v3"
+
+" ---------------------------------------------------------------------
+" NetrwSettings: {{{1
+fun! NetrwSettings#NetrwSettings()
+ " this call is here largely just to insure that netrw has been loaded
+ call netrw#NetSavePosn()
+
+ above wincmd s
+ enew
+ setlocal noswapfile bh=wipe
+ set ft=vim
+ file Netrw\ Settings
+
+ " these variables have the following default effects when they don't
+ " exist (ie. have not been set by the user in his/her .vimrc)
+ if !exists("g:netrw_longlist")
+ let g:netrw_longlist= 0
+ let g:netrw_list_cmd= "ssh HOSTNAME ls -FLa"
+ endif
+ if !exists("g:netrw_silent")
+ let g:netrw_silent= 0
+ endif
+ if !exists("g:netrw_use_nt_rcp")
+ let g:netrw_use_nt_rcp= 0
+ endif
+ if !exists("g:netrw_ftp")
+ let g:netrw_ftp= 0
+ endif
+ if !exists("g:netrw_ignorenetrc")
+ let g:netrw_ignorenetrc= 0
+ endif
+
+ put ='+ ---------------------------------------------'
+ put ='+ NetrwSettings: (by Charles E. Campbell, Jr.)'
+ put ='+ Press ? with cursor atop any line for help '
+ put ='+ ---------------------------------------------'
+ let s:netrw_settings_stop= line(".")
+
+ put =''
+ put ='+ Netrw Protocol Commands'
+ put = 'let g:netrw_dav_cmd = '.g:netrw_dav_cmd
+ put = 'let g:netrw_fetch_cmd = '.g:netrw_fetch_cmd
+ put = 'let g:netrw_ftp_cmd = '.g:netrw_ftp_cmd
+ put = 'let g:netrw_http_cmd = '.g:netrw_http_cmd
+ put = 'let g:netrw_rcp_cmd = '.g:netrw_rcp_cmd
+ put = 'let g:netrw_rsync_cmd = '.g:netrw_rsync_cmd
+ put = 'let g:netrw_scp_cmd = '.g:netrw_scp_cmd
+ put = 'let g:netrw_sftp_cmd = '.g:netrw_sftp_cmd
+ let s:netrw_protocol_stop= line(".")
+ put = ''
+
+ put ='+Netrw Transfer Control'
+ put = 'let g:netrw_cygwin = '.g:netrw_cygwin
+ put = 'let g:netrw_ftp = '.g:netrw_ftp
+ put = 'let g:netrw_ftpmode = '.g:netrw_ftpmode
+ put = 'let g:netrw_ignorenetrc = '.g:netrw_ignorenetrc
+ put = 'let g:netrw_use_nt_rcp = '.g:netrw_use_nt_rcp
+ put = 'let g:netrw_win95ftp = '.g:netrw_win95ftp
+ let s:netrw_xfer_stop= line(".")
+
+ put = ''
+ put ='+ Netrw Browser Control'
+ put = 'let g:netrw_alto = '.g:netrw_alto
+ put = 'let g:netrw_altv = '.g:netrw_altv
+ put = 'let g:netrw_dirhistmax = '.g:netrw_dirhistmax
+ put = 'let g:netrw_ftp_browse_reject = '.g:netrw_ftp_browse_reject
+ put = 'let g:netrw_ftp_list_cmd = '.g:netrw_ftp_list_cmd
+ put = 'let g:netrw_hide = '.g:netrw_hide
+ put = 'let g:netrw_keepdir = '.g:netrw_keepdir
+ put = 'let g:netrw_list_cmd = '.g:netrw_list_cmd
+ put = 'let g:netrw_list_cmd = '.g:netrw_list_cmd
+ put = 'let g:netrw_list_hide = '.g:netrw_list_hide
+ put = 'let g:netrw_local_mkdir = '.g:netrw_local_mkdir
+ put = 'let g:netrw_local_rmdir = '.g:netrw_local_rmdir
+ put = 'let g:netrw_longlist = '.g:netrw_longlist
+ put = 'let g:netrw_maxfilenamelen = '.g:netrw_maxfilenamelen
+ put = 'let g:netrw_mkdir_cmd = '.g:netrw_mkdir_cmd
+ put = 'let g:netrw_rename_cmd = '.g:netrw_rename_cmd
+ put = 'let g:netrw_rm_cmd = '.g:netrw_rm_cmd
+ put = 'let g:netrw_rmdir_cmd = '.g:netrw_rmdir_cmd
+ put = 'let g:netrw_rmf_cmd = '.g:netrw_rmf_cmd
+ put = 'let g:netrw_silent = '.g:netrw_silent
+ put = 'let g:netrw_sort_by = '.g:netrw_sort_by
+ put = 'let g:netrw_sort_direction = '.g:netrw_sort_direction
+ put = 'let g:netrw_sort_sequence = '.g:netrw_sort_sequence
+ put = 'let g:netrw_ssh_browse_reject = '.g:netrw_ssh_browse_reject
+ put = 'let g:netrw_timefmt = '.g:netrw_timefmt
+ put = 'let g:netrw_winsize = '.g:netrw_winsize
+
+ put =''
+ put ='+ For help, place cursor on line and press ?'
+
+ 1d
+ silent %s/^+/"/e
+ res 99
+ silent %s/= \([^0-9].*\)$/= '\1'/e
+ silent %s/= $/= ''/e
+ 1
+
+ set nomod
+
+ map <buffer> <silent> ? :call NetrwSettingHelp()<cr>
+ let tmpfile= tempname()
+ exe 'au BufWriteCmd Netrw\ Settings silent w! '.tmpfile.'|so '.tmpfile.'|call delete("'.tmpfile.'")|set nomod'
+endfun
+
+" ---------------------------------------------------------------------
+" NetrwSettingHelp: {{{2
+fun! NetrwSettingHelp()
+" call Dfunc("NetrwSettingHelp()")
+ let curline = getline(".")
+ if curline =~ '='
+ let varhelp = substitute(curline,'^\s*let ','','e')
+ let varhelp = substitute(varhelp,'\s*=.*$','','e')
+" call Decho("trying help ".varhelp)
+ try
+ exe "he ".varhelp
+ catch /^Vim\%((\a\+)\)\=:E149/
+ echo "***sorry*** no help available for <".varhelp.">"
+ endtry
+ elseif line(".") < s:netrw_settings_stop
+ he netrw-settings
+ elseif line(".") < s:netrw_protocol_stop
+ he netrw-externapp
+ elseif line(".") < s:netrw_xfer_stop
+ he netrw-variables
+ else
+ he netrw-browse-var
+ endif
+" call Dret("NetrwSettingHelp")
+endfun
+
+" ---------------------------------------------------------------------
+" Modelines: {{{1
+" vim:ts=8 fdm=marker
diff --git a/runtime/plugin/netrwPlugin.vim b/runtime/plugin/netrwPlugin.vim
index bc5a85a..6e33d51 100644
--- a/runtime/plugin/netrwPlugin.vim
+++ b/runtime/plugin/netrwPlugin.vim
@@ -1,6 +1,6 @@
" netrwPlugin.vim: Handles file transfer and remote directory listing across a network
" PLUGIN PORTION
-" Date: Oct 12, 2005
+" Date: Oct 27, 2005
" Maintainer: Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
" GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
" Copyright: Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1
@@ -42,15 +42,15 @@
augroup Network
au!
if has("win32") || has("win95") || has("win64") || has("win16")
- au BufReadCmd file://* exe "silent doau BufReadPre ".expand("<amatch>")|exe 'e '.substitute(expand("<amatch>"),"file:/*","","")|exe "silent doau BufReadPost ".expand("<amatch>")
+ au BufReadCmd file://* exe "silent doau BufReadPre ".netrw#RFC2396(expand("<amatch>"))|exe 'e '.substitute(netrw#RFC2396(expand("<amatch>")),'file://\(.*\)','\1',"")|exe "silent doau BufReadPost ".netrw#RFC2396(expand("<amatch>"))
else
- au BufReadCmd file:///* exe "silent doau BufReadPre ".expand("<amatch>")|exe 'e /'.substitute(expand("<amatch>"),"file:/*","","")|exe "silent doau BufReadPost ".expand("<amatch>")
- au BufReadCmd file://localhost/* exe "silent doau BufReadPre ".expand("<amatch>")|exe 'e /'.substitute(expand("<amatch>"),"file:/*","","")|exe "silent doau BufReadPost ".expand("<amatch>")
+ au BufReadCmd file://* exe "silent doau BufReadPre ".netrw#RFC2396(expand("<amatch>"))|exe 'e '.substitute(netrw#RFC2396(expand("<amatch>")),'file://\(.*\)','\1',"")|exe "silent doau BufReadPost ".netrw#RFC2396(expand("<amatch>"))
+ au BufReadCmd file://localhost/* exe "silent doau BufReadPre ".netrw#RFC2396(expand("<amatch>"))|exe 'e '.substitute(netrw#RFC2396(expand("<amatch>")),'file://localhost/\(.*\)','\1',"")|exe "silent doau BufReadPost ".netrw#RFC2396(expand("<amatch>"))
endif
au BufReadCmd ftp://*,rcp://*,scp://*,http://*,dav://*,rsync://*,sftp://* exe "silent doau BufReadPre ".expand("<amatch>")|exe "Nread 0r ".expand("<amatch>")|exe "silent doau BufReadPost ".expand("<amatch>")
- au FileReadCmd ftp://*,rcp://*,scp://*,http://*,dav://*,rsync://*,sftp://* exe "silent doau BufReadPre ".expand("<amatch>")|exe "Nread " .expand("<amatch>")|exe "silent doau FileReadPost ".expand("<amatch>")
+ au FileReadCmd ftp://*,rcp://*,scp://*,http://*,dav://*,rsync://*,sftp://* exe "silent doau FileReadPre ".expand("<amatch>")|exe "Nread " .expand("<amatch>")|exe "silent doau FileReadPost ".expand("<amatch>")
au BufWriteCmd ftp://*,rcp://*,scp://*,dav://*,rsync://*,sftp://* exe "silent doau BufWritePre ".expand("<amatch>")|exe "Nwrite " .expand("<amatch>")|exe "silent doau BufWritePost ".expand("<amatch>")
- au FileWriteCmd ftp://*,rcp://*,scp://*,dav://*,rsync://*,sftp://* exe "silent doau BufWritePre ".expand("<amatch>")|exe "'[,']Nwrite " .expand("<amatch>")|exe "silent doau FileWritePost ".expand("<amatch>")
+ au FileWriteCmd ftp://*,rcp://*,scp://*,dav://*,rsync://*,sftp://* exe "silent doau FileWritePre ".expand("<amatch>")|exe "'[,']Nwrite " .expand("<amatch>")|exe "silent doau FileWritePost ".expand("<amatch>")
augroup END
" Commands: :Nread, :Nwrite, :NetUserPass {{{2
diff --git a/runtime/plugin/tar.vim b/runtime/plugin/tar.vim
deleted file mode 100644
index cc97f44..0000000
--- a/runtime/plugin/tar.vim
+++ /dev/null
@@ -1,34 +0,0 @@
-" tar.vim -- a Vim plugin for browsing tarfiles
-" Copyright (c) 2002, Michael C. Toren <mct@toren.net>
-" Distributed under the GNU General Public License.
-"
-" Version: 1.01
-" Last Change: 2005 Jul 26
-"
-" Updates are available from <http://michael.toren.net/code/>. If you
-" find this script useful, or have suggestions for improvements, please
-" let me know.
-" Also look there for further comments and documentation.
-"
-" This part only sets the autocommands. The functions are in autoload/tar.vim.
-
-if has("autocmd")
- augroup tar
- au!
- au BufReadCmd tarfile:* call tar#Read(expand("<afile>"), 1)
- au BufReadCmd tarfile:*/* call tar#Read(expand("<afile>"), 1)
- au FileReadCmd tarfile:* call tar#Read(expand("<afile>"), 0)
- au FileReadCmd tarfile:*/* call tar#Read(expand("<afile>"), 0)
-
- au BufWriteCmd tarfile:* call tar#Write(expand("<afile>"))
- au BufWriteCmd tarfile:*/* call tar#Write(expand("<afile>"))
- au FileWriteCmd tarfile:* call tar#Write(expand("<afile>"))
- au FileWriteCmd tarfile:*/* call tar#Write(expand("<afile>"))
-
- au BufReadCmd *.tar call tar#Browse(expand("<afile>"))
- au BufReadCmd *.tar.gz call tar#Browse(expand("<afile>"))
- au BufReadCmd *.tar.bz2 call tar#Browse(expand("<afile>"))
- au BufReadCmd *.tar.Z call tar#Browse(expand("<afile>"))
- au BufReadCmd *.tgz call tar#Browse(expand("<afile>"))
- augroup END
-endif
diff --git a/runtime/plugin/tarPlugin.vim b/runtime/plugin/tarPlugin.vim
index b9a34aa..506b431 100644
--- a/runtime/plugin/tarPlugin.vim
+++ b/runtime/plugin/tarPlugin.vim
@@ -9,25 +9,25 @@
"
" This part only sets the autocommands. The functions are in autoload/tar.vim.
-if has("autocmd")
- augroup tar
- au!
- au BufReadCmd tarfile:* call tar#Read(expand("<afile>"), 1)
- au BufReadCmd tarfile:*/* call tar#Read(expand("<afile>"), 1)
- au FileReadCmd tarfile:* call tar#Read(expand("<afile>"), 0)
- au FileReadCmd tarfile:*/* call tar#Read(expand("<afile>"), 0)
+augroup tar
+ au!
+ au BufReadCmd tarfile:* call tar#Read(expand("<amatch>"), 1)
+ au FileReadCmd tarfile:* call tar#Read(expand("<amatch>"), 0)
+ au BufWriteCmd tarfile:* call tar#Write(expand("<amatch>"))
+ au FileWriteCmd tarfile:* call tar#Write(expand("<amatch>"))
- au BufWriteCmd tarfile:* call tar#Write(expand("<afile>"))
- au BufWriteCmd tarfile:*/* call tar#Write(expand("<afile>"))
- au FileWriteCmd tarfile:* call tar#Write(expand("<afile>"))
- au FileWriteCmd tarfile:*/* call tar#Write(expand("<afile>"))
+ if has("unix")
+ au BufReadCmd tarfile:*/* call tar#Read(expand("<amatch>"), 1)
+ au FileReadCmd tarfile:*/* call tar#Read(expand("<amatch>"), 0)
+ au BufWriteCmd tarfile:*/* call tar#Write(expand("<amatch>"))
+ au FileWriteCmd tarfile:*/* call tar#Write(expand("<amatch>"))
+ endif
- au BufReadCmd *.tar call tar#Browse(expand("<afile>"))
- au BufReadCmd *.tar.gz call tar#Browse(expand("<afile>"))
- au BufReadCmd *.tar.bz2 call tar#Browse(expand("<afile>"))
- au BufReadCmd *.tar.Z call tar#Browse(expand("<afile>"))
- au BufReadCmd *.tgz call tar#Browse(expand("<afile>"))
- augroup END
-endif
+ au BufReadCmd *.tar call tar#Browse(expand("<amatch>"))
+ au BufReadCmd *.tar.gz call tar#Browse(expand("<amatch>"))
+ au BufReadCmd *.tar.bz2 call tar#Browse(expand("<amatch>"))
+ au BufReadCmd *.tar.Z call tar#Browse(expand("<amatch>"))
+ au BufReadCmd *.tgz call tar#Browse(expand("<amatch>"))
+augroup END
" vim: ts=8
diff --git a/runtime/plugin/zipPlugin.vim b/runtime/plugin/zipPlugin.vim
index 608edb5..20319a3 100644
--- a/runtime/plugin/zipPlugin.vim
+++ b/runtime/plugin/zipPlugin.vim
@@ -22,19 +22,19 @@
" Public Interface: {{{1
augroup zip
au!
- au BufReadCmd zipfile:* call zip#Read(expand("<afile>"), 1)
- au FileReadCmd zipfile:* call zip#Read(expand("<afile>"), 0)
- au BufWriteCmd zipfile:* call zip#Write(expand("<afile>"))
- au FileWriteCmd zipfile:* call zip#Write(expand("<afile>"))
+ au BufReadCmd zipfile:* call zip#Read(expand("<amatch>"), 1)
+ au FileReadCmd zipfile:* call zip#Read(expand("<amatch>"), 0)
+ au BufWriteCmd zipfile:* call zip#Write(expand("<amatch>"))
+ au FileWriteCmd zipfile:* call zip#Write(expand("<amatch>"))
if has("unix")
- au BufReadCmd zipfile:*/* call zip#Read(expand("<afile>"), 1)
- au FileReadCmd zipfile:*/* call zip#Read(expand("<afile>"), 0)
- au BufWriteCmd zipfile:*/* call zip#Write(expand("<afile>"))
- au FileWriteCmd zipfile:*/* call zip#Write(expand("<afile>"))
+ au BufReadCmd zipfile:*/* call zip#Read(expand("<amatch>"), 1)
+ au FileReadCmd zipfile:*/* call zip#Read(expand("<amatch>"), 0)
+ au BufWriteCmd zipfile:*/* call zip#Write(expand("<amatch>"))
+ au FileWriteCmd zipfile:*/* call zip#Write(expand("<amatch>"))
endif
- au BufReadCmd *.zip call zip#Browse(expand("<afile>"))
+ au BufReadCmd *.zip call zip#Browse(expand("<amatch>"))
augroup END
" ------------------------------------------------------------------------
diff --git a/runtime/spell/sv/main.aap b/runtime/spell/sv/main.aap
index fc45fcf..5634711 100644
--- a/runtime/spell/sv/main.aap
+++ b/runtime/spell/sv/main.aap
@@ -1,4 +1,6 @@
# Aap recipe for Swedish Vim spell files.
+#
+# Maintainer: Stefan Karlsson <stefan.74@comhem.se>
# Use a freshly compiled Vim if it exists.
@if os.path.exists('../../../src/vim'):
diff --git a/runtime/spell/sv/sv_SE.diff b/runtime/spell/sv/sv_SE.diff
index 3dfc515..5a0b383 100644
--- a/runtime/spell/sv/sv_SE.diff
+++ b/runtime/spell/sv/sv_SE.diff
@@ -139,3 +139,547 @@
+ SAL Ä E
+ SAL ÖG(IE)-6 ÖK # vokal+g(ie) ger ej j-ljud
+ SAL Ö Ö
+*** sv_SE.orig.dic 2003-08-14 13:02:06.000000000 +0200
+--- sv_SE.dic 2005-10-15 18:15:52.171875000 +0200
+***************
+*** 108,113 ****
+--- 108,114 ----
+ adoption/ADHS
+ adoptivbarn/BDS
+ adoptivson/ADS
++ adr.
+ adrenalin/BS
+ adress/DHS
+ adressat/ADHS
+***************
+*** 608,613 ****
+--- 609,615 ----
+ anlöps/S
+ anlöpta/JRS
+ anm
++ anm.
+ anmaning/ADGS
+ anmoda/ABCDEFMNPS
+ anmodande/ACEFS
+***************
+*** 973,978 ****
+--- 975,981 ----
+ arrogant/OS
+ arsenal/DHS
+ arsenik/DS
++ art.
+ art/ADHOS
+ arta/CHJMNPS
+ artefakt/DHS
+***************
+*** 1094,1099 ****
+--- 1097,1103 ----
+ audiens/DHS
+ auditorie/CIS
+ auditorium/JS
++ aug.
+ August/A
+ augusti/AS
+ auktion/ADHS
+***************
+*** 2376,2381 ****
+--- 2380,2386 ----
+ bikupa/AEGS
+ bikupe/S
+ bikups/S
++ bil.
+ bil/ADGS
+ bila/EGIJOS
+ bilaga/EGOS
+***************
+*** 2490,2495 ****
+--- 2495,2501 ----
+ Björn
+ björn/ADGS
+ Björns
++ bl.a.
+ bla/JS
+ black/DGS
+ blackout/DHS
+***************
+*** 3645,3650 ****
+--- 3651,3657 ----
+ debut/ADHS
+ debutant/DHS
+ debutera/JMS
++ dec.
+ december/AS
+ decennie/CIS
+ decennium/AJS
+***************
+*** 4117,4122 ****
+--- 4124,4130 ----
+ dotterson/ADS
+ Douglas
+ dov/OPS
++ dr
+ dra/AJS
+ drabant/DHS
+ drabba/ACMNPS
+***************
+*** 4315,4321 ****
+ duven/MS
+ dvala/EGJS
+ dvaldes/S
+! dvs
+ dväljas/S
+ dväljes/S
+ dväljs/NS
+--- 4323,4330 ----
+ duven/MS
+ dvala/EGJS
+ dvaldes/S
+! dvs.
+! d.v.s.
+ dväljas/S
+ dväljes/S
+ dväljs/NS
+***************
+*** 4463,4468 ****
+--- 4472,4478 ----
+ Ebbas
+ Ecuador/A
+ ed/ADHS
++ e.d.
+ Edberg/A
+ eder/AJMS
+ Edit/A
+***************
+*** 4612,4617 ****
+--- 4622,4628 ----
+ ekorre/AEGS
+ ekosystem/BDS
+ ekosändning/ADGS
++ e.Kr.
+ eksem/BDS
+ Eksjö/A
+ ekumenik/DS
+***************
+*** 4825,4830 ****
+--- 4836,4842 ----
+ enkrona/EGS
+ enkät/DHS
+ Enköping/A
++ enl.
+ enlighet/S
+ enligt/S
+ enorm/OPS
+***************
+*** 4990,4995 ****
+--- 5002,5008 ----
+ etanol/DS
+ etapp/DHS
+ etc
++ etc.
+ etcetera/S
+ eten/BDS
+ eter/ES
+***************
+*** 5334,5341 ****
+--- 5347,5356 ----
+ favorisera/ACDMNPS
+ favorit/ADHS
+ favör/DHS
++ f.d.
+ fe/EFHS
+ feber/ES
++ febr.
+ febril/MOPS
+ februari/AS
+ federal/MOS
+***************
+*** 5451,5456 ****
+--- 5466,5472 ----
+ fiffla/ACDMNS
+ fifflar/DJQS
+ fifflare/AEJS
++ fig.
+ figur/ADHS
+ figurativ/OS
+ figurera/ACJMNPS
+***************
+*** 5635,5640 ****
+--- 5651,5657 ----
+ fjäsk/ABS
+ fjäska/JMS
+ fjättra/CMNPS
++ f.Kr.
+ flack/OPS
+ flacka/ABCDJMNS
+ fladder/CS
+***************
+*** 5913,5918 ****
+--- 5930,5936 ----
+ fortplanta/ACMNPS
+ fortplantning/ADGS
+ fortran/S
++ forts.
+ fortsatt/OQS
+ fortskrida/KS
+ fortsätta/AJS
+***************
+*** 6075,6080 ****
+--- 6093,6099 ----
+ fras/DHS
+ frasa/BDHJMS
+ frasering/ADS
++ fre.
+ fred/ADS
+ freda/ACJMNPS
+ fredag/ADGS
+***************
+*** 6170,6175 ****
+--- 6189,6195 ----
+ frivol/MOS
+ froda/ACMNPS
+ frodig/OS
++ fr.o.m.
+ from/KLMNS
+ fromhet/ADS
+ fromt/S
+***************
+*** 6453,6458 ****
+--- 6473,6479 ----
+ fästman/AFS
+ fästmö/AEIS
+ fästning/ADGS
++ f.ö.
+ föda/ADEJKLRS
+ född/OQS
+ födelse/AES
+***************
+*** 10493,10498 ****
+--- 10514,10520 ----
+ Jan/A
+ Janne/A
+ Janos
++ jan.
+ januari/AS
+ japan/DHS
+ Japans
+***************
+*** 10520,10525 ****
+--- 10542,10548 ----
+ jetflyg/ABS
+ jetmotor/EHS
+ jetplan/ABDS
++ jfr
+ jiddisch/DS
+ Jimmy/A
+ jippo/ACES
+***************
+*** 10870,10875 ****
+--- 10893,10899 ----
+ kaos/BS
+ kaotisk/OS
+ Kap
++ kap.
+ kap/BDS
+ kapa/ACJMNPS
+ kapabel/KMS
+***************
+*** 11119,11124 ****
+--- 11143,11149 ----
+ Kjell/A
+ kjol/ADGS
+ kjortel/EIS
++ kl.
+ kl
+ klack/DGS
+ klacka/IJMS
+***************
+*** 13445,13450 ****
+--- 13470,13476 ----
+ löpning/ADGS
+ löpsedel/AEIS
+ löptid/DS
++ lör.
+ lördag/ADGS
+ lös/AORS
+ lösa/ABDJKLQRS
+***************
+*** 13783,13788 ****
+--- 13809,13815 ----
+ Mauretanien/A
+ Mauritius
+ mausoleum/JS
++ max.
+ max
+ maxim/DHS
+ maximal/MOS
+***************
+*** 13965,13970 ****
+--- 13992,13998 ----
+ mexikan/DHS
+ mexikanska/AEGS
+ Mexiko/A
++ m.fl.
+ mg
+ MHz
+ Michael/A
+***************
+*** 14016,14021 ****
+--- 14044,14050 ----
+ milslång/OS
+ milstolpe/AEGS
+ mimosa/AES
++ min.
+ min/ACDFHS
+ mina/HJS
+ mindervärdig/OQRS
+***************
+*** 14136,14141 ****
+--- 14165,14171 ----
+ mjölnar/DJQS
+ mjölnare/AEJS
+ ml
++ m.m.
+ mm
+ mo/AEGS
+ mobba/ACMNPS
+***************
+*** 14539,14544 ****
+--- 14569,14575 ----
+ målstyrd/OS
+ målsättning/ADGS
+ måltid/ADHS
++ mån.
+ mån/DGQS
+ måna/IJMPRS
+ månad/ADHQS
+***************
+*** 14792,14797 ****
+--- 14823,14830 ----
+ neutron/DHS
+ nevö/ES
+ New
++ ngn
++ ngt
+ nia/EGJQS
+ Nicaragua/A
+ nick/DGS
+***************
+*** 14920,14931 ****
+--- 14953,14966 ----
+ notifikation/ADS
+ notis/DHS
+ notorisk/OS
++ nov.
+ nova/AES
+ novell/DHS
+ novellmagasin/ABDS
+ novellsamling/ADGS
+ november/AS
+ novis/DHS
++ nr.
+ nr
+ nu/BS
+ nubb/S
+***************
+*** 15243,15248 ****
+--- 15278,15284 ----
+ obrottslig/OS
+ obrukbar/MOS
+ obruten/MS
++ obs.
+ obs
+ observant/OPS
+ observation/ADHS
+***************
+*** 15470,15475 ****
+--- 15506,15512 ----
+ okonventionell/MOS
+ okritisk/OS
+ okryddade/OS
++ okt.
+ oktagon/HS
+ oktal/MOS
+ oktav/DHS
+***************
+*** 15741,15746 ****
+--- 15778,15784 ----
+ onjutbar/MOS
+ onkel/AES
+ onormal/MOS
++ ons.
+ onsdag/ADGS
+ onyanserade/OS
+ onykter/MS
+***************
+*** 15977,15983 ****
+--- 16015,16023 ----
+ ostrukturerade/OS
+ ostörd/OS
+ osund/OS
++ osv.
+ osv
++ o.s.v.
+ osvensk/OS
+ osviklig/OPS
+ osympatisk/OPQS
+***************
+*** 16378,16383 ****
+--- 16418,16424 ----
+ petitum/ES
+ Petra/A
+ Pettersson/A
++ p.g.a.
+ pga
+ Philips
+ pi/FS
+***************
+*** 17457,17462 ****
+--- 17498,17504 ----
+ resonabel/MS
+ resonemang/ABDS
+ resonera/ACMNS
++ resp.
+ resp/S
+ respekt/S
+ respektabel/LMS
+***************
+*** 18328,18333 ****
+--- 18370,18376 ----
+ sentimentalitet/ADS
+ separat/OS
+ separera/ACMNPS
++ sept.
+ september/AS
+ seraf/DHS
+ serenad/DHS
+***************
+*** 18652,18657 ****
+--- 18695,18701 ----
+ sjöslag/S
+ sjöss/S
+ sjåpig/OS
++ s.k.
+ ska/GJMPS
+ skada/ABCDEGJMNPS
+ skadedjur/BDS
+***************
+*** 20767,20772 ****
+--- 20811,20817 ----
+ sömnlös/OQRS
+ sömnlöshet/ADS
+ sömnmedel/ACFS
++ sön.
+ söndag/ADGS
+ sönder/S
+ sönderbruten/MS
+***************
+*** 20832,20837 ****
+--- 20877,20883 ----
+ såväl/S
+ såvärst/S
+ ta/AKRS
++ tab.
+ tabbe/S
+ tabell/DHS
+ tabernaklet/AS
+***************
+*** 21063,21068 ****
+--- 21109,21115 ----
+ testar/DJQS
+ testare/AEJS
+ testning/ADGS
++ t.ex.
+ tex
+ Texas
+ text/DHOS
+***************
+*** 21336,21341 ****
+--- 21383,21389 ----
+ tippa/ACMNPS
+ tips/BDS
+ tipsa/ACJMNPS
++ tis.
+ tisdag/ADGS
+ tistel/EIS
+ titan/S
+***************
+*** 21463,21468 ****
+--- 21511,21517 ----
+ tolvårig/OS
+ tolvårs/S
+ Tom
++ t.o.m.
+ tom/LMS
+ Tomas
+ tomat/DHS
+***************
+*** 21513,21518 ****
+--- 21562,21568 ----
+ torped/ADHS
+ torpedbåt/ADGS
+ torr/MOPS
++ tors.
+ torsdag/ADGS
+ torsk/DGS
+ Torsten/A
+***************
+*** 22359,22364 ****
+--- 22409,22415 ----
+ uppkomst/DS
+ uppkoppling/ADGS
+ uppkrupen/MS
++ uppl.
+ upplaga/AEGOS
+ upplagd/OS
+ upplage/S
+***************
+*** 22639,22644 ****
+--- 22690,22696 ----
+ utförar/DJQS
+ utförare/AEJS
+ utförlig/OPS
++ utg.
+ utgallra/ACMNPS
+ utgamla/S
+ utgammal/MS
+***************
+*** 23003,23008 ****
+--- 23055,23061 ----
+ varannan/S
+ varav/S
+ Varberg/A
++ vard.
+ varda/BDS
+ vardag/ADGS
+ vardaglig/OPS
+***************
+*** 23091,23096 ****
+--- 23144,23150 ----
+ Vaxholm/A
+ vaxljus/BDS
+ Vaxmora
++ vd
+ VD
+ ve/GS
+ veck/ABDS
+***************
+*** 23203,23208 ****
+--- 23257,23264 ----
+ vettlös/OS
+ vev/DS
+ veva/ACJMNPS
++ v.g.
++ v.g.v.
+ vi/ACEOS
+ vibration/ADHS
+ vibrator/AES
+***************
+*** 23416,23421 ****
+--- 23472,23478 ----
+ VM
+ vokabulär/S
+ vokal/DHS
++ vol.
+ volontär/ADHS
+ volt/S
+ Volvo/A
diff --git a/runtime/syntax/catalog.vim b/runtime/syntax/catalog.vim
index 2f8e388..4dbff00 100644
--- a/runtime/syntax/catalog.vim
+++ b/runtime/syntax/catalog.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: sgml catalog file
" Maintainer: Johannes Zellner <johannes@zellner.org>
-" Last Change: Tue, 27 Apr 2004 14:54:59 CEST
+" Last Change: Fr, 04 Nov 2005 12:46:45 CET
" Filenames: /etc/sgml.catalog
" $Id$
@@ -17,8 +17,8 @@
syn region catalogString start=+'+ skip=+\\\\\|\\'+ end=+'+ keepend
syn region catalogComment start=+--+ end=+--+ contains=catalogTodo
-syn keyword catalogTodo TODO FIXME XXX contained display
-syn keyword catalogKeyword DOCTYPE OVERRIDE PUBLIC DTDDECL ENTITY display
+syn keyword catalogTodo TODO FIXME XXX NOTE contained
+syn keyword catalogKeyword DOCTYPE OVERRIDE PUBLIC DTDDECL ENTITY CATALOG
" The default highlighting.
diff --git a/runtime/syntax/cf.vim b/runtime/syntax/cf.vim
index 647c56a..517a20d 100644
--- a/runtime/syntax/cf.vim
+++ b/runtime/syntax/cf.vim
@@ -1,175 +1,251 @@
-" Vim syntax file
-" Language: ColdFusion
-" Maintainer: Toby Woodwark (toby.woodwark+vim@gmail.com)
-" Last Change: August 3, 2005
-" ColdFusion MX 7
-" Usage: Since ColdFusion has its own version of HTML comments
-" (<!--- --->)
-" make sure that you put 'let html_wrong_comments=1' in your .vimrc /
-" _vimrc file.
-
-" For version 5.x, clear all syntax items.
-" For version 6.x, quit when a syntax file was already loaded.
-if version < 600
- syntax clear
-elseif exists("b:current_syntax")
- finish
-endif
-
-" Use all the stuff from the HTML syntax file.
-if version < 600
- source <sfile>:p:h/html.vim
-else
- runtime! syntax/html.vim
-endif
-
-" Tag names.
-syn keyword cfTagName contained cfabort cfapplet cfapplication cfargument cfassociate cfbreak cfcache
-syn keyword cfTagName contained cfcalendar cfcase cfcatch cfchart cfchartdata cfchartseries cfcol cfcollection
-syn keyword cfTagName contained cfcomponent cfcontent cfcookie cfdefaultcase cfdirectory cfdocument
-syn keyword cfTagName contained cfdocumentitem cfdocumentsection cfdump cfelse cfelseif cferror cfexecute
-syn keyword cfTagName contained cfexit cffile cfflush cfform cfformgroup cfformitem cfftp cffunction cfgrid
-syn keyword cfTagName contained cfgridcolumn cfgridrow cfgridupdate cfheader cfhtmlhead cfhttp cfhttpparam cfif
-syn keyword cfTagName contained cfimport cfinclude cfindex cfinput cfinsert cfinvoke cfinvokeargument
-syn keyword cfTagName contained cfldap cflocation cflock cflog cflogin cfloginuser cflogout cfloop cfmail
-syn keyword cfTagName contained cfmailparam cfmailpart cfmodule cfNTauthenticate cfobject cfobjectcache
-syn keyword cfTagName contained cfoutput cfparam cfpop cfprocessingdirective cfprocparam cfprocresult
-syn keyword cfTagName contained cfproperty cfquery cfqueryparam cfregistry cfreport cfreportparam cfrethrow
-syn keyword cfTagName contained cfreturn cfsavecontent cfschedule cfscript cfsearch cfselect cfset cfsetting
-syn keyword cfTagName contained cfsilent cfslider cfstoredproc cfswitch cftable cftextarea cfthrow cftimer
-syn keyword cfTagName contained cftrace cftransaction cftree cftreeitem cftry cfupdate cfwddx cfxml
-
-" Tag parameters.
-syn keyword cfArg contained abort accept access accessible action addnewline addtoken addtoken agentname
-syn keyword cfArg contained align appendkey appletsource application applicationtimeout applicationtoken
-syn keyword cfArg contained archive argumentcollection arguments asciiextensionlist attachmentpath
-syn keyword cfArg contained attributecollection attributes attributes autowidth backgroundcolor
-syn keyword cfArg contained backgroundvisible basetag bcc bgcolor bind bindingname blockfactor body bold
-syn keyword cfArg contained border branch cachedafter cachedwithin casesensitive categories category
-syn keyword cfArg contained categorytree cc cfsqltype charset chartheight chartwidth checked class
-syn keyword cfArg contained clientmanagement clientstorage codebase colheaderalign colheaderbold
-syn keyword cfArg contained colheaderfont colheaderfontsize colheaderitalic colheaders colheadertextcolor
-syn keyword cfArg contained collection colorlist colspacing columns completepath component condition
-syn keyword cfArg contained connection contentid context contextbytes contexthighlightbegin
-syn keyword cfArg contained contexthighlightend contextpassages cookiedomain criteria custom1 custom2
-syn keyword cfArg contained custom3 custom4 data dataalign databackgroundcolor datacollection
-syn keyword cfArg contained datalabelstyle datasource date daynames dbname dbserver dbtype dbvarname debug
-syn keyword cfArg contained default delete deletebutton deletefile delimiter delimiters description
-syn keyword cfArg contained destination detail directory disabled display displayname disposition dn domain
-syn keyword cfArg contained enablecab enablecfoutputonly enabled encoded encryption enctype enddate
-syn keyword cfArg contained endrange endrow endtime entry errorcode exception existing expand expires
-syn keyword cfArg contained expireurl expression extendedinfo extends extensions external failifexists
-syn keyword cfArg contained failto file filefield filename filter firstdayofweek firstrowasheaders font
-syn keyword cfArg contained fontbold fontembed fontitalic fontsize foregroundcolor format formfields
-syn keyword cfArg contained formula from generateuniquefilenames getasbinary grid griddataalign gridlines
-syn keyword cfArg contained groovecolor group groupcasesensitive header headeralign headerbold headerfont
-syn keyword cfArg contained headerfontsize headeritalic headerlines headertextcolor height highlighthref
-syn keyword cfArg contained hint href hrefkey hscroll hspace htmltable id idletimeout img imgopen imgstyle
-syn keyword cfArg contained index inline input insert insertbutton interval isolation italic item
-syn keyword cfArg contained itemcolumn key keyonly label labelformat language list listgroups locale
-syn keyword cfArg contained localfile log loginstorage lookandfeel mailerid mailto marginbottom marginleft
-syn keyword cfArg contained marginright marginright margintop markersize markerstyle mask maxlength maxrows
-syn keyword cfArg contained message messagenumber method mimeattach mimetype mode modifytype monthnames
-syn keyword cfArg contained multipart multiple name namecomplict nameconflict namespace new newdirectory
-syn keyword cfArg contained notsupported null numberformat object omit onchange onclick onerror onkeydown
-syn keyword cfArg contained onkeyup onload onmousedown onmouseup onreset onsubmit onvalidate operation
-syn keyword cfArg contained orderby orientation output outputfile overwrite ownerpassword pageencoding
-syn keyword cfArg contained pageheight pagetype pagewidth paintstyle param_1 param_2 param_3 param_4
-syn keyword cfArg contained param_5 parent passive passthrough password path pattern permissions picturebar
-syn keyword cfArg contained pieslicestyle port porttypename prefix preloader preservedata previouscriteria
-syn keyword cfArg contained procedure protocol provider providerdsn proxybypass proxypassword proxyport
-syn keyword cfArg contained proxyserver proxyuser publish query queryasroot queryposition range rebind
-syn keyword cfArg contained recurse redirect referral refreshlabel remotefile replyto report requesttimeout
-syn keyword cfArg contained required reset resolveurl result resultset retrycount returnasbinary returncode
-syn keyword cfArg contained returntype returnvariable roles rowheaderalign rowheaderbold rowheaderfont
-syn keyword cfArg contained rowheaderfontsize rowheaderitalic rowheaders rowheadertextcolor rowheaderwidth
-syn keyword cfArg contained rowheight scale scalefrom scaleto scope scriptprotect scriptsrc secure
-syn keyword cfArg contained securitycontext select selectcolor selected selecteddate selectedindex
-syn keyword cfArg contained selectmode separator seriescolor serieslabel seriesplacement server serviceport
-syn keyword cfArg contained serviceportname sessionmanagement sessiontimeout setclientcookies setcookie
-syn keyword cfArg contained setdomaincookies show3d showborder showdebugoutput showerror showlegend
-syn keyword cfArg contained showmarkers showxgridlines showygridlines size skin sort sortascendingbutton
-syn keyword cfArg contained sortcontrol sortdescendingbutton sortxaxis source spoolenable sql src start
-syn keyword cfArg contained startdate startrange startrow starttime status statuscode statust step
-syn keyword cfArg contained stoponerror style subject suggestions suppresswhitespace tablename tableowner
-syn keyword cfArg contained tablequalifier taglib target task template text textcolor textqualifier
-syn keyword cfArg contained thread throwonerror throwonfailure throwontimeout time timeout timespan tipbgcolor tipstyle
-syn keyword cfArg contained title to tooltip top toplevelvariable transfermode type uid unit url urlpath
-syn keyword cfArg contained useragent username userpassword usetimezoneinfo validate validateat value
-syn keyword cfArg contained valuecolumn values valuesdelimiter valuesdisplay var variable vertical visible
-syn keyword cfArg contained vscroll vspace webservice width wmode wraptext wsdlfile xaxistitle xaxistype
-syn keyword cfArg contained xoffset yaxistitle yaxistype yoffset
-
-" ColdFusion Functions.
-syn keyword cfFunctionName contained Abs GetFunctionList Max ACos GetGatewayHelper Mid AddSOAPRequestHeader
-syn keyword cfFunctionName contained GetHttpRequestData Min AddSOAPResponseHeader GetHttpTimeString Minute
-syn keyword cfFunctionName contained ArrayAppend GetLocale Month ArrayAvg GetLocaleDisplayName MonthAsString
-syn keyword cfFunctionName contained ArrayClear GetMetaData Now ArrayDeleteAt GetMetricData NumberFormat
-syn keyword cfFunctionName contained ArrayInsertAt GetPageContext ParagraphFormat ArrayIsEmpty GetProfileSections
-syn keyword cfFunctionName contained ParseDateTime ArrayLen GetProfileString Pi ArrayMax GetSOAPRequest
-syn keyword cfFunctionName contained PreserveSingleQuotes ArrayMin GetSOAPRequestHeader Quarter ArrayNew
-syn keyword cfFunctionName contained GetSOAPResponse QueryAddColumn ArrayPrepend GetSOAPResponseHeader QueryAddRow
-syn keyword cfFunctionName contained ArrayResize GetTempDirectory QueryNew ArraySet GetTempFile QuerySetCell
-syn keyword cfFunctionName contained ArraySort GetTickCount QuotedValueList ArraySum GetTimeZoneInfo Rand ArraySwap
-syn keyword cfFunctionName contained GetToken Randomize ArrayToList Hash RandRange Asc Hour REFind ASin
-syn keyword cfFunctionName contained HTMLCodeFormat REFindNoCase Atn HTMLEditFormat ReleaseComObject BinaryDecode
-syn keyword cfFunctionName contained IIf RemoveChars BinaryEncode IncrementValue RepeatString BitAnd InputBaseN
-syn keyword cfFunctionName contained Replace BitMaskClear Insert ReplaceList BitMaskRead Int ReplaceNoCase
-syn keyword cfFunctionName contained BitMaskSet IsArray REReplace BitNot IsBinary REReplaceNoCase BitOr IsBoolean
-syn keyword cfFunctionName contained Reverse BitSHLN IsCustomFunction Right BitSHRN IsDate RJustify BitXor
-syn keyword cfFunctionName contained IsDebugMode Round Ceiling IsDefined RTrim CharsetDecode IsLeapYear Second
-syn keyword cfFunctionName contained CharsetEncode IsNumeric SendGatewayMessage Chr IsNumericDate SetEncoding
-syn keyword cfFunctionName contained CJustify IsObject SetLocale Compare IsQuery SetProfileString CompareNoCase
-syn keyword cfFunctionName contained IsSimpleValue SetVariable Cos IsSOAPRequest Sgn CreateDate IsStruct Sin
-syn keyword cfFunctionName contained CreateDateTime IsUserInRole SpanExcluding CreateObject IsValid SpanIncluding
-syn keyword cfFunctionName contained CreateODBCDate IsWDDX Sqr CreateODBCDateTime IsXML StripCR CreateODBCTime
-syn keyword cfFunctionName contained IsXmlAttribute StructAppend CreateTime IsXmlDoc StructClear CreateTimeSpan
-syn keyword cfFunctionName contained IsXmlElem StructCopy CreateUUID IsXmlNode StructCount DateAdd IsXmlRoot
-syn keyword cfFunctionName contained StructDelete DateCompare JavaCast StructFind DateConvert JSStringFormat
-syn keyword cfFunctionName contained StructFindKey DateDiff LCase StructFindValue DateFormat Left StructGet
-syn keyword cfFunctionName contained DatePart Len StructInsert Day ListAppend StructIsEmpty DayOfWeek
-syn keyword cfFunctionName contained ListChangeDelims StructKeyArray DayOfWeekAsString ListContains StructKeyExists
-syn keyword cfFunctionName contained DayOfYear ListContainsNoCase StructKeyList DaysInMonth ListDeleteAt StructNew
-syn keyword cfFunctionName contained DaysInYear ListFind StructSort DE ListFindNoCase StructUpdate DecimalFormat
-syn keyword cfFunctionName contained ListFirst Tan DecrementValue ListGetAt TimeFormat Decrypt ListInsertAt
-syn keyword cfFunctionName contained ToBase64 DeleteClientVariable ListLast ToBinary DirectoryExists ListLen
-syn keyword cfFunctionName contained ToScript DollarFormat ListPrepend ToString Duplicate ListQualify Trim Encrypt
-syn keyword cfFunctionName contained ListRest UCase Evaluate ListSetAt URLDecode Exp ListSort URLEncodedFormat
-syn keyword cfFunctionName contained ExpandPath ListToArray URLSessionFormat FileExists ListValueCount Val Find
-syn keyword cfFunctionName contained ListValueCountNoCase ValueList FindNoCase LJustify Week FindOneOf Log Wrap
-syn keyword cfFunctionName contained FirstDayOfMonth Log10 WriteOutput Fix LSCurrencyFormat XmlChildPos FormatBaseN
-syn keyword cfFunctionName contained LSDateFormat XmlElemNew GetTempDirectory LSEuroCurrencyFormat XmlFormat
-syn keyword cfFunctionName contained GetAuthUser LSIsCurrency XmlGetNodeType GetBaseTagData LSIsDate XmlNew
-syn keyword cfFunctionName contained GetBaseTagList LSIsNumeric XmlParse GetBaseTemplatePath LSNumberFormat
-syn keyword cfFunctionName contained XmlSearch GetClientVariablesList LSParseCurrency XmlTransform
-syn keyword cfFunctionName contained GetCurrentTemplatePath LSParseDateTime XmlValidate GetDirectoryFromPath
-syn keyword cfFunctionName contained LSParseEuroCurrency Year GetEncoding LSParseNumber YesNoFormat GetException
-syn keyword cfFunctionName contained LSTimeFormat GetFileFromPath LTrim
-
-syn cluster htmlTagNameCluster add=cfTagName
-syn cluster htmlArgCluster add=cfArg,cfFunctionName
-
-syn region cfFunctionRegion start='#' end='#' contains=cfFunctionName
-
-" Define the default highlighting.
-" For version 5.x and earlier, only when not done already.
-" For version 5.8 and later, only when an item doesn't have highlighting yet.
-if version >= 508 || !exists("did_cf_syn_inits")
- if version < 508
- let did_cf_syn_inits = 1
- command -nargs=+ HiLink hi link <args>
- else
- command -nargs=+ HiLink hi def link <args>
- endif
-
- HiLink cfTagName Statement
- HiLink cfArg Type
- HiLink cfFunctionName Function
- HiLink cfFunctionRegion PreProc
-
- delcommand HiLink
-endif
-
-let b:current_syntax = "cf"
-
-" vim: ts=8 sw=2
+" Vim syntax file
+" Language: ColdFusion
+" Maintainer: Toby Woodwark (toby.woodwark+vim@gmail.com)
+" Last Change: 2005-11-02
+" Filenames: *.cfc *.cfm
+" Version: Macromedia ColdFusion MX 7
+" Usage: Note that ColdFusion has its own comment syntax
+" i.e. <!--- --->
+
+" For version 5.x, clear all syntax items.
+" For version 6.x+, quit if a syntax file is already loaded.
+if version < 600
+ syntax clear
+elseif exists("b:current_syntax")
+ finish
+endif
+
+" Use all the stuff from the HTML syntax file.
+" TODO remove this; CFML is not a superset of HTML
+if version < 600
+ source <sfile>:p:h/html.vim
+else
+ runtime! syntax/html.vim
+endif
+
+syn sync fromstart
+syn sync maxlines=200
+syn case ignore
+
+" Scopes and keywords.
+syn keyword cfScope contained cgi cffile request caller this thistag cfcatch variables application server session client form url attributes arguments
+syn keyword cfBool contained yes no true false
+
+" Operator strings.
+" Not exhaustive, since there are longhand equivalents.
+syn keyword cfOperator contained xor eqv and or lt le lte gt ge gte eq neq not is mod contains
+syn match cfOperatorMatch contained "[\+\-\*\/\\\^\&][\+\-\*\/\\\^\&]\@!"
+syn cluster cfOperatorCluster contains=cfOperator,cfOperatorMatch
+
+" Tag names.
+syn keyword cfTagName contained cfabort cfapplet cfapplication cfargument cfassociate cfbreak cfcache
+syn keyword cfTagName contained cfcalendar cfcase cfcatch cfchart cfchartdata cfchartseries cfcol cfcollection
+syn keyword cfTagName contained cfcomponent cfcontent cfcookie cfdefaultcase cfdirectory cfdocument
+syn keyword cfTagName contained cfdocumentitem cfdocumentsection cfdump cfelse cfelseif cferror cfexecute
+syn keyword cfTagName contained cfexit cffile cfflush cfform cfformgroup cfformitem cfftp cffunction cfgrid
+syn keyword cfTagName contained cfgridcolumn cfgridrow cfgridupdate cfheader cfhtmlhead cfhttp cfhttpparam cfif
+syn keyword cfTagName contained cfimport cfinclude cfindex cfinput cfinsert cfinvoke cfinvokeargument
+syn keyword cfTagName contained cfldap cflocation cflock cflog cflogin cfloginuser cflogout cfloop cfmail
+syn keyword cfTagName contained cfmailparam cfmailpart cfmodule cfNTauthenticate cfobject cfobjectcache
+syn keyword cfTagName contained cfoutput cfparam cfpop cfprocessingdirective cfprocparam cfprocresult
+syn keyword cfTagName contained cfproperty cfquery cfqueryparam cfregistry cfreport cfreportparam cfrethrow
+syn keyword cfTagName contained cfreturn cfsavecontent cfschedule cfscript cfsearch cfselect cfset cfsetting
+syn keyword cfTagName contained cfsilent cfslider cfstoredproc cfswitch cftable cftextarea cfthrow cftimer
+syn keyword cfTagName contained cftrace cftransaction cftree cftreeitem cftry cfupdate cfwddx cfxml
+
+" Tag parameters.
+syn keyword cfArg contained abort accept access accessible action addnewline addtoken addtoken agentname
+syn keyword cfArg contained align appendkey appletsource application applicationtimeout applicationtoken
+syn keyword cfArg contained archive argumentcollection arguments asciiextensionlist attachmentpath
+syn keyword cfArg contained attributecollection attributes attributes autowidth backgroundcolor
+syn keyword cfArg contained backgroundvisible basetag bcc bgcolor bind bindingname blockfactor body bold
+syn keyword cfArg contained border branch cachedafter cachedwithin casesensitive categories category
+syn keyword cfArg contained categorytree cc cfsqltype charset chartheight chartwidth checked class
+syn keyword cfArg contained clientmanagement clientstorage codebase colheaderalign colheaderbold
+syn keyword cfArg contained colheaderfont colheaderfontsize colheaderitalic colheaders colheadertextcolor
+syn keyword cfArg contained collection colorlist colspacing columns completepath component condition
+syn keyword cfArg contained connection contentid context contextbytes contexthighlightbegin
+syn keyword cfArg contained contexthighlightend contextpassages cookiedomain criteria custom1 custom2
+syn keyword cfArg contained custom3 custom4 data dataalign databackgroundcolor datacollection
+syn keyword cfArg contained datalabelstyle datasource date daynames dbname dbserver dbtype dbvarname debug
+syn keyword cfArg contained default delete deletebutton deletefile delimiter delimiters description
+syn keyword cfArg contained destination detail directory disabled display displayname disposition dn domain
+syn keyword cfArg contained enablecab enablecfoutputonly enabled encoded encryption enctype enddate
+syn keyword cfArg contained endrange endrow endtime entry errorcode exception existing expand expires
+syn keyword cfArg contained expireurl expression extendedinfo extends extensions external failifexists
+syn keyword cfArg contained failto file filefield filename filter firstdayofweek firstrowasheaders font
+syn keyword cfArg contained fontbold fontembed fontitalic fontsize foregroundcolor format formfields
+syn keyword cfArg contained formula from generateuniquefilenames getasbinary grid griddataalign gridlines
+syn keyword cfArg contained groovecolor group groupcasesensitive header headeralign headerbold headerfont
+syn keyword cfArg contained headerfontsize headeritalic headerlines headertextcolor height highlighthref
+syn keyword cfArg contained hint href hrefkey hscroll hspace htmltable id idletimeout img imgopen imgstyle
+syn keyword cfArg contained index inline input insert insertbutton interval isolation italic item
+syn keyword cfArg contained itemcolumn key keyonly label labelformat language list listgroups locale
+syn keyword cfArg contained localfile log loginstorage lookandfeel mailerid mailto marginbottom marginleft
+syn keyword cfArg contained marginright marginright margintop markersize markerstyle mask maxlength maxrows
+syn keyword cfArg contained message messagenumber method mimeattach mimetype mode modifytype monthnames
+syn keyword cfArg contained multipart multiple name namecomplict nameconflict namespace new newdirectory
+syn keyword cfArg contained notsupported null numberformat object omit onchange onclick onerror onkeydown
+syn keyword cfArg contained onkeyup onload onmousedown onmouseup onreset onsubmit onvalidate operation
+syn keyword cfArg contained orderby orientation output outputfile overwrite ownerpassword pageencoding
+syn keyword cfArg contained pageheight pagetype pagewidth paintstyle param_1 param_2 param_3 param_4
+syn keyword cfArg contained param_5 parent passive passthrough password path pattern permissions picturebar
+syn keyword cfArg contained pieslicestyle port porttypename prefix preloader preservedata previouscriteria
+syn keyword cfArg contained procedure protocol provider providerdsn proxybypass proxypassword proxyport
+syn keyword cfArg contained proxyserver proxyuser publish query queryasroot queryposition range rebind
+syn keyword cfArg contained recurse redirect referral refreshlabel remotefile replyto report requesttimeout
+syn keyword cfArg contained required reset resolveurl result resultset retrycount returnasbinary returncode
+syn keyword cfArg contained returntype returnvariable roles rowheaderalign rowheaderbold rowheaderfont
+syn keyword cfArg contained rowheaderfontsize rowheaderitalic rowheaders rowheadertextcolor rowheaderwidth
+syn keyword cfArg contained rowheight scale scalefrom scaleto scope scriptprotect scriptsrc secure
+syn keyword cfArg contained securitycontext select selectcolor selected selecteddate selectedindex
+syn keyword cfArg contained selectmode separator seriescolor serieslabel seriesplacement server serviceport
+syn keyword cfArg contained serviceportname sessionmanagement sessiontimeout setclientcookies setcookie
+syn keyword cfArg contained setdomaincookies show3d showborder showdebugoutput showerror showlegend
+syn keyword cfArg contained showmarkers showxgridlines showygridlines size skin sort sortascendingbutton
+syn keyword cfArg contained sortcontrol sortdescendingbutton sortxaxis source spoolenable sql src start
+syn keyword cfArg contained startdate startrange startrow starttime status statuscode statustext step
+syn keyword cfArg contained stoponerror style subject suggestions suppresswhitespace tablename tableowner
+syn keyword cfArg contained tablequalifier taglib target task template text textcolor textqualifier
+syn keyword cfArg contained thread throwonerror throwonfailure throwontimeout time timeout timespan tipbgcolor tipstyle
+syn keyword cfArg contained title to tooltip top toplevelvariable transfermode type uid unit url urlpath
+syn keyword cfArg contained useragent username userpassword usetimezoneinfo validate validateat value
+syn keyword cfArg contained valuecolumn values valuesdelimiter valuesdisplay var variable vertical visible
+syn keyword cfArg contained vscroll vspace webservice width wmode wraptext wsdlfile xaxistitle xaxistype
+syn keyword cfArg contained xoffset yaxistitle yaxistype yoffset
+
+" ColdFusion Functions.
+syn keyword cfFunctionName contained Abs GetFunctionList Max ACos GetGatewayHelper Mid AddSOAPRequestHeader
+syn keyword cfFunctionName contained GetHttpRequestData Min AddSOAPResponseHeader GetHttpTimeString Minute
+syn keyword cfFunctionName contained ArrayAppend GetLocale Month ArrayAvg GetLocaleDisplayName MonthAsString
+syn keyword cfFunctionName contained ArrayClear GetMetaData Now ArrayDeleteAt GetMetricData NumberFormat
+syn keyword cfFunctionName contained ArrayInsertAt GetPageContext ParagraphFormat ArrayIsEmpty GetProfileSections
+syn keyword cfFunctionName contained ParseDateTime ArrayLen GetProfileString Pi ArrayMax GetSOAPRequest
+syn keyword cfFunctionName contained PreserveSingleQuotes ArrayMin GetSOAPRequestHeader Quarter ArrayNew
+syn keyword cfFunctionName contained GetSOAPResponse QueryAddColumn ArrayPrepend GetSOAPResponseHeader QueryAddRow
+syn keyword cfFunctionName contained ArrayResize GetTempDirectory QueryNew ArraySet GetTempFile QuerySetCell
+syn keyword cfFunctionName contained ArraySort GetTickCount QuotedValueList ArraySum GetTimeZoneInfo Rand ArraySwap
+syn keyword cfFunctionName contained GetToken Randomize ArrayToList Hash RandRange Asc Hour REFind ASin
+syn keyword cfFunctionName contained HTMLCodeFormat REFindNoCase Atn HTMLEditFormat ReleaseComObject BinaryDecode
+syn keyword cfFunctionName contained IIf RemoveChars BinaryEncode IncrementValue RepeatString BitAnd InputBaseN
+syn keyword cfFunctionName contained Replace BitMaskClear Insert ReplaceList BitMaskRead Int ReplaceNoCase
+syn keyword cfFunctionName contained BitMaskSet IsArray REReplace BitNot IsBinary REReplaceNoCase BitOr IsBoolean
+syn keyword cfFunctionName contained Reverse BitSHLN IsCustomFunction Right BitSHRN IsDate RJustify BitXor
+syn keyword cfFunctionName contained IsDebugMode Round Ceiling IsDefined RTrim CharsetDecode IsLeapYear Second
+syn keyword cfFunctionName contained CharsetEncode IsNumeric SendGatewayMessage Chr IsNumericDate SetEncoding
+syn keyword cfFunctionName contained CJustify IsObject SetLocale Compare IsQuery SetProfileString CompareNoCase
+syn keyword cfFunctionName contained IsSimpleValue SetVariable Cos IsSOAPRequest Sgn CreateDate IsStruct Sin
+syn keyword cfFunctionName contained CreateDateTime IsUserInRole SpanExcluding CreateObject IsValid SpanIncluding
+syn keyword cfFunctionName contained CreateODBCDate IsWDDX Sqr CreateODBCDateTime IsXML StripCR CreateODBCTime
+syn keyword cfFunctionName contained IsXmlAttribute StructAppend CreateTime IsXmlDoc StructClear CreateTimeSpan
+syn keyword cfFunctionName contained IsXmlElem StructCopy CreateUUID IsXmlNode StructCount DateAdd IsXmlRoot
+syn keyword cfFunctionName contained StructDelete DateCompare JavaCast StructFind DateConvert JSStringFormat
+syn keyword cfFunctionName contained StructFindKey DateDiff LCase StructFindValue DateFormat Left StructGet
+syn keyword cfFunctionName contained DatePart Len StructInsert Day ListAppend StructIsEmpty DayOfWeek
+syn keyword cfFunctionName contained ListChangeDelims StructKeyArray DayOfWeekAsString ListContains StructKeyExists
+syn keyword cfFunctionName contained DayOfYear ListContainsNoCase StructKeyList DaysInMonth ListDeleteAt StructNew
+syn keyword cfFunctionName contained DaysInYear ListFind StructSort DE ListFindNoCase StructUpdate DecimalFormat
+syn keyword cfFunctionName contained ListFirst Tan DecrementValue ListGetAt TimeFormat Decrypt ListInsertAt
+syn keyword cfFunctionName contained ToBase64 DeleteClientVariable ListLast ToBinary DirectoryExists ListLen
+syn keyword cfFunctionName contained ToScript DollarFormat ListPrepend ToString Duplicate ListQualify Trim Encrypt
+syn keyword cfFunctionName contained ListRest UCase Evaluate ListSetAt URLDecode Exp ListSort URLEncodedFormat
+syn keyword cfFunctionName contained ExpandPath ListToArray URLSessionFormat FileExists ListValueCount Val Find
+syn keyword cfFunctionName contained ListValueCountNoCase ValueList FindNoCase LJustify Week FindOneOf Log Wrap
+syn keyword cfFunctionName contained FirstDayOfMonth Log10 WriteOutput Fix LSCurrencyFormat XmlChildPos FormatBaseN
+syn keyword cfFunctionName contained LSDateFormat XmlElemNew GetTempDirectory LSEuroCurrencyFormat XmlFormat
+syn keyword cfFunctionName contained GetAuthUser LSIsCurrency XmlGetNodeType GetBaseTagData LSIsDate XmlNew
+syn keyword cfFunctionName contained GetBaseTagList LSIsNumeric XmlParse GetBaseTemplatePath LSNumberFormat
+syn keyword cfFunctionName contained XmlSearch GetClientVariablesList LSParseCurrency XmlTransform
+syn keyword cfFunctionName contained GetCurrentTemplatePath LSParseDateTime XmlValidate GetDirectoryFromPath
+syn keyword cfFunctionName contained LSParseEuroCurrency Year GetEncoding LSParseNumber YesNoFormat GetException
+syn keyword cfFunctionName contained LSTimeFormat GetFileFromPath LTrim
+
+syn cluster htmlTagNameCluster add=cfTagName
+syn cluster htmlArgCluster add=cfArg,cfHashRegion,cfScope
+syn cluster htmlPreproc add=cfHashRegion
+
+syn cluster cfExpressionCluster contains=cfFunctionName,cfScope,@cfOperatorCluster,cfScriptStringD,cfScriptStringS,cfScriptNumber,cfBool
+
+" Evaluation; skip strings ( this helps with cases like nested IIf() )
+syn region cfHashRegion start=+#+ skip=+"[^"]*"\|'[^']*'+ end=+#+ contains=@cfExpressionCluster,cfScriptParenError
+
+" <cfset>, <cfif>, <cfelseif>, <cfreturn> are analogous to hashmarks (implicit evaluation) and has 'var'
+syn region cfSetRegion start="<cfset " start="<cfreturn " start="<cfelseif " start="<cfif " end='>' keepend contains=@cfExpressionCluster,cfSetLHSRegion,cfSetTagEnd,cfScriptType
+syn region cfSetLHSRegion contained start="<cfreturn" start="<cfelseif" start="<cfif" start="<cfset" end=" " keepend contains=cfTagName,htmlTag
+syn match cfSetTagEnd contained '>'
+
+" CF comments: similar to SGML comments
+syn region cfComment start='<!---' end='--->' keepend contains=cfCommentTodo
+syn keyword cfCommentTodo contained TODO FIXME XXX TBD WTF
+
+" CFscript
+syn match cfScriptLineComment contained "\/\/.*$" contains=cfCommentTodo
+syn region cfScriptComment contained start="/\*" end="\*/" contains=cfCommentTodo
+" in CF, quotes are escaped by doubling
+syn region cfScriptStringD contained start=+"+ skip=+\\\\\|""+ end=+"+ extend contains=@htmlPreproc,cfHashRegion
+syn region cfScriptStringS contained start=+'+ skip=+\\\\\|''+ end=+'+ extend contains=@htmlPreproc,cfHashRegion
+syn match cfScriptNumber contained "-\=\<\d\+L\=\>"
+syn keyword cfScriptConditional contained if else
+syn keyword cfScriptRepeat contained while for in
+syn keyword cfScriptBranch contained break switch case try catch continue
+syn keyword cfScriptFunction contained function
+syn keyword cfScriptType contained var
+syn match cfScriptBraces contained "[{}]"
+syn keyword cfScriptStatement contained return
+
+syn cluster cfScriptCluster contains=cfScriptParen,cfScriptLineComment,cfScriptComment,cfScriptStringD,cfScriptStringS,cfScriptFunction,cfScriptNumber,cfScriptRegexpString,cfScriptBoolean,cfScriptBraces,cfHashRegion,cfFunctionName,cfScope,@cfOperatorCluster,cfScriptConditional,cfScriptRepeat,cfScriptBranch,cfScriptType,@cfExpressionCluster,cfScriptStatement
+
+" Errors caused by wrong parenthesis; skip strings
+syn region cfScriptParen contained transparent skip=+"[^"]*"\|'[^']*'+ start=+(+ end=+)+ contains=@cfScriptCluster
+syn match cfScrParenError contained +)+
+
+syn region cfscriptBlock matchgroup=NONE start="<cfscript>" end="<\/cfscript>"me=s-1 keepend contains=@cfScriptCluster,cfscriptTag,cfScrParenError
+syn region cfscriptTag contained start='<cfscript' end='>' keepend contains=cfTagName,htmlTag
+
+" Define the default highlighting.
+if version >= 508 || !exists("did_cf_syn_inits")
+ if version < 508
+ let did_cf_syn_inits = 1
+ command -nargs=+ HiLink hi link <args>
+ else
+ command -nargs=+ HiLink hi def link <args>
+ endif
+
+ HiLink cfTagName Statement
+ HiLink cfArg Type
+ HiLink cfFunctionName Function
+ HiLink cfHashRegion PreProc
+ HiLink cfComment Comment
+ HiLink cfCommentTodo Todo
+ HiLink cfOperator Operator
+ HiLink cfOperatorMatch Operator
+ HiLink cfScope Title
+ HiLink cfBool Constant
+
+ HiLink cfscriptBlock Special
+ HiLink cfscriptTag htmlTag
+ HiLink cfSetRegion PreProc
+ HiLink cfSetLHSRegion htmlTag
+ HiLink cfSetTagEnd htmlTag
+
+ HiLink cfScriptLineComment Comment
+ HiLink cfScriptComment Comment
+ HiLink cfScriptStringS String
+ HiLink cfScriptStringD String
+ HiLink cfScriptNumber cfScriptValue
+ HiLink cfScriptConditional Conditional
+ HiLink cfScriptRepeat Repeat
+ HiLink cfScriptBranch Conditional
+ HiLink cfScriptType Type
+ HiLink cfScriptStatement Statement
+ HiLink cfScriptBraces Function
+ HiLink cfScriptFunction Function
+ HiLink cfScriptError Error
+ HiLink cfScrParenError cfScriptError
+
+ delcommand HiLink
+endif
+
+let b:current_syntax = "cf"
+
+" vim: ts=8 sw=2
diff --git a/runtime/syntax/css.vim b/runtime/syntax/css.vim
index c24b299..269a9f8 100644
--- a/runtime/syntax/css.vim
+++ b/runtime/syntax/css.vim
@@ -2,7 +2,7 @@
" Language: Cascading Style Sheets
" Maintainer: Claudio Fleiner <claudio@fleiner.com>
" URL: http://www.fleiner.com/vim/syntax/css.vim
-" Last Change: 2004 Mar 30
+" Last Change: 2005 Nov 23
" CSS2 by Nikolai Weibull
" Full CSS2, HTML4 support by Yeti
@@ -38,7 +38,12 @@
syn match cssSelectorOp2 "[~|]\?=" contained
syn region cssAttributeSelector matchgroup=cssSelectorOp start="\[" end="]" transparent contains=cssUnicodeEscape,cssSelectorOp2,cssStringQ,cssStringQQ
+try
syn match cssIdentifier "#[A-Za-zÀ-ÿ_@][A-Za-zÀ-ÿ0-9_@-]*"
+catch /^.*/
+syn match cssIdentifier "#[A-Za-z_@][A-Za-z0-9_@-]*"
+endtry
+
syn match cssMedia "@media\>" nextgroup=cssMediaType skipwhite skipnl
syn keyword cssMediaType contained screen print aural braile embosed handheld projection ty tv all nextgroup=cssMediaComma,cssMediaBlock skipwhite skipnl
@@ -270,5 +275,6 @@
unlet main_syntax
endif
+
" vim: ts=8
diff --git a/runtime/syntax/d.vim b/runtime/syntax/d.vim
index 1b4995e..2ab9b25 100644
--- a/runtime/syntax/d.vim
+++ b/runtime/syntax/d.vim
@@ -1,9 +1,12 @@
-" Vim syntax file for the D programming language (version 0.116).
+" Vim syntax file for the D programming language (version 0.137).
"
" Language: D
" Maintainer: Jason Mills<jmills@cs.mun.ca>
-" Last Change: 2005 Mar 09
-" Version: 0.12
+" Last Change: 2005 Oct 29
+" Version: 0.14
+"
+" Please email me with bugs, comments, and suggestion. Put vim in the subject
+" to ensure the email will not be marked has spam.
"
" Options:
" d_comment_strings - set to highlight strings and numbers in comments
@@ -21,6 +24,8 @@
"
" - Mark contents of the asm statement body as special
"
+" - Highlight the string prefix r and and postfixes c,w,d
+"
" Quit when a syntax file was already loaded
if exists("b:current_syntax")
@@ -30,7 +35,7 @@
" Keyword definitions
"
syn keyword dExternal import package module extern
-syn keyword dConditional if else switch
+syn keyword dConditional if else switch iftype
syn keyword dBranch goto break continue
syn keyword dRepeat while for do foreach
syn keyword dBoolean true false
@@ -41,7 +46,7 @@
syn keyword dOperator new delete typeof typeid cast align is
syn keyword dOperator this super
if exists("d_hl_operator_overload")
- syn keyword dOpOverload opNeg opCom opPostInc opPostDec opAdd opSub opSub_r
+ syn keyword dOpOverload opNeg opCom opPostInc opPostDec opCast opAdd opSub opSub_r
syn keyword dOpOverload opMul opDiv opDiv_r opMod opMod_r opAnd opOr opXor
syn keyword dOpOverload opShl opShl_r opShr opShr_r opUShr opUShr_r opCat
syn keyword dOpOverload opCat_r opEquals opEquals opCmp opCmp opCmp opCmp
@@ -49,7 +54,7 @@
syn keyword dOpOverload opModAssign opAndAssign opOrAssign opXorAssign
syn keyword dOpOverload opShlAssign opShrAssign opUShrAssign opCatAssign
syn keyword dOpOverload opIndex opIndexAssign opCall opSlice opPos
- syn keyword dOpOverload opAdd_r opMul_r opAnd_r opOr_r opXor_r
+ syn keyword dOpOverload opAdd_r opMul_r opAnd_r opOr_r opXor_r
endif
syn keyword dType ushort int uint long ulong float
syn keyword dType void byte ubyte double bit char wchar ucent cent
@@ -135,7 +140,7 @@
"
syn region dString start=+"+ end=+"+ contains=dEscSequence,@Spell
syn region dRawString start=+`+ skip=+\\`+ end=+`+ contains=@Spell
-syn region dRawString start=+r"+ skip=+\\"+ end=+"+ contains=@Spell
+"syn region dRawString start=+r"+ skip=+\\"+ end=+"+ contains=@Spell
syn region dHexString start=+x"+ skip=+\\"+ end=+"+
" Numbers
@@ -220,4 +225,4 @@
let b:current_syntax = "d"
-" vim: ts=8
+" vim: ts=8 noet
diff --git a/runtime/syntax/eruby.vim b/runtime/syntax/eruby.vim
index 59f042d..c3cc435 100644
--- a/runtime/syntax/eruby.vim
+++ b/runtime/syntax/eruby.vim
@@ -2,14 +2,9 @@
" Language: eRuby
" Maintainer: Doug Kearns <djkea2 at gus.gscit.monash.edu.au>
" Info: $Id$
-" URL: http://vim-ruby.sourceforge.net
+" URL: http://vim-ruby.rubyforge.org
" Anon CVS: See above site
-" Licence: GPL (http://www.gnu.org)
-" Disclaimer:
-" This program is distributed in the hope that it will be useful,
-" but WITHOUT ANY WARRANTY; without even the implied warranty of
-" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-" GNU General Public License for more details.
+" ----------------------------------------------------------------------------
" For version 5.x: Clear all syntax items
" For version 6.x: Quit when a syntax file was already loaded
diff --git a/runtime/syntax/java.vim b/runtime/syntax/java.vim
index 030e9ec..c6363d9 100644
--- a/runtime/syntax/java.vim
+++ b/runtime/syntax/java.vim
@@ -2,7 +2,7 @@
" Language: Java
" Maintainer: Claudio Fleiner <claudio@fleiner.com>
" URL: http://www.fleiner.com/vim/syntax/java.vim
-" Last Change: 2004 Nov 12
+" Last Change: 2005 Nov 04
" Please check :help java.vim for comments on some of the options available.
@@ -58,8 +58,11 @@
syn keyword javaClassDecl enum
syn match javaClassDecl "^class\>"
syn match javaClassDecl "[^.]\s*\<class\>"ms=s+1
+syn match javaAnnotation "@[_$a-zA-Z][_$a-zA-Z0-9_]*\>"
+syn match javaClassDecl "@interface\>"
syn keyword javaBranch break continue nextgroup=javaUserLabelRef skipwhite
syn match javaUserLabelRef "\k\+" contained
+syn match javaVarArg "\.\.\."
syn keyword javaScopeDecl public protected private abstract
if exists("java_highlight_java_lang_ids") || exists("java_highlight_java_lang") || exists("java_highlight_all")
@@ -130,7 +133,7 @@
endif
" The following cluster contains all java groups except the contained ones
-syn cluster javaTop add=javaExternal,javaError,javaError,javaBranch,javaLabelRegion,javaLabel,javaConditional,javaRepeat,javaBoolean,javaConstant,javaTypedef,javaOperator,javaType,javaType,javaStatement,javaStorageClass,javaAssert,javaExceptions,javaMethodDecl,javaClassDecl,javaClassDecl,javaClassDecl,javaScopeDecl,javaError,javaError2,javaUserLabel,javaLangObject
+syn cluster javaTop add=javaExternal,javaError,javaError,javaBranch,javaLabelRegion,javaLabel,javaConditional,javaRepeat,javaBoolean,javaConstant,javaTypedef,javaOperator,javaType,javaType,javaStatement,javaStorageClass,javaAssert,javaExceptions,javaMethodDecl,javaClassDecl,javaClassDecl,javaClassDecl,javaScopeDecl,javaError,javaError2,javaUserLabel,javaLangObject,javaAnnotation,javaVarArg
" Comments
@@ -283,6 +286,7 @@
let did_java_syn_inits = 1
endif
JavaHiLink javaFuncDef Function
+ JavaHiLink javaVarArg Function
JavaHiLink javaBraces Function
JavaHiLink javaBranch Conditional
JavaHiLink javaUserLabelRef javaUserLabel
@@ -314,6 +318,7 @@
JavaHiLink javaConstant Constant
JavaHiLink javaTypedef Typedef
JavaHiLink javaTodo Todo
+ JavaHiLink javaAnnotation PreProc
JavaHiLink javaCommentTitle SpecialComment
JavaHiLink javaDocTags Special
diff --git a/runtime/syntax/javascript.vim b/runtime/syntax/javascript.vim
index 10bf4db..9e959e1 100644
--- a/runtime/syntax/javascript.vim
+++ b/runtime/syntax/javascript.vim
@@ -1,8 +1,13 @@
" Vim syntax file
" Language: JavaScript
" Maintainer: Claudio Fleiner <claudio@fleiner.com>
+" Updaters: Scott Shattuck (ss) <ss@technicalpursuit.com>
" URL: http://www.fleiner.com/vim/syntax/javascript.vim
-" Last Change: 2005 Jul 13
+" Changes: (ss) added keywords, reserved words, and other identifiers
+" (ss) repaired several quoting and grouping glitches
+" (ss) fixed regex parsing issue with multiple qualifiers [gi]
+" (ss) additional factoring of keywords, globals, and members
+" Last Change: 2005 Nov 12 (ss)
" For version 5.x: Clear all syntax items
" For version 6.x: Quit when a syntax file was already loaded
@@ -27,23 +32,33 @@
syn keyword javaScriptCommentTodo TODO FIXME XXX TBD contained
-syn match javaScriptLineComment "\/\/.*$" contains=javaScriptCommentTodo
+syn match javaScriptLineComment "\/\/.*" contains=javaScriptCommentTodo
syn match javaScriptCommentSkip "^[ \t]*\*\($\|[ \t]\+\)"
syn region javaScriptComment start="/\*" end="\*/" contains=javaScriptCommentTodo
syn match javaScriptSpecial "\\\d\d\d\|\\."
-syn region javaScriptStringD start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=javaScriptSpecial,@htmlPreproc
-syn region javaScriptStringS start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=javaScriptSpecial,@htmlPreproc
+syn region javaScriptStringD start=+"+ skip=+\\\\\|\\"+ end=+"\|$+ contains=javaScriptSpecial,@htmlPreproc
+syn region javaScriptStringS start=+'+ skip=+\\\\\|\\'+ end=+'\|$+ contains=javaScriptSpecial,@htmlPreproc
+
syn match javaScriptSpecialCharacter "'\\.'"
syn match javaScriptNumber "-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>"
-syn region javaScriptRegexpString start=+/[^/*]+me=e-1 skip=+\\\\\|\\/+ end=+/[gi]\?\s*$+ end=+/[gi]\?\s*[;.,)]+me=e-1 contains=@htmlPreproc oneline
-syn keyword javaScriptConditional if else
-syn keyword javaScriptRepeat while for
-syn keyword javaScriptBranch break continue switch case default
-syn keyword javaScriptOperator new in
-syn keyword javaScriptType this var const
+syn region javaScriptRegexpString start=+/[^/*]+me=e-1 skip=+\\\\\|\\/+ end=+/[gi]\{0,2\}\s*$+ end=+/[gi]\{0,2\}\s*[;.,)]+me=e-1 contains=@htmlPreproc oneline
+
+syn keyword javaScriptConditional if else switch
+syn keyword javaScriptRepeat while for do in
+syn keyword javaScriptBranch break continue
+syn keyword javaScriptOperator new delete instanceof typeof
+syn keyword javaScriptType Array Boolean Date Function Number Object String RegExp
syn keyword javaScriptStatement return with
syn keyword javaScriptBoolean true false
-syn keyword javaScriptNull null
+syn keyword javaScriptNull null undefined
+syn keyword javaScriptIdentifier arguments this var
+syn keyword javaScriptLabel case default
+syn keyword javaScriptException try catch finally throw
+syn keyword javaScriptMessage alert confirm prompt status
+syn keyword javaScriptGlobal self window top parent
+syn keyword javaScriptMember document event location
+syn keyword javaScriptDeprecated escape unescape
+syn keyword javaScriptReserved abstract boolean byte char class const debugger double enum export extends final float goto implements import int interface long native package private protected public short static super synchronized throws transient volatile
if exists("javaScript_fold")
syn match javaScriptFunction "\<function\>"
@@ -56,17 +71,13 @@
setlocal foldtext=getline(v:foldstart)
else
syn keyword javaScriptFunction function
- syn match javaScriptBraces "[{}]"
+ syn match javaScriptBraces "[{}\[\]]"
+ syn match javaScriptParens "[()]"
endif
syn sync fromstart
syn sync maxlines=100
-" catch errors caused by wrong parenthesis
-syn region javaScriptParen transparent start="(" end=")" contains=javaScriptParen,javaScriptComment,javaScriptSpecial,javaScriptStringD,javaScriptStringS,javaScriptSpecialCharacter,javaScriptNumber,javaScriptRegexpString,javaScriptBoolean,javaScriptBraces,javaScriptFunction,javaScriptFunctionFold,javaScriptConditional,javaScriptRepeat,javaScriptBranch,javaScriptOperator,javaScriptType,javaScriptStatement,javaScriptBoolean,javaScriptConstant
-" syn region javaScriptParen transparent start="(" end=")" contains=javaScriptParen,javaScriptComment,javaScriptSpecial,javaScriptStringD,javaScriptStringS,javaScriptSpecialCharacter,javaScriptNumber,javaScriptRegexpString,javaScriptBoolean,javaScriptBraces
-syn match javaScrParenError ")"
-
if main_syntax == "javascript"
syn sync ccomment javaScriptComment
endif
@@ -103,6 +114,18 @@
HiLink javaScriptNull Keyword
HiLink javaScriptBoolean Boolean
HiLink javaScriptRegexpString String
+
+ HiLink javaScriptIdentifier Identifier
+ HiLink javaScriptLabel Label
+ HiLink javaScriptException Exception
+ HiLink javaScriptMessage Keyword
+ HiLink javaScriptGlobal Keyword
+ HiLink javaScriptMember Keyword
+ HiLink javaScriptDeprecated Exception
+ HiLink javaScriptReserved Keyword
+ HiLink javaScriptDebug Debug
+ HiLink javaScriptConstant Label
+
delcommand HiLink
endif
diff --git a/runtime/syntax/lisp.vim b/runtime/syntax/lisp.vim
index e47f0a1..61792d1 100644
--- a/runtime/syntax/lisp.vim
+++ b/runtime/syntax/lisp.vim
@@ -2,19 +2,13 @@
" Language: Lisp
" Maintainer: Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
" Last Change: Oct 12, 2005
-" Version: 16
+" Version: 17a
" URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
"
" Thanks to F Xavier Noria for a list of 978 Common Lisp symbols
" taken from the HyperSpec
-"
-" Options:
-" g:lisp_instring : if it exists, then "(...") strings are highlighted
-" as if the contents were lisp. Useful for AutoLisp.
-" Put
-" let g:lisp_instring=1
-" into your <.vimrc> if you want this option.
+" ---------------------------------------------------------------------
" Load Once: {{{1
" For vim-version 5.x: Clear all syntax items
" For vim-version 6.x: Quit when a syntax file was already loaded
@@ -30,6 +24,7 @@
set iskeyword=42,43,45,47-58,60-62,64-90,97-122,_
endif
+" ---------------------------------------------------------------------
" Clusters: {{{1
syn cluster lispAtomCluster contains=lispAtomBarSymbol,lispAtomList,lispAtomNmbr0,lispComment,lispDecl,lispFunc,lispLeadWhite
syn cluster lispBaseListCluster contains=lispAtom,lispAtomBarSymbol,lispAtomMark,lispBQList,lispBarSymbol,lispComment,lispConcat,lispDecl,lispFunc,lispKey,lispList,lispNumber,lispSpecial,lispSymbol,lispVar,lispLeadWhite
@@ -39,6 +34,7 @@
syn cluster lispListCluster contains=@lispBaseListCluster,lispString
endif
+" ---------------------------------------------------------------------
" Lists: {{{1
syn match lispSymbol contained ![^()'`,"; \t]\+!
syn match lispBarSymbol contained !|..\{-}|!
@@ -58,6 +54,7 @@
syn region lispBQList matchgroup=PreProc start="`(" skip="|.\{-}|" matchgroup=PreProc end=")" contains=@lispListCluster
endif
+" ---------------------------------------------------------------------
" Atoms: {{{1
syn match lispAtomMark "'"
syn match lispAtom "'("me=e-1 contains=lispAtomMark nextgroup=lispAtomList
@@ -68,6 +65,7 @@
syn match lispAtomNmbr contained "\<\d\+"
syn match lispLeadWhite contained "^\s\+"
+" ---------------------------------------------------------------------
" Standard Lisp Functions and Macros: {{{1
syn keyword lispFunc * find-method pprint-indent
syn keyword lispFunc ** find-package pprint-linear
@@ -386,6 +384,7 @@
syn match lispFunc "\<c[ad]\+r\>"
+" ---------------------------------------------------------------------
" Lisp Keywords (modifiers): {{{1
syn keyword lispKey :abort :from-end :overwrite
syn keyword lispKey :adjustable :gensym :predicate
@@ -414,6 +413,7 @@
syn keyword lispKey :escape :output-file :version
syn keyword lispKey :external
+" ---------------------------------------------------------------------
" Standard Lisp Variables: {{{1
syn keyword lispVar *applyhook* *load-pathname* *print-pprint-dispatch*
syn keyword lispVar *break-on-signals* *load-print* *print-pprint-dispatch*
@@ -434,6 +434,7 @@
syn keyword lispVar *features* *print-miser-width* *terminal-io*
syn keyword lispVar *gensym-counter* *print-miser-width* *trace-output*
+" ---------------------------------------------------------------------
" Strings: {{{1
syn region lispString start=+"+ skip=+\\\\\|\\"+ end=+"+
if exists("g:lisp_instring")
@@ -441,6 +442,7 @@
syn region lispInStringString start=+\\"+ skip=+\\\\+ end=+\\"+ contained
endif
+" ---------------------------------------------------------------------
" Shared with Xlisp, Declarations, Macros, Functions: {{{1
syn keyword lispDecl defmacro do-all-symbols labels
syn keyword lispDecl defsetf do-external-symbols let
@@ -448,6 +450,7 @@
syn keyword lispDecl defun dotimes macrolet
syn keyword lispDecl do* flet multiple-value-bind
+" ---------------------------------------------------------------------
" Numbers: supporting integers and floating point numbers {{{1
syn match lispNumber "-\=\(\.\d\+\|\d\+\(\.\d*\)\=\)\(e[-+]\=\d\+\)\="
@@ -463,6 +466,7 @@
syn match lispConcat "\s\.\s"
syn match lispParenError ")"
+" ---------------------------------------------------------------------
" Comments: {{{1
syn cluster lispCommentGroup contains=lispTodo,@Spell
syn match lispComment ";.*$" contains=@lispCommentGroup
@@ -471,19 +475,16 @@
syn keyword lispTodo contained combak combak: todo todo:
syn case match
+" ---------------------------------------------------------------------
" Synchronization: {{{1
syn sync lines=100
+" ---------------------------------------------------------------------
" Define Highlighting: {{{1
" For version 5.7 and earlier: only when not done already
" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_lisp_syntax_inits")
- if version < 508
- let did_lisp_syntax_inits = 1
- command -nargs=+ HiLink hi link <args>
- else
- command -nargs=+ HiLink hi def link <args>
- endif
+if version >= 508
+ command -nargs=+ HiLink hi def link <args>
HiLink lispCommentRegion lispComment
HiLink lispAtomNmbr lispNumber
@@ -508,27 +509,27 @@
if exists("g:lisp_rainbow") && g:lisp_rainbow != 0
if &bg == "dark"
- hi hlLevel0 ctermfg=red guifg=red1
- hi hlLevel1 ctermfg=yellow guifg=orange1
- hi hlLevel2 ctermfg=green guifg=yellow1
- hi hlLevel3 ctermfg=cyan guifg=greenyellow
- hi hlLevel4 ctermfg=magenta guifg=green1
- hi hlLevel5 ctermfg=red guifg=springgreen1
- hi hlLevel6 ctermfg=yellow guifg=cyan1
- hi hlLevel7 ctermfg=green guifg=slateblue1
- hi hlLevel8 ctermfg=cyan guifg=magenta1
- hi hlLevel9 ctermfg=magenta guifg=purple1
+ hi def hlLevel0 ctermfg=red guifg=red1
+ hi def hlLevel1 ctermfg=yellow guifg=orange1
+ hi def hlLevel2 ctermfg=green guifg=yellow1
+ hi def hlLevel3 ctermfg=cyan guifg=greenyellow
+ hi def hlLevel4 ctermfg=magenta guifg=green1
+ hi def hlLevel5 ctermfg=red guifg=springgreen1
+ hi def hlLevel6 ctermfg=yellow guifg=cyan1
+ hi def hlLevel7 ctermfg=green guifg=slateblue1
+ hi def hlLevel8 ctermfg=cyan guifg=magenta1
+ hi def hlLevel9 ctermfg=magenta guifg=purple1
else
- hi hlLevel0 ctermfg=red guifg=red3
- hi hlLevel1 ctermfg=darkyellow guifg=orangered3
- hi hlLevel2 ctermfg=darkgreen guifg=orange2
- hi hlLevel3 ctermfg=blue guifg=yellow3
- hi hlLevel4 ctermfg=darkmagenta guifg=olivedrab4
- hi hlLevel5 ctermfg=red guifg=green4
- hi hlLevel6 ctermfg=darkyellow guifg=paleturquoise3
- hi hlLevel7 ctermfg=darkgreen guifg=deepskyblue4
- hi hlLevel8 ctermfg=blue guifg=darkslateblue
- hi hlLevel9 ctermfg=darkmagenta guifg=darkviolet
+ hi def hlLevel0 ctermfg=red guifg=red3
+ hi def hlLevel1 ctermfg=darkyellow guifg=orangered3
+ hi def hlLevel2 ctermfg=darkgreen guifg=orange2
+ hi def hlLevel3 ctermfg=blue guifg=yellow3
+ hi def hlLevel4 ctermfg=darkmagenta guifg=olivedrab4
+ hi def hlLevel5 ctermfg=red guifg=green4
+ hi def hlLevel6 ctermfg=darkyellow guifg=paleturquoise3
+ hi def hlLevel7 ctermfg=darkgreen guifg=deepskyblue4
+ hi def hlLevel8 ctermfg=blue guifg=darkslateblue
+ hi def hlLevel9 ctermfg=darkmagenta guifg=darkviolet
endif
endif
@@ -537,4 +538,5 @@
let b:current_syntax = "lisp"
+" ---------------------------------------------------------------------
" vim: ts=8 nowrap fdm=marker
diff --git a/runtime/syntax/mush.vim b/runtime/syntax/mush.vim
index 5565927..d43740b 100644
--- a/runtime/syntax/mush.vim
+++ b/runtime/syntax/mush.vim
@@ -1,7 +1,8 @@
" MUSHcode syntax file
-" Maintainer: Bek Oberin <gossamer@tertius.net.au>
-" Last updated by Rimnal on Mon Aug 20 08:28:56 MDT 2001
-
+" Maintainer: Rick Bird <nveid@nveid.com>
+" Based on vim Syntax file by: Bek Oberin <gossamer@tertius.net.au>
+" Last Updated: Fri Nov 04 20:28:15 2005
+"
" For version 5.x: Clear all syntax items
" For version 6.x: Quit when a syntax file was already loaded
if version < 600
@@ -12,57 +13,115 @@
" regular mush functions
-syntax keyword mushFunction contained abs acos add after and andflags aposs
-syntax keyword mushFunction contained asin atan before capstr cat ceil center
-syntax keyword mushFunction contained comp con conn controls convsecs convtime
-syntax keyword mushFunction contained cos default delete dist2d dist3d div e
-syntax keyword mushFunction contained edefault edit elements elock eq escape
-syntax keyword mushFunction contained exit exp extract fdiv filter first flags
-syntax keyword mushFunction contained floor fold foreach findable fullname get
-syntax keyword mushFunction contained get_eval grab gt gte hasattr hasflag
-syntax keyword mushFunction contained home idle index insert isdbref isnum
-syntax keyword mushFunction contained isword iter last lattr lcon lcstr
-syntax keyword mushFunction contained ldelete left lexits ljust ln lnum loc
-syntax keyword mushFunction contained locate lock log lpos lt lte lwho map
-syntax keyword mushFunction contained match matchall max member merge mid min
-syntax keyword mushFunction contained mix mod money mudname mul munge name
-syntax keyword mushFunction contained nearby neq next not num obj objeval
-syntax keyword mushFunction contained objmem or orflags owner parent parse pi
-syntax keyword mushFunction contained ports pos poss power r rand remove repeat
-syntax keyword mushFunction contained replace rest reverse revwords right
-syntax keyword mushFunction contained rjust rloc room round s scramble search
-syntax keyword mushFunction contained secs secure setdiff setinter setq
-syntax keyword mushFunction contained setunion shuffle sign sin sort sortby
-syntax keyword mushFunction contained space splice sqrt squish starttime stats
-syntax keyword mushFunction contained strlen strmatch sub subj switch tan time
-syntax keyword mushFunction contained trim trunc type u ucstr udefault ulocal
-syntax keyword mushFunction contained v version visible where wordpos words
-syntax keyword mushFunction contained xcon xor
-" only highligh functions when they have an in-bracket immediately after
-syntax match mushFunctionBrackets "\i\I*(" contains=mushFunction
+syntax keyword mushFunction contained @@ abs accent accname acos add after align
+syntax keyword mushFunction contained allof alphamax alphamin and andflags
+syntax keyword mushFunction contained andlflags andlpowers andpowers ansi aposs art
+syntax keyword mushFunction contained asin atan atan2 atrlock attrcnt band baseconv
+syntax keyword mushFunction contained beep before blank2tilde bnand bnot bor bound
+syntax keyword mushFunction contained brackets break bxor cand cansee capstr case
+syntax keyword mushFunction contained caseall cat ceil center checkpass children
+syntax keyword mushFunction contained chr clone cmds cnetpost comp con config conn
+syntax keyword mushFunction contained controls convsecs convtime convutcsecs cor
+syntax keyword mushFunction contained cos create ctime ctu dec decrypt default
+syntax keyword mushFunction contained delete die dig digest dist2d dist3d div
+syntax keyword mushFunction contained division divscope doing downdiv dynhelp e
+syntax keyword mushFunction contained edefault edit element elements elist elock
+syntax keyword mushFunction contained emit empire empower encrypt endtag entrances
+syntax keyword mushFunction contained eq escape etimefmt eval exit exp extract fdiv
+syntax keyword mushFunction contained filter filterbool findable first firstof
+syntax keyword mushFunction contained flags flip floor floordiv fmod fold
+syntax keyword mushFunction contained folderstats followers following foreach
+syntax keyword mushFunction contained fraction fullname functions get get_eval grab
+syntax keyword mushFunction contained graball grep grepi gt gte hasattr hasattrp
+syntax keyword mushFunction contained hasattrpval hasattrval hasdivpower hasflag
+syntax keyword mushFunction contained haspower haspowergroup hastype height hidden
+syntax keyword mushFunction contained home host hostname html idle idlesecs
+syntax keyword mushFunction contained idle_average idle_times idle_total if ifelse
+syntax keyword mushFunction contained ilev iname inc index indiv indivall insert
+syntax keyword mushFunction contained inum ipaddr isdaylight isdbref isint isnum
+syntax keyword mushFunction contained isword itemize items iter itext last lattr
+syntax keyword mushFunction contained lcon lcstr ldelete ldivisions left lemit
+syntax keyword mushFunction contained level lexits lflags link list lit ljust lmath
+syntax keyword mushFunction contained ln lnum loc localize locate lock loctree log
+syntax keyword mushFunction contained lparent lplayers lports lpos lsearch lsearchr
+syntax keyword mushFunction contained lstats lt lte lthings lvcon lvexits lvplayers
+syntax keyword mushFunction contained lvthings lwho mail maildstats mailfrom
+syntax keyword mushFunction contained mailfstats mailstats mailstatus mailsubject
+syntax keyword mushFunction contained mailtime map match matchall max mean median
+syntax keyword mushFunction contained member merge mid min mix mod modulo modulus
+syntax keyword mushFunction contained money mtime mudname mul munge mwho name nand
+syntax keyword mushFunction contained nattr ncon nearby neq nexits next nor not
+syntax keyword mushFunction contained nplayers nsemit nslemit nsoemit nspemit
+syntax keyword mushFunction contained nsremit nszemit nthings null num nvcon
+syntax keyword mushFunction contained nvexits nvplayers nvthings obj objeval objid
+syntax keyword mushFunction contained objmem oemit ooref open or ord orflags
+syntax keyword mushFunction contained orlflags orlpowers orpowers owner parent
+syntax keyword mushFunction contained parse pcreate pemit pi pickrand playermem
+syntax keyword mushFunction contained pmatch poll ports pos poss power powergroups
+syntax keyword mushFunction contained powers powover program prompt pueblo quitprog
+syntax keyword mushFunction contained quota r rand randword recv regedit regeditall
+syntax keyword mushFunction contained regeditalli regediti regmatch regmatchi
+syntax keyword mushFunction contained regrab regraball regraballi regrabi regrep
+syntax keyword mushFunction contained regrepi remainder remit remove repeat replace
+syntax keyword mushFunction contained rest restarts restarttime reswitch
+syntax keyword mushFunction contained reswitchall reswitchalli reswitchi reverse
+syntax keyword mushFunction contained revwords right rjust rloc rnum room root
+syntax keyword mushFunction contained round s scan scramble search secs secure sent
+syntax keyword mushFunction contained set setdiff setinter setq setr setunion sha0
+syntax keyword mushFunction contained shl shr shuffle sign signal sin sort sortby
+syntax keyword mushFunction contained soundex soundlike soundslike space spellnum
+syntax keyword mushFunction contained splice sql sqlescape sqrt squish ssl
+syntax keyword mushFunction contained starttime stats stddev step strcat strinsert
+syntax keyword mushFunction contained stripaccents stripansi strlen strmatch
+syntax keyword mushFunction contained strreplace sub subj switch switchall t table
+syntax keyword mushFunction contained tag tagwrap tan tel terminfo textfile
+syntax keyword mushFunction contained tilde2blank time timefmt timestring tr
+syntax keyword mushFunction contained trigger trim trimpenn trimtiny trunc type u
+syntax keyword mushFunction contained ucstr udefault ufun uldefault ulocal updiv
+syntax keyword mushFunction contained utctime v vadd val valid vcross vdim vdot
+syntax keyword mushFunction contained version visible vmag vmax vmin vmul vsub
+syntax keyword mushFunction contained vtattr vtcount vtcreate vtdestroy vtlcon
+syntax keyword mushFunction contained vtloc vtlocate vtmaster vtname vtref vttel
+syntax keyword mushFunction contained vunit wait where width wipe wordpos words
+syntax keyword mushFunction contained wrap xcon xexits xget xor xplayers xthings
+syntax keyword mushFunction contained xvcon xvexits xvplayers xvthings zemit zfun
+syntax keyword mushFunction contained zmwho zone zwho
+
+" only highligh functions when they have an in-bracket immediately after
+syntax match mushFunctionBrackets "\i*(" contains=mushFunction
+"
" regular mush commands
-syntax keyword mushAtCommandList contained @alias @chown @clone @create
-syntax keyword mushAtCommandList contained @decompile @destroy @doing @dolist
-syntax keyword mushAtCommandList contained @drain @edit @emit @entrances @femit
-syntax keyword mushAtCommandList contained @force @fpose @fsay @halt @last
-syntax keyword mushAtCommandList contained @link @list @listmotd @lock @mudwho
-syntax keyword mushAtCommandList contained @mvattr @name @notify @oemit @parent
-syntax keyword mushAtCommandList contained @password @pemit @ps @quota @robot
-syntax keyword mushAtCommandList contained @search @set @stats @sweep @switch
-syntax keyword mushAtCommandList contained @teleport @trigger @unlink @unlock
-syntax keyword mushAtCommandList contained @verb @wait @wipe
+syntax keyword mushAtCommandList contained @ALLHALT @ALLQUOTA @ASSERT @ATRCHOWN @ATRLOCK @ATTRIBUTE @BOOT
+syntax keyword mushAtCommandList contained @BREAK @CEMIT @CHANNEL @CHAT @CHOWN @CHOWNALL @CHZONE @CHZONEALL
+syntax keyword mushAtCommandList contained @CLOCK @CLONE @COBJ @COMMAND @CONFIG @CPATTR @CREATE @CRPLOG @DBCK
+syntax keyword mushAtCommandList contained @DECOMPILE @DESTROY @DIG @DISABLE @DIVISION @DOING @DOLIST @DRAIN
+syntax keyword mushAtCommandList contained @DUMP @EDIT @ELOCK @EMIT @EMPOWER @ENABLE @ENTRANCES @EUNLOCK @FIND
+syntax keyword mushAtCommandList contained @FIRSTEXIT @FLAG @FORCE @FUNCTION @EDIT @GREP @HALT @HIDE @HOOK @KICK
+syntax keyword mushAtCommandList contained @LEMIT @LEVEL @LINK @LIST @LISTMOTD @LOCK @LOG @LOGWIPE @LSET @MAIL @MALIAS
+syntax keyword mushAtCommandList contained @MAP @MOTD @MVATTR @NAME @NEWPASSWORD @NOTIFY @NSCEMIT @NSEMIT @NSLEMIT
+syntax keyword mushAtCommandList contained @NSOEMIT @NSPEMIT @NSPEMIT @NSREMIT @NSZEMIT @NUKE @OEMIT @OPEN @PARENT @PASSWORD
+syntax keyword mushAtCommandList contained @PCREATE @PEMIT @POLL @POOR @POWERLEVEL @PROGRAM @PROMPT @PS @PURGE @QUOTA
+syntax keyword mushAtCommandList contained @READCACHE @RECYCLE @REJECTMOTD @REMIT @RESTART @SCAN @SEARCH @SELECT @SET
+syntax keyword mushAtCommandList contained @SHUTDOWN @SITELOCK @SNOOP @SQL @SQUOTA @STATS @SWITCH @SWEEP @SWITCH @TELEPORT
+syntax keyword mushAtCommandList contained @TRIGGER @ULOCK @UNDESTROY @UNLINK @UNLOCK @UNRECYCLE @UPTIME @UUNLOCK @VERB
+syntax keyword mushAtCommandList contained @VERSION @WAIT @WALL @WARNINGS @WCHECK @WHEREIS @WIPE @ZCLONE @ZEMIT
syntax match mushCommand "@\i\I*" contains=mushAtCommandList
-syntax keyword mushCommand drop enter examine get give goto help inventory
-syntax keyword mushCommand kill leave look news page pose say score use
-syntax keyword mushCommand version whisper DOING LOGOUT OUTPUTPREFIX
-syntax keyword mushCommand OUTPUTSUFFIX QUIT SESSION WHO
+syntax keyword mushCommand AHELP ANEWS ATTRIB_SET BRIEF BRIEF BUY CHANGES DESERT
+syntax keyword mushCommand DISMISS DROP EMPTY ENTER EXAMINE FOLLOW GET GIVE GOTO
+syntax keyword mushCommand HELP HUH_COMMAND INVENTORY INVENTORY LOOK LEAVE LOOK
+syntax keyword mushCommand GOTO NEWS PAGE PAGE POSE RULES SAY SCORE SEMIPOSE
+syntax keyword mushCommand SPECIALNEWS TAKE TEACH THINK UNFOLLOW USE WHISPER WHISPER
+syntax keyword mushCommand WARN_ON_MISSING WHISPER WITH
syntax match mushSpecial "\*\|!\|=\|-\|\\\|+"
syntax match mushSpecial2 contained "\*"
+syn region mushString start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=mushSpecial,mushSpecial2,@Spell
+
+
syntax match mushIdentifier "&[^ ]\+"
syntax match mushVariable "%r\|%t\|%cr\|%[A-Za-z0-9]\+\|%#\|##\|here"
@@ -73,9 +132,32 @@
" A comment line starts with a or # or " at the start of the line
" or an @@
syntax keyword mushTodo contained TODO FIXME XXX
-syntax match mushComment +^\s*@@.*$+ contains=mushTodo
-syntax match mushComment +^".*$+ contains=mushTodo
-syntax match mushComment +^#.*$+ contains=mushTodo
+syntax cluster mushCommentGroup contains=mushTodo
+syntax match mushComment "^\s*@@.*$" contains=mushTodo
+syntax match mushComment "^#[^define|^ifdef|^else|^pragma|^ifndef|^echo|^elif|^undef|^warning].*$" contains=mushTodo
+syntax match mushComment "^#$" contains=mushTodo
+syntax region mushComment matchgroup=mushCommentStart start="/@@" end="@@/" contains=@mushCommentGroup,mushCommentStartError,mushCommentString,@Spell
+syntax region mushCommentString contained start=+L\=\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end=+@@/+me=s-1 contains=mushCommentSkip
+syntax match mushCommentSkip contained "^\s*@@\($\|\s\+\)"
+
+
+syntax match mushCommentStartError display "/@@"me=e-1 contained
+
+" syntax match mushComment +^".*$+ contains=mushTodo
+" Work on this one
+" syntax match mushComment +^#.*$+ contains=mushTodo
+
+syn region mushPreCondit start="^\s*\(%:\|#\)\s*\(if\|ifdef\|ifndef\|elif\)\>" skip="\\$" end="$" end="//"me=s-1 contains=mushComment
+syn match mushPreCondit display "^\s*\(%:\|#\)\s*\(else\|endif\)\>"
+
+syn cluster mushPreProcGroup contains=mushPreCondit,mushIncluded,mushInclude,mushDefine,mushSpecial,mushString,mushCommentSkip,mushCommentString,@mushCommentGroup,mushCommentStartError
+
+syn region mushIncluded display contained start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn match mushIncluded display contained "<[^>]*>"
+syn match mushInclude display "^\s*\(%:\|#\)\s*include\>\s*["<]" contains=mushIncluded
+syn region mushDefine start="^\s*\(%:\|#\)\s*\(define\|undef\)\>" skip="\\$" end="$" end="//"me=s-1 contains=ALLBUT,@mushPreProcGroup,@Spell
+syn region mushPreProc start="^\s*\(%:\|#\)\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" end="$" keepend contains=ALLBUT,@mushPreProcGroup
+
syntax region mushFuncBoundaries start="\[" end="\]" contains=mushFunction,mushFlag,mushAttributes,mushNumber,mushCommand,mushVariable,mushSpecial2
@@ -114,7 +196,6 @@
" The default methods for highlighting. Can be overridden later
HiLink mushAttribute Constant
HiLink mushCommand Function
- HiLink mushComment Comment
HiLink mushNumber Number
HiLink mushSetting PreProc
HiLink mushFunction Statement
@@ -123,6 +204,20 @@
HiLink mushTodo Todo
HiLink mushFlag Special
HiLink mushIdentifier Identifier
+ HiLink mushDefine Macro
+ HiLink mushPreProc PreProc
+ HiLink mushPreProcGroup PreProc
+ HiLink mushPreCondit PreCondit
+ HiLink mushIncluded cString
+ HiLink mushInclude Include
+
+
+
+" Comments
+ HiLink mushCommentStart mushComment
+ HiLink mushComment Comment
+ HiLink mushCommentString mushString
+
delcommand HiLink
endif
diff --git a/runtime/syntax/perl.vim b/runtime/syntax/perl.vim
index 8cd40b4..ff566e1 100644
--- a/runtime/syntax/perl.vim
+++ b/runtime/syntax/perl.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: Perl
" Maintainer: Nick Hibma <n_hibma@van-laarhoven.org>
-" Last Change: 2005 Oct 06
+" Last Change: 2005 October 18
" Location: http://www.van-laarhoven.org/vim/syntax/perl.vim
"
" Please download most recent version first before mailing
@@ -47,18 +47,18 @@
syn include @Pod syntax/pod.vim
unlet b:current_syntax
if exists("perl_fold")
- syn region perlPOD start="^=[a-z]" end="^=cut" contains=@Pod,perlTodo keepend fold
+ syn region perlPOD start="^=[a-z]" end="^=cut" contains=@Pod,@Spell,perlTodo keepend fold
syn region perlPOD start="^=cut" end="^=cut" contains=perlTodo keepend fold
else
- syn region perlPOD start="^=[a-z]" end="^=cut" contains=@Pod,perlTodo keepend
+ syn region perlPOD start="^=[a-z]" end="^=cut" contains=@Pod,@Spell,perlTodo keepend
syn region perlPOD start="^=cut" end="^=cut" contains=perlTodo keepend
endif
else
" Use only the bare minimum of rules
if exists("perl_fold")
- syn region perlPOD start="^=[a-z]" end="^=cut" fold
+ syn region perlPOD start="^=[a-z]" end="^=cut" contains=@Spell fold
else
- syn region perlPOD start="^=[a-z]" end="^=cut"
+ syn region perlPOD start="^=[a-z]" end="^=cut" contains=@Spell
endif
endif
@@ -87,8 +87,8 @@
endif
syn keyword perlOperator defined undef and or not bless ref
if exists("perl_fold")
- " if BEGIN/END would be a keyword the perlBEGINENDFold does not work
- syn match perlControl "\<BEGIN\|CHECK\|INIT\|END\>" contained
+ " if BEGIN/END is a keyword the perlBEGINENDFold does not work
+ syn match perlControl "\<BEGIN\|END\|CHECK\|INIT\>" contained
else
syn keyword perlControl BEGIN END CHECK INIT
endif
@@ -108,8 +108,8 @@
syn match perlStatementFiles "-[rwxoRWXOezsfdlpSbctugkTBMAC]\>"
syn keyword perlStatementFlow caller die dump eval exit wantarray
syn keyword perlStatementInclude require
-syn match perlStatementInclude "\(use\|no\)\s\+\(integer\>\|strict\>\|lib\>\|sigtrap\>\|subs\>\|vars\>\|warnings\>\|utf8\>\|byte\>\)\="
-syn keyword perlStatementScope import
+syn match perlStatementInclude "\<\(use\|no\)\s\+\(\(attributes\|autouse\|base\|big\(int\|num\|rat\)\|blib\|bytes\|charnames\|constant\|diagnostics\|encoding\|fields\|filetest\|if\|integer\|less\|lib\|locale\|open\|ops\|overload\|re\|sigtrap\|sort\|strict\|subs\|threads\(::shared\)\=\|utf8\|vars\|vmsish\|warnings\(::register\)\=\)\>\)\="
+
syn keyword perlStatementProc alarm exec fork getpgrp getppid getpriority kill pipe setpgrp setpriority sleep system times wait waitpid
syn keyword perlStatementSocket accept bind connect getpeername getsockname getsockopt listen recv send setsockopt shutdown socket socketpair
syn keyword perlStatementIPC msgctl msgget msgrcv msgsnd semctl semget semop shmctl shmget shmread shmwrite
@@ -118,8 +118,11 @@
syn keyword perlStatementTime gmtime localtime time times
syn keyword perlStatementMisc warn formline reset scalar delete prototype lock
-syn keyword perlStatementNew new
-
+if !exists("perl_no_semi_keywords")
+ syn keyword perlStatementScope import
+ syn keyword perlStatementNew new
+ syn keyword perlStatementCarp carp confess croak
+endif
syn keyword perlTodo TODO TBD FIXME XXX contained
" Perl Identifiers.
@@ -134,14 +137,16 @@
" Special variables first ($^A, ...) and ($|, $', ...)
syn match perlVarPlain "$^[ADEFHILMOPSTWX]\="
-syn match perlVarPlain "$[\\\"\[\]'&`+*.,;=%~!?@$<>(-]"
-syn match perlVarPlain "$\(0\|[1-9][0-9]*\)"
+syn match perlVarPlain "$[\\\"\[\]'&`+*.,;=%~?@$<>(-]"
+syn match perlVarPlain "$\(0\|[1-9]\d*\)"
" Same as above, but avoids confusion in $::foo (equivalent to $main::foo)
syn match perlVarPlain "$:[^:]"
" These variables are not recognized within matches.
syn match perlVarNotInMatches "$[|)]"
-" This variable is not recognized within matches delimited by m//.
+" This variable is not recognized within matches delimited by '/'.
syn match perlVarSlash "$/"
+" This variable is not recognized within matches delimited by '!'.
+syn match perlVarBang "$!"
" And plain identifiers
syn match perlPackageRef "\(\h\w*\)\=\(::\|'\)\I"me=e-1 contained
@@ -159,7 +164,7 @@
endif
if !exists("perl_no_extended_vars")
- syn cluster perlExpr contains=perlStatementScalar,perlStatementRegexp,perlStatementNumeric,perlStatementList,perlStatementHash,perlStatementFiles,perlStatementTime,perlStatementMisc,perlVarPlain,perlVarNotInMatches,perlVarSlash,perlVarBlock,perlShellCommand,perlFloat,perlNumber,perlStringUnexpanded,perlString,perlQQ
+ syn cluster perlExpr contains=perlStatementScalar,perlStatementRegexp,perlStatementNumeric,perlStatementList,perlStatementHash,perlStatementFiles,perlStatementTime,perlStatementMisc,perlVarPlain,perlVarNotInMatches,perlVarSlash,perlVarBang,perlVarBlock,perlShellCommand,perlFloat,perlNumber,perlStringUnexpanded,perlString,perlQQ
syn region perlVarBlock matchgroup=perlVarPlain start="\($#\|[@%$]\)\$*{" skip="\\}" end="}" contains=@perlExpr nextgroup=perlVarMember,perlVarSimpleMember
syn region perlVarBlock matchgroup=perlVarPlain start="&\$*{" skip="\\}" end="}" contains=@perlExpr
syn match perlVarPlain "\\\=\(\$#\|[@%&$]\)\$*{\I\i*}" nextgroup=perlVarMember,perlVarSimpleMember
@@ -174,17 +179,18 @@
syn match perlFiledescRead "[<]\h\w\+[>]"
syn match perlFiledescStatementComma "(\=\s*\u\w*\s*,"me=e-1 transparent contained contains=perlFiledescStatement
-syn match perlFiledescStatementNocomma "(\=\s*\u\w*\s*[^, \t]"me=e-1 transparent contained contains=perlFiledescStatement
+syn match perlFiledescStatementNocomma "(\=\s*\u\w*\s*[^,[:space:]]"me=e-1 transparent contained contains=perlFiledescStatement
syn match perlFiledescStatement "\u\w*" contained
" Special characters in strings and matches
syn match perlSpecialString "\\\(\d\+\|[xX]\x\+\|c\u\|.\)" contained
syn match perlSpecialStringU "\\['\\]" contained
-syn match perlSpecialMatch "{\d\+\(,\(\d\+\)\=\)\=}" contained
+syn match perlSpecialMatch "{\d\+\(,\d*\)\=}" contained
syn match perlSpecialMatch "\[\(\]\|-\)\=[^\[\]]*\(\[\|\-\)\=\]" contained
syn match perlSpecialMatch "[+*()?.]" contained
syn match perlSpecialMatch "(?[#:=!]" contained
+syn match perlSpecialMatch "(?<[=!]" contained
syn match perlSpecialMatch "(?[imsx]\+)" contained
" FIXME the line below does not work. It should mark end of line and
" begin of line as perlSpecial.
@@ -201,13 +207,13 @@
" Variable interpolation
"
" These items are interpolated inside "" strings and similar constructs.
-syn cluster perlInterpDQ contains=perlSpecialString,perlVarPlain,perlVarNotInMatches,perlVarSlash,perlVarBlock
+syn cluster perlInterpDQ contains=perlSpecialString,perlVarPlain,perlVarNotInMatches,perlVarSlash,perlVarBang,perlVarBlock
" These items are interpolated inside '' strings and similar constructs.
syn cluster perlInterpSQ contains=perlSpecialStringU
" These items are interpolated inside m// matches and s/// substitutions.
syn cluster perlInterpSlash contains=perlSpecialString,perlSpecialMatch,perlVarPlain,perlVarBlock,perlSpecialBEOM
" These items are interpolated inside m## matches and s### substitutions.
-syn cluster perlInterpMatch contains=@perlInterpSlash,perlVarSlash
+syn cluster perlInterpMatch contains=@perlInterpSlash,perlVarSlash,perlVarBang
" Shell commands
syn region perlShellCommand matchgroup=perlMatchStartEnd start="`" end="`" contains=@perlInterpDQ
@@ -233,8 +239,7 @@
" Below some hacks to recognise the // variant. This is virtually impossible to catch in all
" cases as the / is used in so many other ways, but these should be the most obvious ones.
-"syn region perlMatch matchgroup=perlMatchStartEnd start=+^split /+lc=5 start=+[^$@%]\<split /+lc=6 start=+^if /+lc=2 start=+[^$@%]if /+lc=3 start=+[!=]\~\s*/+lc=2 start=+[(~]/+lc=1 start=+\.\./+lc=2 start=+\s/[^= \t0-9$@%]+lc=1,me=e-1,rs=e-1 start=+^/+ skip=+\\/+ end=+/[cgimosx]*+ contains=@perlInterpSlash
-syn region perlMatch matchgroup=perlMatchStartEnd start=+^split /+lc=5 start=+[^$@%]\<split /+lc=6 start=+^while /+lc=5 start=+[^$@%]while /+lc=6 start=+^if /+lc=2 start=+[^$@%]if /+lc=3 start=+[!=]\~\s*/+lc=2 start=+[(~]/+lc=1 start=+\.\./+lc=2 start=+\s/[^= \t0-9$@%]+lc=1,me=e-1,rs=e-1 start=+^/+ skip=+\\/+ end=+/[cgimosx]*+ contains=@perlInterpSlash
+syn region perlMatch matchgroup=perlMatchStartEnd start=+^split /+lc=5 start=+[^$@%&]\<split /+lc=6 start=+^while /+lc=5 start=+[^$@%&]while /+lc=6 start=+^if /+lc=2 start=+[^$@%&]if /+lc=3 start=+[!=]\~\s*/+lc=2 start=+[(~]/+lc=1 start=+\.\./+lc=2 start=+\s/[^=[:space:][:digit:]$@%&]+lc=1,me=e-1,rs=e-1 start=+^/+ skip=+\\/+ end=+/[cgimosx]*+ contains=@perlInterpSlash
" Substitutions
@@ -253,7 +258,7 @@
syn region perlSubstitutionBracket matchgroup=perlMatchStartEnd start=+\[+ end=+\][ecgimosx]*+ contained contains=@perlInterpDQ
syn region perlSubstitutionCurly matchgroup=perlMatchStartEnd start=+{+ end=+}[ecgimosx]*+ contained contains=@perlInterpDQ
-" A special case for m!!x which allows for comments and extra whitespace in the pattern
+" A special case for s!!!x which allows for comments and extra whitespace in the pattern
syn region perlMatch matchgroup=perlMatchStartEnd start=+\<s!+ end=+!+me=e-1 contains=@perlInterpSlash,perlComment nextgroup=perlSubstitutionPling
syn region perlSubstitutionPling matchgroup=perlMatchStartEnd start=+!+ end=+![ecgimosx]*+ contained contains=@perlInterpDQ
@@ -280,24 +285,24 @@
" Strings and q, qq, qw and qr expressions
-" Brackets in qq()
-syn region perlBrackets start=+(+ end=+)+ contained transparent contains=perlBrackets,@perlStringSQ
+" Parentheses in qq()
+syn region perlParens start=+(+ end=+)+ contained transparent contains=perlParens,@perlStringSQ
-syn region perlStringUnexpanded matchgroup=perlStringStartEnd start="'" end="'" contains=@perlInterpSQ
-syn region perlString matchgroup=perlStringStartEnd start=+"+ end=+"+ contains=@perlInterpDQ
+syn region perlStringUnexpanded matchgroup=perlStringStartEnd start="'" end="'" contains=@Spell,@perlInterpSQ
+syn region perlString matchgroup=perlStringStartEnd start=+"+ end=+"+ contains=@Spell,@perlInterpDQ
syn region perlQQ matchgroup=perlStringStartEnd start=+\<q#+ end=+#+ contains=@perlInterpSQ
syn region perlQQ matchgroup=perlStringStartEnd start=+\<q|+ end=+|+ contains=@perlInterpSQ
-syn region perlQQ matchgroup=perlStringStartEnd start=+\<q(+ end=+)+ contains=@perlInterpSQ,perlBrackets
+syn region perlQQ matchgroup=perlStringStartEnd start=+\<q(+ end=+)+ contains=@perlInterpSQ,perlParens
syn region perlQQ matchgroup=perlStringStartEnd start=+\<q{+ end=+}+ contains=@perlInterpSQ
syn region perlQQ matchgroup=perlStringStartEnd start=+\<q/+ end=+/+ contains=@perlInterpSQ
syn region perlQQ matchgroup=perlStringStartEnd start=+\<q[qx]#+ end=+#+ contains=@perlInterpDQ
syn region perlQQ matchgroup=perlStringStartEnd start=+\<q[qx]|+ end=+|+ contains=@perlInterpDQ
-syn region perlQQ matchgroup=perlStringStartEnd start=+\<q[qx](+ end=+)+ contains=@perlInterpDQ,perlBrackets
+syn region perlQQ matchgroup=perlStringStartEnd start=+\<q[qx](+ end=+)+ contains=@perlInterpDQ,perlParens
syn region perlQQ matchgroup=perlStringStartEnd start=+\<q[qx]{+ end=+}+ contains=@perlInterpDQ
syn region perlQQ matchgroup=perlStringStartEnd start=+\<q[qx]/+ end=+/+ contains=@perlInterpDQ
syn region perlQQ matchgroup=perlStringStartEnd start=+\<qw#+ end=+#+ contains=@perlInterpSQ
syn region perlQQ matchgroup=perlStringStartEnd start=+\<qw|+ end=+|+ contains=@perlInterpSQ
-syn region perlQQ matchgroup=perlStringStartEnd start=+\<qw(+ end=+)+ contains=@perlInterpSQ,perlBrackets
+syn region perlQQ matchgroup=perlStringStartEnd start=+\<qw(+ end=+)+ contains=@perlInterpSQ,perlParens
syn region perlQQ matchgroup=perlStringStartEnd start=+\<qw{+ end=+}+ contains=@perlInterpSQ
syn region perlQQ matchgroup=perlStringStartEnd start=+\<qw/+ end=+/+ contains=@perlInterpSQ
syn region perlQQ matchgroup=perlStringStartEnd start=+\<qr#+ end=+#[imosx]*+ contains=@perlInterpMatch
@@ -362,7 +367,7 @@
" All other # are comments, except ^#!
-syn match perlComment "#.*" contains=perlTodo
+syn match perlComment "#.*" contains=@Spell,perlTodo
syn match perlSharpBang "^#!.*"
" Formats
@@ -391,8 +396,8 @@
syn region perlBEGINENDFold start="^\z(\s*\)\<\(BEGIN\|END\|CHECK\|INIT\)\>.*[^};]$" end="^\z1}\s*$" transparent fold keepend
if exists("perl_fold_blocks")
- syn region perlIfFold start="^\z(\s*\)\(if\|unless\|for\|while\|until\)\s*(.*)\s*{\s*$" start="^\z(\s*\)foreach\s*\(\(my\|our\)\=\s*\S\+\s*\)\=(.*)\s*{\s*$" end="^\z1}\s*;\=$" transparent fold keepend
- syn region perlIfFold start="^\z(\s*\)do\s*{\s*$" end="^\z1}\s*while" end="^\z1}\s*;\=$" transparent fold keepend
+ syn region perlIfFold start="^\z(\s*\)\(if\|unless\|for\|while\|until\)\s*(.*)\(\s*{\)\=\s*$" start="^\z(\s*\)foreach\s*\(\(my\|our\)\=\s*\S\+\s*\)\=(.*)\(\s*{\)\=\s*$" start="\z(\s*\)else\s*{\s*$" end="^\z1}\s*;\=$" transparent fold keepend
+ syn region perlIfFold start="^\z(\s*\)do\(\s*{\)\=\s*$" end="^\z1}\s*while" end="^\z1}\s*;\=$" transparent fold keepend
endif
setlocal foldmethod=syntax
@@ -445,6 +450,7 @@
HiLink perlVarSimpleMemberName perlString
HiLink perlVarNotInMatches perlIdentifier
HiLink perlVarSlash perlIdentifier
+ HiLink perlVarBang perlIdentifier
HiLink perlQQ perlString
if version >= 600
HiLink perlHereDoc perlString
@@ -454,7 +460,7 @@
HiLink perlUntilEOFSQ perlString
HiLink perlUntilEmptyDQ perlString
HiLink perlUntilEmptySQ perlString
- HiLink perlUntilEOF perlString
+ HiLink perlUntilEOF perlString
endif
HiLink perlStringUnexpanded perlString
HiLink perlSubstitutionSQ perlString
@@ -490,7 +496,7 @@
HiLink perlStatementFiles perlStatement
HiLink perlStatementFlow perlStatement
HiLink perlStatementScope perlStatement
- HiLink perlStatementInclude perlStatement
+ HiLink perlStatementInclude perlInclude
HiLink perlStatementProc perlStatement
HiLink perlStatementSocket perlStatement
HiLink perlStatementIPC perlStatement
@@ -511,9 +517,9 @@
HiLink perlSpecialMatch perlSpecial
HiLink perlSpecialBEOM perlSpecial
HiLink perlDATA perlComment
-
- HiLink perlBrackets Error
-
+
+ HiLink perlParens Error
+
" Possible errors
HiLink perlNotEmptyLine Error
HiLink perlElseIfError Error
diff --git a/runtime/syntax/ruby.vim b/runtime/syntax/ruby.vim
index 23079e9..bdd6e2e 100644
--- a/runtime/syntax/ruby.vim
+++ b/runtime/syntax/ruby.vim
@@ -2,14 +2,8 @@
" Language: Ruby
" Maintainer: Doug Kearns <djkea2 at gus.gscit.monash.edu.au>
" Info: $Id$
-" URL: http://vim-ruby.sourceforge.net
+" URL: http://vim-ruby.rubyforge.org
" Anon CVS: See above site
-" Licence: GPL (http://www.gnu.org)
-" Disclaimer:
-" This program is distributed in the hope that it will be useful,
-" but WITHOUT ANY WARRANTY; without even the implied warranty of
-" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-" GNU General Public License for more details.
" ----------------------------------------------------------------------------
"
" Previous Maintainer: Mirko Nasato
diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim
index b979221..7615c59 100644
--- a/runtime/syntax/sh.vim
+++ b/runtime/syntax/sh.vim
@@ -2,21 +2,22 @@
" Language: shell (sh) Korn shell (ksh) bash (sh)
" Maintainer: Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
" Previous Maintainer: Lennart Schultz <Lennart.Schultz@ecmwf.int>
-" Last Change: Sep 06, 2005
-" Version: 77
+" Last Change: Oct 18, 2005
+" Version: 78
" URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
"
" Using the following VIM variables: {{{1
-" b:is_kornshell if defined, enhance with kornshell syntax
+" b:is_kornshell if defined, enhance with kornshell/POSIX syntax
" b:is_bash if defined, enhance with bash syntax
-" is_kornshell if neither b:is_kornshell or b:is_bash is
-" defined, then if is_kornshell is set
-" b:is_kornshell is default
-" is_bash if none of the previous three variables are
-" defined, then if is_bash is set b:is_bash is default
+" g:is_kornshell if neither b:is_kornshell or b:is_bash is
+" defined, then if g:is_kornshell is set
+" enhance with kornshell/POSIX syntax highlighting
+" g:is_bash if none of the previous three variables are
+" defined, then if g:is_bash is set enhance with
+" bash syntax highlighting
" g:sh_fold_enabled if non-zero, syntax folding is enabled
-" sh_minlines sets up syn sync minlines (default: 200)
-" sh_maxlines sets up syn sync maxlines (default: twice sh_minlines)
+" g:sh_minlines sets up syn sync minlines (dflt: 200)
+" g:sh_maxlines sets up syn sync maxlines (dflt: 2x sh_minlines)
"
" This file includes many ideas from Éric Brunet (eric.brunet@ens.fr)
@@ -385,7 +386,7 @@
" bash : ${parameter//pattern/string}
" bash : ${parameter//pattern}
syn match shDerefPPS contained '/\{1,2}' nextgroup=shDerefPPSleft
- syn region shDerefPPSleft contained start='.' skip=@\%(\\\)\/@ matchgroup=shDerefOp end='/' nextgroup=shDerefPPSright contains=@shCommandSubList
+ syn region shDerefPPSleft contained start='.' skip=@\%(\\\)\/@ matchgroup=shDerefOp end='/' end='\ze}' nextgroup=shDerefPPSright contains=@shCommandSubList
syn region shDerefPPSright contained start='.' end='\ze}' contains=@shCommandSubList
endif
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 9ab7646..4d14f86 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -1,8 +1,8 @@
" Vim syntax file
" Language: Vim 7.0 script
" Maintainer: Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change: October 12, 2005
-" Version: 7.0-17
+" Last Change: Nov 18, 2005
+" Version: 7.0-20
" Automatically generated keyword lists: {{{1
" Quit when a syntax file was already loaded {{{2
@@ -123,11 +123,11 @@
" Operators: {{{2
" =========
-syn cluster vimOperGroup contains=vimOper,vimOperParen,vimNumber,vimString,vimOperOk,vimRegister
+syn cluster vimOperGroup contains=vimOper,vimOperParen,vimNumber,vimString,vimOperOk,vimRegister,vimContinue
syn match vimOper "\(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\|=\)[?#]\{0,2}" skipwhite nextgroup=vimString,vimSpecFile
syn match vimOper "||\|&&\|[-+.]" skipwhite nextgroup=vimString,vimSpecFile
syn region vimOperParen oneline matchgroup=vimOper start="(" end=")" contains=@vimOperGroup
-syn region vimOperParen oneline matchgroup=vimSep start="{" end="}" contains=@vimOperGroup nextgroup=vimVar
+syn region vimOperParen matchgroup=vimSep start="{" end="}" contains=@vimOperGroup nextgroup=vimVar
syn match vimOperOk "\<[aiAIrR][()]"
if !exists("g:vimsyntax_noerror")
syn match vimOperError ")"
@@ -217,7 +217,7 @@
syn match vimCollClass contained transparent "\[:\(alnum\|alpha\|blank\|cntrl\|digit\|graph\|lower\|print\|punct\|space\|upper\|xdigit\|return\|tab\|escape\|backspace\):\]"
syn match vimSubstSubstr contained "\\z\=\d"
syn match vimSubstTwoBS contained "\\\\"
-syn match vimSubstFlagErr contained "[^< \t\r]\+" contains=vimSubstFlags
+syn match vimSubstFlagErr contained "[^< \t\r|]\+" contains=vimSubstFlags
syn match vimSubstFlags contained "[&cegiIpr]\+"
" 'String': {{{2
diff --git a/runtime/tutor/tutor.sk.cp1250 b/runtime/tutor/tutor.sk.cp1250
new file mode 100644
index 0000000..dc13b26
--- /dev/null
+++ b/runtime/tutor/tutor.sk.cp1250
@@ -0,0 +1,821 @@
+===============================================================================
+= V i t a j t e v o V I M T u t o r i a l i - Verzia 1.5 =
+===============================================================================
+
+ Vim je ve¾mi výkonný editor, ktorý má príli ve¾a príkazov na to aby
+ mohli byt vetky popísané vo výuke akou je táto. Táto výuka
+ popisuje dostatoèné mnostvo príkazov nato aby bolo moné pouíva
+ Vim ako viacúèelový editor.
+
+ Pribliný èas potrebný na prebratie tejto výuky je 25-30 minút,
+ závisí na tom, ko¾ko je stráveného èasu s preskúavaním.
+
+ Príkazy v lekciách modifikujú text. Vytvor kópiu tohto súboru aby
+ sa mohlo precvièova na òom (pri tarte "vimtutor" je toto kópia).
+
+ Je dôleité zapamäta si, e táto výuka je vytvorená pre výuku
+ pouívaním. To znamená, e je potrebné si príkazy vyskúa, aby bolo
+ uèenie správne. Ak len èitas text, príkazy zabudne!
+
+ Presvedè sa, e Shift-Lock NIEJE stlaèený a stlaèt klávesu
+ j nieko¾ko krát, aby sa kurzor posunul nato¾ko, e lekcia 1.1
+ celkom zaplní obrazovku.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 1.1: POHYB KURZOROM
+
+
+ ** Pre pohyb kurzorum stlaè klávesy h,j,k,l ako je znázornené. **
+ ^
+ k Funkcia: Klávesa h je na¾avo a vykoná pohyb do¾ava.
+ < h l > Klávesa l je napravo a vykoná pohyb doprava.
+ j Klávesa j vyzerá ako ípka dole
+ v
+ 1. Pohybuj kurzorom po obrazovke, kým si na to nezvykne.
+
+ 2. Dr stlaèenú klávesu pre pohyb dole (j), kým sa jej funkcia nezopakuje.
+---> Teraz sa u vie pohybova na nasledujúcu lekciu.
+
+ 3. Pouitím klávesy pre pohyb dole prejdi na Lekciu 1.2.
+
+Poznámka: Ak si niesi istý tým èo si napísal, stlaè <ESC>
+ na prechod do normálneho módu.
+
+Poznámka: Kurzorové klávesy sú tie funkèné. Ale pouívaním hjkl sa bude
+ schopný pohybova rýchlejie, keï si zvykne ich pouíva.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ LEKCIA 1.2: SPÚANIE A ZATVÁRANIE VIMU
+
+ !! POZNÁMKA: Pred vykonaním týchto krokov si preèítaj celú túto lekciu !!
+
+ 1. Stlaè klávesu <ESC> (aby si sa uèite nachádzal v normálnom móde)
+
+ 2. Napí: :q! <ENTER>.
+
+---> Tým ukonèí prácu s editorom BEZ uloenia zmien, ktoré si vykonal.
+ Ak chce uloi vykonané zmeny a ukonèi prácu s editorom napí:
+ :wq <ENTER>
+
+ 3. Keï sa dostane na príkazový riadok, napí príkaz, ktorým sa dostane
+ spe do tejto výuky. To môe by: vimtutor <ENTER>
+ Zvyèajne sa pouíva: vim tutor <ENTER>
+
+---> 'vim' znamená spustenie editora vim, 'tutor' je názov súboru, ktorý
+ chce editova.
+
+ 4. Ak si si tieto kroky spo¾ahlivo zapamätal, vykonaj kroky 1 a 3, pre
+ ukonèenie a znovu spustenie editora. Potom presuò kurzor dole na
+ lekciu 1.3.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 1.3: EDITÁCIA TEXTU - MAZANIE
+
+
+** Stlaèenie klávesy x v normálnom móde zmae znak na mieste kurzora. **
+
+ 1. Presuò kurzor niie na riadok oznaèený znaèkou --->.
+
+ 2. Aby si mohol odstráni chyby, pohybuj kurzorom kým neprejde na znak,
+ ktorý chce zmaza.
+
+ 3. Stlaè klávesu x aby sa zmazal nechcený znak.
+
+ 4. Zopakuj kroky 2 a 4 a kým veta nieje správna.
+
+---> Kraava skooèilla ccezz mesiiac.
+
+ 5. Ak je veta správna, prejdi na lekciu 1.4.
+
+POZNÁMKA: Neskúaj si zapametä obsah tejto výuky, ale sa uè pouívaním.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 1.4: EDITÁCIA TEXTU - VKLADANIE
+
+
+ ** Stlaèenie klávesy i v normálnom móde umoòuje vkladanie textu. **
+
+ 1. Presuò kurzor niie na prvý riadok za znaèku --->.
+
+ 2. Pre upravenie prvého riadku do rovnakého tvaru ako je druhý riadok,
+ presuò kurzor na prvý znak za misto, kde má by text vloený.
+
+ 3. Stlaè klávesu i a napí potrebný text.
+
+ 4. Po opravení kadej chyby, stlaè <ESC> pre návrat do normálneho módu.
+ Zopakuj kroky 2 a 4 kým nieje veta správna.
+
+---> Tu je text chýbajúci tejto.
+---> Tu je nejaký text chýbajúci od tejto èiary.
+
+ 5. Keï sa dostatoène nauèí vklada text, prejdi na nasledujúce zhrnutie.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ZHRNUTIE LEKCIE 1
+
+
+ 1. Kurzor sa pohybuje pouitím kláves so ípkami alebo klávesmi hjkl.
+ h (do lava) j (dole) k (hore) l (doprava)
+
+ 2. Pre spustenie Vimu (z príkazového riadku) napí: vim FILENAME <ENTER>
+
+ 3. Na ukonèenie Vimu napí: <ESC> :q! <ENTER> pre zruenie vetkých zmien
+ alebo napí: <ESC> :wq <ENTER> pre uloenie zmien.
+
+ 4. Na zmazanie znaku na mieste kurzora napí v normálnom móde: x
+
+ 5. Pre vloenie textu na mieste kurzora v normálnom móde napí:
+ i vkladaný text <ESC>
+
+POZNÁMKA: Stlaèenie <ESC> a premiestní do normálneho módu alebo zruí
+ nejaký nechcený a èiastoène dokonèený príkaz.
+
+Teraz pokraèuj lekciou 2.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 2.1: Mazacie príkazy
+
+
+ ** Napísanie príkazu dw zmae znaky do konca slova. **
+
+1. Stlaè <ESC> aby si bol bezpeène v normálnom móde.
+
+2. Presuò kurzor niie na riadok oznaèený znaèkou --->.
+
+3. Presuò kurzor na zaèiatok slova, ktoré je potrebné zmaza.
+
+4. Napí dw aby slovo zmizlo.
+
+POZNÁMKA: Písmená dw sa zobrazia na poslednom riadku obrazovky tak ako ich
+ píe. Ak píe nieèo zle, stlaè <ESC> a zaèni znova.
+
+---> Tu je nieko¾ko slov zábava, ktoré nie patria list do tejto vety.
+
+5. Zopakuj kroky 3 a 4 kým veta nieje správna a prejdi na lekciu 2.2.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 2.2: VIAC MAZACÍCH PRÍKAZOV
+
+
+ ** Napísanie príkazu d$ zmae znaky do konca riadku **
+
+1. Stlaè <ESC> aby si bol bezpeène v normálnom móde.
+
+2. Presuò kurzor niie na riadok oznaèený znaèkou --->.
+
+3. Presuò kurzor na koniec správnej vety (ZA prvú bodku).
+
+4. Napí d$ aby sa zmazali znaky do konca riadku.
+
+---> Niekto napísal koniec tohto riadku dvakrát. koniec tohot riadku dvakrát.
+
+
+5. Prejdi na lekciu 2.3 pre pochopenie toho èo sa stalo.
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 2.3: ROZIROVACIE PRÍKAZY A OBJEKTY
+
+
+ Formát mazacieho príkazu d je nasledovný:
+
+ [èíslo] d objekt ALEBO d [èíslo] objekt
+ Kde:
+ èíslo - udáva ko¾ko krát sa príkaz vykoná (volite¾né, implicitne=1)
+ d - je príkaz pre mazanie
+ objekt - udáva na èom sa príkaz vykonáva (vypísané niie)
+
+ Krátky výpis objektov:
+ w - od kurzora do konca slova, vrátanie medzier
+ e - od kurzora do konca slova, BEZ medzier
+ $ - od kurzora do konca riadku.
+
+POZNÁMKA: Ak stlaèí klávesu objektu v normálnom móde bez príkazu, kurzor
+ sa presunie na miesto pecifikované vo výpise objektov.
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 2.4: VÝNIMKA V 'PRÍKAZOVOM OBJEKTE'
+
+
+ ** Napísanie príkazu dd zmae celý riadok. **
+
+Vzh¾adom na frekvenciu mazania celého riadku, sa autori Vimu rozhodli,
+e bude jednoduchie maza celý riadok napísaním dvoch písmen d.
+
+1. Presuò kurzor na druhý riadok v texte na spodu.
+2. Napí dd aby si zmazal riadok.
+3. Prejdi na tvrtý riadok.
+4. Napí 2dd (pametaj si èíslo-príkaz-objekt) aby si zmazal dva riadky.
+
+ 1) Rue sú èervené,
+ 2) Blato je zábavné,
+ 3) Fialky sú modré,
+ 4) Mám auto,
+ 5) Hodinky ukazujú èas,
+ 6) Cukor je sladký,
+ 7) A to si ty.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 2.5: PRÍKAZ UNDO
+
+
+** Stlaè u pre vrátenie posledného príkazu, U pre úpravu celého riadku. **
+
+1. Presuò kurzor niie na riadok oznaèený znaèkou ---> a premiestni ho na
+ prvú chybu.
+2. Napí x pre zmazanie prvého nechceného riadku.
+3. Teraz napí u èím vrátí spä posledne vykonaný príkaz.
+4. Teraz oprav vetky chyby na riadku pouitím príkazu x .
+5. Teraz napí ve¾ké U èím vrátí riadok do pôvodného stavu.
+6. Teraz napí u nieko¾ko krát, èím vrátí spä príkaz U.
+7. Teraz napí CTRL-R (dr klávesu CTRL stlaèenú kým stláèa R) nieko¾ko
+ krát, èím vrátí spä predtým vrátené príkazy (redo).
+
+---> Opprav chybby nna toomto riadku a zmeeò ich pommocou undo.
+
+ 8. Tieto príkazy sú èasto pouívané. Teraz prejdi na zhrnutie lekcie 2.
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ LEKCIA 2 ZHRNUTIE
+
+
+ 1. Pre zmazanie znakov od kurzora do konca slova napí: dw
+
+ 2. Pre zmazanie znakov od kurzora do konca riadku napí: d$
+
+ 3. Pre zmazanie celého riadku napí: dd
+
+ 4. Formát pre píkaz v norálnom móde je:
+
+ [èíslo] príkaz objekt ALEBO príkaz [èíslo] objekt
+ kde:
+ èíslo - udáva ko¾ko krát sa príkaz zopakuje
+ príkaz - udáva vykonávaný príkaz, ako napríklad d pre mazanie
+ objekt - udáva rozsah príkazu, ako napríklad w(slovo),
+ $ (do konca riadku), atï.
+
+ 5. Pre vrátenie spä predolej operácie napí: u (malé u)
+ Pre vrátenie vetkých úprav na riadku napí: U (ve¾ké U)
+ Pre vrátenie vrátených úprav napí: CTRL-R
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 3.1: PRÍKAZ VLOI
+
+
+ ** Napísanie príkazu p vloí psledný výmaz za kurzor. **
+
+ 1. Presuò kurzor niie na prvý riadok textu.
+
+ 2. Napí dd èím zmae riadok a uloí ho do buffera editora Vim.
+
+ 3. Presuò kurzor vyie tam, kam zmazaný riadok patrí.
+
+ 4. Ak napíe v normálnom móde p zmazaný riadk sa vloí.
+
+ 5. Zopakuj kroky 2 a 4, kým riadky niesú v správnom poradí.
+
+ d) Tie sa dokáe vzdeláva?
+ b) Fialky sú modré,
+ c) Inteligencia sa vzdeláva,
+ a) Rue sú èervené,
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 3.2: PRÍKAZ NAHRADENIA
+
+
+ ** Napísaním r a znaku sa nahradí znak na mieste kurzora. **
+
+ 1. Presuò kurzor niie na prví riadok textu oznaèeného znaèkou --->.
+
+ 2. Presuò kurzor na zaèiatok prvej chyby.
+
+ 3. napí r a potom znak, ktorý nahradí chybu.
+
+ 4. Zopakuj kroky 2 a 3, kým prvý riadok nieje správny.
+
+---> Kaï bol tento riasok píaaný, niekro stlail nesprábne klávesy!
+---> Keï bol tento riadok písaný, niekto stlaèil nesprávne klávesy!
+
+ 5. Teraz prejdi na lekciu 3.2.
+
+POZNÁMKA: Pamätaj si, e nauèi sa môe len pouívanim, nie pamätaním.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 3.3. PRÍKAZ ÚPRAVY
+
+
+ ** Ak chce zmeni èas slova alebo celé slovo, napí cw . **
+
+ 1. Presuò kurzor niie na prvý riadok oznaèený znaèkou --->.
+
+ 2. Umiestni kurzor na písmeno o v slove rosfpl.
+
+ 3. Napí cw a oprav slovo (v tomto prípade napí 'iadok'.)
+
+ 4. Stlaè <ESC> a prejdi na ïaliu chybu (prvý znak, ktorý treba zmeni.)
+
+ 5. Zopakuj kroky 3 a 4, kým prvá veta nieje rovnaká ako druhá.
+
+---> Tento rosfpl má nieko¾ko skic, ktoré je pirewvbí zmeni piyuèán príkazu.
+---> Tento riadok má nieko¾ko slov, ktoré je potrebné zmeni pouitím príkazu.
+
+Poznámka, e cw nielen nahrádza slovo, ale a aj premiestní do vkladania.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 3.4: VIAC ZMIEN POUITÍM c
+
+
+ ** Príkaz pre úpravy sa pouíva s rovnakými objektami ako pre mazanie **
+
+ 1. Príkaz pre úpravy pracuje rovnako ako pre mazanie. Formát je:
+
+ [èíslo] c objekt ALEBO c [èíslo] objekt
+
+ 2. Objekty sú rovnaké, ako napríklad w (slovo), $ (koniec riadku), atï.
+
+ 3. Presuò kurzor niie na prvý riadok oznaèený znaèkou --->.
+
+ 4. Presuò kurzor na prvú chybu.
+
+ 5. napí c$ aby si mohol upravi zvyok riadku pod¾a druhého
+ a stlaè <ESC>.
+
+---> Koniec tohto riadku potrebuje pomoc, aby bol ako druhy.
+---> Koniec tohto riadku potrebuje opravi pouitím príkazu c$ .
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ LEKCIA 3 ZHRNUTIE
+
+
+ 1. Na vloenie textu, ktorý u bol zmazaný, napí p . To vloí zmazaný
+ text ZA kurzor (ak bol riadok zmazaný prejde na riadok pod kurzorom).
+
+ 2. Pre naradenie znaku na mieste kurzora, napí r a potom znak, ktorý
+ nahradí pôvodný znak.
+
+ 3. Príkaz na upravenie umoòuje zmeni pecifikovaný objekt od kurzora
+ a po koniec objektu. napr. Napí cw èím zmní text od pozície
+ kurzora do konca slova, c$ zmení text do konca riadku.
+
+ 4. Format pre nahradenie je:
+
+ [èíslo] c objekt ALEBO c [èíslo] objekt
+
+
+Teraz prejdi na nalsedujúcu lekciu.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 4.1: POZÍCIA A STATUS SÚBORU
+
+
+ ** Stlaè CTRL-g pre zobrazenie svojej pozície v súbore a statusu súboru.
+ Stlaè SHIFT-G pre prechod na riadok v súbore. **
+
+ Poznámka: Preèítaj si celú túto lekciu skôr ako zaène vykonáva kroky!!
+
+ 1. Dr stlaèenú klávesu Ctrl a stlaè g . Na spodu obrazovky sa zobrazí
+ stavový riadok s názvom súboru a riadkom na ktorom práve si. Zapamätaj
+ si si èíslo riadku pre krok 3.
+
+ 2. Stlaè Shift-G èím sa dostane na spodok súboru.
+
+ 3. Napí èíslo riadku na ktorom si sa nachádzal a stlaè Shift-G. To a
+ vráti na riadok, na ktorom si prvý krát stlaèil Ctrl-g.
+ (Keï píe èísla, tieto sa nezobrazujú na obrazovke.)
+
+ 4. Ak sa cítí schopný vykona teto kroky, vykonaj kroky 1 a 3.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 4.2: PRÍKAZ VYH¼ADÁVANIA
+
+
+ ** Napí / nasledované reazcom pre vyh¾adanie prísluného reazca. **
+
+ 1. Napí znak / v normálnom móde. Poznámka, e tento znak sa spolu
+ s kurzorom zobrazí v dolnej èasti obrazovky ako s : príkazom.
+
+ 2. Teraz napí 'errroor' <ENTER>. To je slovo, ktoré chce vyh¾ada.
+
+ 3. Pre vyh¾adanie ïalieho výskytu rovnakého reazca, stlaè jednoducho n.
+ Pre vyh¾adanie ïalieho výskytu rovnakého reazca opaèným smerom,
+ napí Shift-N.
+
+ 4. Ak chce vyh¾ada reazec v spätnom smere, pouí príkaz ? miesto
+ príkazu /.
+
+ ---> Keï vyh¾adávanie dosiahne koniec tohto súboru, bude pokraèova na
+ zaèiatku.
+
+ "errroor" nie je spôsob ako nahradi error; errroor je error.
+
+POZNÁMKA: Keï vyh¾adávanie dosiahne koniec súboru, bude pokraèova na jeho
+ zaèiatku.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 4.3: VYH¼ADÁVANIE ZODPOVEDAJÚCICH ZÁTAVORIEK
+
+
+ ** Napí % pre vyh¾adanie prísluného znaku ),], alebo } . **
+
+ 1. Premiestni kurzor na hocaký zo znakov (, [, alebo { v riadku niie
+ oznaèeného znaèkou --->.
+
+ 2. Teraz napí znak % .
+
+ 3. Kurzor sa premiestni na zodpovedajúcu zátvorku.
+
+ 4. Napí % pre presun kurzoru spä na otvárajúcu zátvorku.
+
+---> Toto ( je testovací riadok s ('s, ['s ] a {'s } v riadku. ))
+
+Poznámka: Toto je ve¾mi výhodné pouí pri ladení programu s chýbajúcimi
+ uzatvárajúcimi zátvorkami.
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 4.4: SPOSOB AKO ZMENI CHYBY
+
+
+ ** Napí :s/starý/nový/g pre nahradenie slova 'starý' za slovo 'nový'. **
+
+ 1. Presuò kurzor niie na riadok oznaèený znaèkou --->.
+
+ 2. Napí :s/thee/the <ENTER> . Poznamka, e tento príkaz zmení len prvý
+ výskyt v riadku.
+
+ 3. Teraz napí :s/thee/the/g èo znamená celkové nahradenie v riadku.
+ Toto nahradí vetky výskyty v riadku.
+
+---> Thee best time to see thee flowers in thee spring.
+
+ 4. Pre zmenu vetkých výskytov daného reazca medzi dvomi ridakami,
+ napí :#,#s/starý/nový/g kde #,# sú èísla dvoch riadkov.
+ napí :%s/starý/nový/g pre zmenu vetkých výskytov v celom riadku
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ LEKCIA 4 ZHRNUTIE
+
+
+ 1. Ctrl-g vypíe tvoju pozíciu v súbore a status súboru.
+ Shift-g a premiestni na koniec riadku. Èíslo riadku nasledované
+ Shift-g a presunie na dané èíslo riadku.
+
+ 2. Napísanie / nasledované reazcom vyh¾adá reazec smerom DOPREDU.
+ Napísanie ? nasledované reazcom vyh¾ada reazec smerom DOZADU.
+ Napísanie n po vyh¾adávaní, vyh¾adá nasledujúci výskyt reazca
+ v rovnakom smere, prièom Shift-N vyh¾adá v opaènom smere.
+
+ 3. Napísanie % keï kurzor je na (,),[,],{, alebo } nájde zodpovdajúcu
+ párú zátvorku.
+
+ 4. Pre nahradenie nového za prvý starý v riadku napí :s/nový/starý
+ Pre nahradenie nového za vetky staré v riadku napí :s/nový/starý/g
+ Pre nahradenie reazcov medzi dvoma riadkami 3 napí :#,#/nový/starý/g
+ Pre nahradenie vetkých výskytov v súbore napí :%s/starý/nový/g
+ Pre potvrdenie kadého nahradenia pridaj 'c' :%s/nový/starý/gc
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 5.1 AKO SPUSTI VONKAJÍ PRÍKAZ
+
+
+ ** Napí príkaz :! nasledovaný vonkajím príkazom pre spustenie príkazu **
+
+ 1. Napí obvyklý píkaz : ktorý nastaví kurzor na spodok obrazovky.
+ To umoní napísa príkaz.
+
+ 2. Teraz napí ! (výkrièník). To umoní spusti hociaký vonkají príkaz
+ z príkazového riadku.
+
+ 3. Ako príklad napí ls za ! a stlaè <ENTER>. Tento príkaz
+ zobrazí obsah tvojho adresára rovnako ako na príkazovom riadku.
+ Alebo poui :!dir ak ls nefunguje.
+
+Poznámka: Takto je moné spusti hociaký vonkají príkaz.
+Poznámka: Vetky príkazy : musia by dokonèené stlaèením <ENTER>
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 5.2: VIAC O UKLADANÍ SÚBOROV
+
+
+ ** Pre uloenie zmien v súbore, napí :w FILENAME. **
+
+ 1. Napí :!dir alebo :!ls pre výpis aktuálneho adresára.
+ U vie, e musí za týmto stlaèi <ENTER> .
+
+ 2. Vyber názov súboru, ktorý ETE neexistuje.
+
+ 3. Teraz napí: :w TEST (kde TEST je názov vybratého súboru.)
+
+ 4. To uloí celý súbor (Vim Tutor) pod názovm TEST.
+ Pre overenie napí :!dir , èím zobrazí obsah adresára.
+
+Poznámka: e ak ukonèí prácu s editorom Vim a znovu ho spustí s názvom
+ súboru TEST, súbor bude kópia výuky, keï si ho uloil.
+
+ 5. Teraz odstráò súbor napísaním (MS-DOS): :!del TEST
+ alebo (Unix): :!rm TEST
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 5.3 VÝBEROVÝ PRÍKAZ PRE ULOENIE
+
+
+ ** Pre uloenie èasti súboru, napí :#,# w FILENAME **
+
+ 1. Znovu napí :!dir alebo :!ls pre zobrazenie obsahu aktuálneho
+ adresára a vyber vhodný súbor ako TEST.
+
+ 2. Presuò kurzor na vrch tejto strany a napí Ctrl-g pre vyh¾adanie èísla
+ tohto riadku. PAMETAJ SI TOTO ÈÍSLO!
+
+ 3. Teraz prejdi na spodok strany a napí Ctrl-g znovu. ZAPAMETAJ SI ÈÍSLO
+ AJ TOHTO RIADKU!
+
+ 4. Pre uloenie LEN èasti súboru, napí :#,# w TEST kde #,# sú dve èísla
+ zapamätaných riadkov (vrch, spodok) a TEST je názov súboru.
+
+ 5. Znova sa pozri, èi tam ten súbor je pomocou príkazu :!dir ale
+ NEODSTRAÒUJ ho.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 5.4: VÝBER A ZLUÈOVANIE SÚBOROV
+
+
+ ** Pre vloenie obsahu súboru, napí :r FILENAME **
+
+ 1. Napí :!dir aby si sa presvedèil, e súbor TEST stále existuje.
+
+ 2. Presuò kurzor na vrch tejto strany.
+
+POZNÁMKA: Po vykonaní kroku 3 uvidí Lekciu 5.3. Potom sa presuò dole
+ na túto lekciu.
+
+ 3. Teraz vlo súbor TEST pouitím príkazu :r TEST kde TEST je názov
+ súboru.
+
+POZNÁMKA: Súbor, ktorý si vloil sa vloí od miesta, kde sa nachádza kurzor.
+
+ 4. Pre kontrolu vloenia súboru, presuò kurzor spä a vimni si, e teraz
+ má dve kópie lekcie 5.3, originál a súborovú verziu.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ LEKCIA 5 ZHRNUTIE
+
+
+ 1. :!príkaz spustí vonkají príkaz.
+
+ Niektoré vyuite¾né príklady sú:
+ (MS_DOS) (UNIX)
+ :!dir :!ls - zobrazí obsah adresára
+ :!del FILENAME :!rm FILENAME - odstráni súbor FILENAME
+
+ 2. :w FILENAME uloí aktuálny súbor na disk pod menom FILENAME.
+
+ 3. :#,#w FILENAME uloí riadky od # do # do súboru FILENAME.
+
+ 4. :r FILENAME vyberie z disku súbor FILENAME a vloí ho do aktuálneho
+ súboru za pozíciou kurzora.
+
+
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 6.1: PRÍKAZ OTVORI
+
+
+** Napí o pre vloenie riadku pod kurzor a prepnutie do vkladacieho módu **
+
+ 1. Presuò kurzor niie na riadok oznaèený znaèkou --->.
+
+ 2. Napí o (malé písmeno) pre vloenie èistého riadku pod kurzorm
+ a prepnutie do vkladacieho módu.
+
+ 3. Teraz skopíruj riadok oznaèený ---> a stlaè <ESC> pre ukonèenie
+ vkladacieho módu.
+
+---> Po napísaní o sa kurzor premiestní na vloený riadok do vkladacieho
+ módu.
+
+ 4. Pre otvorenie riadku nad kurzorom, jednotucho napí ve¾ké O , namiesto
+ malého o. Vyskúaj si to na nasledujúcom riadku.
+Vlo riadok nad týmto napísaním Shift-O, keï kurzor je na tomto riadku.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 6.2: PRÍKAZ PRIDA
+
+
+ ** Napí a pre vloenie textu ZA kurzor. **
+
+ 1. Presuò kurzor niie na koniec prvého riadku oznaèeného znaèkou --->
+ napísaním $ v normálnom móde.
+
+ 2. Napí a (malé písmeno) pre pridanie textu ZA znakom na mieste
+ kurzora. (Ve¾ké A pridá na koniec riadku.)
+
+Poznámka: Toto obchádza písanie i , posledný znak, text na vloenie, <ESC>,
+ kurzor doprava, a nakoniec, x , na pridávanie na koniec riadku!
+
+ 3. Teraz dokonèi prvý riadok. Poznámka, e pridávanie je vlastne rovnaké
+ ako vkladací mód, okrem miesta, kde sa text vkladá.
+
+---> Tento riadok ti dovo¾uje nácvik
+---> Tento riadok ti dovo¾uje nácvik pridávania textu na koniec riadku.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 6.3: INÝ SPOSOB NAHRADZOVANIA
+
+
+ ** Napí ve¾ké R pre nahradenie viac ako jedného znaku. **
+
+ 1. Presuò kurzor niie na prvý riadok oznaèený znaèkou --->.
+
+ 2. Premiestni kurzor na zaèiatok prvého slova, ktoré je odliné od druhého
+ riadku oznaèeného ---> (slovo 'posledná').
+
+ 3. Teraz napí R a nahraï zvyok textu na prvom riadku písaním cez starý
+ text tak, aby prvý riadok bol rovnaký ako druhý.
+
+---> Na úpravu prvého riadku do tvaru ako je posledný na strane poui klávesy.
+---> Na úpravu prvého riadku do tavru ako je druhý, napí R a nový text.
+
+ 4. Poznámka, e ak stlaèí <ESC> pre ukonèenie, vetok nezmenený text
+ zostane.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Lekcia 6.4: NASTAVENIE MONOSTÍ
+
+
+** Nastav monosti, take vyh¾adávanie alebo nahradzovanie ignoruje
+ rozliovanie **
+
+
+ 1. Vyh¾adaj reazec 'ignore' napísaním:
+ /ignore
+ Zopakuj vyh¾adávanie nieko¾ko krát stlaèením klávesy n
+
+ 2. Nastav monos 'ic' (Ignore case) napísaním príkazu:
+ :set ic
+
+ 3. Teraz vyh¾adaj reazec 'ingore' znova stlaèením klávesy: n
+ Zopakuj vyh¾adávanie nieko¾ko krát stlaèením klávesy n
+
+ 4. Nastav monosi 'hlsearch' a 'incsearch':
+ :set hls is
+
+ 5. Teraz spusti vyh¾adávací príkaz znovu, a pozri èo sa stalo:
+ /ignore
+
+ 6. Na odstránenie zvýraznenia výrazov napí:
+ :nohlsearch
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ LEKCIA 6 ZHRNUTIE
+
+
+ 1. Napísaním o sa otvorí nový riadok pod kurzorom a premiestni sa kurzor
+ na vloený riadok do vkladacieho módu.
+ napísaním ve¾kého O sa otvorí riadok nad aktuálnym riadkom s kurzorom.
+
+ 2. Napí a pre vkladanie textu ZA znak na pozícii kurzoru.
+ Napísaním ve¾kého A sa text automatický pridáva na koniec riadku.
+
+ 3. Napísanie ve¾kého R prepne do nahradzovacieho módu, kým nieje
+ stlaèené <ESC> pre ukonèenie nahradzovacieho módu.
+
+ 4. Napísanie ":set xxx" nastaví monos "xxx".
+
+
+
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ LEKCIA 7: PRÍKAZY ON-LINE NÁPOVEDY
+
+
+ ** Pouívaj on-line systém nápovedy **
+
+ Vim má obsiahly on-line systém nápovedy. Pre odtartovanie, vyskúaj jeden
+ z týchto troch:
+ - stlaè klávesu <HELP> (ak nejakú má)
+ - stlaè klávesu <F1> (ak nejakú má)
+ - napí :help <ENTER>
+
+ Napí :q <ENTER> èím zatvorí okno nápovedy.
+
+ Môe nájs help ku hociakej téme pridaním argumentu ku príkazu ":help".
+ Vyskúaj tieto (nezabudni stlaèi <ENTER>):
+
+ :help w
+ :help c_<T
+ :help insert-index
+ :help user-manual
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ LEKCIA 8: VYTVORENIE TARTOVACIEHO SKRIPTU
+
+ ** Zapni funkcie editora Vim **
+
+ Vim má omnoho viac funkcii ne Vi, ale veèina z nich je implicitne
+ vypnutá. Pre pouívanie viac Vim funkcii vytvor "vimrc" súbor.
+
+ 1. Zaèni editova "vimrc" súbor, to závisí na pouitom systéme:
+ :edit ~/.vimrc pre Unix
+ :edit $VIM/_vimrc pre MS-Windows
+
+ 2. Teraz si preèítaj text príkladu "vimrc" súboru:
+
+ :read $VIMRUNTIME/vimrc_example.vim
+
+ 3. Ulo súbor:
+
+ :write
+
+ Pri nasledujúcom tarte editora Vim sa pouije zvýrazòovanie syntaxe.
+ Do "vimrc" súboru môe prida vetky svoje uprednostòované nastavenia.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ Toto vymedzuje výuku Vimu. Toto je urèené pre strucný preh¾ad o editore
+ Vim, úplne postaèujúce pre ¾ahké a obstojné pouívanie tohto editora.
+ Táto výuka je ïaleko od kompletnosti, pretoe Vim má omnoho viacej príkazov.
+ Ako ïalie si preèítaj uívat¾ský manuál: ":help user-manual".
+
+ Pre ïalie èítanie a túdium je odporúèaná kniha:
+ Vim - Vi Improved - od Steve Oualline
+ Vydavate¾: New Riders
+ Prvá kniha urèená pre Vim. peciálne vhodná pre zaèiatoèníkov.
+ Obsahuje mnostvo príkladov a obrázkov.
+ Pozri na http://iccf-holland.org/click5.html
+
+ Táto kniha je staria a je viac o Vi ako o Vim, ale je tie odporúèaná:
+ Learning the Vi Editor - od Linda Lamb
+ Vydavate¾: O'Reilly & Associates Inc.
+ Je to dobrá kniha pre získanie vedomostí o práci s editorom Vi.
+ ieste vydanie obsahuje tie informácie o editore Vim.
+
+ Táto výuka bola napísaná autormi Michael C. Pierce a Robert K. Ware,
+ Colorado School of Mines s pouitím mylienok dodanými od Charles Smith,
+ Colorado State University. E-mail: bware@mines.colorado.edu.
+
+ Modifikované pre Vim od Bram Moolenaar.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ Preklad do Slovenèiny: ¼ubo Èelko
+ e-mail: celbos@inmail.sk
+ Last Change: 2004 Apr 29
+ encoding: cp1250
diff --git a/runtime/tutor/tutor.vim b/runtime/tutor/tutor.vim
index 8621ae2..29eda4c 100644
--- a/runtime/tutor/tutor.vim
+++ b/runtime/tutor/tutor.vim
@@ -1,6 +1,6 @@
" Vim tutor support file
" Author: Eduardo F. Amatria <eferna1@platea.pntic.mec.es>
-" Last Change: 2005 Mar 15
+" Last Change: 2005 Oct 16
" This small source file is used for detecting if a translation of the
" tutor file exist, i.e., a tutor.xx file, where xx is the language.
@@ -83,6 +83,15 @@
endif
endif
+" The Turkish tutor is available in two encodings, guess which one to use
+if s:ext =~? '\.tr'
+ if &enc == "utf-8"
+ let s:ext = ".tr.utf-8"
+ elseif &enc == "iso-8859-9"
+ let s:ext = ".tr.iso9"
+ endif
+endif
+
" The Greek tutor is available in two encodings, guess which one to use
if s:ext =~? '\.gr' && &enc =~ 737
let s:ext = ".gr.cp737"
diff --git a/src/Makefile b/src/Makefile
index 3c0429b..56ab707 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -149,7 +149,7 @@
# make -n uninstall
# }}}
#
-### This Makefile has been succesfully tested on many systems. {{{
+### This Makefile has been successfully tested on many systems. {{{
### Only the ones that require special options are mentioned here.
### Check the (*) column for remarks, listed below.
### Later code changes may cause small problems, otherwise Vim is supposed to
@@ -296,7 +296,7 @@
# below. As shipped, this file contains a target that causes to run
# configure. Once configure was run, this file contains a list of
# make variables with predefined values instead. Thus any second invocation
-# of make, will buid Vim.
+# of make, will build Vim.
# CONFIGURE - configure arguments {{{1
# You can give a lot of options to configure.
@@ -374,6 +374,7 @@
# Uncomment this when you want to include the Python interface.
# NOTE: This may cause threading to be enabled, which has side effects (such
# as using different libraries and debugging becomes more difficult).
+# NOTE: Using this together with Perl may cause a crash in initialization.
#CONF_OPT_PYTHON = --enable-pythoninterp
# TCL
@@ -420,10 +421,10 @@
# though configure can find support for it.
#CONF_OPT_NLS = --disable-nls
-# XIM - X Input Method. Special character input support for X11 (chinese,
-# japanese, special symbols, etc). Also needed for dead-key support.
+# XIM - X Input Method. Special character input support for X11 (Chinese,
+# Japanese, special symbols, etc). Also needed for dead-key support.
# When omitted it's automatically enabled for the X-windows GUI.
-# HANGUL - Input Hangul (korean) language using internal routines.
+# HANGUL - Input Hangul (Korean) language using internal routines.
# Uncomment one of these when you want to input a multibyte language.
#CONF_OPT_INPUT = --enable-xim
#CONF_OPT_INPUT = --disable-xim
@@ -462,7 +463,7 @@
#CONF_OPT_X = --without-x
# X WINDOWS DIRECTORY - specify X directories
-# If configure can't find you X stuff, or if you have multiple X11 derivates
+# If configure can't find you X stuff, or if you have multiple X11 derivatives
# installed, you may wish to specify which one to use.
# Select nothing to let configure choose.
# This here selects openwin (as found on sun).
diff --git a/src/auto/configure b/src/auto/configure
index 1056c0b..c109822 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -2801,8 +2801,8 @@
fi
if test "$GCC" = yes; then
gccversion=`"$CC" --version | sed -e '2,$d;s/^[^0-9]*\([0-9]\.[0-9.]*\).*$/\1/g'`
- if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2"; then
- echo 'GCC 3.0.x has a bug in the optimizer, disabling "-O#"'
+ if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then
+ echo 'GCC 34.0.12 has a bug in the optimizer, disabling "-O#"'
CFLAGS=`echo "$CFLAGS" | sed 's/-O[23456789]/-O/'`
else
if test "$gccversion" = "3.1" -o "$gccversion" = "3.2" -o "$gccversion" = "3.2.1" && `echo "$CFLAGS" | grep -v fno-strength-reduce >/dev/null`; then
@@ -4516,7 +4516,7 @@
echo "${ECHO_T}$try/tclConfig.sh" >&6
. $try/tclConfig.sh
TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`
- TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\ /\X/' | tr ' ' '\012' | sed -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr -d '\012'`
+ TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\ /\\X/' | tr ' ' '\012' | sed -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr -d '\012'`
break
fi
done
@@ -16048,13 +16048,22 @@
fi
fi
+echo "$as_me:$LINENO: checking for GCC 3 or later" >&5
+echo $ECHO_N "checking for GCC 3 or later... $ECHO_C" >&6
DEPEND_CFLAGS_FILTER=
if test "$GCC" = yes; then
- gccmajor=`"$CC" --version | sed -e '2,$d;s/^[^0-9]*\([3-9]\)\.[0-9.]*.*$/\1/g'`
- if test "$gccmajor" != ""; then
+ gccmajor=`"$CC" --version | sed -e '2,$d;s/^[^0-9]*\([1-9]\)\.[0-9.]*.*$/\1/g'`
+ if test "$gccmajor" > "2"; then
DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
fi
fi
+if test "$DEPEND_CFLAGS_FILTER" = ""; then
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+else
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+fi
ac_config_files="$ac_config_files auto/config.mk:config.mk.in"
diff --git a/src/charset.c b/src/charset.c
index 19f202a..1e0e837 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1381,8 +1381,8 @@
if (c != TAB && vim_isprintc(c))
{
endadd = char2cells(c) - 1;
- if (coladd >= endadd)
- coladd -= endadd;
+ if (coladd > endadd) /* past end of line */
+ endadd = 0;
else
coladd = 0;
}
diff --git a/src/configure.in b/src/configure.in
index ba22f58..404fbaf 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -30,8 +30,9 @@
fi
if test "$GCC" = yes; then
gccversion=`"$CC" --version | sed -e '2,$d;s/^[[^0-9]]*\([[0-9]]\.[[0-9.]]*\).*$/\1/g'`
- if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2"; then
- echo 'GCC 3.0.x has a bug in the optimizer, disabling "-O#"'
+ dnl version 4.0.1 was reported to cause trouble on Macintosh by Marcin Dalecki
+ if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then
+ echo 'GCC [34].0.[12] has a bug in the optimizer, disabling "-O#"'
CFLAGS=`echo "$CFLAGS" | sed 's/-O[[23456789]]/-O/'`
else
if test "$gccversion" = "3.1" -o "$gccversion" = "3.2" -o "$gccversion" = "3.2.1" && `echo "$CFLAGS" | grep -v fno-strength-reduce >/dev/null`; then
@@ -748,7 +749,7 @@
TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`
dnl Use $TCL_DEFS for -D_THREAD_SAFE et al. But only use the
dnl "-D_ABC" items. Watch out for -DFOO=long\ long.
- TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\ /\X/' | tr ' ' '\012' | sed -e '/^-[[^D]]/d' -e '/-D[[^_]]/d' -e 's/-D_/ -D_/' | tr -d '\012'`
+ TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\ /\\X/' | tr ' ' '\012' | sed -e '/^-[[^D]]/d' -e '/-D[[^_]]/d' -e 's/-D_/ -D_/' | tr -d '\012'`
break
fi
done
@@ -3071,13 +3072,19 @@
dnl gcc 3.1 changed the meaning of -MM. The only solution appears to be to
dnl use "-isystem" instead of "-I" for all non-Vim include dirs.
dnl But only when making dependencies, cproto and lint don't take "-isystem".
+AC_MSG_CHECKING(for GCC 3 or later)
DEPEND_CFLAGS_FILTER=
if test "$GCC" = yes; then
- gccmajor=`"$CC" --version | sed -e '2,$d;s/^[[^0-9]]*\([[3-9]]\)\.[[0-9.]]*.*$/\1/g'`
- if test "$gccmajor" != ""; then
+ gccmajor=`"$CC" --version | sed -e '2,$d;s/^[[^0-9]]*\([[1-9]]\)\.[[0-9.]]*.*$/\1/g'`
+ if test "$gccmajor" > "2"; then
DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
fi
fi
+if test "$DEPEND_CFLAGS_FILTER" = ""; then
+ AC_MSG_RESULT(no)
+else
+ AC_MSG_RESULT(yes)
+fi
AC_SUBST(DEPEND_CFLAGS_FILTER)
dnl write output files
diff --git a/src/eval.c b/src/eval.c
index ef84aee..423faea 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -16538,7 +16538,8 @@
{
/* Make sure the variable name is valid. */
for (p = varname; *p != NUL; ++p)
- if (!eval_isnamec1(*p) && (p == varname || !VIM_ISDIGIT(*p)))
+ if (!eval_isnamec1(*p) && (p == varname || !VIM_ISDIGIT(*p))
+ && *p != AUTOLOAD_CHAR)
{
EMSG2(_(e_illvar), varname);
return;
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 84c5b49..ac3a2b2 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -12,6 +12,9 @@
*/
#include "vim.h"
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
#include "version.h"
#ifdef FEAT_EX_EXTRA
@@ -1797,7 +1800,17 @@
if (tempname != NULL)
{
- fp_out = mch_fopen((char *)tempname, WRITEBIN);
+ int fd;
+
+ /* Use mch_open() to be able to use O_NOFOLLOW and set file
+ * protection same as original file, but strip s-bit. */
+ fd = mch_open((char *)tempname,
+ O_CREAT|O_EXTRA|O_EXCL|O_WRONLY|O_NOFOLLOW,
+ (int)((st_old.st_mode & 0777) | 0600));
+ if (fd < 0)
+ fp_out = NULL;
+ else
+ fp_out = fdopen(fd, WRITEBIN);
/*
* If we can't create in the same directory, try creating a
@@ -1809,18 +1822,14 @@
if ((tempname = vim_tempname('o')) != NULL)
fp_out = mch_fopen((char *)tempname, WRITEBIN);
}
-#ifdef UNIX
+
+#if defined(UNIX) && defined(HAVE_FCHOWN)
/*
- * Set file protection same as original file, but strip s-bit
- * and make sure the owner can read/write it.
+ * Make sure the owner can read/write it. This only works for
+ * root.
*/
if (fp_out != NULL)
- {
- (void)mch_setperm(tempname,
- (long)((st_old.st_mode & 0777) | 0600));
- /* this only works for root: */
- (void)chown((char *)tempname, st_old.st_uid, st_old.st_gid);
- }
+ (void)fchown(fileno(fp_out), st_old.st_uid, st_old.st_gid);
#endif
}
}
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 7242381..4a4e89f 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -2152,20 +2152,16 @@
*/
if (!global_busy && ea.line1 > ea.line2)
{
- if (sourcing || exmode_active)
+ if (msg_silent == 0)
{
- errormsg = (char_u *)_("E493: Backwards range given");
- goto doend;
- }
- else
- {
- int msg_silent_save = msg_silent;
-
- msg_silent = 0;
+ if (sourcing || exmode_active)
+ {
+ errormsg = (char_u *)_("E493: Backwards range given");
+ goto doend;
+ }
if (ask_yesno((char_u *)
_("Backwards range given, OK to swap"), FALSE) != 'y')
- goto doend;
- msg_silent = msg_silent_save;
+ goto doend;
}
lnum = ea.line1;
ea.line1 = ea.line2;
diff --git a/src/fileio.c b/src/fileio.c
index f04612d..a3ceb4b 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3111,7 +3111,12 @@
if (st_old.st_nlink > 1
|| mch_lstat((char *)fname, &st) < 0
|| st.st_dev != st_old.st_dev
- || st.st_ino != st_old.st_ino)
+ || st.st_ino != st_old.st_ino
+# ifndef HAVE_FCHOWN
+ || st.st_uid != st_old.st_uid
+ || st.st_gid != st_old.st_gid
+# endif
+ )
backup_copy = TRUE;
else
# endif
@@ -3126,18 +3131,19 @@
for (i = 4913; ; i += 123)
{
sprintf((char *)gettail(IObuff), "%d", i);
- if (mch_stat((char *)IObuff, &st) < 0)
+ if (mch_lstat((char *)IObuff, &st) < 0)
break;
}
- fd = mch_open((char *)IObuff, O_CREAT|O_WRONLY|O_EXCL, perm);
- close(fd);
+ fd = mch_open((char *)IObuff,
+ O_CREAT|O_WRONLY|O_EXCL|O_NOFOLLOW, perm);
if (fd < 0) /* can't write in directory */
backup_copy = TRUE;
else
{
# ifdef UNIX
- chown((char *)IObuff, st_old.st_uid, st_old.st_gid);
- (void)mch_setperm(IObuff, perm);
+# ifdef HAVE_FCHOWN
+ fchown(fd, st_old.st_uid, st_old.st_gid);
+# endif
if (mch_stat((char *)IObuff, &st) < 0
|| st.st_uid != st_old.st_uid
|| st.st_gid != st_old.st_gid
@@ -3145,6 +3151,7 @@
backup_copy = TRUE;
# endif
mch_remove(IObuff);
+ close(fd);
}
}
}
@@ -3338,7 +3345,8 @@
/* Open with O_EXCL to avoid the file being created while
* we were sleeping (symlink hacker attack?) */
bfd = mch_open((char *)backup,
- O_WRONLY|O_CREAT|O_EXTRA|O_EXCL, perm & 0777);
+ O_WRONLY|O_CREAT|O_EXTRA|O_EXCL|O_NOFOLLOW,
+ perm & 0777);
if (bfd < 0)
{
vim_free(backup);
@@ -3357,11 +3365,9 @@
* bits for the group same as the protection bits for
* others.
*/
- if (st_new.st_gid != st_old.st_gid &&
+ if (st_new.st_gid != st_old.st_gid
# ifdef HAVE_FCHOWN /* sequent-ptx lacks fchown() */
- fchown(bfd, (uid_t)-1, st_old.st_gid) != 0
-# else
- chown((char *)backup, (uid_t)-1, st_old.st_gid) != 0
+ && fchown(bfd, (uid_t)-1, st_old.st_gid) != 0
# endif
)
mch_setperm(backup,
@@ -4023,6 +4029,29 @@
}
#endif
+#ifdef UNIX
+ /* When creating a new file, set its owner/group to that of the original
+ * file. Get the new device and inode number. */
+ if (backup != NULL && !backup_copy)
+ {
+# ifdef HAVE_FCHOWN
+ struct stat st;
+
+ /* don't change the owner when it's already OK, some systems remove
+ * permission or ACL stuff */
+ if (mch_stat((char *)wfname, &st) < 0
+ || st.st_uid != st_old.st_uid
+ || st.st_gid != st_old.st_gid)
+ {
+ fchown(fd, st_old.st_uid, st_old.st_gid);
+ if (perm >= 0) /* set permission again, may have changed */
+ (void)mch_setperm(wfname, perm);
+ }
+# endif
+ buf_setino(buf);
+ }
+#endif
+
if (close(fd) != 0)
{
errmsg = (char_u *)_("E512: Close failed");
@@ -4047,27 +4076,6 @@
mch_set_acl(wfname, acl);
#endif
-#ifdef UNIX
- /* When creating a new file, set its owner/group to that of the original
- * file. Get the new device and inode number. */
- if (backup != NULL && !backup_copy)
- {
- struct stat st;
-
- /* don't change the owner when it's already OK, some systems remove
- * permission or ACL stuff */
- if (mch_stat((char *)wfname, &st) < 0
- || st.st_uid != st_old.st_uid
- || st.st_gid != st_old.st_gid)
- {
- chown((char *)wfname, st_old.st_uid, st_old.st_gid);
- if (perm >= 0) /* set permission again, may have changed */
- (void)mch_setperm(wfname, perm);
- }
- buf_setino(buf);
- }
-#endif
-
#if defined(FEAT_MBYTE) && defined(FEAT_EVAL)
if (wfname != fname)
@@ -4288,7 +4296,8 @@
int empty_fd;
if (org == NULL
- || (empty_fd = mch_open(org, O_CREAT | O_EXTRA | O_EXCL,
+ || (empty_fd = mch_open(org,
+ O_CREAT | O_EXTRA | O_EXCL | O_NOFOLLOW,
perm < 0 ? 0666 : (perm & 0777))) < 0)
EMSG(_("E206: patchmode: can't touch empty original file"));
else
@@ -5757,7 +5766,8 @@
return -1;
/* Create the new file with same permissions as the original. */
- fd_out = mch_open((char *)to, O_CREAT|O_EXCL|O_WRONLY|O_EXTRA, (int)perm);
+ fd_out = mch_open((char *)to,
+ O_CREAT|O_EXCL|O_WRONLY|O_EXTRA|O_NOFOLLOW, (int)perm);
if (fd_out == -1)
{
close(fd_in);
@@ -7273,7 +7283,7 @@
save_ei = vim_strsave(p_ei);
if (save_ei != NULL)
{
- new_ei = vim_strnsave(p_ei, (int)STRLEN(p_ei) + 8);
+ new_ei = vim_strnsave(p_ei, (int)(STRLEN(p_ei) + STRLEN(what)));
if (new_ei != NULL)
{
STRCAT(new_ei, what);
diff --git a/src/gui_x11.c b/src/gui_x11.c
index 829176b..be93cc5 100644
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -535,7 +535,7 @@
{"+reverse", "*reverseVideo", XrmoptionNoArg, "False"},
{"+rv", "*reverseVideo", XrmoptionNoArg, "False"},
{"-display", ".display", XrmoptionSepArg, NULL},
- {"-iconic", "*iconic", XrmoptionNoArg, "True"},
+ {"-iconic", ".iconic", XrmoptionNoArg, "True"},
{"-name", ".name", XrmoptionSepArg, NULL},
{"-bw", ".borderWidth", XrmoptionSepArg, NULL},
{"-borderwidth", ".borderWidth", XrmoptionSepArg, NULL},
@@ -1610,7 +1610,8 @@
gui_mch_open()
{
/* Actually open the window */
- XtPopup(vimShell, XtGrabNone);
+ XtRealizeWidget(vimShell);
+ XtManageChild(XtNameToWidget(vimShell, "*vimForm"));
gui.wid = gui_x11_get_wid();
gui.blank_pointer = gui_x11_create_blank_mouse();
diff --git a/src/if_python.c b/src/if_python.c
index 623731a..d58f7cf 100644
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -436,6 +436,14 @@
void
python_end()
{
+ static int recurse = 0;
+
+ /* If a crash occurs while doing this, don't try again. */
+ if (recurse != 0)
+ return;
+
+ ++recurse;
+
#ifdef DYNAMIC_PYTHON
if (hinstPython && Py_IsInitialized())
{
@@ -450,6 +458,8 @@
Py_Finalize();
}
#endif
+
+ --recurse;
}
static int
diff --git a/src/memfile.c b/src/memfile.c
index 8c41832..e1a6b60 100644
--- a/src/memfile.c
+++ b/src/memfile.c
@@ -1287,7 +1287,7 @@
/*
* try to open the file
*/
- flags |= O_EXTRA;
+ flags |= O_EXTRA | O_NOFOLLOW;
#ifdef WIN32
/* Prevent handle inheritance that cause problems with Cscope
* (swap file may not be deleted if cscope connection was open after
diff --git a/src/normal.c b/src/normal.c
index 73c4cfd..2d574d5 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -4229,9 +4229,7 @@
cmdarg_T *cap;
{
# if defined(FEAT_GUI) && defined(FEAT_WINDOWS)
- win_T *old_curwin;
-
- old_curwin = curwin;
+ win_T *old_curwin = curwin;
/* Currently we only get the mouse coordinates in the GUI. */
if (gui.in_use && mouse_row >= 0 && mouse_col >= 0)
@@ -8083,6 +8081,8 @@
if ((fdo_flags & FDO_HOR) && KeyTyped && cap->oap->op_type == OP_NOP)
foldOpenCursor();
#endif
+ ins_at_eol = FALSE; /* Don't move cursor past eol (only necessary in a
+ one-character line). */
}
#ifdef FEAT_VISUAL
diff --git a/src/ops.c b/src/ops.c
index a88c907..8c239da 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -3724,13 +3724,17 @@
&& curwin->w_cursor.col > 0
&& !(restart_edit || (State & INSERT)))
{
-#ifdef FEAT_VIRTUALEDIT
- col = curwin->w_cursor.col;
-#endif
+ /* Put the cursor on the last character in the line. */
dec_cursor();
#ifdef FEAT_VIRTUALEDIT
if (ve_flags == VE_ALL)
- curwin->w_cursor.coladd = col - curwin->w_cursor.col;
+ {
+ colnr_T scol, ecol;
+
+ /* Coladd is set to the width of the last character. */
+ getvcol(curwin, &curwin->w_cursor, &scol, NULL, &ecol);
+ curwin->w_cursor.coladd = ecol - scol + 1;
+ }
#endif
}
}
diff --git a/src/os_unix.c b/src/os_unix.c
index 491d41a..f951f18 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3709,6 +3709,11 @@
putenv(envbuf_Columns);
# endif
+ /*
+ * stderr is only redirected when using the GUI, so that a
+ * program like gpg can still access the terminal to get a
+ * passphrase using stderr.
+ */
# ifdef FEAT_GUI
if (pty_master_fd >= 0)
{
@@ -3719,8 +3724,11 @@
dup(pty_slave_fd);
close(1);
dup(pty_slave_fd);
- close(2);
- dup(pty_slave_fd);
+ if (gui.in_use)
+ {
+ close(2);
+ dup(pty_slave_fd);
+ }
close(pty_slave_fd); /* has been dupped, close it now */
}
@@ -3739,9 +3747,14 @@
dup(fd_fromshell[1]);
close(fd_fromshell[1]);
- /* set up stderr for the child */
- close(2);
- dup(1);
+# ifdef FEAT_GUI
+ if (gui.in_use)
+ {
+ /* set up stderr for the child */
+ close(2);
+ dup(1);
+ }
+# endif
}
}
diff --git a/src/po/check.vim b/src/po/check.vim
index a5f25aa..50ed9a4 100644
--- a/src/po/check.vim
+++ b/src/po/check.vim
@@ -19,6 +19,9 @@
let idline .= substitute(line, '"\(.*\)"$', '\1', '')
endwhile
+ " remove '%', not used for formatting.
+ let idline = substitute(idline, "'%'", '', 'g')
+
" remove everything but % items.
return substitute(idline, '[^%]*\(%[-+ #''.0-9*]*l\=[dsuxXpoc%]\)\=', '\1', 'g')
endfunc
@@ -39,6 +42,8 @@
let toline = GetMline()
if fromline != toline
echo 'Mismatching % in line ' . (line('.') - 1)
+ echo 'msgid: ' . fromline
+ echo 'msgstr: ' . toline
let error = 1
endif
endif
diff --git a/src/po/cleanup.vim b/src/po/cleanup.vim
index 313f159..78d1e5a 100644
--- a/src/po/cleanup.vim
+++ b/src/po/cleanup.vim
@@ -3,8 +3,8 @@
" - Comment-out fuzzy and empty messages.
" - Make sure there is a space before the string (required for Solaris).
" Requires Vim 6.0 or later (because of multi-line search patterns).
-g/^#: /d
-g/^#, fuzzy\(, .*\)\=\nmsgid ""\@!/.+1,/^$/-1s/^/#\~ /
-g/^msgstr"/s//msgstr "/
-g/^msgid"/s//msgid "/
-g/^msgstr ""\(\n"\)\@!/?^msgid?,.s/^/#\~ /
+silent g/^#: /d
+silent g/^#, fuzzy\(, .*\)\=\nmsgid ""\@!/.+1,/^$/-1s/^/#\~ /
+silent g/^msgstr"/s//msgstr "/
+silent g/^msgid"/s//msgid "/
+silent g/^msgstr ""\(\n"\)\@!/?^msgid?,.s/^/#\~ /
diff --git a/src/po/pl.cp1250.po b/src/po/pl.cp1250.po
index 8014f25..aa45662 100644
--- a/src/po/pl.cp1250.po
+++ b/src/po/pl.cp1250.po
@@ -1,18 +1,18 @@
# translation of pl.po to Polish
# Polish Translation for Vim
#
-# updated 2001 for vim-6.0
+# updated 2005 for vim-7.0
+#
# FIRST AUTHOR Marcin Dalecki <martin@dalecki.de>, 2000.
# Mikolaj Machowski <mikmach@wp.pl>, 2004, 2005.
-#
msgid ""
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-27 01:18+0200\n"
-"PO-Revision-Date: 2005-06-27 10:45+0200\n"
+"POT-Creation-Date: 2005-10-14 01:26+0200\n"
+"PO-Revision-Date: 2005-10-14 12:24+0200\n"
"Last-Translator: Mikolaj Machowski <mikmach@wp.pl>\n"
-"Language-Team: Polish <kde-transl@mer.chemia.polsl.gliwice.pl>\n"
+"Language-Team: Polish <mikmach@wp.pl>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=cp1250\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -218,13 +218,8 @@
msgstr " Dope³nianie s³ów kluczowych (^N^P)"
#. ctrl_x_mode == 0, ^P/^N compl.
-msgid " ^X mode (^E^Y^L^]^F^I^K^D^U^V^N^P)"
-msgstr " ^X tryb (^E^Y^L^]^F^I^K^D^U^V^N^P)"
-
-#. Scroll has it's own msgs, in it's place there is the msg for local
-#. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL) -- Acevedo
-msgid " Keyword Local completion (^N^P)"
-msgstr " Lokalne dope³nianie s³ów kluczowych (^N^P)"
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
+msgstr " ^X tryb (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
msgid " Whole line completion (^L^N^P)"
msgstr " Dope³nianie pe³nych wierszy (^L^N^P)"
@@ -253,15 +248,24 @@
msgid " User defined completion (^U^N^P)"
msgstr "Dope³nianie zdefiniowane przez u¿ytkownika (^U^N^P)"
+msgid " Omni completion (^O^N^P)"
+msgstr " Omni uzupe³nianie (^O^N^P)"
+
+msgid " Spelling suggestion (^S^N^P)"
+msgstr "Propozycja ortografii (^L^N^P)"
+
+msgid " Keyword Local completion (^N^P)"
+msgstr " Lokalne dope³nianie s³ów kluczowych (^N^P)"
+
msgid "Hit end of paragraph"
msgstr "Dobi³em do koñca akapitu"
-msgid "'thesaurus' option is empty"
-msgstr "opcja 'thesaurus' jest pusta"
-
msgid "'dictionary' option is empty"
msgstr "opcja 'dictionary' jest pusta"
+msgid "'thesaurus' option is empty"
+msgstr "opcja 'thesaurus' jest pusta"
+
#, c-format
msgid "Scanning dictionary: %s"
msgstr "Przegl¹dam s³ownik: %s"
@@ -311,9 +315,8 @@
msgstr "E18: Nieoczekiwane znaki w :let"
#, c-format
-#, fuzzy
-#~ msgid "E684: list index out of range: %ld"
-#~ msgstr "E684: : %ld"
+msgid "E684: list index out of range: %ld"
+msgstr "E684: Indeks listy poza zakresem: %ld"
#, c-format
msgid "E121: Undefined variable: %s"
@@ -372,11 +375,11 @@
msgid "E461: Illegal variable name: %s"
msgstr "E418: Niedozwolona nazwa zmiennej: %s"
-#~ msgid "E687: Less targets than List items"
-#~ msgstr ""
+msgid "E687: Less targets than List items"
+msgstr "E687: Mniej celów ni¿ elementów Listy"
-#~ msgid "E688: More targets than List items"
-#~ msgstr ""
+msgid "E688: More targets than List items"
+msgstr "E688: Wiêcej celów ni¿ elementów Listy"
msgid "Double ; in list of variables"
msgstr "Podwójny ; w licie zmiennych"
@@ -394,11 +397,11 @@
msgid "E709: [:] requires a List value"
msgstr "E709: [:] wymaga wartoci listy"
-#~ msgid "E710: List value has more items than target"
-#~ msgstr ""
+msgid "E710: List value has more items than target"
+msgstr "E710: Lista ma wiêcej elementów ni¿ cel"
-#~ msgid "E711: List value has not enough items"
-#~ msgstr ""
+msgid "E711: List value has not enough items"
+msgstr "E711: Lista nie ma wystarczaj¹cej iloci elementów"
msgid "E690: Missing \"in\" after :for"
msgstr "E690: Brak \"in\" po :for"
@@ -438,9 +441,8 @@
msgid "E110: Missing ')'"
msgstr "E110: Brak ')'"
-#, fuzzy
-#~ msgid "E695: Cannot index a Funcref"
-#~ msgstr "E90: Nie mogê wy³adowaæ ostatniego bufora"
+msgid "E695: Cannot index a Funcref"
+msgstr "E695: Nie mo¿na zindeksowaæ Funcref"
#, c-format
msgid "E112: Option name missing: %s"
@@ -472,7 +474,7 @@
#, c-format
msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: Podwójny klucz w S³owniku: \"%s\""
+msgstr "E721: Powtórzony klucz w S³owniku: \"%s\""
#, c-format
msgid "E722: Missing comma in Dictionary: %s"
@@ -524,8 +526,8 @@
msgid "E701: Invalid type for len()"
msgstr "E701: Nieprawid³owy typ dla len()"
-#~ msgid "E726: Stride is zero"
-#~ msgstr ""
+msgid "E726: Stride is zero"
+msgstr "E726: Skok to zero"
msgid "E727: Start past end"
msgstr "E727: Pocz¹tek po koñcu"
@@ -549,9 +551,8 @@
msgid "E258: Unable to send to client"
msgstr "E258: Nie mogê wys³aæ do klienta"
-#, fuzzy
-#~ msgid "E702: Sort compare function failed"
-#~ msgstr "E237: Wybór drukarki nie powiód³ siê"
+msgid "E702: Sort compare function failed"
+msgstr "E702: Funkcja porównywania w sort nie powiod³a siê"
msgid "(Invalid)"
msgstr "(Niew³aciwe)"
@@ -582,8 +583,8 @@
msgstr "E704: Nazwa Funcref musi siê zaczynaæ wielk¹ liter¹: %s"
#, c-format
-#~ msgid "705: Variable name conflicts with existing function: %s"
-#~ msgstr ""
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: Nazwa zmiennej jest w konflikcie z istniej¹c¹ funkcj¹: %s"
#, c-format
msgid "E706: Variable type mismatch for: %s"
@@ -623,7 +624,9 @@
#, c-format
msgid "E128: Function name must start with a capital or contain a colon: %s"
-msgstr "E128: Nazwa funkcji musi rozpoczynaæ siê wielk¹ liter¹ lub zawieraæ dwukropek: %s"
+msgstr ""
+"E128: Nazwa funkcji musi rozpoczynaæ siê wielk¹ liter¹ lub zawieraæ "
+"dwukropek: %s"
#, c-format
msgid "E131: Cannot delete function %s: It is in use"
@@ -663,6 +666,13 @@
"\n"
"# zmienne globalne:\n"
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\tOstatnie ustawienie przez "
+
msgid "Entering Debug mode. Type \"cont\" to continue."
msgstr "Wchodzê w tryb odpluskwiania. Wprowad \"cont\" aby kontynuowaæ."
@@ -771,90 +781,6 @@
msgstr "E168: u¿yto :finish poza wczytywanym plikiem"
#, c-format
-msgid "Page %d"
-msgstr "Strona %d"
-
-msgid "No text to be printed"
-msgstr "Brak tekstu do drukowania"
-
-#, c-format
-msgid "Printing page %d (%d%%)"
-msgstr "Drukujê stronê %d (%d%%)"
-
-#, c-format
-msgid " Copy %d of %d"
-msgstr " Kopia %d z %d"
-
-#, c-format
-msgid "Printed: %s"
-msgstr "Wydrukowano: %s"
-
-msgid "Printing aborted"
-msgstr "Drukowanie odwo³ane"
-
-msgid "E455: Error writing to PostScript output file"
-msgstr "E455: Nie mo¿na zapisaæ do wyjciowego pliku PostScriptu"
-
-#, c-format
-msgid "E624: Can't open file \"%s\""
-msgstr "E624: Nie mogê otworzyæ pliku \"%s\""
-
-#, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: Nie mo¿na odczytaæ pliku zasobów PostScriptu \"%s\""
-
-#, c-format
-msgid "E618: file \"%s\" is not a PostScript resource file"
-msgstr "E618: plik \"%s\" nie jest plikiem zasobów PostScriptu"
-
-#, c-format
-msgid "E619: file \"%s\" is not a supported PostScript resource file"
-msgstr "E619: plik \"%s\" nie jest wspieranym plikiem zasobów PostScriptu"
-
-#, c-format
-msgid "E621: \"%s\" resource file has wrong version"
-msgstr "E621: \"%s\" nieprawid³owa wersja pliku zasobów"
-
-msgid "E673: Incompatible multi-byte encoding and character set."
-msgstr "E673: Niekompatybilne kodowanie wielobajtowe i zestaw znaków."
-
-msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
-msgstr "E674: printmbcharset nie mo¿e byæ pusty przy kodowaniu wielobajtowym."
-
-msgid "E675: No default font specified for multi-byte printing."
-msgstr "E675: Nie okrelono domylnej czcionki dla drukowania wielobajtowego."
-
-msgid "E324: Can't open PostScript output file"
-msgstr "E324: Nie mo¿na otworzyæ pliku PostScript do wyjcia"
-
-#, c-format
-msgid "E456: Can't open file \"%s\""
-msgstr "E456: Nie mogê otworzyæ pliku \"%s\""
-
-msgid "E456: Can't find PostScript resource file \"prolog.ps\""
-msgstr "E456: Nie mo¿na znaleæ pliku zasobów PostScriptu \"prolog.ps\""
-
-msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
-msgstr "E456: Nie mo¿na znaleæ pliku zasobów PostScriptu \"cidfont.ps\""
-
-#, c-format
-msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: Nie mo¿na znaleæ pliku zasobów PostScriptu \"%s.ps\""
-
-#, c-format
-msgid "E620: Unable to convert to print encoding \"%s\""
-msgstr "E620: Nie mo¿na przekonwertowaæ by drukowaæ kodowanie \"%s\""
-
-msgid "Sending to printer..."
-msgstr "Przesy³am do drukarki..."
-
-msgid "E365: Failed to print PostScript file"
-msgstr "E365: Drukowanie pliku PostScript nie powiod³o siê"
-
-msgid "Print job sent."
-msgstr "Zadanie drukowanie przes³ane."
-
-#, c-format
msgid "Current %slanguage: \"%s\""
msgstr "Bie¿¹cy %sjêzyk: \"%s\""
@@ -957,6 +883,14 @@
msgstr "Nadpisaæ istniej¹cy plik \"%s\"?"
#, c-format
+msgid "Swap file \"%s\" exists, overwrite anyway?"
+msgstr "Plik wymiany \"%s\" istnieje, czy go nadpisaæ?"
+
+#, c-format
+msgid "E768: Swap file exists: %s (:silent! overrides)"
+msgstr "E768: Plik wymiany istnieje: %s (wymu poprzez :silent!)"
+
+#, c-format
msgid "E141: No file name for buffer %ld"
msgstr "E141: Brak nazwy pliku dla bufora %ld"
@@ -1069,7 +1003,7 @@
#, c-format
msgid "E154: Duplicate tag \"%s\" in file %s/%s"
-msgstr "E154: Dwukrotny znacznik \"%s\" w pliku %s/%s"
+msgstr "E154: Powtórzony znacznik \"%s\" w pliku %s/%s"
#, c-format
msgid "E160: Unknown sign command: %s"
@@ -1188,18 +1122,8 @@
msgid "E178: Invalid default value for count"
msgstr "E178: Niew³aciwa domylna wartoæ mno¿nika"
-msgid "E179: argument required for complete"
-msgstr "E179: argument wymagany do dope³niania"
-
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: Niew³aciwa wartoæ dope³niania: %s"
-
-msgid "E468: Completion argument only allowed for custom completion"
-msgstr "E468: Argument depe³niania dozwolony wy³¹cznie dla dope³niania u¿ytkownika"
-
-msgid "E467: Custom completion requires a function argument"
-msgstr "E467: Dope³nianie u¿ytkownika wymaga funkcji jako argumentu"
+msgid "E179: argument required for -complete"
+msgstr "E179: -complete wymaga argumentu"
#, c-format
msgid "E181: Invalid attribute: %s"
@@ -1218,6 +1142,16 @@
msgstr "E184: Nie ma takiej komendy u¿ytkownika: %s"
#, c-format
+msgid "E180: Invalid complete value: %s"
+msgstr "E180: Niew³aciwa wartoæ dope³niania: %s"
+
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr "E468: Argument depe³niania dozwolony wy³¹cznie dla dope³niania u¿ytkownika"
+
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: Dope³nianie u¿ytkownika wymaga funkcji jako argumentu"
+
+#, c-format
msgid "E185: Cannot find color scheme %s"
msgstr "E185: Nie mogê znaleæ zestawu kolorów %s"
@@ -1234,7 +1168,9 @@
msgstr "Do³¹cz plik"
msgid "E747: Cannot change directory, buffer is modifed (add ! to override)"
-msgstr "E747: Nie mogê zmieniæ katalogu, bufor zosta³ zmodyfikowany (dodaj ! aby wymusiæ)"
+msgstr ""
+"E747: Nie mogê zmieniæ katalogu, bufor zosta³ zmodyfikowany (dodaj ! aby "
+"wymusiæ)"
msgid "E186: No previous directory"
msgstr "E186: Nie ma poprzedniego katalogu"
@@ -1468,6 +1404,9 @@
msgid "[New File]"
msgstr "[Nowy Plik]"
+msgid "[File too big]"
+msgstr "[Za du¿y plik]"
+
msgid "[Permission Denied]"
msgstr "[Nie dozwolono]"
@@ -1756,8 +1695,8 @@
msgstr "--Skasowano--"
#, c-format
-#~ msgid "auto-removing autocommand: %s <buffer=%d>"
-#~ msgstr ""
+msgid "auto-removing autocommand: %s <buffer=%d>"
+msgstr "auto-usuwanie autokomendy: %s <buffer=%d>"
#. the group doesn't exist
#, c-format
@@ -1784,9 +1723,9 @@
"\n"
"--- Autokomendy ---"
-#, fuzzy, c-format
-#~ msgid "E680: <buffer=%d>: invalid buffer number "
-#~ msgstr "niew³aciwy numer bufora"
+#, c-format
+msgid "E680: <buffer=%d>: invalid buffer number "
+msgstr "E680: <buffer=%d>: niew³aciwy numer bufora"
msgid "E217: Can't execute autocommands for ALL events"
msgstr "E217: Nie mo¿na wykonywaæ autokomend dla wydarzeñ ALL"
@@ -1910,8 +1849,8 @@
msgid "E254: Cannot allocate color %s"
msgstr "E254: Nie mogê zarezerwowaæ koloru %s"
-#~ msgid "No match at cursor, finding next"
-#~ msgstr ""
+msgid "No match at cursor, finding next"
+msgstr "Brak dopasowania przy kursorze, szukam dalej"
msgid "Vim dialog..."
msgstr "Dialog Vima..."
@@ -2052,8 +1991,8 @@
msgid "Not Used"
msgstr "Nie u¿ywany"
-#~ msgid "Directory\t*.nothing\n"
-#~ msgstr ""
+msgid "Directory\t*.nothing\n"
+msgstr "Katalog\t*.nic\n"
msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
msgstr ""
@@ -2084,9 +2023,9 @@
msgid "Font1: %s\n"
msgstr "Font1: %s\n"
-#, fuzzy, c-format
-#~ msgid "Font%ld width is not twice that of font0\n"
-#~ msgstr "szerokoæ font%d nie jest podwójn¹ szerokoci¹ font0\n"
+#, c-format
+msgid "Font%ld width is not twice that of font0\n"
+msgstr "Szerokoæ font%ld nie jest podwójn¹ szerokoci¹ font0\n"
#, c-format
msgid "Font0 width: %ld\n"
@@ -2103,11 +2042,11 @@
msgid "Invalid font specification"
msgstr "Nieprawid³owy opis czcionki"
-#~ msgid "&Dismiss"
-#~ msgstr ""
+msgid "&Dismiss"
+msgstr "&Anuluj"
-#~ msgid "no specific match"
-#~ msgstr ""
+msgid "no specific match"
+msgstr "brak okrelonego dopasowania"
msgid "Vim - Font Selector"
msgstr "Vim - wybór czcionki"
@@ -2134,6 +2073,99 @@
msgid "E256: Hangul automata ERROR"
msgstr "E256: B£¥D w automacie Hangul"
+msgid "E550: Missing colon"
+msgstr "E550: Brak dwukropka"
+
+msgid "E551: Illegal component"
+msgstr "E551: Niedozwolona czêæ"
+
+msgid "E552: digit expected"
+msgstr "E552: oczekiwano cyfry"
+
+#, c-format
+msgid "Page %d"
+msgstr "Strona %d"
+
+msgid "No text to be printed"
+msgstr "Brak tekstu do drukowania"
+
+#, c-format
+msgid "Printing page %d (%d%%)"
+msgstr "Drukujê stronê %d (%d%%)"
+
+#, c-format
+msgid " Copy %d of %d"
+msgstr " Kopia %d z %d"
+
+#, c-format
+msgid "Printed: %s"
+msgstr "Wydrukowano: %s"
+
+msgid "Printing aborted"
+msgstr "Drukowanie odwo³ane"
+
+msgid "E455: Error writing to PostScript output file"
+msgstr "E455: Nie mo¿na zapisaæ do wyjciowego pliku PostScriptu"
+
+#, c-format
+msgid "E624: Can't open file \"%s\""
+msgstr "E624: Nie mogê otworzyæ pliku \"%s\""
+
+#, c-format
+msgid "E457: Can't read PostScript resource file \"%s\""
+msgstr "E457: Nie mo¿na odczytaæ pliku zasobów PostScriptu \"%s\""
+
+#, c-format
+msgid "E618: file \"%s\" is not a PostScript resource file"
+msgstr "E618: plik \"%s\" nie jest plikiem zasobów PostScriptu"
+
+#, c-format
+msgid "E619: file \"%s\" is not a supported PostScript resource file"
+msgstr "E619: plik \"%s\" nie jest wspieranym plikiem zasobów PostScriptu"
+
+#, c-format
+msgid "E621: \"%s\" resource file has wrong version"
+msgstr "E621: \"%s\" nieprawid³owa wersja pliku zasobów"
+
+msgid "E673: Incompatible multi-byte encoding and character set."
+msgstr "E673: Niekompatybilne kodowanie wielobajtowe i zestaw znaków."
+
+msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
+msgstr "E674: printmbcharset nie mo¿e byæ pusty przy kodowaniu wielobajtowym."
+
+msgid "E675: No default font specified for multi-byte printing."
+msgstr "E675: Nie okrelono domylnej czcionki dla drukowania wielobajtowego."
+
+msgid "E324: Can't open PostScript output file"
+msgstr "E324: Nie mo¿na otworzyæ pliku PostScript do wyjcia"
+
+#, c-format
+msgid "E456: Can't open file \"%s\""
+msgstr "E456: Nie mogê otworzyæ pliku \"%s\""
+
+msgid "E456: Can't find PostScript resource file \"prolog.ps\""
+msgstr "E456: Nie mo¿na znaleæ pliku zasobów PostScriptu \"prolog.ps\""
+
+msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
+msgstr "E456: Nie mo¿na znaleæ pliku zasobów PostScriptu \"cidfont.ps\""
+
+#, c-format
+msgid "E456: Can't find PostScript resource file \"%s.ps\""
+msgstr "E456: Nie mo¿na znaleæ pliku zasobów PostScriptu \"%s.ps\""
+
+#, c-format
+msgid "E620: Unable to convert to print encoding \"%s\""
+msgstr "E620: Nie mo¿na przekonwertowaæ by drukowaæ kodowanie \"%s\""
+
+msgid "Sending to printer..."
+msgstr "Przesy³am do drukarki..."
+
+msgid "E365: Failed to print PostScript file"
+msgstr "E365: Drukowanie pliku PostScript nie powiod³o siê"
+
+msgid "Print job sent."
+msgstr "Zadanie drukowanie przes³ane."
+
msgid "Add a new database"
msgstr "Dodaj now¹ bazê danych"
@@ -2278,7 +2310,9 @@
msgid ""
"???: Sorry, this command is disabled, the MzScheme library could not be "
"loaded."
-msgstr "???: Przykro mi, ta komenda jest wy³¹czona, biblioteka MzScheme nie mo¿e byæ za³adowana."
+msgstr ""
+"???: Przykro mi, ta komenda jest wy³¹czona, biblioteka MzScheme nie mo¿e byæ "
+"za³adowana."
msgid "invalid expression"
msgstr "niepoprawne wyra¿enie"
@@ -2292,9 +2326,8 @@
msgid "unknown option"
msgstr "nieznana opcja"
-#, fuzzy
-#~ msgid "window index is out of range"
-#~ msgstr "numer wiersza poza zakresem"
+msgid "window index is out of range"
+msgstr "indeks okna poza zakresem"
msgid "couldn't open buffer"
msgstr "nie mogê otworzyæ bufora"
@@ -2576,8 +2609,8 @@
msgid "E251: VIM instance registry property is badly formed. Deleted!"
msgstr "E251: wcielenia instancji rejestru Vima jest le sformowane. Skasowano!"
-msgid "Unknown option"
-msgstr "Nieznana opcja"
+msgid "Unknown option argument"
+msgstr "Nieznany argument opcji"
msgid "Too many edit arguments"
msgstr "Zbyt wiele argumentów"
@@ -2585,8 +2618,8 @@
msgid "Argument missing after"
msgstr "Brak argumentu po"
-msgid "Garbage after option"
-msgstr "miecie po opcji"
+msgid "Garbage after option argument"
+msgstr "miecie po argumencie opcji"
msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
msgstr "Zbyt wiele argumentów \"+komenda\", \"-c komenda\" lub \"--cmd komenda\""
@@ -2594,6 +2627,10 @@
msgid "Invalid argument for"
msgstr "Niew³aciwy argument dla"
+#, c-format
+msgid "%d files to edit\n"
+msgstr "%d plików do edycji\n"
+
msgid "This Vim was not compiled with the diff feature."
msgstr "Ta wersja Vima nie by³a skompilowanego z opcj¹ ró¿nic (diff)."
@@ -2615,10 +2652,6 @@
msgid "Vim: Warning: Input is not from a terminal\n"
msgstr "Vim: OSTRZE¯ENIE: Wejcie nie pochodzi z terminala\n"
-#, c-format
-msgid "%d files to edit\n"
-msgstr "%d plików do edycji\n"
-
#. just in case..
msgid "pre-vimrc command line"
msgstr "linia poleceñ pre-vimrc"
@@ -2665,8 +2698,8 @@
"\n"
" lub:"
-#~ msgid "where case is ignored prepend / to make flag upper case"
-#~ msgstr ""
+msgid "where case is ignored prepend / to make flag upper case"
+msgstr "gdzie wielkoæ znaków jest ignorowana dodaj na pocz¹tku / by flaga by³a wielk¹ liter¹"
msgid ""
"\n"
@@ -3498,8 +3531,9 @@
msgid "E328: Menu only exists in another mode"
msgstr "E328: Menu istnieje tylko w innym trybie"
-msgid "E329: No menu of that name"
-msgstr "E329: Nie ma menu o tej nazwie"
+#, c-format
+msgid "E329: No menu \"%s\""
+msgstr "E329: Nie ma menu \"%s\""
msgid "E330: Menu path must not lead to a sub-menu"
msgstr "E330: Trop menu nie mo¿e prowadziæ do podmenu"
@@ -3557,17 +3591,18 @@
msgid "Interrupt: "
msgstr "Przerwanie: "
-msgid "Hit ENTER or type command to continue"
+msgid "Press ENTER or type command to continue"
msgstr "Nacinij ENTER lub wprowad komendê aby kontynuowaæ"
+#, c-format
+msgid "%s line %ld"
+msgstr "%s wiersz %ld"
+
msgid "-- More --"
msgstr "-- Wiêcej --"
-msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
-msgstr " (RET/BS: wiersz, SPACE/b: stronê, d/u: pó³ strony, q: zakoñcz)"
-
-msgid " (RET: line, SPACE: page, d: half page, q: quit)"
-msgstr " (RET: wiersz, SPACE: stronê, d: pó³ strony, q: zakoñczenie)"
+msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " SPACE/d/j: ekran/strona/wiersz w dó³, b/u/k: do góry, q: zakoñcz"
msgid "Question"
msgstr "Pytanie"
@@ -3605,10 +3640,18 @@
msgid "E338: Sorry, no file browser in console mode"
msgstr "E338: Przykro mi, nie ma przegl¹darki plików w trybie konsoli"
+msgid "E766: Insufficient arguments for printf()"
+msgstr "E766: Za ma³o argumentów dla printf()"
+
+msgid "E767: Too many arguments to printf()"
+msgstr "E767: Za du¿o argumentów dla printf()"
+
msgid "W10: Warning: Changing a readonly file"
msgstr "W10: OSTRZE¯ENIE: Zmiany w pliku tylko do odczytu"
-#. When using ":silent" assume that <CR> was entered.
+msgid "Type number or click with mouse (<Enter> cancels): "
+msgstr "Wpisz numer lub wybierz mysz¹ (<Enter> anuluje): "
+
msgid "Choice number (<Enter> cancels): "
msgstr "Wybierz numer (<Enter> anuluje): "
@@ -3723,15 +3766,6 @@
msgid "E347: No more file \"%s\" found in path"
msgstr "E347: Pliku \"%s\" nie ma wiêcej w tropie"
-msgid "E550: Missing colon"
-msgstr "E550: Brak dwukropka"
-
-msgid "E551: Illegal component"
-msgstr "E551: Niedozwolona czêæ"
-
-msgid "E552: digit expected"
-msgstr "E552: oczekiwano cyfry"
-
#. Get here when the server can't be found.
msgid "Cannot connect to Netbeans #2"
msgstr "Nie mo¿na po³¹czyæ z Netbeans #2"
@@ -3822,9 +3856,8 @@
msgid "freeing %ld lines"
msgstr "zwalniam %ld wierszy"
-#, fuzzy
-#~ msgid "block of 1 line yanked"
-#~ msgstr "1 wiersz skopiowano"
+msgid "block of 1 line yanked"
+msgstr "skopiowano blok 1 wiersza"
msgid "1 line yanked"
msgstr "1 wiersz skopiowano"
@@ -3876,7 +3909,9 @@
msgid ""
"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
"Bytes"
-msgstr "Wybrano %s%ld z %ld Wierszy; %ld z %ld S³ów; %ld z %ld Znaków; %ld z %ld Bajtów"
+msgstr ""
+"Wybrano %s%ld z %ld Wierszy; %ld z %ld S³ów; %ld z %ld Znaków; %ld z %ld "
+"Bajtów"
#, c-format
msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
@@ -3886,7 +3921,9 @@
msgid ""
"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
"%ld"
-msgstr "Kol %s z %s; Wiersz %ld z %ld; S³owo %ld z %ld; Znak %ld z %ld; Bajt %ld z %ld"
+msgstr ""
+"Kol %s z %s; Wiersz %ld z %ld; S³owo %ld z %ld; Znak %ld z %ld; Bajt %ld z %"
+"ld"
#, c-format
msgid "(+%ld for BOM)"
@@ -3907,13 +3944,6 @@
msgid "E520: Not allowed in a modeline"
msgstr "E520: Niedozwolone w modeline"
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tOstatnie ustawienie przez "
-
msgid "E521: Number required after ="
msgstr "E521: Po = wymagany jest numer"
@@ -4425,6 +4455,10 @@
msgstr "E71: Niedozwolony znak po %s%%"
#, c-format
+msgid "E769: Missing ] after %s["
+msgstr "E769: Brak ] po %s["
+
+#, c-format
msgid "E554: Syntax error in %s{...}"
msgstr "E554: B³¹d sk³adni w %s{...}"
@@ -4485,12 +4519,6 @@
msgid "recording"
msgstr "zapis"
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "szukanie dobi³o GÓRY; kontynuacja od KOÑCA"
-
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "szukanie dobi³o KOÑCA; kontynuacja od GÓRY"
-
#, c-format
msgid "E383: Invalid search string: %s"
msgstr "E383: Niew³aciwy ci¹g do szukania: %s"
@@ -4547,34 +4575,56 @@
msgid "E759: Format error in spell file"
msgstr "E759: Nieprawid³owy format pliku sprawdzania pisowni"
+msgid "E758: Truncated spell file"
+msgstr "E758: Obciêty plik sprawdzania pisowni"
+
+#, c-format
+msgid "Trailing text in %s line %d: %s"
+msgstr "Zbêdny tekst w %s wiersz %d: %s"
+
+#, c-format
+msgid "Affix name too long in %s line %d: %s"
+msgstr "Za d³uga nazwa afiksu w %s wiersz %d: %s"
+
+msgid "E761: Format error in affix file FOL, LOW or UPP"
+msgstr "E761: B³¹d formatu w pliku afiksów FOL, LOW lub UPP"
+
+msgid "E762: Character in FOL, LOW or UPP is out of range"
+msgstr "E762: Znak w FOL, LOW lub UPP jest poza zasiêgiem"
+
+msgid "Compressing word tree..."
+msgstr "Kompresja drzewa s³ów..."
+
msgid "E756: Spell checking is not enabled"
msgstr "E756: Sprawdzanie pisowni nie jest w³¹czone"
#, c-format
-msgid "Warning: Cannot find word list \"%s\""
-msgstr "Ostrze¿enie: Nie mogê znaleæ listy s³ów \"%s\""
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr "Ostrze¿enie: Nie mogê znaleæ listy s³ów \"%s.%s.spl\" lub \"%s.ascii.spl\""
#, c-format
msgid "Reading spell file \"%s\""
msgstr "Odczytujê plik sprawdzania pisowni \"%s\""
-msgid "E757: Wrong file ID in spell file"
-msgstr "E757: B³êdne ID pliku sprawdzania pisowni"
+msgid "E757: This does not look like a spell file"
+msgstr "E757: To nie wygl¹da na plik sprawdzania pisowni"
-msgid "E758: Truncated spell file"
-msgstr "E758: Obciêty plik sprawdzania pisowni"
+msgid "E771: Old spell file, needs to be updated"
+msgstr "E771: Stary plik sprawdzania pisowni, wymagane uaktualnienie"
+
+msgid "E772: Spell file is for newer version of Vim"
+msgstr "E772: Plik sprawdzania pisowni dla nowszej wersji Vima"
+
+msgid "E770: Unsupported section in spell file"
+msgstr "E770: Niewspierana sekcja w pliku sprawdzania pisowni"
#, c-format
msgid "Warning: region %s not supported"
msgstr "Ostrze¿enie: region %s nie jest wspierany"
#, c-format
-#~ msgid "Affix name too long in %s line %d: %s"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "Reading affix file %s..."
-#~ msgstr "Szukam w pliku znaczników %s"
+msgid "Reading affix file %s ..."
+msgstr "Czytam plik afiksów %s ..."
#, c-format
msgid "Conversion failure for word in %s line %d: %s"
@@ -4588,29 +4638,49 @@
msgid "Conversion in %s not supported"
msgstr "Konwersja w %s nie jest wspierana"
-#, fuzzy, c-format
-#~ msgid "Trailing text in %s line %d: %s"
-#~ msgstr "Punkt kontrolny w \"%s%s\" wiersz %ld"
+#, c-format
+msgid "Invalid value for FLAG in %s line %d: %s"
+msgstr "Nieprawid³owa wartoæ FLAG w %s wierz %d: %s"
+
+#, c-format
+msgid "FLAG after using flags in %s line %d: %s"
+msgstr "FLAG po u¿yciu flag w %s wiersz %d: %s"
+
+#, c-format
+msgid "Character used for SLASH must be ASCII; in %s line %d: %s"
+msgstr "Znak u¿yty jako SLASH musi byæ znakiem ASCII; w %s wiersz %d: %s"
+
+#, c-format
+msgid "Wrong COMPOUNDMAX value in %s line %d: %s"
+msgstr "Z³a wartoæ COMPOUNDMAX w %s wiersz %d: %s"
+
+#, c-format
+msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
+msgstr "Z³a wartoæ COMPOUNDMIM w %s wiersz %d: %s"
+
+#, c-format
+msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
+msgstr "Z³a wartoæ COMPOUNDSYLMAX w %s wiersz %d: %s"
+
+#, c-format
+msgid "Different combining flag in continued affix block in %s line %d: %s"
+msgstr "Ró¿ne flagi z³o¿eñ w kontynuowanym bloku afiksu w %s wiersz %d: %s"
+
+#, c-format
+msgid "Duplicate affix in %s line %d: %s"
+msgstr "Powtórzony afiks w %s wiersz %d: %s"
+
+#, c-format
+msgid "Affix also used for BAD/RAR/KEP/NEEDAFFIX/NEEDCOMPOUND in %s line %d: %s"
+msgstr "Afiks u¿yty tak¿e dla BAD/RAR/KEP/NEEDAFFIX/NEEDCOMPOUND w %s wiersz %d: %s"
#, c-format
msgid "Expected Y or N in %s line %d: %s"
msgstr "Oczekiwano Y lub N w %s wierszu %d: %s"
-#, fuzzy, c-format
-#~ msgid "Duplicate affix in %s line %d: %s"
-#~ msgstr "Dwukrotny znacznik \"%s\" w pliku %s"
-
#, c-format
-msgid "Duplicate FOL in %s line %d"
-msgstr "Dwukrotny FOL w %s wierszu %d"
-
-#, c-format
-msgid "Duplicate LOW in %s line %d"
-msgstr "Dwukrotny LOW w %s wierszu %d"
-
-#, c-format
-msgid "Duplicate UPP in %s line %d"
-msgstr "Dwukrotny UPP w %s wierszu %d"
+msgid "Broken condition in %s line %d: %s"
+msgstr "B³êdny warunek w %s wiersz %d: %s"
#, c-format
msgid "Expected REP count in %s line %d"
@@ -4622,19 +4692,51 @@
#, c-format
msgid "Duplicate character in MAP in %s line %d"
-msgstr "Podwojony znak w MAP w %s wierszu %d"
+msgstr "Powtórzony znak w MAP w %s wierszu %d"
#, c-format
-msgid "Unrecognized item in %s line %d: %s"
-msgstr "Nieznany element w %s wierszu %d: %s"
+msgid "Unrecognized or duplicate item in %s line %d: %s"
+msgstr "Nieznany lub powtórzony element w %s wierszu %d: %s"
#, c-format
msgid "Missing FOL/LOW/UPP line in %s"
msgstr "Brak wiersza FOL/LOW/UPP w %s"
+msgid "COMPOUNDSYLMAX used without SYLLABLE"
+msgstr "COMPOUNDSYLMAX u¿yty bez SYLLABLE"
+
+msgid "Too many postponed prefixes"
+msgstr "Zbyt wiele opónionych prefiksów"
+
+msgid "Too many compound flags"
+msgstr "Zbyt wiele flag z³o¿eñ"
+
+msgid "Too many posponed prefixes and/or compound flags"
+msgstr "Zbyt wiele opónionych prefiksów i/lub flag z³o¿eñ"
+
#, c-format
-msgid "Reading dictionary file %s..."
-msgstr "Czytam plik s³ownika %s..."
+msgid "Missing SOFO%s line in %s"
+msgstr "Brak wiersza SOFO%s wiersz w %s"
+
+#, c-format
+msgid "Both SAL and SOFO lines in %s"
+msgstr "Wiersze SAL i SOFO w %s"
+
+#, c-format
+msgid "Flag is not a number in %s line %d: %s"
+msgstr "Flaga nie jest liczb¹ w %s wiersz %d: %s"
+
+#, c-format
+msgid "Illegal flag in %s line %d: %s"
+msgstr "Nieprawid³owa flaga w %s wiersz %d: %s"
+
+#, c-format
+msgid "%s value differs from what is used in another .aff file"
+msgstr "Wartoæ %s ró¿ni siê od tej u¿ytej w innym pliku .aff"
+
+#, c-format
+msgid "Reading dictionary file %s ..."
+msgstr "Czytam plik s³ownika %s ..."
#, c-format
msgid "E760: No word count in %s"
@@ -4647,19 +4749,29 @@
# c-format
#, c-format
msgid "Duplicate word in %s line %d: %s"
-msgstr "Podwójny wyraz w %s wierszu %d: %s"
+msgstr "Powtórzony wyraz w %s wierszu %d: %s"
+
+# c-format
+#, c-format
+msgid "First duplicate word in %s line %d: %s"
+msgstr "Pierwszy powtórzony wyraz w %s wiersz %d: %s"
+
+# c-format
+#, c-format
+msgid "%d duplicate word(s) in %s"
+msgstr "%d powtórzony(ch) wyraz(ów) w %s"
#, c-format
-msgid "Ignored %d words with non-ASCII characters"
-msgstr "Zignorowa³em %d s³ów ze znakami nie ASCII"
+msgid "Ignored %d word(s) with non-ASCII characters in %s"
+msgstr "Zignorowa³em %d s³ów ze znakami nie ASCII w %s"
#, c-format
-msgid "Reading word file %s..."
-msgstr "Odczytujê plik wyrazów %s..."
+msgid "Reading word file %s ..."
+msgstr "Odczytujê plik wyrazów %s ..."
#, c-format
msgid "Duplicate /encoding= line ignored in %s line %d: %s"
-msgstr "Zignorowano podwojony wiersz /encoding= w %s wierszu %d: %s"
+msgstr "Zignorowano powtórzony wiersz /encoding= w %s wierszu %d: %s"
#, c-format
msgid "/encoding= line after word ignored in %s line %d: %s"
@@ -4667,19 +4779,27 @@
#, c-format
msgid "Duplicate /regions= line ignored in %s line %d: %s"
-msgstr "Podwojony wiersz /regions= zignorowano w %s wierszu %d: %s"
+msgstr "Powtórzony wiersz /regions= zignorowano w %s wierszu %d: %s"
#, c-format
msgid "Too many regions in %s line %d: %s"
msgstr "Za du¿o regionów w %s wiersz %d: %s"
#, c-format
+msgid "/ line ignored in %s line %d: %s"
+msgstr "wiersz / zignorowano w %s wierszu %d: %s"
+
+#, c-format
msgid "Invalid region nr in %s line %d: %s"
msgstr "Nieprawid³owy numer regionu w %s wierszu %d: %s"
#, c-format
-msgid "/ line ignored in %s line %d: %s"
-msgstr "wiersz / zignorowano w %s wierszu %d: %s"
+msgid "Unrecognized flags in %s line %d: %s"
+msgstr "Nieznane flagi w %s wiersz %d: %s"
+
+#, c-format
+msgid "Ignored %d words with non-ASCII characters"
+msgstr "Zignorowa³em %d s³ów ze znakami nie ASCII"
#, c-format
msgid "Compressed %d of %d nodes; %d%% remaining"
@@ -4695,12 +4815,12 @@
msgid "E755: Invalid region in %s"
msgstr "E755: Nieprawid³owy region w %s"
-msgid "Compressing word tree..."
-msgstr "Kompresja drzewa s³ów..."
+msgid "Warning: both compounding and NOBREAK specified"
+msgstr "Ostrze¿enie: okrelono zarówno z³o¿enia jak i NOBREAK"
#, c-format
-msgid "Writing spell file %s..."
-msgstr "Zapisujê plik sprawdzania pisowni %s..."
+msgid "Writing spell file %s ..."
+msgstr "Zapisujê plik sprawdzania pisowni %s ..."
msgid "Done!"
msgstr "Zrobione!"
@@ -4709,15 +4829,9 @@
msgid "Estimated runtime memory use: %d bytes"
msgstr "Oczekiwane zu¿ycie pamiêci: %d bajtów"
-msgid "E764: 'spellfile' is not set"
-msgstr "E764: Nie ustawiono 'spellfile'"
-
-#, fuzzy
-#~ msgid "E761: Format error in affix file FOL, LOW or UPP"
-#~ msgstr "E431: B³¹d formatu w pliku znaczników \"%s\""
-
-msgid "E762: Character in FOL, LOW or UPP is out of range"
-msgstr "E762: Znak w FOL, LOW lub UPP jest poza zasiêgiem"
+#, c-format
+msgid "E765: 'spellfile' does not have %ld entries"
+msgstr "E765: 'spellfile' nie posiada wpisów %ld"
msgid "E763: Word characters differ between spell files"
msgstr "E763: Znaki wyrazów ró¿ni¹ siê miêdzy plikami sprawdzania pisowni"
@@ -4726,29 +4840,29 @@
msgstr "Przykro mi, brak podpowiedzi"
#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "Przykro mi, tylko %ld podpowiedzi"
+
+#. avoid more prompt
+#, c-format
msgid "Change \"%.*s\" to:"
msgstr "Zmieñ \"%.*s\" na:"
#, c-format
-msgid "%2d \"%s\""
-msgstr "%2d \"%s\""
-
-#, c-format
msgid " < \"%.*s\""
msgstr " < \"%.*s\""
-#, c-format
-msgid " (%s%d - %d)"
-msgstr " (%s%d - %d)"
+msgid "E752: No previous spell replacement"
+msgstr "E752: Brak poprzednich podmian sprawdzania pisowni"
#, c-format
-msgid " (%d)"
-msgstr " (%d)"
+msgid "E753: Not found: %s"
+msgstr "E753: Nie znaleziono: %s"
#. This should have been checked when generating the .spl
#. * file.
msgid "E999: duplicate char in MAP entry"
-msgstr "E999: podwojony znak we wpisie MAP"
+msgstr "E999: powtórzony znak we wpisie MAP"
#, c-format
msgid "E390: Illegal argument: %s"
@@ -5773,3 +5887,13 @@
msgid "E139: File is loaded in another buffer"
msgstr "E139: Plik jest za³adowany w innym buforze"
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: Nie ustawiono opcji '%s'"
+
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "szukanie dobi³o GÓRY; kontynuacja od KOÑCA"
+
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "szukanie dobi³o KOÑCA; kontynuacja od GÓRY"
+
diff --git a/src/po/pl.po b/src/po/pl.po
index 82f8c50..ddb6c79 100644
--- a/src/po/pl.po
+++ b/src/po/pl.po
@@ -1,18 +1,18 @@
# translation of pl.po to Polish
# Polish Translation for Vim
#
-# updated 2001 for vim-6.0
+# updated 2005 for vim-7.0
+#
# FIRST AUTHOR Marcin Dalecki <martin@dalecki.de>, 2000.
# Mikolaj Machowski <mikmach@wp.pl>, 2004, 2005.
-#
msgid ""
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-27 01:18+0200\n"
-"PO-Revision-Date: 2005-06-27 10:45+0200\n"
+"POT-Creation-Date: 2005-10-14 01:26+0200\n"
+"PO-Revision-Date: 2005-10-14 12:24+0200\n"
"Last-Translator: Mikolaj Machowski <mikmach@wp.pl>\n"
-"Language-Team: Polish <kde-transl@mer.chemia.polsl.gliwice.pl>\n"
+"Language-Team: Polish <mikmach@wp.pl>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -218,13 +218,8 @@
msgstr " Dope³nianie s³ów kluczowych (^N^P)"
#. ctrl_x_mode == 0, ^P/^N compl.
-msgid " ^X mode (^E^Y^L^]^F^I^K^D^U^V^N^P)"
-msgstr " ^X tryb (^E^Y^L^]^F^I^K^D^U^V^N^P)"
-
-#. Scroll has it's own msgs, in it's place there is the msg for local
-#. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL) -- Acevedo
-msgid " Keyword Local completion (^N^P)"
-msgstr " Lokalne dope³nianie s³ów kluczowych (^N^P)"
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
+msgstr " ^X tryb (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
msgid " Whole line completion (^L^N^P)"
msgstr " Dope³nianie pe³nych wierszy (^L^N^P)"
@@ -253,15 +248,24 @@
msgid " User defined completion (^U^N^P)"
msgstr "Dope³nianie zdefiniowane przez u¿ytkownika (^U^N^P)"
+msgid " Omni completion (^O^N^P)"
+msgstr " Omni uzupe³nianie (^O^N^P)"
+
+msgid " Spelling suggestion (^S^N^P)"
+msgstr "Propozycja ortografii (^L^N^P)"
+
+msgid " Keyword Local completion (^N^P)"
+msgstr " Lokalne dope³nianie s³ów kluczowych (^N^P)"
+
msgid "Hit end of paragraph"
msgstr "Dobi³em do koñca akapitu"
-msgid "'thesaurus' option is empty"
-msgstr "opcja 'thesaurus' jest pusta"
-
msgid "'dictionary' option is empty"
msgstr "opcja 'dictionary' jest pusta"
+msgid "'thesaurus' option is empty"
+msgstr "opcja 'thesaurus' jest pusta"
+
#, c-format
msgid "Scanning dictionary: %s"
msgstr "Przegl±dam s³ownik: %s"
@@ -311,9 +315,8 @@
msgstr "E18: Nieoczekiwane znaki w :let"
#, c-format
-#, fuzzy
-#~ msgid "E684: list index out of range: %ld"
-#~ msgstr "E684: : %ld"
+msgid "E684: list index out of range: %ld"
+msgstr "E684: Indeks listy poza zakresem: %ld"
#, c-format
msgid "E121: Undefined variable: %s"
@@ -372,11 +375,11 @@
msgid "E461: Illegal variable name: %s"
msgstr "E418: Niedozwolona nazwa zmiennej: %s"
-#~ msgid "E687: Less targets than List items"
-#~ msgstr ""
+msgid "E687: Less targets than List items"
+msgstr "E687: Mniej celów ni¿ elementów Listy"
-#~ msgid "E688: More targets than List items"
-#~ msgstr ""
+msgid "E688: More targets than List items"
+msgstr "E688: Wiêcej celów ni¿ elementów Listy"
msgid "Double ; in list of variables"
msgstr "Podwójny ; w li¶cie zmiennych"
@@ -394,11 +397,11 @@
msgid "E709: [:] requires a List value"
msgstr "E709: [:] wymaga warto¶ci listy"
-#~ msgid "E710: List value has more items than target"
-#~ msgstr ""
+msgid "E710: List value has more items than target"
+msgstr "E710: Lista ma wiêcej elementów ni¿ cel"
-#~ msgid "E711: List value has not enough items"
-#~ msgstr ""
+msgid "E711: List value has not enough items"
+msgstr "E711: Lista nie ma wystarczaj±cej ilo¶ci elementów"
msgid "E690: Missing \"in\" after :for"
msgstr "E690: Brak \"in\" po :for"
@@ -438,9 +441,8 @@
msgid "E110: Missing ')'"
msgstr "E110: Brak ')'"
-#, fuzzy
-#~ msgid "E695: Cannot index a Funcref"
-#~ msgstr "E90: Nie mogê wy³adowaæ ostatniego bufora"
+msgid "E695: Cannot index a Funcref"
+msgstr "E695: Nie mo¿na zindeksowaæ Funcref"
#, c-format
msgid "E112: Option name missing: %s"
@@ -472,7 +474,7 @@
#, c-format
msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: Podwójny klucz w S³owniku: \"%s\""
+msgstr "E721: Powtórzony klucz w S³owniku: \"%s\""
#, c-format
msgid "E722: Missing comma in Dictionary: %s"
@@ -524,8 +526,8 @@
msgid "E701: Invalid type for len()"
msgstr "E701: Nieprawid³owy typ dla len()"
-#~ msgid "E726: Stride is zero"
-#~ msgstr ""
+msgid "E726: Stride is zero"
+msgstr "E726: Skok to zero"
msgid "E727: Start past end"
msgstr "E727: Pocz±tek po koñcu"
@@ -549,9 +551,8 @@
msgid "E258: Unable to send to client"
msgstr "E258: Nie mogê wys³aæ do klienta"
-#, fuzzy
-#~ msgid "E702: Sort compare function failed"
-#~ msgstr "E237: Wybór drukarki nie powiód³ siê"
+msgid "E702: Sort compare function failed"
+msgstr "E702: Funkcja porównywania w sort nie powiod³a siê"
msgid "(Invalid)"
msgstr "(Niew³a¶ciwe)"
@@ -582,8 +583,8 @@
msgstr "E704: Nazwa Funcref musi siê zaczynaæ wielk± liter±: %s"
#, c-format
-#~ msgid "705: Variable name conflicts with existing function: %s"
-#~ msgstr ""
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: Nazwa zmiennej jest w konflikcie z istniej±c± funkcj±: %s"
#, c-format
msgid "E706: Variable type mismatch for: %s"
@@ -623,7 +624,9 @@
#, c-format
msgid "E128: Function name must start with a capital or contain a colon: %s"
-msgstr "E128: Nazwa funkcji musi rozpoczynaæ siê wielk± liter± lub zawieraæ dwukropek: %s"
+msgstr ""
+"E128: Nazwa funkcji musi rozpoczynaæ siê wielk± liter± lub zawieraæ "
+"dwukropek: %s"
#, c-format
msgid "E131: Cannot delete function %s: It is in use"
@@ -663,6 +666,13 @@
"\n"
"# zmienne globalne:\n"
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\tOstatnie ustawienie przez "
+
msgid "Entering Debug mode. Type \"cont\" to continue."
msgstr "Wchodzê w tryb odpluskwiania. Wprowad¼ \"cont\" aby kontynuowaæ."
@@ -771,90 +781,6 @@
msgstr "E168: u¿yto :finish poza wczytywanym plikiem"
#, c-format
-msgid "Page %d"
-msgstr "Strona %d"
-
-msgid "No text to be printed"
-msgstr "Brak tekstu do drukowania"
-
-#, c-format
-msgid "Printing page %d (%d%%)"
-msgstr "Drukujê stronê %d (%d%%)"
-
-#, c-format
-msgid " Copy %d of %d"
-msgstr " Kopia %d z %d"
-
-#, c-format
-msgid "Printed: %s"
-msgstr "Wydrukowano: %s"
-
-msgid "Printing aborted"
-msgstr "Drukowanie odwo³ane"
-
-msgid "E455: Error writing to PostScript output file"
-msgstr "E455: Nie mo¿na zapisaæ do wyj¶ciowego pliku PostScriptu"
-
-#, c-format
-msgid "E624: Can't open file \"%s\""
-msgstr "E624: Nie mogê otworzyæ pliku \"%s\""
-
-#, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: Nie mo¿na odczytaæ pliku zasobów PostScriptu \"%s\""
-
-#, c-format
-msgid "E618: file \"%s\" is not a PostScript resource file"
-msgstr "E618: plik \"%s\" nie jest plikiem zasobów PostScriptu"
-
-#, c-format
-msgid "E619: file \"%s\" is not a supported PostScript resource file"
-msgstr "E619: plik \"%s\" nie jest wspieranym plikiem zasobów PostScriptu"
-
-#, c-format
-msgid "E621: \"%s\" resource file has wrong version"
-msgstr "E621: \"%s\" nieprawid³owa wersja pliku zasobów"
-
-msgid "E673: Incompatible multi-byte encoding and character set."
-msgstr "E673: Niekompatybilne kodowanie wielobajtowe i zestaw znaków."
-
-msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
-msgstr "E674: printmbcharset nie mo¿e byæ pusty przy kodowaniu wielobajtowym."
-
-msgid "E675: No default font specified for multi-byte printing."
-msgstr "E675: Nie okre¶lono domy¶lnej czcionki dla drukowania wielobajtowego."
-
-msgid "E324: Can't open PostScript output file"
-msgstr "E324: Nie mo¿na otworzyæ pliku PostScript do wyj¶cia"
-
-#, c-format
-msgid "E456: Can't open file \"%s\""
-msgstr "E456: Nie mogê otworzyæ pliku \"%s\""
-
-msgid "E456: Can't find PostScript resource file \"prolog.ps\""
-msgstr "E456: Nie mo¿na znale¼æ pliku zasobów PostScriptu \"prolog.ps\""
-
-msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
-msgstr "E456: Nie mo¿na znale¼æ pliku zasobów PostScriptu \"cidfont.ps\""
-
-#, c-format
-msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: Nie mo¿na znale¼æ pliku zasobów PostScriptu \"%s.ps\""
-
-#, c-format
-msgid "E620: Unable to convert to print encoding \"%s\""
-msgstr "E620: Nie mo¿na przekonwertowaæ by drukowaæ kodowanie \"%s\""
-
-msgid "Sending to printer..."
-msgstr "Przesy³am do drukarki..."
-
-msgid "E365: Failed to print PostScript file"
-msgstr "E365: Drukowanie pliku PostScript nie powiod³o siê"
-
-msgid "Print job sent."
-msgstr "Zadanie drukowanie przes³ane."
-
-#, c-format
msgid "Current %slanguage: \"%s\""
msgstr "Bie¿±cy %sjêzyk: \"%s\""
@@ -957,6 +883,14 @@
msgstr "Nadpisaæ istniej±cy plik \"%s\"?"
#, c-format
+msgid "Swap file \"%s\" exists, overwrite anyway?"
+msgstr "Plik wymiany \"%s\" istnieje, czy go nadpisaæ?"
+
+#, c-format
+msgid "E768: Swap file exists: %s (:silent! overrides)"
+msgstr "E768: Plik wymiany istnieje: %s (wymu¶ poprzez :silent!)"
+
+#, c-format
msgid "E141: No file name for buffer %ld"
msgstr "E141: Brak nazwy pliku dla bufora %ld"
@@ -1069,7 +1003,7 @@
#, c-format
msgid "E154: Duplicate tag \"%s\" in file %s/%s"
-msgstr "E154: Dwukrotny znacznik \"%s\" w pliku %s/%s"
+msgstr "E154: Powtórzony znacznik \"%s\" w pliku %s/%s"
#, c-format
msgid "E160: Unknown sign command: %s"
@@ -1188,18 +1122,8 @@
msgid "E178: Invalid default value for count"
msgstr "E178: Niew³a¶ciwa domy¶lna warto¶æ mno¿nika"
-msgid "E179: argument required for complete"
-msgstr "E179: argument wymagany do dope³niania"
-
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: Niew³a¶ciwa warto¶æ dope³niania: %s"
-
-msgid "E468: Completion argument only allowed for custom completion"
-msgstr "E468: Argument depe³niania dozwolony wy³±cznie dla dope³niania u¿ytkownika"
-
-msgid "E467: Custom completion requires a function argument"
-msgstr "E467: Dope³nianie u¿ytkownika wymaga funkcji jako argumentu"
+msgid "E179: argument required for -complete"
+msgstr "E179: -complete wymaga argumentu"
#, c-format
msgid "E181: Invalid attribute: %s"
@@ -1218,6 +1142,16 @@
msgstr "E184: Nie ma takiej komendy u¿ytkownika: %s"
#, c-format
+msgid "E180: Invalid complete value: %s"
+msgstr "E180: Niew³a¶ciwa warto¶æ dope³niania: %s"
+
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr "E468: Argument depe³niania dozwolony wy³±cznie dla dope³niania u¿ytkownika"
+
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: Dope³nianie u¿ytkownika wymaga funkcji jako argumentu"
+
+#, c-format
msgid "E185: Cannot find color scheme %s"
msgstr "E185: Nie mogê znale¼æ zestawu kolorów %s"
@@ -1234,7 +1168,9 @@
msgstr "Do³±cz plik"
msgid "E747: Cannot change directory, buffer is modifed (add ! to override)"
-msgstr "E747: Nie mogê zmieniæ katalogu, bufor zosta³ zmodyfikowany (dodaj ! aby wymusiæ)"
+msgstr ""
+"E747: Nie mogê zmieniæ katalogu, bufor zosta³ zmodyfikowany (dodaj ! aby "
+"wymusiæ)"
msgid "E186: No previous directory"
msgstr "E186: Nie ma poprzedniego katalogu"
@@ -1468,6 +1404,9 @@
msgid "[New File]"
msgstr "[Nowy Plik]"
+msgid "[File too big]"
+msgstr "[Za du¿y plik]"
+
msgid "[Permission Denied]"
msgstr "[Nie dozwolono]"
@@ -1756,8 +1695,8 @@
msgstr "--Skasowano--"
#, c-format
-#~ msgid "auto-removing autocommand: %s <buffer=%d>"
-#~ msgstr ""
+msgid "auto-removing autocommand: %s <buffer=%d>"
+msgstr "auto-usuwanie autokomendy: %s <buffer=%d>"
#. the group doesn't exist
#, c-format
@@ -1784,9 +1723,9 @@
"\n"
"--- Autokomendy ---"
-#, fuzzy, c-format
-#~ msgid "E680: <buffer=%d>: invalid buffer number "
-#~ msgstr "niew³a¶ciwy numer bufora"
+#, c-format
+msgid "E680: <buffer=%d>: invalid buffer number "
+msgstr "E680: <buffer=%d>: niew³a¶ciwy numer bufora"
msgid "E217: Can't execute autocommands for ALL events"
msgstr "E217: Nie mo¿na wykonywaæ autokomend dla wydarzeñ ALL"
@@ -1910,8 +1849,8 @@
msgid "E254: Cannot allocate color %s"
msgstr "E254: Nie mogê zarezerwowaæ koloru %s"
-#~ msgid "No match at cursor, finding next"
-#~ msgstr ""
+msgid "No match at cursor, finding next"
+msgstr "Brak dopasowania przy kursorze, szukam dalej"
msgid "Vim dialog..."
msgstr "Dialog Vima..."
@@ -2052,8 +1991,8 @@
msgid "Not Used"
msgstr "Nie u¿ywany"
-#~ msgid "Directory\t*.nothing\n"
-#~ msgstr ""
+msgid "Directory\t*.nothing\n"
+msgstr "Katalog\t*.nic\n"
msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
msgstr ""
@@ -2084,9 +2023,9 @@
msgid "Font1: %s\n"
msgstr "Font1: %s\n"
-#, fuzzy, c-format
-#~ msgid "Font%ld width is not twice that of font0\n"
-#~ msgstr "szeroko¶æ font%d nie jest podwójn± szeroko¶ci± font0\n"
+#, c-format
+msgid "Font%ld width is not twice that of font0\n"
+msgstr "Szeroko¶æ font%ld nie jest podwójn± szeroko¶ci± font0\n"
#, c-format
msgid "Font0 width: %ld\n"
@@ -2103,11 +2042,11 @@
msgid "Invalid font specification"
msgstr "Nieprawid³owy opis czcionki"
-#~ msgid "&Dismiss"
-#~ msgstr ""
+msgid "&Dismiss"
+msgstr "&Anuluj"
-#~ msgid "no specific match"
-#~ msgstr ""
+msgid "no specific match"
+msgstr "brak okre¶lonego dopasowania"
msgid "Vim - Font Selector"
msgstr "Vim - wybór czcionki"
@@ -2134,6 +2073,99 @@
msgid "E256: Hangul automata ERROR"
msgstr "E256: B£¡D w automacie Hangul"
+msgid "E550: Missing colon"
+msgstr "E550: Brak dwukropka"
+
+msgid "E551: Illegal component"
+msgstr "E551: Niedozwolona czê¶æ"
+
+msgid "E552: digit expected"
+msgstr "E552: oczekiwano cyfry"
+
+#, c-format
+msgid "Page %d"
+msgstr "Strona %d"
+
+msgid "No text to be printed"
+msgstr "Brak tekstu do drukowania"
+
+#, c-format
+msgid "Printing page %d (%d%%)"
+msgstr "Drukujê stronê %d (%d%%)"
+
+#, c-format
+msgid " Copy %d of %d"
+msgstr " Kopia %d z %d"
+
+#, c-format
+msgid "Printed: %s"
+msgstr "Wydrukowano: %s"
+
+msgid "Printing aborted"
+msgstr "Drukowanie odwo³ane"
+
+msgid "E455: Error writing to PostScript output file"
+msgstr "E455: Nie mo¿na zapisaæ do wyj¶ciowego pliku PostScriptu"
+
+#, c-format
+msgid "E624: Can't open file \"%s\""
+msgstr "E624: Nie mogê otworzyæ pliku \"%s\""
+
+#, c-format
+msgid "E457: Can't read PostScript resource file \"%s\""
+msgstr "E457: Nie mo¿na odczytaæ pliku zasobów PostScriptu \"%s\""
+
+#, c-format
+msgid "E618: file \"%s\" is not a PostScript resource file"
+msgstr "E618: plik \"%s\" nie jest plikiem zasobów PostScriptu"
+
+#, c-format
+msgid "E619: file \"%s\" is not a supported PostScript resource file"
+msgstr "E619: plik \"%s\" nie jest wspieranym plikiem zasobów PostScriptu"
+
+#, c-format
+msgid "E621: \"%s\" resource file has wrong version"
+msgstr "E621: \"%s\" nieprawid³owa wersja pliku zasobów"
+
+msgid "E673: Incompatible multi-byte encoding and character set."
+msgstr "E673: Niekompatybilne kodowanie wielobajtowe i zestaw znaków."
+
+msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
+msgstr "E674: printmbcharset nie mo¿e byæ pusty przy kodowaniu wielobajtowym."
+
+msgid "E675: No default font specified for multi-byte printing."
+msgstr "E675: Nie okre¶lono domy¶lnej czcionki dla drukowania wielobajtowego."
+
+msgid "E324: Can't open PostScript output file"
+msgstr "E324: Nie mo¿na otworzyæ pliku PostScript do wyj¶cia"
+
+#, c-format
+msgid "E456: Can't open file \"%s\""
+msgstr "E456: Nie mogê otworzyæ pliku \"%s\""
+
+msgid "E456: Can't find PostScript resource file \"prolog.ps\""
+msgstr "E456: Nie mo¿na znale¼æ pliku zasobów PostScriptu \"prolog.ps\""
+
+msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
+msgstr "E456: Nie mo¿na znale¼æ pliku zasobów PostScriptu \"cidfont.ps\""
+
+#, c-format
+msgid "E456: Can't find PostScript resource file \"%s.ps\""
+msgstr "E456: Nie mo¿na znale¼æ pliku zasobów PostScriptu \"%s.ps\""
+
+#, c-format
+msgid "E620: Unable to convert to print encoding \"%s\""
+msgstr "E620: Nie mo¿na przekonwertowaæ by drukowaæ kodowanie \"%s\""
+
+msgid "Sending to printer..."
+msgstr "Przesy³am do drukarki..."
+
+msgid "E365: Failed to print PostScript file"
+msgstr "E365: Drukowanie pliku PostScript nie powiod³o siê"
+
+msgid "Print job sent."
+msgstr "Zadanie drukowanie przes³ane."
+
msgid "Add a new database"
msgstr "Dodaj now± bazê danych"
@@ -2278,7 +2310,9 @@
msgid ""
"???: Sorry, this command is disabled, the MzScheme library could not be "
"loaded."
-msgstr "???: Przykro mi, ta komenda jest wy³±czona, biblioteka MzScheme nie mo¿e byæ za³adowana."
+msgstr ""
+"???: Przykro mi, ta komenda jest wy³±czona, biblioteka MzScheme nie mo¿e byæ "
+"za³adowana."
msgid "invalid expression"
msgstr "niepoprawne wyra¿enie"
@@ -2292,9 +2326,8 @@
msgid "unknown option"
msgstr "nieznana opcja"
-#, fuzzy
-#~ msgid "window index is out of range"
-#~ msgstr "numer wiersza poza zakresem"
+msgid "window index is out of range"
+msgstr "indeks okna poza zakresem"
msgid "couldn't open buffer"
msgstr "nie mogê otworzyæ bufora"
@@ -2576,8 +2609,8 @@
msgid "E251: VIM instance registry property is badly formed. Deleted!"
msgstr "E251: wcielenia instancji rejestru Vima jest ¼le sformowane. Skasowano!"
-msgid "Unknown option"
-msgstr "Nieznana opcja"
+msgid "Unknown option argument"
+msgstr "Nieznany argument opcji"
msgid "Too many edit arguments"
msgstr "Zbyt wiele argumentów"
@@ -2585,8 +2618,8 @@
msgid "Argument missing after"
msgstr "Brak argumentu po"
-msgid "Garbage after option"
-msgstr "¦miecie po opcji"
+msgid "Garbage after option argument"
+msgstr "¦miecie po argumencie opcji"
msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
msgstr "Zbyt wiele argumentów \"+komenda\", \"-c komenda\" lub \"--cmd komenda\""
@@ -2594,6 +2627,10 @@
msgid "Invalid argument for"
msgstr "Niew³a¶ciwy argument dla"
+#, c-format
+msgid "%d files to edit\n"
+msgstr "%d plików do edycji\n"
+
msgid "This Vim was not compiled with the diff feature."
msgstr "Ta wersja Vima nie by³a skompilowanego z opcj± ró¿nic (diff)."
@@ -2615,10 +2652,6 @@
msgid "Vim: Warning: Input is not from a terminal\n"
msgstr "Vim: OSTRZE¯ENIE: Wej¶cie nie pochodzi z terminala\n"
-#, c-format
-msgid "%d files to edit\n"
-msgstr "%d plików do edycji\n"
-
#. just in case..
msgid "pre-vimrc command line"
msgstr "linia poleceñ pre-vimrc"
@@ -2665,8 +2698,8 @@
"\n"
" lub:"
-#~ msgid "where case is ignored prepend / to make flag upper case"
-#~ msgstr ""
+msgid "where case is ignored prepend / to make flag upper case"
+msgstr "gdzie wielko¶æ znaków jest ignorowana dodaj na pocz±tku / by flaga by³a wielk± liter±"
msgid ""
"\n"
@@ -3498,8 +3531,9 @@
msgid "E328: Menu only exists in another mode"
msgstr "E328: Menu istnieje tylko w innym trybie"
-msgid "E329: No menu of that name"
-msgstr "E329: Nie ma menu o tej nazwie"
+#, c-format
+msgid "E329: No menu \"%s\""
+msgstr "E329: Nie ma menu \"%s\""
msgid "E330: Menu path must not lead to a sub-menu"
msgstr "E330: Trop menu nie mo¿e prowadziæ do podmenu"
@@ -3557,17 +3591,18 @@
msgid "Interrupt: "
msgstr "Przerwanie: "
-msgid "Hit ENTER or type command to continue"
+msgid "Press ENTER or type command to continue"
msgstr "Naci¶nij ENTER lub wprowad¼ komendê aby kontynuowaæ"
+#, c-format
+msgid "%s line %ld"
+msgstr "%s wiersz %ld"
+
msgid "-- More --"
msgstr "-- Wiêcej --"
-msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
-msgstr " (RET/BS: wiersz, SPACE/b: stronê, d/u: pó³ strony, q: zakoñcz)"
-
-msgid " (RET: line, SPACE: page, d: half page, q: quit)"
-msgstr " (RET: wiersz, SPACE: stronê, d: pó³ strony, q: zakoñczenie)"
+msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " SPACE/d/j: ekran/strona/wiersz w dó³, b/u/k: do góry, q: zakoñcz"
msgid "Question"
msgstr "Pytanie"
@@ -3605,10 +3640,18 @@
msgid "E338: Sorry, no file browser in console mode"
msgstr "E338: Przykro mi, nie ma przegl±darki plików w trybie konsoli"
+msgid "E766: Insufficient arguments for printf()"
+msgstr "E766: Za ma³o argumentów dla printf()"
+
+msgid "E767: Too many arguments to printf()"
+msgstr "E767: Za du¿o argumentów dla printf()"
+
msgid "W10: Warning: Changing a readonly file"
msgstr "W10: OSTRZE¯ENIE: Zmiany w pliku tylko do odczytu"
-#. When using ":silent" assume that <CR> was entered.
+msgid "Type number or click with mouse (<Enter> cancels): "
+msgstr "Wpisz numer lub wybierz mysz± (<Enter> anuluje): "
+
msgid "Choice number (<Enter> cancels): "
msgstr "Wybierz numer (<Enter> anuluje): "
@@ -3723,15 +3766,6 @@
msgid "E347: No more file \"%s\" found in path"
msgstr "E347: Pliku \"%s\" nie ma wiêcej w tropie"
-msgid "E550: Missing colon"
-msgstr "E550: Brak dwukropka"
-
-msgid "E551: Illegal component"
-msgstr "E551: Niedozwolona czê¶æ"
-
-msgid "E552: digit expected"
-msgstr "E552: oczekiwano cyfry"
-
#. Get here when the server can't be found.
msgid "Cannot connect to Netbeans #2"
msgstr "Nie mo¿na po³±czyæ z Netbeans #2"
@@ -3822,9 +3856,8 @@
msgid "freeing %ld lines"
msgstr "zwalniam %ld wierszy"
-#, fuzzy
-#~ msgid "block of 1 line yanked"
-#~ msgstr "1 wiersz skopiowano"
+msgid "block of 1 line yanked"
+msgstr "skopiowano blok 1 wiersza"
msgid "1 line yanked"
msgstr "1 wiersz skopiowano"
@@ -3876,7 +3909,9 @@
msgid ""
"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
"Bytes"
-msgstr "Wybrano %s%ld z %ld Wierszy; %ld z %ld S³ów; %ld z %ld Znaków; %ld z %ld Bajtów"
+msgstr ""
+"Wybrano %s%ld z %ld Wierszy; %ld z %ld S³ów; %ld z %ld Znaków; %ld z %ld "
+"Bajtów"
#, c-format
msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
@@ -3886,7 +3921,9 @@
msgid ""
"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
"%ld"
-msgstr "Kol %s z %s; Wiersz %ld z %ld; S³owo %ld z %ld; Znak %ld z %ld; Bajt %ld z %ld"
+msgstr ""
+"Kol %s z %s; Wiersz %ld z %ld; S³owo %ld z %ld; Znak %ld z %ld; Bajt %ld z %"
+"ld"
#, c-format
msgid "(+%ld for BOM)"
@@ -3907,13 +3944,6 @@
msgid "E520: Not allowed in a modeline"
msgstr "E520: Niedozwolone w modeline"
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tOstatnie ustawienie przez "
-
msgid "E521: Number required after ="
msgstr "E521: Po = wymagany jest numer"
@@ -4425,6 +4455,10 @@
msgstr "E71: Niedozwolony znak po %s%%"
#, c-format
+msgid "E769: Missing ] after %s["
+msgstr "E769: Brak ] po %s["
+
+#, c-format
msgid "E554: Syntax error in %s{...}"
msgstr "E554: B³±d sk³adni w %s{...}"
@@ -4485,12 +4519,6 @@
msgid "recording"
msgstr "zapis"
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "szukanie dobi³o GÓRY; kontynuacja od KOÑCA"
-
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "szukanie dobi³o KOÑCA; kontynuacja od GÓRY"
-
#, c-format
msgid "E383: Invalid search string: %s"
msgstr "E383: Niew³a¶ciwy ci±g do szukania: %s"
@@ -4547,34 +4575,56 @@
msgid "E759: Format error in spell file"
msgstr "E759: Nieprawid³owy format pliku sprawdzania pisowni"
+msgid "E758: Truncated spell file"
+msgstr "E758: Obciêty plik sprawdzania pisowni"
+
+#, c-format
+msgid "Trailing text in %s line %d: %s"
+msgstr "Zbêdny tekst w %s wiersz %d: %s"
+
+#, c-format
+msgid "Affix name too long in %s line %d: %s"
+msgstr "Za d³uga nazwa afiksu w %s wiersz %d: %s"
+
+msgid "E761: Format error in affix file FOL, LOW or UPP"
+msgstr "E761: B³±d formatu w pliku afiksów FOL, LOW lub UPP"
+
+msgid "E762: Character in FOL, LOW or UPP is out of range"
+msgstr "E762: Znak w FOL, LOW lub UPP jest poza zasiêgiem"
+
+msgid "Compressing word tree..."
+msgstr "Kompresja drzewa s³ów..."
+
msgid "E756: Spell checking is not enabled"
msgstr "E756: Sprawdzanie pisowni nie jest w³±czone"
#, c-format
-msgid "Warning: Cannot find word list \"%s\""
-msgstr "Ostrze¿enie: Nie mogê znale¼æ listy s³ów \"%s\""
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr "Ostrze¿enie: Nie mogê znale¼æ listy s³ów \"%s.%s.spl\" lub \"%s.ascii.spl\""
#, c-format
msgid "Reading spell file \"%s\""
msgstr "Odczytujê plik sprawdzania pisowni \"%s\""
-msgid "E757: Wrong file ID in spell file"
-msgstr "E757: B³êdne ID pliku sprawdzania pisowni"
+msgid "E757: This does not look like a spell file"
+msgstr "E757: To nie wygl±da na plik sprawdzania pisowni"
-msgid "E758: Truncated spell file"
-msgstr "E758: Obciêty plik sprawdzania pisowni"
+msgid "E771: Old spell file, needs to be updated"
+msgstr "E771: Stary plik sprawdzania pisowni, wymagane uaktualnienie"
+
+msgid "E772: Spell file is for newer version of Vim"
+msgstr "E772: Plik sprawdzania pisowni dla nowszej wersji Vima"
+
+msgid "E770: Unsupported section in spell file"
+msgstr "E770: Niewspierana sekcja w pliku sprawdzania pisowni"
#, c-format
msgid "Warning: region %s not supported"
msgstr "Ostrze¿enie: region %s nie jest wspierany"
#, c-format
-#~ msgid "Affix name too long in %s line %d: %s"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "Reading affix file %s..."
-#~ msgstr "Szukam w pliku znaczników %s"
+msgid "Reading affix file %s ..."
+msgstr "Czytam plik afiksów %s ..."
#, c-format
msgid "Conversion failure for word in %s line %d: %s"
@@ -4588,29 +4638,49 @@
msgid "Conversion in %s not supported"
msgstr "Konwersja w %s nie jest wspierana"
-#, fuzzy, c-format
-#~ msgid "Trailing text in %s line %d: %s"
-#~ msgstr "Punkt kontrolny w \"%s%s\" wiersz %ld"
+#, c-format
+msgid "Invalid value for FLAG in %s line %d: %s"
+msgstr "Nieprawid³owa warto¶æ FLAG w %s wierz %d: %s"
+
+#, c-format
+msgid "FLAG after using flags in %s line %d: %s"
+msgstr "FLAG po u¿yciu flag w %s wiersz %d: %s"
+
+#, c-format
+msgid "Character used for SLASH must be ASCII; in %s line %d: %s"
+msgstr "Znak u¿yty jako SLASH musi byæ znakiem ASCII; w %s wiersz %d: %s"
+
+#, c-format
+msgid "Wrong COMPOUNDMAX value in %s line %d: %s"
+msgstr "Z³a warto¶æ COMPOUNDMAX w %s wiersz %d: %s"
+
+#, c-format
+msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
+msgstr "Z³a warto¶æ COMPOUNDMIM w %s wiersz %d: %s"
+
+#, c-format
+msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
+msgstr "Z³a warto¶æ COMPOUNDSYLMAX w %s wiersz %d: %s"
+
+#, c-format
+msgid "Different combining flag in continued affix block in %s line %d: %s"
+msgstr "Ró¿ne flagi z³o¿eñ w kontynuowanym bloku afiksu w %s wiersz %d: %s"
+
+#, c-format
+msgid "Duplicate affix in %s line %d: %s"
+msgstr "Powtórzony afiks w %s wiersz %d: %s"
+
+#, c-format
+msgid "Affix also used for BAD/RAR/KEP/NEEDAFFIX/NEEDCOMPOUND in %s line %d: %s"
+msgstr "Afiks u¿yty tak¿e dla BAD/RAR/KEP/NEEDAFFIX/NEEDCOMPOUND w %s wiersz %d: %s"
#, c-format
msgid "Expected Y or N in %s line %d: %s"
msgstr "Oczekiwano Y lub N w %s wierszu %d: %s"
-#, fuzzy, c-format
-#~ msgid "Duplicate affix in %s line %d: %s"
-#~ msgstr "Dwukrotny znacznik \"%s\" w pliku %s"
-
#, c-format
-msgid "Duplicate FOL in %s line %d"
-msgstr "Dwukrotny FOL w %s wierszu %d"
-
-#, c-format
-msgid "Duplicate LOW in %s line %d"
-msgstr "Dwukrotny LOW w %s wierszu %d"
-
-#, c-format
-msgid "Duplicate UPP in %s line %d"
-msgstr "Dwukrotny UPP w %s wierszu %d"
+msgid "Broken condition in %s line %d: %s"
+msgstr "B³êdny warunek w %s wiersz %d: %s"
#, c-format
msgid "Expected REP count in %s line %d"
@@ -4622,19 +4692,51 @@
#, c-format
msgid "Duplicate character in MAP in %s line %d"
-msgstr "Podwojony znak w MAP w %s wierszu %d"
+msgstr "Powtórzony znak w MAP w %s wierszu %d"
#, c-format
-msgid "Unrecognized item in %s line %d: %s"
-msgstr "Nieznany element w %s wierszu %d: %s"
+msgid "Unrecognized or duplicate item in %s line %d: %s"
+msgstr "Nieznany lub powtórzony element w %s wierszu %d: %s"
#, c-format
msgid "Missing FOL/LOW/UPP line in %s"
msgstr "Brak wiersza FOL/LOW/UPP w %s"
+msgid "COMPOUNDSYLMAX used without SYLLABLE"
+msgstr "COMPOUNDSYLMAX u¿yty bez SYLLABLE"
+
+msgid "Too many postponed prefixes"
+msgstr "Zbyt wiele opó¼nionych prefiksów"
+
+msgid "Too many compound flags"
+msgstr "Zbyt wiele flag z³o¿eñ"
+
+msgid "Too many posponed prefixes and/or compound flags"
+msgstr "Zbyt wiele opó¼nionych prefiksów i/lub flag z³o¿eñ"
+
#, c-format
-msgid "Reading dictionary file %s..."
-msgstr "Czytam plik s³ownika %s..."
+msgid "Missing SOFO%s line in %s"
+msgstr "Brak wiersza SOFO%s wiersz w %s"
+
+#, c-format
+msgid "Both SAL and SOFO lines in %s"
+msgstr "Wiersze SAL i SOFO w %s"
+
+#, c-format
+msgid "Flag is not a number in %s line %d: %s"
+msgstr "Flaga nie jest liczb± w %s wiersz %d: %s"
+
+#, c-format
+msgid "Illegal flag in %s line %d: %s"
+msgstr "Nieprawid³owa flaga w %s wiersz %d: %s"
+
+#, c-format
+msgid "%s value differs from what is used in another .aff file"
+msgstr "Warto¶æ %s ró¿ni siê od tej u¿ytej w innym pliku .aff"
+
+#, c-format
+msgid "Reading dictionary file %s ..."
+msgstr "Czytam plik s³ownika %s ..."
#, c-format
msgid "E760: No word count in %s"
@@ -4647,19 +4749,29 @@
# c-format
#, c-format
msgid "Duplicate word in %s line %d: %s"
-msgstr "Podwójny wyraz w %s wierszu %d: %s"
+msgstr "Powtórzony wyraz w %s wierszu %d: %s"
+
+# c-format
+#, c-format
+msgid "First duplicate word in %s line %d: %s"
+msgstr "Pierwszy powtórzony wyraz w %s wiersz %d: %s"
+
+# c-format
+#, c-format
+msgid "%d duplicate word(s) in %s"
+msgstr "%d powtórzony(ch) wyraz(ów) w %s"
#, c-format
-msgid "Ignored %d words with non-ASCII characters"
-msgstr "Zignorowa³em %d s³ów ze znakami nie ASCII"
+msgid "Ignored %d word(s) with non-ASCII characters in %s"
+msgstr "Zignorowa³em %d s³ów ze znakami nie ASCII w %s"
#, c-format
-msgid "Reading word file %s..."
-msgstr "Odczytujê plik wyrazów %s..."
+msgid "Reading word file %s ..."
+msgstr "Odczytujê plik wyrazów %s ..."
#, c-format
msgid "Duplicate /encoding= line ignored in %s line %d: %s"
-msgstr "Zignorowano podwojony wiersz /encoding= w %s wierszu %d: %s"
+msgstr "Zignorowano powtórzony wiersz /encoding= w %s wierszu %d: %s"
#, c-format
msgid "/encoding= line after word ignored in %s line %d: %s"
@@ -4667,19 +4779,27 @@
#, c-format
msgid "Duplicate /regions= line ignored in %s line %d: %s"
-msgstr "Podwojony wiersz /regions= zignorowano w %s wierszu %d: %s"
+msgstr "Powtórzony wiersz /regions= zignorowano w %s wierszu %d: %s"
#, c-format
msgid "Too many regions in %s line %d: %s"
msgstr "Za du¿o regionów w %s wiersz %d: %s"
#, c-format
+msgid "/ line ignored in %s line %d: %s"
+msgstr "wiersz / zignorowano w %s wierszu %d: %s"
+
+#, c-format
msgid "Invalid region nr in %s line %d: %s"
msgstr "Nieprawid³owy numer regionu w %s wierszu %d: %s"
#, c-format
-msgid "/ line ignored in %s line %d: %s"
-msgstr "wiersz / zignorowano w %s wierszu %d: %s"
+msgid "Unrecognized flags in %s line %d: %s"
+msgstr "Nieznane flagi w %s wiersz %d: %s"
+
+#, c-format
+msgid "Ignored %d words with non-ASCII characters"
+msgstr "Zignorowa³em %d s³ów ze znakami nie ASCII"
#, c-format
msgid "Compressed %d of %d nodes; %d%% remaining"
@@ -4695,12 +4815,12 @@
msgid "E755: Invalid region in %s"
msgstr "E755: Nieprawid³owy region w %s"
-msgid "Compressing word tree..."
-msgstr "Kompresja drzewa s³ów..."
+msgid "Warning: both compounding and NOBREAK specified"
+msgstr "Ostrze¿enie: okre¶lono zarówno z³o¿enia jak i NOBREAK"
#, c-format
-msgid "Writing spell file %s..."
-msgstr "Zapisujê plik sprawdzania pisowni %s..."
+msgid "Writing spell file %s ..."
+msgstr "Zapisujê plik sprawdzania pisowni %s ..."
msgid "Done!"
msgstr "Zrobione!"
@@ -4709,15 +4829,9 @@
msgid "Estimated runtime memory use: %d bytes"
msgstr "Oczekiwane zu¿ycie pamiêci: %d bajtów"
-msgid "E764: 'spellfile' is not set"
-msgstr "E764: Nie ustawiono 'spellfile'"
-
-#, fuzzy
-#~ msgid "E761: Format error in affix file FOL, LOW or UPP"
-#~ msgstr "E431: B³±d formatu w pliku znaczników \"%s\""
-
-msgid "E762: Character in FOL, LOW or UPP is out of range"
-msgstr "E762: Znak w FOL, LOW lub UPP jest poza zasiêgiem"
+#, c-format
+msgid "E765: 'spellfile' does not have %ld entries"
+msgstr "E765: 'spellfile' nie posiada wpisów %ld"
msgid "E763: Word characters differ between spell files"
msgstr "E763: Znaki wyrazów ró¿ni± siê miêdzy plikami sprawdzania pisowni"
@@ -4726,29 +4840,29 @@
msgstr "Przykro mi, brak podpowiedzi"
#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "Przykro mi, tylko %ld podpowiedzi"
+
+#. avoid more prompt
+#, c-format
msgid "Change \"%.*s\" to:"
msgstr "Zmieñ \"%.*s\" na:"
#, c-format
-msgid "%2d \"%s\""
-msgstr "%2d \"%s\""
-
-#, c-format
msgid " < \"%.*s\""
msgstr " < \"%.*s\""
-#, c-format
-msgid " (%s%d - %d)"
-msgstr " (%s%d - %d)"
+msgid "E752: No previous spell replacement"
+msgstr "E752: Brak poprzednich podmian sprawdzania pisowni"
#, c-format
-msgid " (%d)"
-msgstr " (%d)"
+msgid "E753: Not found: %s"
+msgstr "E753: Nie znaleziono: %s"
#. This should have been checked when generating the .spl
#. * file.
msgid "E999: duplicate char in MAP entry"
-msgstr "E999: podwojony znak we wpisie MAP"
+msgstr "E999: powtórzony znak we wpisie MAP"
#, c-format
msgid "E390: Illegal argument: %s"
@@ -5773,3 +5887,13 @@
msgid "E139: File is loaded in another buffer"
msgstr "E139: Plik jest za³adowany w innym buforze"
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: Nie ustawiono opcji '%s'"
+
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "szukanie dobi³o GÓRY; kontynuacja od KOÑCA"
+
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "szukanie dobi³o KOÑCA; kontynuacja od GÓRY"
+
diff --git a/src/po/sk.cp1250.po b/src/po/sk.cp1250.po
index c4f6ecf..b8dad1b 100644
--- a/src/po/sk.cp1250.po
+++ b/src/po/sk.cp1250.po
@@ -1,19 +1,20 @@
# Slovak translation of vim
-# Martin Lacko <lacko@host.sk>, 2001.
-#
-# Generated from sk.po, DO NOT EDIT.
-#
+# Lubomir Host 'rajo' <rajo AT platon.sk>
+# 2005 - Platon Group, http://platon.sk/
+# $Revision$
+# $LastChangedDate: 2005-10-08 12:00:24 +0200 (Sat, 08 Oct 2005) $
msgid ""
msgstr ""
"Project-Id-Version: vim\n"
-"POT-Creation-Date: 2002-03-26 21:54+0100\n"
-"PO-Revision-Date: 2002-03-26 21:58CEST\n"
-"Last-Translator: Martin Lacko <lacko@host.sk>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-09-30 15:58+0200\n"
+"PO-Revision-Date: 2005-09-30 15:58+0200\n"
+"Last-Translator: Lubomir Host <rajo@platon.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=cp1250\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.5\n"
+"X-Generator: Vim 7.x\n"
msgid "E82: Cannot allocate any buffer, exiting..."
msgstr "E82: Nedá sa alokova buffer, konèím..."
@@ -21,35 +22,35 @@
msgid "E83: Cannot allocate buffer, using other one..."
msgstr "E83: Nedá sa alokova buffer, pouijem iný..."
-msgid "No buffers were unloaded"
-msgstr "iadny buffer nebol nájdený"
+msgid "E515: No buffers were unloaded"
+msgstr "E515: iadny buffer nebol uvo¾nený"
-msgid "No buffers were deleted"
-msgstr "iadny buffer nebol vymazaný"
+msgid "E516: No buffers were deleted"
+msgstr "E516: iadny buffer nebol vymazaný"
-msgid "No buffers were wiped out"
-msgstr "iadny buffer nebol vymazaný"
+msgid "E517: No buffers were wiped out"
+msgstr "E517: iadny buffer nebol vymazaný"
msgid "1 buffer unloaded"
-msgstr "poèet deaktivovaných bufferov: 1"
+msgstr "1 buffer uvo¾nený"
#, c-format
msgid "%d buffers unloaded"
-msgstr "poèet deaktivovaných bufferov: %d"
+msgstr "%d bufferov uvo¾nených"
msgid "1 buffer deleted"
-msgstr "poèet vymazaných bufferov: 1"
+msgstr "1 buffer vymazaný"
#, c-format
msgid "%d buffers deleted"
-msgstr "poèet vymazaných bufferov: %d"
+msgstr "%d bufferov vymazaných"
msgid "1 buffer wiped out"
-msgstr "poèet vymazaných bufferov: 1"
+msgstr "1 buffer odstránený"
#, c-format
msgid "%d buffers wiped out"
-msgstr "poèet vymazaných bufferov: %d"
+msgstr "%d bufferov odstránených"
msgid "E84: No modified buffer found"
msgstr "E84: Nebol nájdený iadny zmenený buffer"
@@ -58,9 +59,8 @@
msgid "E85: There is no listed buffer"
msgstr "E85: Nenaiel som iadny buffer"
-#, c-format
-msgid "E86: Cannot go to buffer %ld"
-msgstr "E86: Nedá sa preskoèi na buffer %ld"
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: Buffer %ld neexistuje"
msgid "E87: Cannot go beyond last buffer"
msgstr "E87: Za posledný buffer sa nedá preskoèi"
@@ -68,9 +68,8 @@
msgid "E88: Cannot go before first buffer"
msgstr "E88: Pred prvý buffer sa nedá preskoèi"
-#, c-format
-msgid "E89: No write since last change for buffer %ld (use ! to override)"
-msgstr "E89: Zmeny v bufferi %ld neboly uloené (! pre vynútenie)"
+msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgstr "E89: Zmeny v bufferi %ld neboli uloené (! pre vynútenie)"
msgid "E90: Cannot unload last buffer"
msgstr "E90: Posledný buffer sa nedá odstráni"
@@ -98,16 +97,16 @@
msgstr "E95: Buffer takéhoto mena u existuje"
msgid " [Modified]"
-msgstr " [zmenený]"
+msgstr " [Zmenený]"
msgid "[Not edited]"
-msgstr "[neupravovaný]"
+msgstr "[Neupravovaný]"
msgid "[New file]"
-msgstr "[nový súbor]"
+msgstr "[Nový súbor]"
msgid "[Read errors]"
-msgstr "[chyby pri èítaní]"
+msgstr "[Chyby pri èítaní]"
msgid "[readonly]"
msgstr "[iba pre èítanie]"
@@ -118,14 +117,14 @@
#, c-format
msgid "%ld lines --%d%%--"
-msgstr "riadkov: %ld --%d%%--"
+msgstr "%ld riadkov --%d%%--"
#, c-format
msgid "line %ld of %ld --%d%%-- col "
msgstr "riadok %ld z %ld --%d%%-- ståpec"
-msgid "[No file]"
-msgstr "[iadny súbor]"
+msgid "[No Name]"
+msgstr "[Bez mena]"
#. must be a help buffer
msgid "help"
@@ -135,7 +134,7 @@
msgstr "[pomocník]"
msgid "[Preview]"
-msgstr "[náh¾ad]"
+msgstr "[Náh¾ad]"
msgid "All"
msgstr "Vetko"
@@ -146,18 +145,16 @@
msgid "Top"
msgstr "Zaèiatok"
+#, c-format
msgid ""
"\n"
"# Buffer list:\n"
msgstr ""
"\n"
-"# zoznam bufferov:\n"
+"# Zoznam bufferov:\n"
msgid "[Error List]"
-msgstr "[zoznam chýb]"
-
-msgid "[No File]"
-msgstr "[iadny súbor]"
+msgstr "[Zoznam chýb]"
msgid ""
"\n"
@@ -172,7 +169,7 @@
#, c-format
msgid " line=%ld id=%d name=%s"
-msgstr " line=%ld id=%d meno=%s"
+msgstr " riadok=%ld id=%d meno=%s"
#, c-format
msgid "E96: Can not diff more than %ld buffers"
@@ -182,13 +179,13 @@
msgstr "E97: Nedajú sa vytvori porovnania"
msgid "Patch file"
-msgstr "Opravný súbor"
+msgstr "Záplatový súbor"
msgid "E98: Cannot read diff output"
msgstr "E98: Nedá sa èíta výstup porovnania"
msgid "E99: Current buffer is not in diff mode"
-msgstr "E99: Aktuálny buffer nie je v porovnacom móde"
+msgstr "E99: Aktuálny buffer nie je v porovnávacom móde"
msgid "E100: No other buffer in diff mode"
msgstr "E100: V porovnávacom móde sa nenachádza iný buffer"
@@ -204,59 +201,67 @@
msgid "E103: Buffer \"%s\" is not in diff mode"
msgstr "E103: Buffer \"%s\" nie je v porovnávacom móde"
+# TODO: digraph
msgid "E104: Escape not allowed in digraph"
-msgstr "E104: diagraph nesmie obsahova Escape"
+msgstr "E104: digraph nesmie obsahova znak Escape"
-msgid "Keymap file not found"
-msgstr "Mapa kláves nenájdená"
+msgid "E544: Keymap file not found"
+msgstr "E544: Mapa kláves nenájdená"
msgid "E105: Using :loadkeymap not in a sourced file"
-msgstr "E105: Pouite :loadkeymap v súbore, ktorý nie je zdrojový"
+msgstr "E105: Pouitý príkaz :loadkeymap v súbore, ktorý nie je interpretovaný"
-msgid " Keyword completion (^N/^P)"
-msgstr " Doplòovanie k¾úèových slov (^N/^P)"
+msgid " Keyword completion (^N^P)"
+msgstr " Doplòovanie k¾úèových slov (^N^P)"
#. ctrl_x_mode == 0, ^P/^N compl.
-msgid " ^X mode (^E/^Y/^L/^]/^F/^I/^K/^D/^V/^N/^P)"
-msgstr " ^X reim (^E/^Y/^L/^]/^F/^I/^K/^D/^V/^N/^P)"
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
+msgstr " ^X reim (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
-#. Scroll has it's own msgs, in it's place there is the msg for local
-#. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL) -- Acevedo
-msgid " Keyword Local completion (^N/^P)"
-msgstr " Miestne dopåòanie k¾úèových slov (^N/^P)"
+msgid " Whole line completion (^L^N^P)"
+msgstr " Doplòovanie celých riadkov (^L^N^P)"
-msgid " Whole line completion (^L/^N/^P)"
-msgstr " Doplòovanie celých riadkov (^L/^N/^P)"
+msgid " File name completion (^F^N^P)"
+msgstr " Doplòovanie názvov súborov (^F^N^P)"
-msgid " File name completion (^F/^N/^P)"
-msgstr " Doplòovanie názvov súborov (^F/^N/^P)"
+msgid " Tag completion (^]^N^P)"
+msgstr " Doplòovanie tagov (^]^N^P)"
-msgid " Tag completion (^]/^N/^P)"
-msgstr " Doplòovanie tagov (^]/^N/^P)"
+msgid " Path pattern completion (^N^P)"
+msgstr " Doplòovanie vzoru ciest (^N^P)"
-msgid " Path pattern completion (^N/^P)"
-msgstr " Doplòovanie vzoru ciest (^N/^P)"
+msgid " Definition completion (^D^N^P)"
+msgstr " Doplòovanie definícií (^D^N^P)"
-msgid " Definition completion (^D/^N/^P)"
-msgstr " Doplòovanie definícií (^D/^N/^P)"
+msgid " Dictionary completion (^K^N^P)"
+msgstr " Doplòovanie pod¾a slovníka (^K^N^P)"
-msgid " Dictionary completion (^K/^N/^P)"
-msgstr " Doplòovanie pod¾a slovníka (^K/^N/^P)"
+msgid " Thesaurus completion (^T^N^P)"
+msgstr " Doplòovanie pod¾a lexikonu (^T^N^P)"
-msgid " Thesaurus completion (^T/^N/^P)"
-msgstr " Doplòovanie pod¾a tezauru (^T/^N/^P)"
+msgid " Command-line completion (^V^N^P)"
+msgstr " Doplòovanie príkazového riadka (^V^N^P)"
-msgid " Command-line completion (^V/^N/^P)"
-msgstr " Doplòovòovanie príkazového riadka (^V/^N/^P)"
+msgid " User defined completion (^U^N^P)"
+msgstr " Doplòovanie celých riadkov (^U^N^P)"
+
+msgid " Omni completion (^O^N^P)"
+msgstr " Doplòovanie tagov (^O^N^P)"
+
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " Doplòovanie celých riadkov (^S^N^P)"
+
+msgid " Keyword Local completion (^N^P)"
+msgstr " Miestne doplòovanie k¾úèových slov (^N^P)"
msgid "Hit end of paragraph"
msgstr "Koniec odstavca"
-msgid "'thesaurus' option is empty"
-msgstr "vo¾ba 'thesaurus' je prázdna"
-
msgid "'dictionary' option is empty"
-msgstr "vo¾ba 'dictionary' je prázdna"
+msgstr "vo¾ba 'dictionary' (slovník) je prázdna"
+
+msgid "'thesaurus' option is empty"
+msgstr "vo¾ba 'thesaurus' (lexikon) je prázdna"
#, c-format
msgid "Scanning dictionary: %s"
@@ -272,6 +277,7 @@
msgid "Scanning: %s"
msgstr "Preh¾adávam: %s"
+#, c-format
msgid "Scanning tags."
msgstr "Preh¾adávam tagy."
@@ -302,26 +308,132 @@
msgid "match %d"
msgstr "zhoda %d"
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: Neoèekávané znaky v :let"
+
+msgid "E684: list index out of range: %ld"
+msgstr "E684: index v zozname je mimo rozsah: %ld"
+
#, c-format
-msgid "E106: Unknown variable: \"%s\""
-msgstr "E106: Neznáma premenná: \"%s\""
+msgid "E121: Undefined variable: %s"
+msgstr "E121: Nedefinovaná premenná: %s"
+
+msgid "E111: Missing ']'"
+msgstr "E111: Chýba ']'"
+
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: Argument %s musí by Zoznam (List)"
+
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: Argument %s musí by Zoznam (List) alebo Slovník (Dictionary)"
+
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: Nemono poui prázdny k¾úè pre Slovník (Dictionary)"
+
+msgid "E714: List required"
+msgstr "E714: vyaduje sa Zoznam (List)"
+
+msgid "E715: Dictionary required"
+msgstr "E715: Vyaduje sa Slovník (Dictionary)"
+
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: Príli mnoho argumentov pre funkciu %s"
+
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: k¾úè sa v Slovníku (Dictionary) nenachádza: %s"
+
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E112: Funkcia %s u existuje. Pouite ! pre jej nahradenie."
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: Záznam v Slovníku (Dictionary) u existuje"
+
+msgid "E718: Funcref required"
+msgstr "E718: Je vyadovaný odkaz na Funkciu (Funcref)"
+
+msgid "E719: Cannot use [:] with a Dictionary"
+msgstr "E719: Nemono pouit [:] so Slovníkom (Dictionary)"
+
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: Zlý typ premennej pre %s="
+
+msgid "E130: Unknown function: %s"
+msgstr "E130: Neznáma funkcia: %s"
+
+msgid "E461: Illegal variable name: %s"
+msgstr "E461: Neprípustné meno premennej: %s"
+
+msgid "E687: Less targets than List items"
+msgstr "E687: Menej cie¾ov ako poloiek Po¾a (List items)"
+
+msgid "E688: More targets than List items"
+msgstr "E688: Viac cie¾ov ako poloiek Po¾a (List items)"
+
+msgid "Double ; in list of variables"
+msgstr "Dvojitá ; v zozname premenných"
+
+msgid "E738: Can't list variables for %s"
+msgstr "E738: Nemono vypísa premenné pre %s"
+
+msgid "E689: Can only index a List or Dictionary"
+msgstr "E689: Indexova mono iba Zoznam (List) alebo Slovník (Dictionary)"
+
+msgid "E708: [:] must come last"
+msgstr "E708: [:] musí prís ako posledná"
+
+msgid "E709: [:] requires a List value"
+msgstr "E709: [:] vyaduje hodnotu Po¾a (List value)"
+
+msgid "E710: List value has more items than target"
+msgstr "E710: Hodnota Po¾a (List value) má viac poloiek ako cie¾"
+
+msgid "E711: List value has not enough items"
+msgstr "E711: Hodnota Po¾a (List value) nemá dostatok poloiek"
+
+msgid "E690: Missing \"in\" after :for"
+msgstr "E690: Chýba \"in\" po :for"
#, c-format
msgid "E107: Missing braces: %s"
-msgstr "E107: Chýbjú závorky: %s"
+msgstr "E107: Chýbajú zátvorky: %s"
#, c-format
msgid "E108: No such variable: \"%s\""
msgstr "E108: Premenná \"%s\" neexistuje"
+msgid "E743: variable nested too deep for (un)lock"
+msgstr "E743: premenná je príli vnorená na (od)blokovanie"
+
msgid "E109: Missing ':' after '?'"
msgstr "E109: Po '?' chýba ':'"
+msgid "E691: Can only compare List with List"
+msgstr "E691: Porovnáva mono iba Zoznam so Zoznamom (List with List)"
+
+msgid "E692: Invalid operation for Lists"
+msgstr "E692: Neplatná operácia pre Zoznamy (Lists)"
+
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: Porovnáva mono iba Slovník so Slovníkom (Dictionary with Dictionary)"
+
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: Neplatná operácia pre Slovník"
+
+msgid "E693: Can only compare Funcref with Funcref"
+msgstr "E693: Porovnáva mono iba odkaz na Funkciu s odkazom na Funkciu (Funcref with Funcref)"
+
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: Neplatná operácia pre odkazy na Funkcie (Funcrefs)"
+
msgid "E110: Missing ')'"
msgstr "E110: Chýba ')'"
-msgid "E111: Missing ']'"
-msgstr "E111: Chýba ']'"
+msgid "E695: Cannot index a Funcref"
+msgstr "E695: Nemono indexova odkaz na Funkciu (Funcref)"
#, c-format
msgid "E112: Option name missing: %s"
@@ -333,73 +445,145 @@
#, c-format
msgid "E114: Missing quote: %s"
-msgstr "E114: Chýbjú uvodzovky: %s"
+msgstr "E114: Chýbajú úvodzovky: %s"
#, c-format
msgid "E115: Missing quote: %s"
-msgstr "E115: Chýbjú uvodzovky: %s"
+msgstr "E115: Chýbajú úvodzovky: %s"
+
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: Chýba èiarka v Zozname: %s"
+
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: Chýba koniec Zoznamu (List) ']': %s"
+
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Chýba dvojbodka v Slovníku (Dictionary): %s"
#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: Chybné argumenty pre funkciu %s"
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Duplikovaný k¾úè v Slovníku (Dictionary): \"%s\""
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: Neznáma funkcia: %s"
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: Chýba èiarka v Slovníku (Dictionary): %s"
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: Príli mnoho argumentov pre funkciu %s"
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: Chýba koniec Slovníka (Dictionary) '}': %s"
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: Príli málo argumentov pre funkciu %s"
+msgid "E724: variable nested too deep for displaying"
+msgstr "E724: premenná je vnorená príli hlboko pre zobrazenie"
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: Pouitie <SID> mimo kontext skriptu: %s"
+msgid "E699: Too many arguments"
+msgstr "E699: Príli mnoho argumentov"
+#.
+#. * Yes this is ugly, I don't particularly like it either. But doing it
+#. * this way has the compelling advantage that translations need not to
+#. * be touched at all. See below what 'ok' and 'ync' are used for.
+#.
msgid "&Ok"
msgstr "&Ok"
+msgid "E737: Key already exists: %s"
+msgstr "E737: K¾úè u existuje: %s"
+
#, c-format
msgid "+-%s%3ld lines: "
msgstr "+-%s%3ld riadky: "
+msgid "E700: Unknown function: %s"
+msgstr "E700: Neznáma funkcia: %s"
+
msgid ""
"&OK\n"
"&Cancel"
msgstr ""
-"&Ok\n"
+"&OK\n"
"&Zrui"
+msgid "called inputrestore() more often than inputsave()"
+msgstr "funkcia inputrestore() volaná èastejie ako inputsave()"
+
+msgid "E745: Range not allowed"
+msgstr "E745: Rozsah nie je povolený"
+
+msgid "E701: Invalid type for len()"
+msgstr "E701: Neplatný typ pre len()"
+
+msgid "E726: Stride is zero"
+msgstr "E726: Krok je nulový"
+
+msgid "E727: Start past end"
+msgstr "E727: Zaèiatok presahuje koniec"
+
+msgid "<empty>"
+msgstr "<prázdny>"
+
msgid "E240: No connection to Vim server"
msgstr "E240: Neexistuje pripojenie k Vim serveru"
-msgid "E277: Unable to read a server reply"
-msgstr "E227: Nemôem èíta odpoveï servra"
-
-msgid "E258: Unable to send to client"
-msgstr "E258: Nemôem posla klientovi"
-
#, c-format
msgid "E241: Unable to send to %s"
msgstr "E241: Nemôem posla na %s"
+msgid "E277: Unable to read a server reply"
+msgstr "E227: Nemôem èíta odpoveï servra"
+
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: Príli mnoho symbolických odkazov (sluèka?)"
+
+msgid "E258: Unable to send to client"
+msgstr "E258: Nemôem posla klientovi"
+
+msgid "E702: Sort compare function failed"
+msgstr "E702: Funkcia na utriedenie/porovnanie zlyhala"
+
msgid "(Invalid)"
msgstr "(Chybný)"
-#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: Nedefinovaná premenná: %s"
+msgid "E677: Error writing temp file"
+msgstr "E677: Chyba pri zápise doèasného súboru"
+
+msgid "E703: Using a Funcref as a number"
+msgstr "E703: Pouitý odkaz na Funkciu (Funcref) ako èíslo"
+
+msgid "E745: Using a List as a number"
+msgstr "E745: Zoznam (List) pouitý ako èíslo"
+
+msgid "E728: Using a Dictionary as a number"
+msgstr "E728: Slovník (Dictionary) pouitý ako èíslo"
+
+msgid "E729: using Funcref as a String"
+msgstr "E729: Odkaz na Funkciu (Funcref) pouitý ako Reazec (String)"
+
+msgid "E730: using List as a String"
+msgstr "E730: Zoznam (List) pouitý ako Reazec (String)"
+
+msgid "E731: using Dictionary as a String"
+msgstr "E731: Slovník (Dictionary) pouitý ako Reazec (String)"
+
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: Premenná typu odkaz na Funkciu (Funcref) musí zaèína s ve¾kým písmenom: %s"
#, c-format
-msgid "E122: Function %s already exists, use ! to replace"
-msgstr "E112: Funkcia %s u existuje. Pouite ! pre jej nahradenie."
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: Meno premennej je v konflikte s existujúcou funkciou: %s"
+
+msgid "E706: Variable type mismatch for: %s"
+msgstr "E706: Typ premennej sa nezhoduje: %s"
#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: Nedefinovaná funkcia: %s"
+msgid "E741: Value is locked: %s"
+msgstr "E741: Hodnota je uzamknutá: %s"
+
+msgid "Unknown"
+msgstr "Neznámy"
+
+msgid "E742: Cannot change value of %s"
+msgstr "E742: Nemono zmeni hodnotu %s"
+
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: premenná je vnorená príli hlboko pre skopírovanie"
#, c-format
msgid "E124: Missing '(': %s"
@@ -407,42 +591,41 @@
#, c-format
msgid "E125: Illegal argument: %s"
-msgstr "E125: Neprístupný argument: %s"
+msgstr "E125: Neprípustný argument: %s"
msgid "E126: Missing :endfunction"
msgstr "E126: Chýba :endfunction"
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: Nedá sa predefinova funkcia %s: je pouívaná"
-
-#, c-format
-msgid "E128: Function name must start with a capital: %s"
-msgstr "E128: Názov funkcie musí zaèína ve¾kým písmenom: %s"
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: Meno funkcie sa nezhoduje s menom interpretovaného súboru: %s"
msgid "E129: Function name required"
msgstr "E129: Je vyadované meno funkcie"
-msgid "function "
-msgstr "funkcia "
-
-#, c-format
-msgid "E130: Undefined function: %s"
-msgstr "E130: Nedefinovaná funkcia: %s"
+msgid "E128: Function name must start with a capital or contain a colon: %s"
+msgstr "E128: Názov funkcie musí zaèína ve¾kým písmenom alebo obsahova dvojbodku: %s"
#, c-format
msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: Nedá sa vymaza funkcia %s: je u pouívaná"
+msgstr "E131: Nedá sa vymaza funkcia %s: je pouívaná"
msgid "E132: Function call depth is higher than 'maxfuncdepth'"
msgstr "E132: Zanorenie funkcií je hlbie ne 'maxfuncdepth'"
-#. always scroll up, don't overwrite
#, c-format
msgid "calling %s"
msgstr "volám %s"
-#. always scroll up, don't overwrite
+msgid "%s aborted"
+msgstr "%s zruený"
+
+#, c-format
+msgid "%s returning #%ld"
+msgstr "%s vrátilo #%ld"
+
+msgid "%s returning %s"
+msgstr "%s vrátilo %s"
+
#, c-format
msgid "continuing in %s"
msgstr "pokraèujem v %s"
@@ -451,13 +634,6 @@
msgstr "E133: :return mimo funkciu"
#, c-format
-msgid "%s returning #%ld"
-msgstr "dokonèené %s. Návratová hodnota %ld"
-
-#, c-format
-msgid "%s returning \"%s\""
-msgstr "dokonèené %s. Návratová hodnota \"%s\""
-
msgid ""
"\n"
"# global variables:\n"
@@ -465,33 +641,45 @@
"\n"
"# globálne premenné:\n"
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\tPosledné nastavenie z "
+
#, c-format
msgid "<%s>%s%s %d, Hex %02x, Octal %03o"
msgstr "<%s>%s%s %d, estnástkovo %02x, osmièkovo %03o"
+msgid "> %d, Hex %04x, Octal %o"
+msgstr "> %d, estnástkovo %04x, osmièkovo %o"
+
+msgid "> %d, Hex %08x, Octal %o"
+msgstr "> %d, estnástkovo %08x, osmièkovo %o"
+
msgid "E134: Move lines into themselves"
msgstr "E134: Prekrytie riadkov sebou samými"
msgid "1 line moved"
-msgstr "poèet preruených riadkov: 1"
+msgstr "1 riadok presunutý"
#, c-format
msgid "%ld lines moved"
-msgstr "poèet preruených riadkov: %ld"
+msgstr "%ld riadkov presunutých"
#, c-format
msgid "%ld lines filtered"
-msgstr "poèet filtrovaných riadkov: %ld"
+msgstr "%ld riadkov filtrovaných"
msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: Automatické príkazy *Filter* nesmie meni aktuálny buffer"
+msgstr "E135: Automatické príkazy *Filter* nesmú meni aktuálny buffer"
msgid "[No write since last change]\n"
msgstr "[Neuloené zmeny]\n"
-#, c-format
-msgid "viminfo: %s in line: "
-msgstr "viminfo: %s na riadku: "
+msgid "%sviminfo: %s in line: "
+msgstr "%sviminfo: %s na riadku: "
msgid "E136: viminfo: Too many errors, skipping rest of file"
msgstr "E136: viminfo: príli mnoho chýb, preskakujem zbytok súboru"
@@ -526,36 +714,39 @@
msgid "# This viminfo file was generated by Vim %s.\n"
msgstr "# Tento viminfo súbor bol vytvorený editorom Vim %s.\n"
+#, c-format
msgid ""
"# You may edit it if you're careful!\n"
"\n"
msgstr ""
-"# Pokia¾ budete opatrnný, môete ho upravova.\n"
+"# Pokia¾ budete opatrný, môete ho upravova.\n"
"\n"
+#, c-format
msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# Hodnota 'encoding' poèas zápisu tohoto súboru\n"
+msgstr "# Hodnota 'encoding' (kódovania) poèas zápisu tohoto súboru\n"
msgid "Illegal starting char"
-msgstr "Neprístupný zaèiatoèný znak"
+msgstr "Neprípustný zaèiatoèný znak"
msgid "Save As"
msgstr "Uloi ako"
-#. Overwriting a file that is loaded in another buffer is not a
-#. * good idea.
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: Súbor je naèítaný v inob buffere"
-
msgid "Write partial file?"
msgstr "Uloi neúplný súbor?"
msgid "E140: Use ! to write partial buffer"
msgstr "E140: Pouite ! pre uloenie neúplného bufferu"
+msgid "Overwrite existing file \"%s\"?"
+msgstr "Prepísa existujúci súbor \"%s\"?"
+
#, c-format
-msgid "Overwrite existing file \"%.*s\"?"
-msgstr "Prepísa súbor \"%.*s\"?"
+msgid "Swap file \"%s\" exists, overwrite anyway?"
+msgstr "Odkladací súbor \"%s\" existuje, aj tak prepísa?"
+
+msgid "E768: Swap file exists: %s (:silent! overrides)"
+msgstr "E768: Odkladací súbor existuje: %s (pouite :silent! pre prepísanie)"
#, c-format
msgid "E141: No file name for buffer %ld"
@@ -564,13 +755,12 @@
msgid "E142: File not written: Writing is disabled by 'write' option"
msgstr "E142: Súbor nebol uloený: ukladanie je zakázané vo¾bou 'write'"
-#, c-format
msgid ""
-"'readonly' option is set for \"%.*s\".\n"
+"'readonly' option is set for \"%s\".\n"
"Do you wish to write anyway?"
msgstr ""
-"Pre \"%.*s\" je nastavená vo¾ba 'readonly' (iba na èítanie).\n"
-"Prajete si ju potlaèi?"
+"Pre \"%s\" je nastavená vo¾ba 'readonly' (iba na èítanie).\n"
+"Prajete si aj tak uloi?"
msgid "Edit File"
msgstr "Upravova súbor"
@@ -583,24 +773,30 @@
msgstr "E144: neèíselný argument pre :z"
msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: rvim nepovoluje pouitie príkazov shellu"
+msgstr "E145: rvim nepovo¾uje pouitie príkazov shellu"
msgid "E146: Regular expressions can't be delimited by letters"
msgstr "E146: Regulárne výrazy nesmú by oddelené písmenami"
#, c-format
msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "nahradi %s (y/n/a/q/I/^E/^Y)?"
+msgstr "nahradi %s (y/n/a/q/l/^E/^Y)?"
msgid "(Interrupted) "
msgstr "(preruený) "
+msgid "1 match"
+msgstr "1 zhoda"
+
msgid "1 substitution"
-msgstr "poèet nahradení na riadok: 1"
+msgstr "1 nahradenie"
+
+msgid "%ld matches"
+msgstr "%ld zhôd"
#, c-format
msgid "%ld substitutions"
-msgstr "poèet nahradení na riadok: %ld"
+msgstr "%ld nahradení"
msgid " on 1 line"
msgstr " na 1 riadku"
@@ -610,7 +806,7 @@
msgstr " na %ld riadkov"
msgid "E147: Cannot do :global recursive"
-msgstr "E147: global nedá sa vola rekurzívne"
+msgstr "E147: :global sa nedá vola rekurzívne"
msgid "E148: Regular expression missing from global"
msgstr "E148: Pri príkaze global chýba regulárny výraz"
@@ -619,15 +815,22 @@
msgid "Pattern found in every line: %s"
msgstr "Vzor nájdený na kadom riadku: %s"
+#, c-format
msgid ""
"\n"
"# Last Substitute String:\n"
"$"
msgstr ""
"\n"
-"# Posledný Reazec Podnadpisu:\n"
+"# Posledný zamieòaný reazec:\n"
"$"
+msgid "E478: Don't panic!"
+msgstr "E478: iadnu paniku!"
+
+msgid "E661: Sorry, no '%s' help for %s"
+msgstr "E661: ¼utujem, iadny '%s' pomocník pre %s"
+
#, c-format
msgid "E149: Sorry, no help for %s"
msgstr "E149: ¼utujem, pre %s nie je iadny pomocník"
@@ -642,36 +845,39 @@
#, c-format
msgid "E152: Cannot open %s for writing"
-msgstr "E152: Nedá sa otvori %s pre zápis"
+msgstr "E152: %s sa nedá sa otvori pre zápis"
#, c-format
msgid "E153: Unable to open %s for reading"
-msgstr "E153: Nedá sa otvori %s pre zápis"
+msgstr "E153: %s as nedá otvori pre èítanie"
#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s"
-msgstr "E154: Duplicitný tag \"%s\" v súbore %s"
+msgid "E670: Mix of help file encodings within a language: %s"
+msgstr "E670: Rôzne kódovania pre súbory s pomocníkom pre jazyk: %s"
+
+msgid "E154: Duplicate tag \"%s\" in file %s/%s"
+msgstr "E154: Duplicitný tag \"%s\" v súbore %s/%s"
#, c-format
msgid "E160: Unknown sign command: %s"
-msgstr "E160: Neznáma funkcia: %s"
+msgstr "E160: Neznámu príkaz pre znaèky: %s"
msgid "E156: Missing sign name"
-msgstr "E156: Chýba identifikátor pre sign"
+msgstr "E156: Chýba meno pre znaèku"
-msgid "E255: Too many signs defined"
-msgstr "E255: Príli mnoho definovaných oznaèení"
+msgid "E612: Too many signs defined"
+msgstr "E255: Príli mnoho definovaných znaèiek"
#, c-format
msgid "E239: Invalid sign text: %s"
-msgstr "E239: Chybne oznaèený text: %s"
+msgstr "E239: Chybný text znaèky: %s"
#, c-format
msgid "E155: Unknown sign: %s"
-msgstr "E155: Neznáme oznaèenie: %s"
+msgstr "E155: Neznáma znaèka: %s"
msgid "E159: Missing sign number"
-msgstr "E159: Chýba èislo oznaèenia"
+msgstr "E159: Chýba èislo znaèky"
#, c-format
msgid "E158: Invalid buffer name: %s"
@@ -679,12 +885,18 @@
#, c-format
msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Chybné ID oznaèenia: %ld"
+msgstr "E157: Chybné ID znaèky: %ld"
+
+msgid " (NOT FOUND)"
+msgstr " (NENÁJDENÉ)"
+
+msgid " (not supported)"
+msgstr " (nepodporované)"
msgid "[Deleted]"
msgstr "[vymazaný]"
-msgid "Entering Debug mode. Type \"cont\" to leave."
+msgid "Entering Debug mode. Type \"cont\" to continue."
msgstr "Spúam reim ladenia. Pre ukonèenie napíte \"cont\"."
#, c-format
@@ -710,9 +922,11 @@
msgid "%3d %s %s line %ld"
msgstr "%3d %s %s riadok %ld"
-#, c-format
-msgid "Save changes to \"%.*s\"?"
-msgstr "Uloi zmeny do \"%.*s\"?"
+msgid "E750: First use :profile start <fname>"
+msgstr "E750: Najprv pouite príkaz :profile start <meno_suboru>"
+
+msgid "Save changes to \"%s\"?"
+msgstr "Uloi zmeny do \"%s\"?"
msgid "Untitled"
msgstr "Bez mena"
@@ -722,16 +936,20 @@
msgstr "E162: Buffer \"%s\" obsahuje neuloené zmeny"
msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "Varovanie: Neèakaný vstup do iného bufferu (skontrolujte automatické príkazy)"
+msgstr ""
+"Varovanie: Neèakaný vstup do iného bufferu (skontrolujte automatické príkazy)"
msgid "E163: There is only one file to edit"
msgstr "E163: Pre úpravu bol zadaný iba jeden súbor"
msgid "E164: Cannot go before first file"
-msgstr "E164: Pred prvý súbor sa nedá preskoèi"
+msgstr "E164: Nedá sa preskoèi pred prvý súbor"
msgid "E165: Cannot go beyond last file"
-msgstr "E165: Za posledný súbor sa nedá preskoèi"
+msgstr "E165: Nedá sa preskoèi za posledný súbor"
+
+msgid "E666: compiler not supported: %s"
+msgstr "E666: prekladaè nie je podporovaný: %s"
#, c-format
msgid "Searching for \"%s\" in \"%s\""
@@ -750,7 +968,7 @@
#, c-format
msgid "Cannot source a directory: \"%s\""
-msgstr "\"%s\" nie je adresárom"
+msgstr "Nemono interpretova adresár: \"%s\""
#, c-format
msgid "could not source \"%s\""
@@ -758,7 +976,7 @@
#, c-format
msgid "line %ld: could not source \"%s\""
-msgstr "riadok %ld: nemôe by zdroj \"%s\""
+msgstr "riadok %ld: nemôno interpretova \"%s\""
#, c-format
msgid "sourcing \"%s\""
@@ -766,125 +984,83 @@
#, c-format
msgid "line %ld: sourcing \"%s\""
-msgstr "riadok %ld je zdrojom \"%s\""
+msgstr "riadok %ld: interpretujem \"%s\""
#, c-format
msgid "finished sourcing %s"
msgstr "dokonèená interpretácia %s"
msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: Varovanie: chybný odde¾ovaè riadkov. Moná chýba ^M."
+msgstr "W15: Varovanie: chybný odde¾ovaè riadkov. Mono chýba ^M"
msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: :finish pouité mimo interpretovaný súbor"
+msgstr "E167: príkaz :scriptencoding pouitý mimo interpretovaný súbor"
msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: :finish pouité mimo interpretovaný súbor"
-
-msgid "No text to be printed"
-msgstr "Ïalí na tlaè"
-
-#, c-format
-msgid "Printing page %d (%d%%)"
-msgstr "Tlaèím stranu %d (%d%%)"
-
-#, c-format
-msgid " Copy %d of %d"
-msgstr "Kópia %d z %d"
-
-#, c-format
-msgid "Printed: %s"
-msgstr "Vytlaèené: %s"
-
-msgid "Printing aborted"
-msgstr "Tlaè bola zruená"
-
-msgid "E455: Error writing to PostScript output file"
-msgstr "E455: Nedá sa zapisova do výstupného PostScriptového súboru"
-
-msgid "E324: Can't open PostScript output file"
-msgstr "E324: Nedá sa otvori výstupný PostScriptový súbor"
-
-#, c-format
-msgid "E456: Can't open file \"%s\""
-msgstr "E456: Nedá sa otvori súbor \"%s\""
-
-#, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: Nedá sa èíta PostScriptový súbor \"%s\""
-
-msgid "Sending to printer..."
-msgstr "Posielam na tlaèiareò..."
-
-msgid "E365: Failed to print PostScript file"
-msgstr "E365: PostScriptový súbor sa nepodarilo vytlaèi"
-
-msgid "Print job sent."
-msgstr "Tlaèová úloha bola odoslaná."
+msgstr "E168: príkaz :finish pouitý mimo interpretovaný súbor"
#, c-format
msgid "Current %slanguage: \"%s\""
-msgstr "Aktuálny %s jazyk: \"%s\""
+msgstr "Aktuálny %sjazyk: \"%s\""
#, c-format
msgid "E197: Cannot set language to \"%s\""
msgstr "E197: Nedá sa nastavi jazyk na \"%s\""
msgid "Entering Ex mode. Type \"visual\" to go to Normal mode."
-msgstr "Spúam Ex reim. Napite \"visual\" pre návrat do Normálního reimu."
+msgstr "Spúam Ex reim. Napíte \"visual\" pre návrat do Normálneho reimu."
-#. must be at EOF
-msgid "At end-of-file"
-msgstr "Koniec súboru"
+msgid "E501: At end-of-file"
+msgstr "E501: Koniec súboru"
msgid "E169: Command too recursive"
-msgstr "E169: Príkaz je príli zloitý"
+msgstr "E169: Príkaz je príli rekurzívny"
-msgid "E170: Missing :endwhile"
-msgstr "E170: Chýba :endwhile"
-
-msgid "E171: Missing :endif"
-msgstr "E171: Chýba :endif"
+msgid "E605: Exception not caught: %s"
+msgstr "E605: Výnimka nezachytená: %s"
msgid "End of sourced file"
-msgstr "Koniec zdrojového súboru"
+msgstr "Koniec interpretovaného súboru"
msgid "End of function"
msgstr "Koniec funkcie"
-msgid "Ambiguous use of user-defined command"
-msgstr "Nejednoznaèné pouitie pouívate¾om definovaného príkazu"
+msgid "E464: Ambiguous use of user-defined command"
+msgstr "E464: Nejednoznaèné pouitie pouívate¾om definovaného príkazu"
-msgid "Not an editor command"
-msgstr "Nie je príkazom editoru"
+msgid "E492: Not an editor command"
+msgstr "E492: Nie je príkazom editoru"
-msgid "Don't panic!"
-msgstr "iadnu paniku!"
-
-msgid "Backwards range given"
-msgstr "Zadaný spätný rozsah"
+msgid "E493: Backwards range given"
+msgstr "E493: Zadaný spätný rozsah"
msgid "Backwards range given, OK to swap"
-msgstr "Zadaný spätný rozsah. OK odloi"
+msgstr "Zadaný spätný rozsah. OK pre zámenu"
-msgid "Use w or w>>"
-msgstr "Pouite w èi w>>"
+msgid "E494: Use w or w>>"
+msgstr "E494: Pouite w alebo w>>"
msgid "E319: Sorry, the command is not available in this version"
-msgstr "E319: ¼utujem, ale tento príkaz nie je implementovaný"
+msgstr "E319: ¼utujem, ale tento príkaz nie je dostupný v tejto verzii"
msgid "E172: Only one file name allowed"
msgstr "E172: Prípustný je iba jeden názov súboru"
+msgid "1 more file to edit. Quit anyway?"
+msgstr "Ete zostáva 1 súbor k úprave. Chcete napriek tomu ukonèi editor?"
+
#, c-format
msgid "%d more files to edit. Quit anyway?"
-msgstr "Ete zostávajú %d súborov k úprave. Chcete napriek tomu ukonèi editor?"
+msgstr "Ete zostáva %d súborov k úprave. Chcete napriek tomu ukonèi editor?"
+
+msgid "E173: 1 more file to edit"
+msgstr "E173: Ete zostáva 1 súbor k úprave."
#, c-format
msgid "E173: %ld more files to edit"
-msgstr "E173: Ete zostávajajú %ld súbory k úprave."
+msgstr "E173: Ete zostáva %ld súborov k úprave."
-msgid "E174: Command already exists: use ! to redefine"
+msgid "E174: Command already exists: add ! to replace it"
msgstr "E174: Príkaz u existuje: pouite ! pre predefinovanie"
msgid ""
@@ -909,12 +1085,8 @@
msgid "E178: Invalid default value for count"
msgstr "E178: Chybná implicitná hodnota pre poèet"
-msgid "E179: argument required for complete"
-msgstr "E179: pre doplnenie je potrebný argument"
-
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: Chybná hodnota doplnenia: %s"
+msgid "E179: argument required for -complete"
+msgstr "E179: pre doplnenie (-complete) je potrebný argument"
#, c-format
msgid "E181: Invalid attribute: %s"
@@ -931,11 +1103,21 @@
msgstr "E184: Pouívate¾om definovaný príkaz %s neexistuje"
#, c-format
+msgid "E180: Invalid complete value: %s"
+msgstr "E180: Chybná hodnota doplnenia: %s"
+
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr "E468: Argument doplnenia je povolený iba pre vlastné dopåòania (completion)"
+
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: Vlastné doplnenia vyadujú meno funkcie ako argument"
+
+#, c-format
msgid "E185: Cannot find color scheme %s"
msgstr "E185: Schéma farieb %s nenájdená"
msgid "Greetings, Vim user!"
-msgstr "Pozdraujem, Vim pouívate¾!"
+msgstr "Pozdravujem, uívate¾ Vimu!"
msgid "Edit File in new window"
msgstr "Upravi súbor v novom okne"
@@ -946,18 +1128,27 @@
msgid "Append File"
msgstr "Pripoji súbor"
+msgid "E747: Cannot change directory, buffer is modifed (add ! to override)"
+msgstr "E747: Nemono zmeni adresár, buffer je modifikovaný (pouite ! pre vynútenie)"
+
msgid "E186: No previous directory"
msgstr "E186: iadny predchádzajúci adresár"
msgid "E187: Unknown"
msgstr "E187: Neznámy"
+msgid "E465: :winsize requires two number arguments"
+msgstr "E465: :winsize (ve¾kos okna) vyaduje dva argumenty"
+
#, c-format
msgid "Window position: X %d, Y %d"
-msgstr "Umiestenie okna: X %d, Y %d"
+msgstr "Pozícia okna: X %d, Y %d"
msgid "E188: Obtaining window position not implemented for this platform"
-msgstr "E188: Na tejto platforme sa nedá umiestnenie okna zisti"
+msgstr "E188: Na tejto platforme sa nedá zisti umiestnenie okna"
+
+msgid "E466: :winpos requires two number arguments"
+msgstr "E466: :winpos (pozícia okna) vyaduje dva argumenty"
msgid "Save Redirection"
msgstr "Uloi presmerovanie"
@@ -971,78 +1162,157 @@
msgid "Save Setup"
msgstr "Uloi nastavenie"
-#, c-format
-msgid "E189: \"%s\" exists (use ! to override)"
+msgid "E739: Cannot create directory: %s"
+msgstr "E739: Nemono vytvori adresár: %s"
+
+msgid "E189: \"%s\" exists (add ! to override)"
msgstr "E189: \"%s\" existuje (pouite ! pre vynútenie)"
#, c-format
msgid "E190: Cannot open \"%s\" for writing"
-msgstr "E190: Nedá sa otvori \"%s\" pre zápis"
+msgstr "E190: \"%s\" sa nedá otvori pre zápis"
#. set mark
msgid "E191: Argument must be a letter or forward/backward quote"
-msgstr "E191: Argumentem môe by iba písiemo alebo pravý èi ¾avý apostrof"
+msgstr "E191: Argumentem môe by iba písmeno alebo pravý èi ¾avý apostrof"
msgid "E192: Recursive use of :normal too deep"
-msgstr "E192: Vnorenie :normal je príli hlboké"
+msgstr "E192: Rekurzívne pouitie príkazu :normal príli hlboké"
-msgid ":if nesting too deep"
-msgstr "vnorenie :if je príli hlboké"
+msgid "E194: No alternate file name to substitute for '#'"
+msgstr ""
+"E194: iadny alternatívny názov súboru, ktorým by bolo moné nahradi '#'"
-msgid ":endif without :if"
-msgstr ":endif bez zodpovedajúceho :if"
+msgid "E495: no autocommand file name to substitute for \"<afile>\""
+msgstr "E495: iadny názov súboru, ktorým by bolo moné nahradi \"<afile>\""
-msgid ":else without :if"
-msgstr ":else bez zodpovedajúceho :if"
+msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
+msgstr "E496: iadne èíslo bufferu, ktorým by bolo moné nahradi \"<abuf>\""
-msgid ":elseif without :if"
-msgstr ":elseif bez zodpovedajúceho :if"
+msgid "E497: no autocommand match name to substitute for \"<amatch>\""
+msgstr ""
+"E497: iadna zhoda automatických príkazov, ktorou by bolo moné nahradi \"<amatch>"
+"\""
-msgid ":while nesting too deep"
-msgstr "vnorenie :while je príli hlboké"
+msgid "E498: no :source file name to substitute for \"<sfile>\""
+msgstr "E498: iadny :source súbor, ktorým by bolo moné nahradi \"<sfile>\""
-msgid ":continue without :while"
-msgstr ":continue bez zodpovedajúceho :while"
+msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
+msgstr "E499: Prázdný názov súboru pre '%' alebo '#', funguje iba s \":p:h\""
-msgid ":break without :while"
-msgstr ":break bez zodpovedajúceho :while"
+msgid "E500: Evaluates to an empty string"
+msgstr "E500: Výsledkom vyhodnotenia je prázdny reazec"
-msgid ":endwhile without :while"
-msgstr ":endwhile bez zodpovedajúceho :while"
+msgid "E195: Cannot open viminfo file for reading"
+msgstr "E195: Súbor viminfo sa nedá sa otvori na èítanie"
+
+msgid "E196: No digraphs in this version"
+msgstr "E196: V tejto verzi nie sú digraphy podporované"
+
+msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
+msgstr "E608: Nemono spracova výnimku :throw s preponou 'Vim'"
+
+#. always scroll up, don't overwrite
+#, c-format
+msgid "Exception thrown: %s"
+msgstr "Spracovanie výnimky: %s"
+
+#, c-format
+msgid "Exception finished: %s"
+msgstr "Výnimka ukonèená: %s"
+
+#, c-format
+msgid "Exception discarded: %s"
+msgstr "Výnimka zahodená: %s"
+
+msgid "%s, line %ld"
+msgstr "%s, riadok %ld"
+
+#. always scroll up, don't overwrite
+msgid "Exception caught: %s"
+msgstr "Zachytená výnimka: %s"
+
+#, c-format
+msgid "%s made pending"
+msgstr "%s prebieha"
+
+msgid "%s resumed"
+msgstr "%s vrátené"
+
+#, c-format
+msgid "%s discarded"
+msgstr "%s zahodené"
+
+msgid "Exception"
+msgstr "Výnimka"
+
+msgid "Error and interrupt"
+msgstr "Chyba a preruené"
+
+msgid "Error"
+msgstr "Chyba"
+
+#. if (pending & CSTP_INTERRUPT)
+msgid "Interrupt"
+msgstr "Preruené"
+
+msgid "E579: :if nesting too deep"
+msgstr "E579: vnorenie :if je príli hlboké"
+
+msgid "E580: :endif without :if"
+msgstr "E580 :endif bez zodpovedajúceho :if"
+
+msgid "E581: :else without :if"
+msgstr "E581 :else bez zodpovedajúceho :if"
+
+msgid "E582: :elseif without :if"
+msgstr "E582 :elseif bez zodpovedajúceho :if"
+
+msgid "E583: multiple :else"
+msgstr "E583: viacnásobné :else"
+
+msgid "E584: :elseif after :else"
+msgstr "E584: :elseif nasleduje po :else"
+
+msgid "E585: :while/:for nesting too deep"
+msgstr "E585: vnorenie :while/:for je príli hlboké"
+
+msgid "E586: :continue without :while or :for"
+msgstr "E586: :continue bez zodpovedajúceho :while alebo :for"
+
+msgid "E587: :break without :while or :for"
+msgstr "E587: :break bez zodpovedajúceho :while alebo :for"
+
+msgid "E732: Using :endfor with :while"
+msgstr "E732: Pouité :endfor spolu s :while"
+
+msgid "E733: Using :endwhile with :for"
+msgstr "E733: Pouité :endwhile spolu s :for"
+
+msgid "E601: :try nesting too deep"
+msgstr "E601: vnorenie :try je príli hlboké"
+
+msgid "E603: :catch without :try"
+msgstr "E603: :catch bez :try"
+
+#. Give up for a ":catch" after ":finally" and ignore it.
+#. * Just parse.
+msgid "E604: :catch after :finally"
+msgstr "E604: :catch nasleduje po :finally"
+
+msgid "E606: :finally without :try"
+msgstr "E606: :finally bez :try"
+
+#. Give up for a multiple ":finally" and ignore it.
+msgid "E607: multiple :finally"
+msgstr "E607: viacnásobné pouité :finally"
+
+msgid "E602: :endtry without :try"
+msgstr "E602: :endtry bez :try"
msgid "E193: :endfunction not inside a function"
msgstr "E193: :endfunction mimo funkciu"
-msgid "E194: No alternate file name to substitute for '#'"
-msgstr "E194: iadny alternatívny názov súboru, ktorým by bolo moné nahradi '#'"
-
-msgid "no autocommand file name to substitute for \"<afile>\""
-msgstr "iadny názov súboru, ktorým by bolo moné nahradi \"<afile>\""
-
-msgid "no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "iadne èíslo bufferu, ktorým by bolo moné nahradi \"<abuf>\""
-
-msgid "no autocommand match name to substitute for \"<amatch>\""
-msgstr ""
-"iadna zhoda automatických príkazov, ktorou by bolo moné nahradi \"<amatch>"
-"\""
-
-msgid "no :source file name to substitute for \"<sfile>\""
-msgstr "iadny :source súbor, ktorým by bolo moné nahradi \"<sfile>\""
-
-#, no-c-format
-msgid "Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "Prázdný názov súboru pre '%' èi '#' funguje iba s \":p:h\""
-
-msgid "Evaluates to an empty string"
-msgstr "Výsledkom vyhodnotenia je prázdny reazec"
-
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: Nedá sa otvori pre èítaní viminfo súbor"
-
-msgid "E196: No digraphs in this version"
-msgstr "E196: V tejto verzi nie sú diagraphy podporované"
-
msgid "tagname"
msgstr "meno tagu"
@@ -1061,16 +1331,16 @@
"# História %s (zaèínajúci najnovou polokou):\n"
msgid "Command Line"
-msgstr "Príkazové Riadky"
+msgstr "Príkazový riadok"
msgid "Search String"
-msgstr "Vyh¾adávaný Reazec"
+msgstr "Vyh¾adávaný reazec"
msgid "Expression"
msgstr "Výraz"
msgid "Input Line"
-msgstr "Vstupný Riadok"
+msgstr "Vstupný riadok"
msgid "E198: cmd_pchar beyond the command length"
msgstr "E198: cmd_pchar prevyuje dåku príkazu"
@@ -1079,7 +1349,7 @@
msgstr "E199: Aktívne okno alebo buffer bol vymazaný"
msgid "Illegal file name"
-msgstr "Neprístupný názov súboru"
+msgstr "Neprípustný názov súboru"
msgid "is a directory"
msgstr "je adresárom"
@@ -1094,23 +1364,23 @@
msgstr "[prístup odmietnutý]"
msgid "E200: *ReadPre autocommands made the file unreadable"
-msgstr "E200: *ReadPre automatické príkazy urobili súbor neèitate¾ným"
+msgstr "E200: automatické príkazy *ReadPre urobili súbor neèitate¾ným"
msgid "E201: *ReadPre autocommands must not change current buffer"
-msgstr "E201: *ReadPre automatické príkazy nesmú meni aktuálny buffer"
+msgstr "E201: automatické príkazy *ReadPre nesmú meni aktuálny buffer"
msgid "Vim: Reading from stdin...\n"
-msgstr "Vim: èítam z tandardného vstupu...\n"
+msgstr "Vim: èítam zo tandardného vstupu...\n"
msgid "Reading from stdin..."
-msgstr "Èítam z tandardného vstupu..."
+msgstr "Èítam zo tandardného vstupu..."
#. Re-opening the original file failed!
msgid "E202: Conversion made file unreadable!"
-msgstr "E202: Po konverzii je súbor neèittate¾ný!"
+msgstr "E202: Po konverzii je súbor neèitate¾ný!"
msgid "[fifo/socket]"
-msgstr "[fpomenovaná rúra/soket]"
+msgstr "[pomenovaná rúra/soket]"
msgid "[fifo]"
msgstr "[pomenovaná rúra]"
@@ -1137,11 +1407,15 @@
msgstr "[skonvertovaný]"
msgid "[crypted]"
-msgstr "[zaifrovaný]"
+msgstr "[ifrovaný]"
msgid "[CONVERSION ERROR]"
msgstr "[CHYBA PREVODU]"
+#, c-format
+msgid "[ILLEGAL BYTE in line %ld]"
+msgstr "[NEPRÍPUSTNÝ BAJT na riadku %ld]"
+
msgid "[READ ERRORS]"
msgstr "[CHYBY ÈÍTANIA]"
@@ -1154,6 +1428,9 @@
msgid "can't read output of 'charconvert'"
msgstr "nedá sa èíta výstup 'charconvert'"
+msgid "E676: No matching autocommands for acwrite buffer"
+msgstr "E676: iadne vyhovujúce automatické príkazy pre acwrite buffer "
+
msgid "E203: Autocommands deleted or unloaded buffer to be written"
msgstr ""
"E203: Automatické príkazy zmazali èi deaktivovali buffer, ktorý mal by "
@@ -1162,36 +1439,42 @@
msgid "E204: Autocommand changed number of lines in unexpected way"
msgstr "E204: Automatický príkaz neoèakávaným spôsobom zmenil poèet riadkov"
+msgid "NetBeans dissallows writes of unmodified buffers"
+msgstr "NetBeans rozhranie nedovolilo zapísa nemodifikované buffre"
+
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "Èiastoèné zápisy nie sú povolené pre NetBeans buffre"
+
msgid "is not a file or writable device"
-msgstr "nie je súborom ani zariadením na ktoré sa dá zapisova"
+msgstr "nie je súborom ani zapisovatelným zariadením"
-msgid "is read-only (use ! to override)"
-msgstr "je iba pre èítaníie(pouite ! pre vynútenie)"
+msgid "is read-only (add ! to override)"
+msgstr "je iba pre èítanie (pouite ! pre vynútenie)"
-msgid "Can't write to backup file (use ! to override)"
-msgstr "Nedá sa zapisova do záloného súboru (pouite ! pre vynútenie)"
+msgid "E506: Can't write to backup file (add ! to override)"
+msgstr "E506: Nedá sa zapisova do záloného súboru (pouite ! pre vynútenie)"
-msgid "Close error for backup file (use ! to override)"
-msgstr "Chyba pri uzatváraní záloného súboru (pouite ! pre vynútenie)"
+msgid "E507: Close error for backup file (add ! to override)"
+msgstr "E507: Chyba pri uzatváraní záloného súboru (pouite ! pre vynútenie)"
-msgid "Can't read file for backup (use ! to override)"
-msgstr "Nedá sa naèíta súbor pre zálohu (pouite ! pre vynútenie)"
+msgid "E508: Can't read file for backup (add ! to override)"
+msgstr "E508: Nedá sa naèíta súbor pre zálohu (pouite ! pre vynútenie)"
-msgid "Cannot create backup file (use ! to override)"
-msgstr "Nedá sa vytvori záloný súbor (pouite ! pre vynútenie)"
+msgid "E509: Cannot create backup file (add ! to override)"
+msgstr "E509: Nedá sa vytvori záloný súbor (pouite ! pre vynútenie)"
-msgid "Can't make backup file (use ! to override)"
-msgstr "Nedá sa vytvori záloný súbor (pouite ! pre vynútenie)"
+msgid "E510: Can't make backup file (add ! to override)"
+msgstr "E510: Nedá sa vytvori záloný súbor (pouite ! pre vynútenie)"
-# resource fork ?!
-msgid "The resource fork will be lost (use ! to override)"
-msgstr "'Resource fork' bude stratený (pouite ! pre vynútenie)"
+# TODO: resource fork ?! Note: used only in MACOS_X version
+msgid "E460: The resource fork would be lost (add ! to override)"
+msgstr "E460: 'Resource fork' bude stratený (pouite ! pre vynútenie)"
msgid "E214: Can't find temp file for writing"
msgstr "E214: Nedá sa nájs doèasný súbor pre ukladanie"
-msgid "E213: Cannot convert (use ! to write without conversion)"
-msgstr "E213: Nedá sa previes (pouite ! pre vynútenie prevodu)"
+msgid "E213: Cannot convert (add ! to write without conversion)"
+msgstr "E213: Nedá sa spravi konverzia (pouite ! pre zápis bez konverzie)"
msgid "E166: Can't open linked file for writing"
msgstr "E166: Súbor sa nedá otvori pre ukladanie"
@@ -1199,14 +1482,17 @@
msgid "E212: Can't open file for writing"
msgstr "E212: Súbor sa nedá otvori pre ukladanie"
-msgid "Close failed"
-msgstr "Zatvorenie zlyhalo"
+msgid "E667: Fsync failed"
+msgstr "E667: Fsync zlyhal"
-msgid "write error, conversion failed"
-msgstr "chyba pri zápise, prevod sa nepodaril"
+msgid "E512: Close failed"
+msgstr "E512: Zatvorenie zlyhalo"
-msgid "write error (file system full?)"
-msgstr "chyba pri ukladaní (je vo¾né miesto na disku?)"
+msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
+msgstr "E513: chyba pri zápise, konverzia sa nepodarila (nastavte vo¾bu 'fenc' na prázdnu pre vynútenie)"
+
+msgid "E514: write error (file system full?)"
+msgstr "E514: chyba pri ukladaní (plný disk?)"
msgid " CONVERSION ERROR"
msgstr " CHYBA PREVODU"
@@ -1281,7 +1567,7 @@
msgstr "%ld znakov"
msgid "[noeol]"
-msgstr "[iadny koniec riadku]"
+msgstr "[bez znaku konca riadku]"
msgid "[Incomplete last line]"
msgstr "[neúplný posledný riadok]"
@@ -1290,7 +1576,7 @@
#. must give this prompt
#. don't use emsg() here, don't want to flush the buffers
msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "VAROVANIE: od jeho naèítania bol obsah súboru zmenený!!!!"
+msgstr "VAROVANIE: Súbor bol zmenený od jeho naèítania!!!"
msgid "Do you really want to write to it"
msgstr "Chcete ho naozaj uloi"
@@ -1301,17 +1587,16 @@
#, c-format
msgid "E209: Error closing \"%s\""
-msgstr "E209: Chyb pri uzatváraní \"%s\""
+msgstr "E209: Chyba pri uzatváraní \"%s\""
#, c-format
msgid "E210: Error reading \"%s\""
msgstr "E210: Chyba pri èítaní \"%s\""
msgid "E246: FileChangedShell autocommand deleted buffer"
-msgstr "E246: FileChangedShell automatický príkaz vymazal buffer"
+msgstr "E246: automatický príkaz FileChangedShell vymazal buffer"
-#, c-format
-msgid "E211: Warning: File \"%s\" no longer available"
+msgid "E211: File \"%s\" no longer available"
msgstr "E211: Varovanie: súbor \"%s\" u nie je dostupný"
#, c-format
@@ -1319,20 +1604,30 @@
"W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
"well"
msgstr ""
-"W12: Varovanie: súbor \"%s\" bol po zaèatí úpravy zmenený a Vim tie zmenil "
-"buffer"
+"W12: Varovanie: súbor \"%s\" bol po zaèatí úpravy zmenený a buffer sa tie "
+"zmenil "
+
+msgid "See \":help W12\" for more info."
+msgstr "Pozrite \":help W12\" pre viac informácií."
#, c-format
msgid "W11: Warning: File \"%s\" has changed since editing started"
msgstr "W11: Varovanie: súbor \"%s\" bol po zaèatí úpravy zmenený"
+msgid "See \":help W11\" for more info."
+msgstr "Pozrite \":help W11\" pre viac informácií."
+
#, c-format
msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr "W16: Varovanie: Reim súboru \"%s\" bol po zaèatí úprav zmenený"
+msgstr ""
+"W16: Varovanie: Prístupové práva k súboru \"%s\" boli po zaèatí úprav zmenené"
+
+msgid "See \":help W16\" for more info."
+msgstr "Pozrite \":help W16\" pre viac informácií."
#, c-format
msgid "W13: Warning: File \"%s\" has been created after editing started"
-msgstr "W13: Varovanie: po zaèatí úpravy vytvorený súbor \"%s\""
+msgstr "W13: Varovanie: Súbor \"%s\" bol vytvorený po zaèatí úpravy"
msgid "Warning"
msgstr "Varovanie"
@@ -1344,6 +1639,9 @@
"&OK\n"
"&Naèíta súbor"
+msgid "E462: Could not prepare for reloading \"%s\""
+msgstr "E462: Nemono pripravi na opätovné naèítanie \"%s\""
+
#, c-format
msgid "E321: Could not reload \"%s\""
msgstr "E321: nedá sa obnovi \"%s\""
@@ -1351,6 +1649,10 @@
msgid "--Deleted--"
msgstr "--Vymazaný--"
+#, c-format
+msgid "auto-removing autocommand: %s <buffer=%d>"
+msgstr "samomazací automatický príkaz: %s <buffer=%d>"
+
#. the group doesn't exist
#, c-format
msgid "E367: No such group: \"%s\""
@@ -1358,12 +1660,15 @@
#, c-format
msgid "E215: Illegal character after *: %s"
-msgstr "E215: Neprístupný znak po *: %s"
+msgstr "E215: Neprípustný znak po *: %s"
#, c-format
msgid "E216: No such event: %s"
msgstr "E216: Udalos %s neexistuje"
+msgid "E216: No such group or event: %s"
+msgstr "E216: Udalos alebo skupina %s neexistuje"
+
#. Highlight title
msgid ""
"\n"
@@ -1372,8 +1677,11 @@
"\n"
"--- Automatické príkazy ---"
+msgid "E680: <buffer=%d>: invalid buffer number "
+msgstr "E680: <buffer=%d>: chybné èíslo bufferu"
+
msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: Automatické príkazy sa nedajú spusti pre VETKY udalosi"
+msgstr "E217: Automatické príkazy sa nedajú spusti pre VETKY udalosti"
msgid "No matching autocommands"
msgstr "iadne vyhovujúce automatické príkazy"
@@ -1383,16 +1691,15 @@
#, c-format
msgid "%s Auto commands for \"%s\""
-msgstr "%s automatické príkazy pre \"%s\""
+msgstr "%s Automatické príkazy pre \"%s\""
#, c-format
msgid "Executing %s"
msgstr "Spúam %s"
-#. always scroll up, don't overwrite
#, c-format
msgid "autocommand %s"
-msgstr "Automatický príkaz %s"
+msgstr "automatický príkaz %s"
msgid "E219: Missing {."
msgstr "E219: Chýba {."
@@ -1400,14 +1707,18 @@
msgid "E220: Missing }."
msgstr "E220: Chýba }."
-msgid "No fold found"
-msgstr "iadny záhyb nebol nájdený"
+msgid "E490: No fold found"
+msgstr "E490: Nebol nájdené iadne vnorenie"
msgid "E350: Cannot create fold with current 'foldmethod'"
-msgstr "E350: Pomocou 'foldmethod' sa nedá vytvori záhyb"
+msgstr "E350: Nedá sa vytvori vnorenie s aktuálnou metódou 'foldmethod'"
msgid "E351: Cannot delete fold with current 'foldmethod'"
-msgstr "E351: Pomocou 'foldmethod' sa nedá odstráni záhyb"
+msgstr "E351: Nedá sa zrui vnorenie s aktuálnou metódou 'foldmethod'"
+
+#, c-format
+msgid "+--%3ld lines folded "
+msgstr "+--%3ld riadkov zahnutých "
msgid "E222: Add to read buffer"
msgstr "E222: Prida do bufferu pre èítanie"
@@ -1438,60 +1749,78 @@
msgstr "iadne mapovanie nebolo nájdené"
msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: neprístupný mód"
-
-msgid "<cannot open> "
-msgstr "<nedá sa otvori> "
-
-#, c-format
-msgid "vim_SelFile: can't get font %s"
-msgstr "vim_SelFile: písmo %s nie je dostupné"
-
-msgid "vim_SelFile: can't return to current directory"
-msgstr "vim_SelFile: nedá sa vráti do aktuálneho adresára"
-
-msgid "Pathname:"
-msgstr "Názov cesty:"
-
-msgid "vim_SelFile: can't get current directory"
-msgstr "vim_SelFile: nedá sa zisti aktuálny adresár"
-
-msgid "OK"
-msgstr "OK"
-
-#. 'Cancel' button
-msgid "Cancel"
-msgstr "Zrui"
-
-msgid "Vim dialog"
-msgstr "Vim dialóg"
-
-msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-msgstr "Prípravok posuvnej lity: nedá sa zisti geometria obrázku"
-
-msgid "E232: Cannot create BalloonEval with both message and callback"
-msgstr "E232: BalloonEval nedá sa vytvori správou a zároveò spätným volaním"
+msgstr "E228: makemap: neprípustný mód"
msgid "E229: Cannot start the GUI"
-msgstr "E229: Nedá sa spusti GUI"
+msgstr "E229: Nedá sa spusti GUI (grafické rozhranie)"
#, c-format
msgid "E230: Cannot read from \"%s\""
msgstr "E230: Nedá sa èíta z \"%s\""
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr "E665: Nemono natartova grafické rozhranie, nenájdený iaden pouitelný font"
+
msgid "E231: 'guifontwide' invalid"
-msgstr "E231: vo¾ba 'guifontwide' je chybne nastavená"
+msgstr ""
+"E231: vo¾ba 'guifontwide' (nastavenie irokého písma) je chybne nastavená"
+
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: Hodnota 'imactivatekey' je nesprávne nastavená"
#, c-format
msgid "E254: Cannot allocate color %s"
msgstr "E254: Nedá sa alokova farba %s"
-msgid "Error"
-msgstr "Chyba"
+msgid "No match at cursor, finding next"
+msgstr "iadna zhoda na pozícii kurzora, h¾adám ïalej"
+
+msgid "<cannot open> "
+msgstr "<nedá sa otvori> "
+
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile: písmo %s nie je dostupné"
+
+msgid "E614: vim_SelFile: can't return to current directory"
+msgstr "E614: vim_SelFile: nedá sa vráti do aktuálneho adresára"
+
+msgid "Pathname:"
+msgstr "Názov cesty:"
+
+msgid "E615: vim_SelFile: can't get current directory"
+msgstr "E615: vim_SelFile: nedá sa zisti aktuálny adresár"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Cancel"
+msgstr "Zrui"
+
+msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
+msgstr "Prípravok posuvnej lity: nedá sa zisti geometria náh¾adu obrázku."
+
+msgid "Vim dialog"
+msgstr "Vim dialóg"
+
+msgid "E232: Cannot create BalloonEval with both message and callback"
+msgstr "E232: BalloonEval nedá sa vytvori správou a zároveò spätným volaním"
msgid "Vim dialog..."
msgstr "Vim dialóg.."
+# TODO: Translate as "&Ano\n&Nie\n&Zrui" ?
+msgid ""
+"&Yes\n"
+"&No\n"
+"&Cancel"
+msgstr ""
+"&Ano\n"
+"&Nie\n"
+"&Zrui"
+
+msgid "Input _Methods"
+msgstr "Vstupné metódy (_Methods)"
+
msgid "VIM - Search and Replace..."
msgstr "VIM - Nájs a nahradi..."
@@ -1502,12 +1831,16 @@
msgstr "Vyh¾ada:"
msgid "Replace with:"
-msgstr "Nový text:"
+msgstr "Nahradi s:"
-#. exact match only button
-msgid "Match exact word only"
+#. whole word only button
+msgid "Match whole word only"
msgstr "H¾ada len celé slová"
+#. match case button
+msgid "Match case"
+msgstr "Zhoda ve¾kosti písmen"
+
msgid "Direction"
msgstr "Smer"
@@ -1518,64 +1851,68 @@
msgid "Down"
msgstr "Dolu"
-#. 'Find Next' button
msgid "Find Next"
msgstr "Nájs ïalie"
-#. 'Replace' button
msgid "Replace"
msgstr "Nahradi"
-#. 'Replace All' button
msgid "Replace All"
msgstr "Nahradi Vetko"
-msgid "E233: cannot open display"
-msgstr "E233: nedá sa otvori displej"
+msgid "Vim: Received \"die\" request from session manager\n"
+msgstr "Vim: Prijatá poiadavka na ukonèenie (die) od manaéra sedení\n"
-#, c-format
-msgid "E234: Unknown fontset: %s"
-msgstr "E234: Neznáma sada písiem: %s"
+msgid "Vim: Main window unexpectedly destroyed\n"
+msgstr "Vim: Hlavné okno neoèakávane zruené\n"
msgid "Font Selection"
msgstr "Výber Písma"
-#, c-format
-msgid "E235: Unknown font: %s"
-msgstr "E235: Neznáme písmo: %s"
-
-#, c-format
-msgid "E236: Font \"%s\" is not fixed-width"
-msgstr "E236: Písmo \"%s\" nemá pevnú írku"
-
msgid "Used CUT_BUFFER0 instead of empty selection"
msgstr "Pouitý CUT_BUFFER0 namiesto prázdneho výberu"
-msgid "Filter"
-msgstr "Filter"
+msgid "&Filter"
+msgstr "&Filter"
+
+msgid "&Cancel"
+msgstr "&Zrui"
msgid "Directories"
msgstr "Adresáre"
-msgid "Help"
-msgstr "Pomocník"
+msgid "Filter"
+msgstr "Filter"
+
+msgid "&Help"
+msgstr "&Pomocník"
msgid "Files"
msgstr "Súbory"
+msgid "&OK"
+msgstr "&OK"
+
msgid "Selection"
msgstr "Výber"
-msgid "Undo"
-msgstr "Spä"
+msgid "Find &Next"
+msgstr "Nájs ïa&lie"
-#, c-format
-msgid "E235: Can't load Zap font '%s'"
-msgstr "E235: Nemôem naèíta chybný font '%s'"
+msgid "&Replace"
+msgstr "&Nahradi"
-#, c-format
-msgid "E235: Can't use font %s"
-msgstr "E235: Nedá sa pouí písmo %s"
+msgid "Replace &All"
+msgstr "Nahradi &Vetko"
+
+msgid "&Undo"
+msgstr "&Spä"
+
+msgid "E610: Can't load Zap font '%s'"
+msgstr "E610: Nemôem naèíta chybný font '%s'"
+
+msgid "E611: Can't use font %s"
+msgstr "E611: Nedá sa pouí písmo %s"
msgid ""
"\n"
@@ -1584,25 +1921,36 @@
"\n"
"Posielam správu na ukonèenie synovského procesu.\n"
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: Nemono nájs okno s titulkom \"%s\""
+
#, c-format
msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr ""
-"E243: Argument nie je podporovaný: \n"
-"-%s\"; Pouite OLE verziu."
+msgstr "E243: Argument nie je podporovaný: \"-%s\"; Pouite OLE verziu."
-#. TODO: May be changed this message
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: Chyba -- nedájú sa preèíta oznaèovacie dáta!"
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: Nemono otvori okno vnútri MDI aplikácie"
msgid "Find string (use '\\\\' to find a '\\')"
msgstr "Nájs reazec (pouite '\\\\' ak chete nájs '\\')"
+# Following warning can be ignored:
+# msgfmt -v --statistics --check -C --check-accelerators="&" -o sk.mo sk.po
+# sk.po:2497: msgstr lacks the keyboard accelerator mark '&'
msgid "Find & Replace (use '\\\\' to find a '\\')"
msgstr "Nájs a Nahradi (pouite '\\\\' ak chcete nájs '\\')"
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+msgid "Not Used"
+msgstr "[neupravovaný]"
+
+msgid "Directory\t*.nothing\n"
+msgstr "Adresár\t*.niè\n"
+
msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
msgstr ""
-"Vim E458: Nedá sa alokova poloka mapy farieb. Niektoré farby môu by "
+"Vim E458: Nedá sa alokova poloka mapy farieb, niektoré farby môu by "
"nesprávne"
#, c-format
@@ -1629,9 +1977,8 @@
msgid "Font1: %s\n"
msgstr "Písmo1: %s\n"
-#, c-format
-msgid "Font%d width is not twice that of font0\n"
-msgstr "Písmo%d nie je dvakrát irie ako písmo0\n"
+msgid "Font%ld width is not twice that of font0\n"
+msgstr "Písmo%ld nie je dvakrát irie ako písmo0\n"
#, c-format
msgid "Font0 width: %ld\n"
@@ -1645,12 +1992,128 @@
"írka písma1: %ld\n"
"\n"
+msgid "Invalid font specification"
+msgstr "Chybná pecifikácia písma"
+
+msgid "&Dismiss"
+msgstr "&Zrui"
+
+msgid "no specific match"
+msgstr "iadna pecifická zhoda"
+
+msgid "Vim - Font Selector"
+msgstr "Vim - Výber písma"
+
+msgid "Name:"
+msgstr "Meno:"
+
+#. create toggle button
+msgid "Show size in Points"
+msgstr "Ukazuj ve¾kos v bodoch"
+
+msgid "Encoding:"
+msgstr "Kódujem:"
+
+msgid "Font:"
+msgstr "Písmo:"
+
+msgid "Style:"
+msgstr "týl"
+
+msgid "Size:"
+msgstr "Ve¾kos:"
+
msgid "E256: Hangul automata ERROR"
-msgstr "E256: Hangul automata ERROR"
+msgstr "E256: Hangul ERROR - chyba kórejského spôsobu vkladania znakov"
+
+msgid "E550: Missing colon"
+msgstr "E550: Chýba dvojbodka"
+
+msgid "E551: Illegal component"
+msgstr "E551: Neprípustný komponent"
+
+msgid "E552: digit expected"
+msgstr "E552: oèakávaná èíslica"
#, c-format
-msgid "Usage: cs[cope] %s"
-msgstr "Pouitie: cs[cope] %s"
+msgid "Page %d"
+msgstr "Strana %d"
+
+msgid "No text to be printed"
+msgstr "iadny text na tlaè"
+
+#, c-format
+msgid "Printing page %d (%d%%)"
+msgstr "Tlaèím stranu %d (%d%%)"
+
+#, c-format
+msgid " Copy %d of %d"
+msgstr " Kópia %d z %d"
+
+#, c-format
+msgid "Printed: %s"
+msgstr "Vytlaèené: %s"
+
+msgid "Printing aborted"
+msgstr "Tlaè bola zruená"
+
+msgid "E455: Error writing to PostScript output file"
+msgstr "E455: Nedá sa zapisova do výstupného PostScriptového súboru"
+
+msgid "E624: Can't open file \"%s\""
+msgstr "E624: Nedá sa otvori súbor \"%s\""
+
+#, c-format
+msgid "E457: Can't read PostScript resource file \"%s\""
+msgstr "E457: Nedá sa èíta PostScriptový súbor \"%s\""
+
+msgid "E618: file \"%s\" is not a PostScript resource file"
+msgstr "E618: súbor \"%s\" nie je vo formáte PostScript"
+
+msgid "E619: file \"%s\" is not a supported PostScript resource file"
+msgstr "E619: súbor \"%s\" nie je podporvaný PostScriptový súbor"
+
+#, c-format
+msgid "E621: \"%s\" resource file has wrong version"
+msgstr "E621: \"%s\" zdrojový súbor má zlé èíslo verzie"
+
+msgid "E673: Incompatible multi-byte encoding and character set."
+msgstr "E673: nekompatibilné viacbajtové kódovanie a znaková sada."
+
+msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
+msgstr "E674: vo¾ba printmbcharset nemôe by prázdna pri viacbajtovom kódovaní."
+
+msgid "E675: No default font specified for multi-byte printing."
+msgstr "E675: Nie je pecifikované iadne písmo pre viacbajtové tlaèenie."
+
+msgid "E324: Can't open PostScript output file"
+msgstr "E324: Nedá sa otvori výstupný PostScriptový súbor"
+
+#, c-format
+msgid "E456: Can't open file \"%s\""
+msgstr "E456: Nedá sa otvori súbor \"%s\""
+
+msgid "E456: Can't find PostScript resource file \"prolog.ps\""
+msgstr "E456: Nemono nájs PostScriptový zdrojový súbor \"prolog.ps\""
+
+msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
+msgstr "E456: Nemono nájs PostScriptový zdrojový súbor \"cidfont.ps\""
+
+msgid "E456: Can't find PostScript resource file \"%s.ps\""
+msgstr "E456: Nemono nájs PostScriptový zdrojový súbor \"%s.ps\""
+
+#, c-format
+msgid "E620: Unable to convert to print encoding \"%s\""
+msgstr "E620: Nemono skonvertova do kódovania na tlaèenie \"%s\""
+
+msgid "Sending to printer..."
+msgstr "Posielam na tlaèiareò..."
+
+msgid "E365: Failed to print PostScript file"
+msgstr "E365: PostScriptový súbor sa nepodarilo vytlaèi"
+
+msgid "Print job sent."
+msgstr "Tlaèová úloha bola odoslaná."
msgid "Add a new database"
msgstr "Prida novú databázu"
@@ -1670,100 +2133,110 @@
msgid "Show connections"
msgstr "Zobrazi spojenia"
-msgid "This cscope command does not support splitting the window.\n"
-msgstr "Táto cscope príkaz nepodporuje rozde¾ovanie okna.\n"
+msgid "E560: Usage: cs[cope] %s"
+msgstr "E560: Pouitie: cs[cope] %s"
-msgid "Usage: cstag <ident>"
-msgstr "Pouitie: cstag <odsadenie>"
+msgid "This cscope command does not support splitting the window.\n"
+msgstr "Tento cscope príkaz nepodporuje rozde¾ovanie okna.\n"
+
+msgid "E562: Usage: cstag <ident>"
+msgstr "E562: Pouitie: cstag <odsadenie>"
msgid "E257: cstag: tag not found"
msgstr "E257: cstag: tag nenájdený"
-#, c-format
-msgid "stat(%s) error: %d"
-msgstr "stat(%s) chyba: %d"
+msgid "E563: stat(%s) error: %d"
+msgstr "E563: stat(%s) chyba: %d"
+
+msgid "E563: stat error"
+msgstr "E563: chyba stat"
+
+msgid "E564: %s is not a directory or a valid cscope database"
+msgstr "E564: %s nie je ani adresárom ani správnou cscope databázou"
#, c-format
msgid "Added cscope database %s"
msgstr "Pridaná cscope databáza %s"
-#, c-format
-msgid "%s is not a directory or a valid cscope database"
-msgstr "%s nie je ani adresárom ani správnou cscope databázou"
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: chyba pri èítaní cscope spojenia %ld"
-#, c-format
-msgid "error reading cscope connection %d"
-msgstr "chyba pri èítaní cscope spojenia %d"
+msgid "E561: unknown cscope search type"
+msgstr "E561: neznámy typ cscope h¾adania"
-msgid "unknown cscope search type"
-msgstr "neznámy typ cscope h¾adania"
+msgid "E566: Could not create cscope pipes"
+msgstr "E566: Nedajú sa vytvori cscope rúry"
-msgid "Could not create cscope pipes"
-msgstr "Nedajú sa vytvori cscope rúry"
+msgid "E622: Could not fork for cscope"
+msgstr "E622: Nemono spusti proces pre cscope"
msgid "cs_create_connection exec failed"
msgstr "spustenie cs_create_connection zlyhalo"
+msgid "E623: Could not spawn cscope process"
+msgstr "E623: Nedajú sa vytvori cscope rúry"
+
msgid "cs_create_connection: fdopen for to_fp failed"
msgstr "cs_create_connection: volanie fdopen pre to_fp zlyhalo"
msgid "cs_create_connection: fdopen for fr_fp failed"
msgstr "cs_create_connection: volanie fdopen pre fr_fp zlyhalo"
-msgid "no cscope connections"
-msgstr "iadne cscope spojenia"
+msgid "E567: no cscope connections"
+msgstr "E567: iadne cscope spojenia"
#, c-format
msgid "E259: no matches found for cscope query %s of %s"
msgstr "E259: cscope h¾adanie %s vo vzore %s nenalo iadnu zhodu"
+#, c-format
+msgid "E469: invalid cscopequickfix flag %c for %c"
+msgstr "E469: chybný cscopequickfix príznak %c pre %c"
+
msgid "cscope commands:\n"
msgstr "príkazy cscope:\n"
-#, c-format
-msgid "%-5s: %-30s (Usage: %s)\n"
-msgstr "%-5s: %-30s (Pouitie: %s)\n"
+msgid "%-5s: %-30s (Usage: %s)"
+msgstr "%-5s: %-30s (Pouitie: %s)"
-msgid "duplicate cscope database not added"
-msgstr "duplicitná cscope databáza nebola pridaná"
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: nemono otvori cscope databázu: %s"
-msgid "maximum number of cscope connections reached"
-msgstr "dosiahnutý maximálny poèet cscope spojení"
+msgid "E626: cannot get cscope database information"
+msgstr "E626: nemono získa cscope databázové informácie"
-msgid "E260: cscope connection not found"
-msgstr "E260: cscope spojenie nenájdené"
+msgid "E568: duplicate cscope database not added"
+msgstr "E568: duplicitná cscope databáza nebola pridaná"
+
+msgid "E569: maximum number of cscope connections reached"
+msgstr "E569: dosiahnutý maximálny poèet cscope spojení"
#, c-format
msgid "E261: cscope connection %s not found"
msgstr "E261: cscope spojenie %s nenájdené"
-msgid "cscope connection closed"
-msgstr "cscope spojenie ukonèené"
-
-#, c-format
-msgid "cscope connection %s closed\n"
-msgstr "cscope spojenie %s ukonèené\n"
+msgid "cscope connection %s closed"
+msgstr "cscope spojenie %s ukonèené"
#. should not reach here
-msgid "fatal error in cs_manage_matches"
-msgstr "osudová chyba v cs_manage_matches"
+msgid "E570: fatal error in cs_manage_matches"
+msgstr "E570: vána chyba v cs_manage_matches"
-#, c-format
-msgid "E262: error reading cscope connection %d"
-msgstr "E262: chyba pri èítaní cscope spojenia %d"
+msgid "Cscope tag: %s"
+msgstr "Cscope tag: %s"
-msgid "couldn't malloc\n"
-msgstr "volanie malloc zlyhalo\n"
-
-#, c-format
-msgid "Cscope tag: %s\n"
-msgstr "Cscope tag: %s\n"
-
-msgid " # line"
-msgstr " # riadok"
+msgid ""
+"\n"
+" # line"
+msgstr ""
+"\n"
+" # riadok"
msgid "filename / context / line\n"
-msgstr "názov súboru/ kontext/ riadok\n"
+msgstr "názov súboru/ kontext / riadok\n"
+
+msgid "E609: Cscope error: %s"
+msgstr "E609: Chyba cscope: %s"
msgid "All cscope databases reset"
msgstr "Vetky cscope databáze resetované"
@@ -1772,24 +2245,72 @@
msgstr "iadne cscope spojenia\n"
msgid " # pid database name prepend path\n"
-msgstr " # pid názov databáze predpona cesty\n"
+msgstr " # pid názov databázy predpona cesty\n"
-#, c-format
-msgid "%2d %-5ld %-34s <none>\n"
-msgstr "%2d %-5ld %-34s <iadny>\n"
+msgid ""
+"???: Sorry, this command is disabled, the MzScheme library could not be "
+"loaded."
+msgstr "???: Prepáète, tento príkaz je vypnutý, MzScheme kninica nemôe by naèítaná."
-#, c-format
-msgid "E370: Could not load library %s"
-msgstr "E370: Nepodarilo sa nahra kninicu %s"
+msgid "invalid expression"
+msgstr "chybný výraz"
-#, c-format
-msgid "E448: Could not load library function %s"
-msgstr "E448: Nepodarilo sa nahra funkciu kninice %s"
+msgid "expressions disabled at compile time"
+msgstr "podpora výrazov bola vypnutá pri preklade programu"
+
+msgid "hidden option"
+msgstr "skrytá vo¾ba"
+
+msgid "unknown option"
+msgstr "neznáma vo¾ba"
+
+msgid "window index is out of range"
+msgstr "èíslo okna mimo rozsah"
+
+msgid "couldn't open buffer"
+msgstr "nemono otvori buffer"
+
+msgid "cannot save undo information"
+msgstr "nedajú sa uloi zálone (opravné) informácie"
+
+msgid "cannot delete line"
+msgstr "nedá sa vymaza riadok"
+
+msgid "cannot replace line"
+msgstr "nedá sa nahradi riadok"
+
+msgid "cannot insert line"
+msgstr "nedá sa vloi riadok"
+
+msgid "string cannot contain newlines"
+msgstr "reazec nesmie obsahova znaky nového riadku"
+
+msgid "Vim error: ~a"
+msgstr "Chyba Vim: ~a"
+
+msgid "Vim error"
+msgstr "Chyba Vim"
+
+msgid "buffer is invalid"
+msgstr "buffer je neplatný"
+
+msgid "window is invalid"
+msgstr "okno je neplatné"
+
+msgid "linenr out of range"
+msgstr "èíslo riadka mimo rozsah"
+
+msgid "not allowed in the Vim sandbox"
+msgstr "nie je dovolené v bezpeènostnej schránke"
msgid ""
"E263: Sorry, this command is disabled, the Python library could not be "
"loaded."
-msgstr "E262: Prepáète, tento príkaz je vypnutý, Python kninica nemôe bynaèítaná."
+msgstr ""
+"E262: Prepáète, tento príkaz je vypnutý, Python kninica nemôe by naèítaná."
+
+msgid "E659: Cannot invoke Python recursively"
+msgstr "E659: Python nemôe by spustený rekurzívne"
msgid "can't delete OutputObject attributes"
msgstr "nedá sa vymaza vlastnos OutputObject"
@@ -1806,12 +2327,6 @@
msgid "E264: Python: Error initialising I/O objects"
msgstr "E264: Python: Chyba pri inicializácii I/O objektov"
-msgid "invalid expression"
-msgstr "chybný výraz"
-
-msgid "expressions disabled at compile time"
-msgstr "podpora výrazov bola vypnutá pri preklade programu"
-
msgid "attempt to refer to deleted buffer"
msgstr "pokus o odkaz na vymazaný buffer"
@@ -1852,23 +2367,10 @@
msgid "no such window"
msgstr "iadne také okno"
-msgid "cannot save undo information"
-msgstr "nedajú sa uloi spätné informácie"
-
-msgid "cannot delete line"
-msgstr "nedá sa vymaza riadok"
-
-msgid "cannot replace line"
-msgstr "nedá sa nahradi riadok"
-
-msgid "cannot insert line"
-msgstr "nedá sa vloi riadok"
-
-msgid "string cannot contain newlines"
-msgstr "reazec nesmie obsahova znaky nového riadku"
-
-msgid "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
-msgstr "E266: Prepáète, tento príkaz je vypnutý, Ruby kninica nemôe by naèítaná."
+msgid ""
+"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
+msgstr ""
+"E266: Prepáète, tento príkaz je vypnutý, Ruby kninica nemôe by naèítaná."
#, c-format
msgid "E273: unknown longjmp status %d"
@@ -1932,7 +2434,7 @@
"Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
"$PATH).\n"
msgstr ""
-"Zlihalo pripojenie na SNiFF+, Preverte prostredie (sniffemacs sa musí "
+"Zlyhalo pripojenie na SNiFF+, Preverte prostredie (sniffemacs sa musí "
"nachádza v $PATH).\n"
msgid "E274: Sniff: Error during read. Disconnected"
@@ -1969,9 +2471,6 @@
msgid "not implemented yet"
msgstr "nie je ete podporované"
-msgid "unknown option"
-msgstr "neznáma vo¾ba"
-
#. ???
msgid "cannot set line(s)"
msgstr "nedajú sa nastavi riadky"
@@ -1990,19 +2489,21 @@
msgstr "neznámy príznak: "
msgid "unknown vimOption"
-msgstr "neznáma vimMonos"
+msgstr "neznáma vo¾ba (vimOption)"
msgid "keyboard interrupt"
msgstr "preruenie z klávesnice"
msgid "vim error"
-msgstr "chyba vim"
+msgstr "chyba Vim"
msgid "cannot create buffer/window command: object is being deleted"
-msgstr "nedá sa vytvori príkaz bufferu/okna: objekt vymazaný"
+msgstr "nedá sa vytvori príkaz bufferu/okna: objekt bude vymazaný"
-msgid "cannot register callback command: buffer/window is already being deleted"
-msgstr "nedá sa zaregistrova príkaz spätného volania: buffer/okno u bol vymazaný"
+msgid ""
+"cannot register callback command: buffer/window is already being deleted"
+msgstr ""
+"nedá sa zaregistrova príkaz spätného volania: buffer/okno u bol vymazaný"
#. This should never happen. Famous last word?
msgid ""
@@ -2013,41 +2514,41 @@
"vim-dev@vim.org"
msgid "cannot register callback command: buffer/window reference not found"
-msgstr "nedá sa zaregistrova príkaz spätného volania: odkaz na buffer/okno nenájdený"
-
-msgid "Sorry, this command is disabled: the Tcl library could not be loaded."
-msgstr "Prepáète, tento príkaz je vypnutý, Tcl kninica nemôe by naèítaná."
-
-msgid "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
msgstr ""
-"E281: TCL CHYBA: návratový kód nie je celé èíslo!? Oznamte, presím, tuto "
+"nedá sa zaregistrova príkaz spätného volania: odkaz na buffer/okno nenájdený"
+
+msgid ""
+"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
+msgstr ""
+"E571: Prepáète, tento príkaz je vypnutý, Tcl kninica nemôe by naèítaná."
+
+msgid ""
+"E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
+msgstr ""
+"E281: TCL CHYBA: návratový kód nie je celé èíslo!? Oznámte, prosím, túto "
"chybu na vim-dev@vim.org"
+#, c-format
+msgid "E572: exit code %d"
+msgstr "E572: návratový kód %d"
+
msgid "cannot get line"
msgstr "nedá sa preèíta riadok"
msgid "Unable to register a command server name"
msgstr "Nemôem zaregistrova meno príkazového servra"
-#, c-format
-msgid "E247: no registered server named \"%s\""
-msgstr "E247: meno registrovaného servra \"%s\" neexistuje"
-
msgid "E248: Failed to send command to the destination program"
msgstr "E248: Chyba poèas prenosu príkazu do cie¾ového programu"
-#, c-format
-msgid "Invalid server id used: %s"
-msgstr "Pouíté chybné id servra: %s"
-
-msgid "E249: couldn't read VIM instance registry property"
-msgstr "E249: nemôem èíta VIM registrovú vlastnos"
+msgid "E573: Invalid server id used: %s"
+msgstr "E573: Pouíté chybné èíslo servera: %s"
msgid "E251: VIM instance registry property is badly formed. Deleted!"
-msgstr "E251: VIM registrová iados je zle formulovaná. Vymazané!"
+msgstr "E251: VIM registrová vlastnos je zle formátovaná. Vymazané!"
-msgid "Unknown option"
-msgstr "Neznáma vo¾ba"
+msgid "Unknown option argument"
+msgstr "Neznámy parameter vo¾by"
msgid "Too many edit arguments"
msgstr "Príli mnoho upravovacích argumentov"
@@ -2055,33 +2556,33 @@
msgid "Argument missing after"
msgstr "Chýba argument po"
-msgid "Garbage after option"
-msgstr "Chyby za vo¾bou"
+msgid "Garbage after option argument"
+msgstr "Chyby za parametrom vo¾by"
-msgid "Too many \"+command\" or \"-c command\" arguments"
-msgstr "Príli mnoho \"+príkaz\" èi \"-c príkaz\" argumentov"
+msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
+msgstr "Príli mnoho \"+príkaz\", \"-c príkaz\" alebo \"--cmd príkaz\" argumentov"
msgid "Invalid argument for"
msgstr "Chybný argument pre"
+#, c-format
+msgid "%d files to edit\n"
+msgstr "%d súborov pre úpravu\n"
+
msgid "This Vim was not compiled with the diff feature."
msgstr "Tento Vim nebol kompilovaný s porovnávacími funkciami."
msgid "Attempt to open script file again: \""
msgstr "Pokus o opätovné otvorenie skriptu: \""
-msgid "\"\n"
-msgstr "\"\n"
-
msgid "Cannot open for reading: \""
msgstr "Nedá sa otvori pre zápis: \""
msgid "Cannot open for script output: \""
msgstr "Nedá sa otvori pre výstup skriptu: \""
-#, c-format
-msgid "%d files to edit\n"
-msgstr "poèet súborov pre úpravu: %d\n"
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim: Chyba: Chyba spúania gvim pre NetBeans\n"
msgid "Vim: Warning: Output is not to a terminal\n"
msgstr "Vim: Varovanie: Výstup nesmeruje na terminál\n"
@@ -2105,10 +2606,10 @@
"Podrobnejie informácie získáte pomocou \"vim -h\"\n"
msgid "[file ..] edit specified file(s)"
-msgstr "[súbor ..] .. upravi súbor(y)"
+msgstr "[súbor ..] .. upravi súbor(y)"
msgid "- read text from stdin"
-msgstr "- èíta text z tandardného vstupu"
+msgstr "- èíta text z tandardného vstupu"
msgid "-t tag edit file where tag is defined"
msgstr "-t tag upravi súbor na mieste definície tagu"
@@ -2133,7 +2634,11 @@
" or:"
msgstr ""
"\n"
-" alebo"
+" alebo:"
+
+#. TODO: is translation correct?
+msgid "where case is ignored prepend / to make flag upper case"
+msgstr "v prípade, e je ignorovaná ve¾kos písmen, pouite znak '/' na zaèiatku, aby mal príznak význam ve¾kého písmena"
msgid ""
"\n"
@@ -2148,19 +2653,20 @@
msgstr "--\t\t\tMôu nasledova iba názvy súborov"
msgid "--literal\t\tDon't expand wildcards"
-msgstr "--literal\t\tnepodarilo sa expandova olíkové znaky (wildcards)"
+msgstr "--literal\t\tNexpandova olíkové znaky (wildcards)"
msgid "-register\t\tRegister this gvim for OLE"
-msgstr "-register\t\tprihlási gvim na OLE"
+msgstr "-register\t\tPrihlási gvim na OLE"
msgid "-unregister\t\tUnregister gvim for OLE"
-msgstr "-register\t\todhlási gvim z OLE"
+msgstr "-register\t\tOdhlási gvim z OLE"
msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-msgstr "-g\t\t\tspusti v GUI móde (rovnaké ako \"gvim\")"
+msgstr "-g\t\t\tSpusti v grafickom (GUI) móde (rovnaké ako \"gvim\")"
-msgid "-f\t\t\tForeground: Don't fork when starting GUI"
-msgstr "-f\t\t\tPopredie: pri spustení GUI sa neoddelí od shellu"
+msgid "-f or --nofork\tForeground: Don't fork when starting GUI"
+msgstr ""
+"-f alebo --nofork\tPopredie: Pri spustení grafického (GUI) módu sa nepresunie do pozadia"
msgid "-v\t\t\tVi mode (like \"vi\")"
msgstr "-v\t\t\tVi mód (rovnaké ako \"vi\")"
@@ -2175,10 +2681,10 @@
msgstr "-d\t\t\tPorovnávací mód (rovnaké ako \"vimdiff\")"
msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\tJednoduchý mód (rovnaké ako \"evim\", modeless)"
+msgstr "-y\t\t\tJednoduchý mód (rovnaké ako \"evim\", bezmódový)"
msgid "-R\t\t\tReadonly mode (like \"view\")"
-msgstr "-R\t\t\tMód iba_pre_èítanie (ako \"view\")"
+msgstr "-R\t\t\tMód iba pre èítanie (ako \"view\")"
msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
msgstr "-Z\t\t\tObmedzený mód (rovnaké ako \"rvim\")"
@@ -2187,7 +2693,7 @@
msgstr "-m\t\t\tZmeny (ukladanie súborov) zakázané"
msgid "-M\t\t\tModifications in text not allowed"
-msgstr "-M\t\t\tZmeny v texte nie sú povolené"
+msgstr "-M\t\t\tZmeny v texte zakázané"
msgid "-b\t\t\tBinary mode"
msgstr "-b\t\t\tBinárny mód"
@@ -2208,13 +2714,13 @@
msgstr "-D\t\t\tLadiaci mód"
msgid "-n\t\t\tNo swap file, use memory only"
-msgstr "-n\t\t\tNebude vytvára odkladací súbor, bude pouíva iba pamä"
+msgstr "-n\t\t\tNevytvára odkladací súbor, pouíva iba pamä"
msgid "-r\t\t\tList swap files and exit"
-msgstr "-r\t\t\tVypíe zoznam odkladacích súborov a skonèí"
+msgstr "-r\t\t\tVypí zoznam odkladacích súborov a skonèi"
msgid "-r (with file name)\tRecover crashed session"
-msgstr "-r názov súboru\tObnoví preruené sedenie"
+msgstr "-r (s názvom súboru)\tObnoví preruené sedenie"
msgid "-L\t\t\tSame as -r"
msgstr "-L\t\t\tRovnaké ako -r"
@@ -2225,11 +2731,14 @@
msgid "-dev <device>\t\tUse <device> for I/O"
msgstr "-dev <zariadenie>\t\tPoui <zariadenie> pre I/O"
-msgid "-H\t\t\tstart in Hebrew mode"
-msgstr "-H\t\t\tna spusteníe v hebrejskom móde"
+msgid "-A\t\t\tstart in Arabic mode"
+msgstr "-A\t\t\tspusti v Arabic móde"
-msgid "-F\t\t\tstart in Farsi mode"
-msgstr "-F\t\t\tna spusteníe vo Farsi móde"
+msgid "-H\t\t\tStart in Hebrew mode"
+msgstr "-H\t\t\tspusti v hebrejskom móde"
+
+msgid "-F\t\t\tStart in Farsi mode"
+msgstr "-F\t\t\tspusti vo Farsi móde"
msgid "-T <terminal>\tSet terminal type to <terminal>"
msgstr "-T <terminál>\tNastaví typ terminálu na <terminál>"
@@ -2241,13 +2750,13 @@
msgstr "-U <gvimrc>\t\tPouije <gvimrc> namiesto akéhoko¾vek .gvimrc"
msgid "--noplugin\t\tDon't load plugin scripts"
-msgstr "--noplugin\t\tNenahrá 'plugin' skripty"
+msgstr "--noplugin\t\tNenahrá zásuvné moduly(plugin skripty)"
msgid "-o[N]\t\tOpen N windows (default: one for each file)"
msgstr "-o[N]\t\tOtvorí N okien (implicitne jedno pre kadý súbor)"
-msgid "-O[N]\t\tlike -o but split vertically"
-msgstr "-O[N]\t\tako -o ale rozdelí vertikálne"
+msgid "-O[N]\t\tLike -o but split vertically"
+msgstr "-O[N]\t\tAko -o ale rozdelí vertikálne"
msgid "+\t\t\tStart at end of file"
msgstr "+\t\t\tNastaví kurzor na koniec súboru"
@@ -2256,13 +2765,14 @@
msgstr "+<riadok>\t\tNastaví kurzor na <riadok>"
msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
-msgstr "--cmd <príkaz>\t\tVykoná <príkaz> pred nahraním vimrc súboru"
+msgstr "--cmd <príkaz>\t\tVykoná <príkaz> pred nahratím vimrc súboru"
msgid "-c <command>\t\tExecute <command> after loading the first file"
-msgstr "-c <príkaz>\t\tPo nahraní prvého súboru vykoná <príkaz>"
+msgstr "-c <príkaz>\t\tPo nahratí prvého súboru vykoná <príkaz>"
msgid "-S <session>\t\tSource file <session> after loading the first file"
-msgstr "-S <sedenie>\t\tPo nahrání prvého súboru vykoná príkazy v súbore <sedenie>"
+msgstr ""
+"-S <sedenie>\t\tPo nahratí prvého súboru vykoná príkazy v súbore <sedenie>"
msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
msgstr "-s <skript>\t\tNaèíta príkazy normálneho módu zo <skriptu>"
@@ -2277,19 +2787,25 @@
msgstr "-x\t\t\tÚprava zaifrovaných súborov"
msgid "-display <display>\tConnect vim to this particular X-server"
-msgstr "-display <displej>\tSpustí vim na <displej>"
+msgstr "-display <displej>\tPripojí vim na prísluný X-server"
msgid "-X\t\t\tDo not connect to X server"
msgstr "-X\t\t\tNepripojí sa k X serveru"
-msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-msgstr "--socketid <xid>\tOtvorí Vim vnútri iného GTK programu."
+msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+msgstr "--remote <súbory>\tUpravi <súbory> na Vim servri ak je to moné"
-msgid "--remote <files>\tEdit <files> in a Vim server and exit"
-msgstr "--remote <súbory>\tUpravi <súbory> na Vim servri a skonèi"
+msgid "--remote-silent <files> Same, don't complain if there is no server"
+msgstr "--remote-silent <súbory>\tTo isté, ale nesauj si, ak neexistuje server"
-msgid "--remote-wait <files> As --remote but wait for files to have been edited"
-msgstr "--remote-wait <súbory>\tAko --remote ale èaká na súbory pre ukonèenie úprav"
+msgid ""
+"--remote-wait <files> As --remote but wait for files to have been edited"
+msgstr ""
+"--remote-wait <súbory>\tAko --remote ale èaká na súbory pre ukonèenie úprav"
+
+msgid ""
+"--remote-wait-silent <files> Same, don't complain if there is no server"
+msgstr "--remote-wait-silent <súbory>\tTo isté, ale nesauj si, ak neexistuje server"
msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
msgstr "--remote-send <vo¾by>\tOdole <vo¾by> na Vim server a skonèí"
@@ -2306,25 +2822,32 @@
msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
msgstr "-i <viminfo>\t\tPouije <viminfo> namiesto akéhoko¾vek .viminfo"
-msgid "-h\t\t\tprint Help (this message) and exit"
-msgstr "-h\t\t\tVypíe túto nápovedu a skonèí"
+msgid "-h or --help\tPrint Help (this message) and exit"
+msgstr "-h alebo --help\tVypíe túto nápovedu a skonèí"
-msgid "--version\t\tprint version information and exit"
-msgstr "--version\t\tvypíe informácie o verzii a skonèí"
+msgid "--version\t\tPrint version information and exit"
+msgstr "--version\t\tVypíe informácie o verzii a skonèí"
msgid ""
"\n"
"Arguments recognised by gvim (Motif version):\n"
msgstr ""
"\n"
-"Argumenty pre gvim (Motif verzia):\n"
+"Argumenty dostupné pre gvim (Motif verzia):\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (neXtaw version):\n"
+msgstr ""
+"\n"
+"Argumenty dostupné pre gvim (neXtaw verzia):\n"
msgid ""
"\n"
"Arguments recognised by gvim (Athena version):\n"
msgstr ""
"\n"
-"Argumenty pre gvim (Athena verzia):\n"
+"Argumenty dostupné pre gvim (Athena verzia):\n"
msgid "-display <display>\tRun vim on <display>"
msgstr "-display <displej>\tSpustí vim na <displej>"
@@ -2371,6 +2894,7 @@
msgid "+reverse\t\tDon't use reverse video (also: +rv)"
msgstr "+reverse\t\tNepouije reverzné farby (tie +rv)"
+# TODO: howto translate 'resource' in this case?
msgid "-xrm <resource>\tSet the specified resource"
msgstr "-xrm <resource>\tNastaví zadaný <resource>"
@@ -2379,49 +2903,72 @@
"Arguments recognised by gvim (RISC OS version):\n"
msgstr ""
"\n"
-"Argumenty pre gvim (RISC OS verzia):\n"
+"Argumenty dostupné pre gvim (RISC OS verzia):\n"
msgid "--columns <number>\tInitial width of window in columns"
-msgstr "--columns <poèet>\t<poèet> ståpcov na okno"
+msgstr "--columns <poèet>\tPoèiatoèná írka okna v ståpcoch"
msgid "--rows <number>\tInitial height of window in rows"
-msgstr "--rows <poèet>\t<poèet> riadkov na okno"
+msgstr "--rows <poèet>\tPoèiatoèná výka okna v riadkoch"
msgid ""
"\n"
"Arguments recognised by gvim (GTK+ version):\n"
msgstr ""
"\n"
-"Argumenty pre gvim (GTK+ verzia):\n"
+"Argumenty dostupné pre gvim (GTK+ verzia):\n"
msgid "-display <display>\tRun vim on <display> (also: --display)"
-msgstr "-display <displej>\tspustí vim na <displej> (tie --display)"
+msgstr "-display <displej>\tSpustí vim na <displej> (tie --display)"
-msgid "--help\t\tShow Gnome arguments"
-msgstr "--help\t\tVypíe Gnome argumenty"
+msgid "--role <role>\tSet a unique role to identify the main window"
+msgstr "-role <rola>\tNastaví unikátnu rolu pre identifikáciu hlavného okna"
+
+msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
+msgstr "--socketid <xid>\tOtvorí Vim vnútri iného GTK programu."
+
+msgid ""
+"\n"
+"Arguments recognised by kvim (KDE version):\n"
+msgstr ""
+"\n"
+"Argumenty dostupné pre kvim (KDE verzia):\n"
+
+msgid "-black\t\tUse reverse video"
+msgstr "-black\t\tPouije reverzné farby"
+
+msgid "-tip\t\t\tDisplay the tip dialog on startup"
+msgstr "-tip\t\t\tZobraz tip pri tarte"
+
+msgid "-notip\t\tDisable the tip dialog"
+msgstr "-notip\t\tNezobrazuj tip pri tarte"
+
+msgid "--display <display>\tRun vim on <display>"
+msgstr "-display <displej>\tSpustí vim na <displej>"
+
+msgid "-P <parent title>\tOpen Vim inside parent application"
+msgstr "-P <titulok rodièa>\tOtvor Vim vnútri materskej aplikácie"
+
+msgid "No display"
+msgstr "Bez grafického rozhrania"
#. Failed to send, abort.
-msgid ""
-"\n"
-"Send failed.\n"
-msgstr ""
-"\n"
-"Odoslanie zlyhalo.\n"
+msgid ": Send failed.\n"
+msgstr ": Odoslanie zlyhalo.\n"
#. Let vim start normally.
-msgid ""
-"\n"
-"Send failed. Trying to execute locally\n"
-msgstr ""
-"\n"
-"Odoslanie zlyhalo. Pokúam sa spusti lokálne\n"
+msgid ": Send failed. Trying to execute locally\n"
+msgstr ": Odoslanie zlyhalo. Pokúam sa spusti lokálne\n"
#, c-format
msgid "%d of %d edited"
msgstr "%d upravených súborov z %d"
-msgid "Send expression failed.\n"
-msgstr "Odoslanie výrazu zlyhalo.\n"
+msgid "No display: Send expression failed.\n"
+msgstr "iaden graf. mód: Odoslanie výrazu zlyhalo.\n"
+
+msgid ": Send expression failed.\n"
+msgstr ": Odoslanie výrazu zlyhalo.\n"
msgid "No marks set"
msgstr "Nie sú nastavené iadne znaèky"
@@ -2446,6 +2993,15 @@
"\n"
" skok riadok ståpec súbor/text"
+#. Highlight title
+msgid ""
+"\n"
+"change line col text"
+msgstr ""
+"\n"
+"znaèka riadok ståpec text"
+
+#, c-format
msgid ""
"\n"
"# File marks:\n"
@@ -2454,6 +3010,7 @@
"# Súborové znaèky:\n"
#. Write the jumplist with -'
+#, c-format
msgid ""
"\n"
"# Jumplist (newest first):\n"
@@ -2461,6 +3018,7 @@
"\n"
"# Zoznam skokov (zaèínajúci najnovou polokou):\n"
+#, c-format
msgid ""
"\n"
"# History of marks within files (newest to oldest):\n"
@@ -2471,11 +3029,11 @@
msgid "Missing '>'"
msgstr "Chýba '>'"
-msgid "Not a valid codepage"
-msgstr "Chybná kódová stránka"
+msgid "E543: Not a valid codepage"
+msgstr "E543: Chybná kódová stránka"
msgid "E284: Cannot set IC values"
-msgstr "E284: Nedjú sa nastavi IC hodnoty"
+msgstr "E284: Nedajú sa nastavi IC hodnoty"
msgid "E285: Failed to create input context"
msgstr "E285: Nepodarilo sa vytvori vstupný kontext"
@@ -2493,7 +3051,7 @@
msgstr "E289: vstupná metóda nepodporuje môj 'preedit' typ"
msgid "E290: over-the-spot style requires fontset"
-msgstr "E290: Nadbodový týl vyaduje fontset"
+msgstr "E290: Nadbodový týl vyaduje sadu fontov (fontset)"
msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
msgstr "E291: Máte GTK+ verziu stariu ne 1.2.3. Stavová plocha vypnutá."
@@ -2517,7 +3075,7 @@
msgstr "E297: Chyba pri ukladaní do odkladacieho súboru"
msgid "E300: Swap file already exists (symlink attack?)"
-msgstr "E300: Odkladací súbor u existuje!"
+msgstr "E300: Odkladací súbor u existuje (symlink útok?)"
msgid "E298: Didn't get block nr 0?"
msgstr "E298: Nedá sa získa blok 0?"
@@ -2537,17 +3095,18 @@
#, c-format
msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
-msgstr "E303: Nedá sa otvori odkladací súbor pre \"%s\", oprava nie je nemoná"
+msgstr "E303: Nedá sa otvori odkladací súbor pre \"%s\", oprava nemoná"
-msgid "E304: ml_timestamp: Didn't get block 0??"
-msgstr "E304: ml_timestamp: nedá sa získa blok 0??"
+msgid "E304: ml_upd_block0(): Didn't get block 0??"
+msgstr "E304: ml_upd_block0(): nedá sa získa blok 0??"
#, c-format
msgid "E305: No swap file found for %s"
msgstr "E305: Odkladací súbor pre %s nebol nájdený"
msgid "Enter number of swap file to use (0 to quit): "
-msgstr "Zadajte èíslo odkladacieho súboru, ktorý sa má pouit (0 pre ukonèenie): "
+msgstr ""
+"Zadajte èíslo odkladacieho súboru, ktorý sa má pouit (0 pre ukonèenie): "
#, c-format
msgid "E306: Cannot open %s"
@@ -2588,14 +3147,14 @@
#, c-format
msgid "Using swap file \"%s\""
-msgstr "Pouívám odkladací súbor \"%s\""
+msgstr "Pouívam odkladací súbor \"%s\""
#, c-format
msgid "Original file \"%s\""
msgstr "Pôvodný súbor \"%s\""
msgid "E308: Warning: Original file may have been changed"
-msgstr "E308: Varovanie: Pôvodný súbor mohl by zmenený"
+msgstr "E308: Varovanie: Pôvodný súbor mohol by zmenený"
#, c-format
msgid "E309: Unable to read block 1 from %s"
@@ -2624,7 +3183,7 @@
msgstr "od ??? po ???END môu by riadky pomieané"
msgid "??? from here until ???END lines may have been inserted/deleted"
-msgstr "od ??? po ???END môu by vloené/vymazané riadky"
+msgstr "od ??? po ???END môu by riadky vloené/vymazané"
msgid "???END"
msgstr "???KONIEC"
@@ -2632,8 +3191,13 @@
msgid "E311: Recovery Interrupted"
msgstr "E311: Obnova preruená"
-msgid "E312: Errors detected while recovering; look for lines starting with ???"
-msgstr "E312: V priebehu obnovy dolo k chybám; skontrolujte riadky zaèínajúce na ???"
+msgid ""
+"E312: Errors detected while recovering; look for lines starting with ???"
+msgstr ""
+"E312: V priebehu obnovy dolo k chybám; skontrolujte riadky zaèínajúce na ???"
+
+msgid "See \":help E312\" for more information."
+msgstr "Pozrite \":help E312\" pre ïalie informácie"
msgid "Recovery completed. You should check if everything is OK."
msgstr "Obnova dokonèená. Skontrolujte, èi je vetko v poriadku."
@@ -2646,12 +3210,12 @@
"(Zváte uloenie tohoto súboru pod iným menom\n"
msgid "and run diff with the original file to check for changes)\n"
-msgstr "a pomocou programu diff zistite zmeny oproti pôvodnému súboru.)\n"
+msgstr "a pomocou programu diff zistite zmeny oproti pôvodnému súboru)\n"
msgid ""
"Delete the .swp file afterwards.\n"
"\n"
-msgstr "Potom vymate odkladací súbor.\n"
+msgstr "Potom vymate odkladací súbor s príponou .swp.\n"
#. use msg() to start the scrolling properly
msgid "Swap files found:"
@@ -2670,29 +3234,29 @@
msgstr " -- iadne --\n"
msgid " owned by: "
-msgstr " vlastník: "
+msgstr " vlastník: "
msgid " dated: "
-msgstr " dátum vytvorenia: "
+msgstr " dátum vytvorenia: "
msgid " dated: "
-msgstr " dátum vytvorenia: "
+msgstr " dátum vytvorenia: "
msgid " [from Vim version 3.0]"
msgstr " [od Vim verzie 3.0]"
msgid " [does not look like a Vim swap file]"
-msgstr " [nevypadá ako odkladací súbor Vim]"
+msgstr " [nevyzerá ako odkladací súbor Vim]"
msgid " file name: "
-msgstr " názov súboru: "
+msgstr " názov súboru: "
msgid ""
"\n"
" modified: "
msgstr ""
"\n"
-" dátum zmeny: "
+" zmenený: "
msgid "YES"
msgstr "ÁNO"
@@ -2705,10 +3269,10 @@
" user name: "
msgstr ""
"\n"
-" uívate¾ské meno: "
+" uívate¾ské meno: "
msgid " host name: "
-msgstr " názov poèítaèa: "
+msgstr " názov poèítaèa: "
msgid ""
"\n"
@@ -2722,10 +3286,10 @@
" process ID: "
msgstr ""
"\n"
-" ID procesu : "
+" ID procesu : "
msgid " (still running)"
-msgstr " (stále aktívny)"
+msgstr " (stále beí)"
msgid ""
"\n"
@@ -2748,7 +3312,7 @@
msgstr " [nedá sa otvori]"
msgid "E313: Cannot preserve, there is no swap file"
-msgstr "E313: Nedá sa zachova - odkladací súbor neexistuje."
+msgstr "E313: Nedá sa zachova - odkladací súbor neexistuje"
msgid "File preserved"
msgstr "Súbor zachovaný"
@@ -2765,16 +3329,16 @@
msgstr "E316: ml_get: nedá sa nájs riadok %ld"
msgid "E317: pointer block id wrong 3"
-msgstr "E317: chybné id ukazovate¾a na blok 3"
+msgstr "E317: chybné èíslo ukazovate¾a na blok 3"
msgid "stack_idx should be 0"
-msgstr "stack_idx by malo ma hodnotu 3"
+msgstr "stack_idx by mal ma hodnotu 3"
msgid "E318: Updated too many blocks?"
msgstr "E318: Aktualizovaných príli ve¾a blokov?"
msgid "E317: pointer block id wrong 4"
-msgstr "E317: chybné id ukazovate¾a na blok 4"
+msgstr "E317: chybné èíslo ukazovate¾a na blok 4"
msgid "deleted block 1?"
msgstr "vymazaný blok 1?"
@@ -2784,7 +3348,7 @@
msgstr "E320: Nedá sa nájs riadok %ld"
msgid "E317: pointer block id wrong"
-msgstr "E317: chybné id ukazovate¾a na blok"
+msgstr "E317: chybné èíslo ukazovate¾a na blok"
msgid "pe_line_count is zero"
msgstr "pe_line_count má nulovú hodnotu"
@@ -2801,7 +3365,7 @@
msgstr "Nárast ve¾kosti zásobníku"
msgid "E317: pointer block id wrong 2"
-msgstr "E317: chybný id ukazovate¾a na blok 2"
+msgstr "E317: chybný èíslo ukazovate¾a na blok 2"
msgid "E325: ATTENTION"
msgstr "E325: POZOR"
@@ -2814,7 +3378,7 @@
"Nájdený odkladací súbor s menom \""
msgid "While opening file \""
-msgstr "Pri otváraní súboru\""
+msgstr "Pri otváraní súboru \""
msgid " NEWER than swap file!\n"
msgstr " NOVÍ ako odkladací súbor!\n"
@@ -2833,7 +3397,7 @@
" nemali dve rôzne verzie toho istého súboru.\n"
msgid " Quit, or continue with caution.\n"
-msgstr " Ukonèite program, alebo opatrnne pokraèujte v úpravách.\n"
+msgstr " Ukonèite program, alebo opatrne pokraèujte v úpravách.\n"
msgid ""
"\n"
@@ -2850,7 +3414,7 @@
" to recover the changes (see \":help recovery\").\n"
msgstr ""
"\"\n"
-" pre obnovenie zmien (viz \":help recovery)\".\n"
+" pre obnovenie zmien (viï \":help recovery)\".\n"
msgid " If you did this already, delete the swap file \""
msgstr " Pokia¾ ste tak u urobili, tak vymate odkladací súbor \""
@@ -2878,25 +3442,29 @@
"&Open Read-Only\n"
"&Edit anyway\n"
"&Recover\n"
-"&Quit"
+"&Quit\n"
+"&Abort"
msgstr ""
"&Otvori iba pre èítanie\n"
"&Pokraèova v úpravách\n"
"O&bnovi súbor\n"
-"&Koniec"
+"&Koniec\n"
+"&Zrui"
msgid ""
"&Open Read-Only\n"
"&Edit anyway\n"
"&Recover\n"
"&Quit\n"
+"&Abort\n"
"&Delete it"
msgstr ""
"&Otvori iba pre èítanie\n"
"&Pokraèovat v úpravách\n"
"O&bnovi súbor\n"
"&Koniec\n"
-"&Zmaza"
+"&Zrui\n"
+"Z&maza"
msgid "E326: Too many swap files found"
msgstr "E326: Príli mnoho odkladacích súborov"
@@ -2907,14 +3475,14 @@
msgid "E328: Menu only exists in another mode"
msgstr "E328: Ponuka existuje iba v inom móde"
-msgid "E329: No menu of that name"
-msgstr "E329: Ponuka tohoto mena neexistuje"
+msgid "E329: No menu \"%s\""
+msgstr "E329: Ponuka \"%s\" neexistuje"
msgid "E330: Menu path must not lead to a sub-menu"
msgstr "E330: Cesta ponuky nesmie vies do podponuky"
msgid "E331: Must not add menu items directly to menu bar"
-msgstr "E331: Poloky ponuky sa nedjú pridáva priamo na litu"
+msgstr "E331: Poloky ponuky sa nejdú pridáva priamo na litu"
msgid "E332: Separator cannot be part of a menu path"
msgstr "E332: Odde¾ovaè nesmie by èasou cesty ponuky"
@@ -2936,7 +3504,7 @@
#, c-format
msgid "E334: Menu not found: %s"
-msgstr "E334: Vzor nenájdený: %s"
+msgstr "E334: Ponuka nenájdená: %s"
#, c-format
msgid "E335: Menu not defined for %s mode"
@@ -2956,49 +3524,37 @@
msgid "line %4ld:"
msgstr "riadok %4ld:"
-msgid "[string too long]"
-msgstr "[príli dlhý reazec]"
+#, c-format
+msgid "E354: Invalid register name: '%s'"
+msgstr "E354: '%s' nie je prístupné meno registru"
msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "Správca správ: Martin Lacko <lacko@host.sk>"
+msgstr "Správca prekladu: Lubomir Host <rajo@platon.sk>"
msgid "Interrupt: "
msgstr "Preruenie: "
-msgid "Hit ENTER to continue"
-msgstr "Pokraèovanie stlaèením ENTER"
-
-msgid "Hit ENTER or type command to continue"
-msgstr "Pre pokraèovanie stlaète ENTER alebo zadajte príkaz"
+msgid "Press ENTER or type command to continue"
+msgstr "Stlaète ENTER alebo zadajte príkaz pre pokraèovanie"
msgid "-- More --"
msgstr "-- Pokraèovanie --"
-msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
-msgstr " (RET/BS: riadok, MEDZERNÍK/b: stránka, d/u: 0.5 stránky, q: koniec)"
-
-msgid " (RET: line, SPACE: page, d: half page, q: quit)"
-msgstr " (RET: riadok, MEDZERNÍK: stránka, d: 0.5 stránky, q: koniec)"
+msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " MEDZERA/d/j: obrazovka/stránka/riadok dole, b/u/k: hore, q: koniec"
msgid "Question"
msgstr "Otázka"
+# TODO: Translate as "&Ano\n&Nie" ?
msgid ""
"&Yes\n"
"&No"
msgstr ""
-"Án&o\n"
+"&Ano\n"
"&Nie"
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"Án&o\n"
-"&Nie\n"
-"&Zrui"
-
+# TODO: Translate as "&Ano\n&Nie\n&Uloi vetko\nZahodi &vetko\n&Zrui" ?
msgid ""
"&Yes\n"
"&No\n"
@@ -3006,42 +3562,59 @@
"&Discard All\n"
"&Cancel"
msgstr ""
-"Án&o\n"
+"&Ano\n"
"&Nie\n"
"&Uloi vetko\n"
"Zahodi &vetko\n"
"&Zrui"
+msgid "Select Directory dialog"
+msgstr "Dialóg pre vytvorenie adresára"
+
msgid "Save File dialog"
msgstr "Dialóg pre ukladanie súborov"
msgid "Open File dialog"
msgstr "Dialóg pre otváranie súborov"
-#. TODO: non-GUI file selector here
msgid "E338: Sorry, no file browser in console mode"
msgstr "E338: ¼utujem, ale konzolová verzia nepodporuje prehliadaè súborov"
+msgid "E766: Insufficient arguments for printf()"
+msgstr "E766: Chybné argumenty pre funkciu printf()"
+
+msgid "E767: Too many arguments to printf()"
+msgstr "E767: Príli mnoho argumentov pre funkciu printf()"
+
msgid "W10: Warning: Changing a readonly file"
msgstr "W10: Varovanie: mením súbor iba pre èítanie"
+msgid "Type number or click with mouse (<Enter> cancels): "
+msgstr "Zadajte èíslo ale kliknite myou (<Enter> zruí): "
+
+msgid "Choice number (<Enter> cancels): "
+msgstr "Zvo¾te èíslo (<Enter> zruí): "
+
msgid "1 more line"
-msgstr "poèet nových riadkov: 1"
+msgstr "1 nový riadok"
msgid "1 line less"
-msgstr "poèet vymazaných riadkov: 1"
+msgstr "1 vymazaný riadok"
#, c-format
msgid "%ld more lines"
-msgstr "poèet nových riadkov: %ld"
+msgstr "%ld nových riadkov"
#, c-format
msgid "%ld fewer lines"
-msgstr "poèet vymazaných riadkov: %ld"
+msgstr "%ld vymazaných riadkov"
msgid " (Interrupted)"
msgstr " (Preruené)"
+msgid "Beep!"
+msgstr "Piip!"
+
msgid "Vim: preserving files...\n"
msgstr "Vim: zachovávam súbory...\n"
@@ -3049,6 +3622,7 @@
msgid "Vim: Finished.\n"
msgstr "Vim: ukonèený\n"
+#, c-format
msgid "ERROR: "
msgstr "CHYBA: "
@@ -3058,8 +3632,7 @@
"[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n"
msgstr ""
"\n"
-"[bajtov] celkom uvolnené-alokované %lu-%lu, vyuité %lu, maximálne vyuitie %"
-"lu\n"
+"[bajtov] celkom uvolnené-alokované %lu-%lu, vyuité %lu, maximálne vyuitie %lu\n"
#, c-format
msgid ""
@@ -3078,35 +3651,35 @@
#, c-format
msgid "E342: Out of memory! (allocating %lu bytes)"
-msgstr "E342: Nedostatok pamäte! (alokujem %lu bytov)"
+msgstr "E342: Nedostatok pamäte! (alokujem %lu bajtov)"
#, c-format
msgid "Calling shell to execute: \"%s\""
msgstr "Volám shell na spustenie: \"%s\""
-msgid "Missing colon"
-msgstr "Chýba dvojbodka"
+msgid "E545: Missing colon"
+msgstr "E545: Chýba dvojbodka"
-msgid "Illegal mode"
-msgstr "Neprístupný mód"
+msgid "E546: Illegal mode"
+msgstr "E546: Neprípustný mód"
-msgid "Illegal mouseshape"
-msgstr "Chybný tvar myi"
+msgid "E547: Illegal mouseshape"
+msgstr "E547: Chybný tvar myi"
-msgid "digit expected"
-msgstr "oèakávaná èíslica"
+msgid "E548: digit expected"
+msgstr "E548: oèakávaná èíslica"
-msgid "Illegal percentage"
-msgstr "Neprístupné precento"
+msgid "E549: Illegal percentage"
+msgstr "E549: Neprípustné percento"
msgid "Enter encryption key: "
msgstr "Zadajte ifrovací k¾úè: "
msgid "Enter same key again: "
-msgstr "Vlote k¾úè znova: "
+msgstr "Vlote ten istý k¾úè znova: "
msgid "Keys don't match!"
-msgstr "K¾úè nie je správny!"
+msgstr "K¾úèe sa nezhodujú!"
#, c-format
msgid ""
@@ -3114,11 +3687,11 @@
"followed by '%s'."
msgstr ""
"E343: Chybná cesta: '**[èíslo] musí by buï na konci cesty, alebo musí by\n"
-"nasledované '%s. Viz :help path."
+"nasledované '%s. Viï :help path."
#, c-format
msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: Adresár \"%s\" sa nedá v cdpath nájs"
+msgstr "E344: Adresár \"%s\" sa nedá nájs v cdpath"
#, c-format
msgid "E345: Can't find file \"%s\" in path"
@@ -3132,8 +3705,25 @@
msgid "E347: No more file \"%s\" found in path"
msgstr "E347: iadny ïalí súbor \"%s\" nebol v ceste nájdený"
-msgid "Illegal component"
-msgstr "Neprístupný komponent"
+#. Get here when the server can't be found.
+msgid "Cannot connect to Netbeans #2"
+msgstr "Nedá sa pripoji na Netbeans #2"
+
+msgid "Cannot connect to Netbeans"
+msgstr "Nedá sa pripoji na Netbeans"
+
+#, c-format
+msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+msgstr "E668: Zlé prístupové práva pre súbor s informáciami pre NetBeans spojenie: \"%s\""
+
+msgid "read from Netbeans socket"
+msgstr "èítanie z Netbeans soketu"
+
+msgid "E658: NetBeans connection lost for buffer %ld"
+msgstr "E658: Stratené NetBeans spojenie pre buffer %ld"
+
+msgid "E505: "
+msgstr "E505: "
msgid "Warning: terminal cannot highlight"
msgstr "Varovanie: terminál nepodporuje zvýrazòovanie"
@@ -3145,56 +3735,77 @@
msgstr "E349: Pod kurzorom nie je iadny identifikátor"
msgid "E352: Cannot erase folds with current 'foldmethod'"
-msgstr "E352: Pomocou 'foldmethod' sa nedá vymaza záhyb"
+msgstr "E352: Pomocou 'foldmethod' sa nedá vymaza vnorenie"
+
+msgid "E664: changelist is empty"
+msgstr "E664: zoznam zmien je prázdny"
+
+msgid "E662: At start of changelist"
+msgstr "E662: Na zaèiatku zoznamu zmien"
+
+msgid "E663: At end of changelist"
+msgstr "E663: Na konci zoznamu zmien"
+
+msgid "Type :quit<Enter> to exit Vim"
+msgstr "Zadajte :quit<Enter> pre ukonèenie programu Vim"
#, c-format
msgid "1 line %sed 1 time"
-msgstr "poèet riadkov posunutých naraz pomocou %s : 1"
+msgstr "poèet riadkov upravených naraz pomocou %s: 1"
#, c-format
msgid "1 line %sed %d times"
-msgstr "poèet riadkov posunutých %s krát pomocou %d s : 1"
+msgstr "1 riadok upravený pomocou %s %d krát"
#, c-format
msgid "%ld lines %sed 1 time"
-msgstr "%ld riadkov posunutých naraz pomocou %s"
+msgstr "%ld riadkov upravených naraz pomocou %s"
#, c-format
msgid "%ld lines %sed %d times"
-msgstr "%ld riadkov posunutých pomocou %s %d krát"
+msgstr "%ld riadkov upravených pomocou %s %d krát"
#, c-format
msgid "%ld lines to indent... "
-msgstr "poèet riadkov pre odsadenie: %ld"
+msgstr "%ld riadkov pre odsadenie..."
msgid "1 line indented "
-msgstr "poèet riadkov pre odsadenie: 1 "
+msgstr "1 riadok odsadený "
#, c-format
msgid "%ld lines indented "
-msgstr "poèet odsadených riadkov: %ld"
+msgstr "%ld riadkov odsadených "
+
+msgid "E748: No previously used register"
+msgstr "E748: iadny predtým pouívaný register"
#. must display the prompt
msgid "cannot yank; delete anyway"
msgstr "nedá sa kopírova; napriek tomu vymazané"
msgid "1 line changed"
-msgstr "poèet zmenených riadkov: 1"
+msgstr "1 riadok zmenený"
#, c-format
msgid "%ld lines changed"
-msgstr "poèet zmenených riadkov: %ld"
+msgstr "%ld zmenených riadkov"
#, c-format
msgid "freeing %ld lines"
-msgstr "poèet uvolòovaných riadkov: %ld"
+msgstr "uvolòujem %ld riadkov"
+
+msgid "block of 1 line yanked"
+msgstr "skopírovaný blok 1 riadku"
msgid "1 line yanked"
-msgstr "poèet skopírovaných riadkov: 1"
+msgstr "1 riadok skopírovaný"
+
+msgid "block of %ld lines yanked"
+msgstr "skopírovaný blok %ld riadkov"
#, c-format
msgid "%ld lines yanked"
-msgstr "poèet skopírovaných riadkov: %ld"
+msgstr "%ld skopírovaných riadkov"
#, c-format
msgid "E353: Nothing in register %s"
@@ -3209,8 +3820,9 @@
"--- Registre ---"
msgid "Illegal register name"
-msgstr "Neprístupný názov registru"
+msgstr "Neprípustný názov registra"
+#, c-format
msgid ""
"\n"
"# Registers:\n"
@@ -3218,141 +3830,146 @@
"\n"
"# Registre:\n"
-#, c-format
-msgid "Unknown register type %d"
-msgstr "%d nie je známým typom registru"
-
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: '%s' nie je prístupné meno registru"
+msgid "E574: Unknown register type %d"
+msgstr "E574: Neznámy typ registra %d"
#, c-format
msgid "%ld Cols; "
-msgstr "%ld Buniek; "
+msgstr "%ld Ståpcov; "
#, c-format
msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Vybraných %s%ld z %ld riadkov; %ld zo %ld slov; %ld z %ld Bytov"
+msgstr "Vybraných %s%ld z %ld Riadkov; %ld zo %ld Slov; %ld z %ld Bajtov"
+
+msgid ""
+"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Bytes"
+msgstr "Vybraných %s%ld z %ld Riadkov; %ld zo %ld Slov; %ld z %ld Znakov; %ld z %ld Bajtov"
#, c-format
msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Bunka %s z %s; Riadok %ld z %ld; Slovo %ld z %ld; Byte %ld z %ld"
+msgstr "Ståpec %s z %s; Riadok %ld z %ld; Slovo %ld z %ld; Bajt %ld z %ld"
+
+#, c-format
+msgid ""
+"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
+"%ld"
+msgstr "Ståpec %s z %s; Riadok %ld z %ld; Slovo %ld z %ld; Znak %ld z %ld; Bajt %ld z %ld"
#, c-format
msgid "(+%ld for BOM)"
msgstr "(+%ld pre BOM)"
+msgid "%<%f%h%m%=Page %N"
+msgstr "%<%f%h%m%=Strana %N"
+
msgid "Thanks for flying Vim"
-msgstr "Ïakujem za pouitie Vim"
+msgstr "Ïakujeme za pouitie Vim"
-msgid "Option not supported"
-msgstr "Vo¾ba nie je podporovaná"
+msgid "E518: Unknown option"
+msgstr "E518: Neznáma vo¾ba"
-msgid "Not allowed in a modeline"
-msgstr "Nie je v modeline povolené"
+msgid "E519: Option not supported"
+msgstr "E519: Vo¾ba nie je podporovaná"
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tOstatné nastavenie z "
+msgid "E520: Not allowed in a modeline"
+msgstr "E520: Nie je v modeline povolené"
-msgid "Number required after ="
-msgstr "Po = je vyadované èíslo"
+msgid "E521: Number required after ="
+msgstr "E521: Po = je vyadované èíslo"
-msgid "Not found in termcap"
-msgstr "Nenájdený v termcapu"
+msgid "E522: Not found in termcap"
+msgstr "E522: Nenájdený v termcape"
#, c-format
-msgid "Illegal character <%s>"
-msgstr "Neprístupný znak <%s>"
+msgid "E539: Illegal character <%s>"
+msgstr "E539: Neprípustný znak <%s>"
-msgid "Not allowed here"
-msgstr "Toto nie je na tomto mieste povolené"
+msgid "E529: Cannot set 'term' to empty string"
+msgstr "E529: Vo¾ba 'term' nemôe by prázdna"
-msgid "Cannot set 'term' to empty string"
-msgstr "Vo¾ba 'term' nemôe by prázdna"
+msgid "E530: Cannot change term in GUI"
+msgstr "E530: V grafickom móde (GUI) sa nedá meni typ terminálu"
-msgid "Cannot change term in GUI"
-msgstr "V GUI sa nedá meni term"
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531: Pouite \"gui\" pre spustenie GUI"
-msgid "Use \":gui\" to start the GUI"
-msgstr "Pouite \"gui\" pre spustenie GUI"
+msgid "E589: 'backupext' and 'patchmode' are equal"
+msgstr "E589: vo¾by 'backupext' a 'patchmode' majú rovnakú hodnotu"
-msgid "'backupext' and 'patchmode' are equal"
-msgstr "vo¾by 'backupext' a 'patchmode' majú rovnakú hodnotu"
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617: Nedá sa zmeni v grafickom rozhraní GTK+ 2"
-msgid "Zero length string"
-msgstr "Reazec s nulovou dåkou"
+msgid "E524: Missing colon"
+msgstr "E524: Chýba dvojbodka"
+
+msgid "E525: Zero length string"
+msgstr "E525: Reazec s nulovou dåkou"
#, c-format
-msgid "Missing number after <%s>"
-msgstr "Po <%s> chýba èíslo"
+msgid "E526: Missing number after <%s>"
+msgstr "E526: Po <%s> chýba èíslo"
-msgid "Missing comma"
-msgstr "Chýba èiarka"
+msgid "E527: Missing comma"
+msgstr "E527: Chýba èiarka"
-msgid "Must specify a ' value"
-msgstr "Je nutné zada hodnotu '"
+msgid "E528: Must specify a ' value"
+msgstr "E528: Je nutné zada hodnotu '"
-msgid "contains unprintable character"
-msgstr "obsahuje netlaèite¾né znaky"
+msgid "E595: contains unprintable or wide character"
+msgstr "E595: obsahuje netlaèite¾né znaky"
-msgid "Invalid font(s)"
-msgstr "Chybné písma"
+msgid "E596: Invalid font(s)"
+msgstr "E596: Chybné písma"
-msgid "can't select fontset"
-msgstr "nedá sa vybra sada písiem"
+msgid "E597: can't select fontset"
+msgstr "E597: nedá sa vybra sada písiem"
-msgid "Invalid fontset"
-msgstr "Chybná sada písiem"
+msgid "E598: Invalid fontset"
+msgstr "E598: Chybná sada písiem"
-msgid "can't select wide font"
-msgstr "nedá sa vybra iroký font"
+msgid "E533: can't select wide font"
+msgstr "E533: nedá sa vybra iroký font"
-msgid "Invalid wide font"
-msgstr "Chybné iroké písmo"
+msgid "E534: Invalid wide font"
+msgstr "E534: Chybné iroké písmo"
#, c-format
-msgid "Illegal character after <%c>"
-msgstr "Neprístupný znak po <%c>"
+msgid "E535: Illegal character after <%c>"
+msgstr "E535: Neprípustný znak po <%c>"
-msgid "comma required"
-msgstr "je nutná èiarka"
+msgid "E536: comma required"
+msgstr "E536: je nutná èiarka"
#, c-format
-msgid "'commentstring' must be empty or contain %s"
-msgstr "'komentár' musí by prázdny alebo musí obsahova %s"
+msgid "E537: 'commentstring' must be empty or contain %s"
+msgstr "E537: 'commentstring' (komentár) musí by prázdny alebo musí obsahova %s"
-msgid "No mouse support"
-msgstr "Bez podpory myi"
+msgid "E538: No mouse support"
+msgstr "E538: Bez podpory myi"
-msgid "Unclosed expression sequence"
-msgstr "Neuzatvorené zoskupenie výrazov"
+msgid "E540: Unclosed expression sequence"
+msgstr "E540: Neuzatvorené zoskupenie výrazov"
-msgid "too many items"
-msgstr "príli mnoho poloiek"
+msgid "E541: too many items"
+msgstr "E541: príli mnoho poloiek"
-msgid "unbalanced groups"
-msgstr "nevyváené skupiny"
+msgid "E542: unbalanced groups"
+msgstr "E542: nevyváené skupiny"
-msgid "A preview window already exists"
-msgstr "Okno náh¾adu u existuje"
+msgid "E590: A preview window already exists"
+msgstr "E590: Okno náh¾adu u existuje"
-msgid "'winheight' cannot be smaller than 'winminheight'"
-msgstr "hodnota vo¾by 'winheight' nesmie by menia ne hodnota vo¾by 'winminheight'"
-
-msgid "'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "hodnota vo¾by 'winwidth' nesmie by menia ne hodnota vol¾y 'winminwidth'"
+msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
+msgstr "W17: Mód Arabic vyaduje kódovanie UTF-8, nastavte to príkazom ':set encoding=utf-8'"
#, c-format
-msgid "Need at least %d lines"
-msgstr "Minimálne potrebný poèet riadkov: %d"
+msgid "E593: Need at least %d lines"
+msgstr "E593: Minimálny potrebný poèet riadkov je %d"
#, c-format
-msgid "Need at least %d columns"
-msgstr "Minimálne potrebný poèet ståpcov: %d"
+msgid "E594: Need at least %d columns"
+msgstr "E594: Minimálne potrebný poèet ståpcov je %d"
#, c-format
msgid "E355: Unknown option: %s"
@@ -3377,7 +3994,7 @@
"--- Local option values ---"
msgstr ""
"\n"
-"--- Nastavenie globálnych volieb ---"
+"--- Nastavenie lokálnych volieb ---"
msgid ""
"\n"
@@ -3408,7 +4025,7 @@
#, c-format
msgid "Need %s version %ld\n"
-msgstr "Potrebný %s verzia %ld\n"
+msgstr "Potrebná %s verzia %ld\n"
msgid "Cannot open NIL:\n"
msgstr "Nedá sa otvori NIL:\n"
@@ -3423,9 +4040,6 @@
msgid "cannot change console mode ?!\n"
msgstr "nemôem zmeni konzolový mód ?!\n"
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: Nastavovanie reimu obrazovky nie je podporované"
-
msgid "mch_get_shellsize: not a console??\n"
msgstr "mch_get_shellsize: nie je konzolou??\n"
@@ -3454,10 +4068,6 @@
msgid "'columns' is not 80, cannot execute external commands"
msgstr "'ståpce' nie je 80, nemôem spusti externý príkaz"
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: Vyvolanie kniniènej funkcia zlyhalo pre \"%s()\""
-
msgid "E237: Printer selection failed"
msgstr "E237: Zlyhal výber tlaèiarne"
@@ -3466,16 +4076,13 @@
msgstr "%s na %s"
#, c-format
-msgid "E448: Unknown font: %s"
-msgstr "E448: Neznáme písmo: %s"
+msgid "E613: Unknown printer font: %s"
+msgstr "E613: Neznámy font tlaèiarne: %s"
#, c-format
msgid "E238: Print error: %s"
msgstr "E238: Chyba tlaèe: %s"
-msgid "Unknown"
-msgstr "Neznámy"
-
#, c-format
msgid "Printing '%s'"
msgstr "Tlaèím '%s'"
@@ -3492,25 +4099,34 @@
msgstr "E366: Chybná 'osfiletype' vo¾ba - pouitie Textu"
msgid "Vim: Double signal, exiting\n"
-msgstr "VIm: dvojitý signál, konèím\n"
+msgstr "Vim: dvojitý signál, konèím\n"
#, c-format
msgid "Vim: Caught deadly signal %s\n"
msgstr "Vim: Zachytený smrtiaci signál %s\n"
+#, c-format
msgid "Vim: Caught deadly signal\n"
msgstr "Vim: Zachytený smrtiaci signál\n"
#, c-format
msgid "Opening the X display took %ld msec"
-msgstr "Otváram X displej - zaberie %ld msec"
+msgstr "Otvorenie X displej zabralo %ld msec"
+
+#. KDE sometimes produces X error that we want to ignore
+msgid ""
+"\n"
+"Vim: Got X error but we continue...\n"
+msgstr ""
+"\n"
+"Vim: Chyba X ale pokraèujem ...\n"
msgid ""
"\n"
"Vim: Got X error\n"
msgstr ""
"\n"
-"Vim: chyba X\n"
+"Vim: Chyba X\n"
msgid "Testing the X display failed"
msgstr "Testovanie X displeja zlyhalo"
@@ -3560,12 +4176,41 @@
"\n"
"Príkaz ukonèený\n"
+msgid "XSMP lost ICE connection"
+msgstr "XSMP stratilo ICE spojenie"
+
+#, c-format
+msgid "dlerror = \"%s\""
+msgstr "dlerror = \"%s\""
+
msgid "Opening the X display failed"
msgstr "Otvorenie X displeja zlyhalo"
+msgid "XSMP handling save-yourself request"
+msgstr "XSMP spracuváva poiadavku na samouloenie"
+
+msgid "XSMP opening connection"
+msgstr "XSMP otvára spojenie"
+
+msgid "XSMP ICE connection watch failed"
+msgstr "XSMP kontrola spojenia ICE zlyhala"
+
+#, c-format
+msgid "XSMP SmcOpenConnection failed: %s"
+msgstr "XSMP SmcOpenConnection zlyhalo: %s"
+
msgid "At line"
msgstr "Na riadku"
+msgid "Could not load vim32.dll!"
+msgstr "Nemôem nahra vim32.dll!"
+
+msgid "VIM Error"
+msgstr "VIM Chyba"
+
+msgid "Could not fix up function pointers to the DLL!"
+msgstr "Nemôem opravi odkazy funkcií na DLL!"
+
#, c-format
msgid "shell returned %d"
msgstr "návratová hodnota shellu %d"
@@ -3598,15 +4243,6 @@
msgid "Vim Warning"
msgstr "Vim Varovanie"
-msgid "Could not load vim32.dll!"
-msgstr "Nemôem nahra vim32.dll!"
-
-msgid "VIM Error"
-msgstr "VIM Chyba"
-
-msgid "Could not fix up function pointers to the DLL!"
-msgstr "Nemôem opravi odkazy funkcie na DLL!"
-
#, c-format
msgid "E372: Too many %%%c in format string"
msgstr "E372: Príli mnoho %%%c vo formátovacom reazci"
@@ -3620,7 +4256,8 @@
#, c-format
msgid "E375: Unsupported %%%c in format string"
-msgstr "E375: Nepodporovaná formátová pecifikácia %%%c vo formátovacom reazci"
+msgstr ""
+"E375: Nepodporovaná formátová pecifikácia %%%c vo formátovacom reazci"
#, c-format
msgid "E376: Invalid %%%c in format string prefix"
@@ -3636,12 +4273,12 @@
msgid "E379: Missing or empty directory name"
msgstr "E379: Chýbajúci alebo prázdny názov adresára"
-msgid "No more items"
-msgstr "iadne ïalie poloky"
+msgid "E553: No more items"
+msgstr "E553: iadne ïalie poloky"
#, c-format
msgid "(%d of %d)%s%s: "
-msgstr "(%d/%d)%s%s: "
+msgstr "(%d z %d)%s%s: "
msgid " (line deleted)"
msgstr " (riadok vymazaný)"
@@ -3654,43 +4291,111 @@
#, c-format
msgid "error list %d of %d; %d errors"
-msgstr "zoznam chýb %d z %d; poèet chýb: %d"
+msgstr "zoznam chýb %d z %d; %d chýb"
msgid "E382: Cannot write, 'buftype' option is set"
msgstr "E382: Nedá sa uloi, je nastavená vo¾ba 'buftype'"
+msgid "E683: File name missing or invalid pattern"
+msgstr "E683: Chýba meno súboru alebo chybný vzor"
+
+msgid "Cannot open file \"%s\""
+msgstr "Nedá sa otvori súbor \"%s\""
+
+msgid "E681: Buffer is not loaded"
+msgstr "E681: Buffer nie je naèítaný"
+
+#, c-format
+msgid "E369: invalid item in %s%%[]"
+msgstr "E369: chybná poloka v %s%%[]"
+
msgid "E339: Pattern too long"
msgstr "E339: Vzor je príli dlhý"
+msgid "E50: Too many \\z("
+msgstr "E50: Príli mnoho \\z("
+
+#, c-format
+msgid "E51: Too many %s("
+msgstr "E51: Príli mnoho %s("
+
+msgid "E52: Unmatched \\z("
+msgstr "E52: Nespárované \\z("
+
+#, c-format
+msgid "E53: Unmatched %s%%("
+msgstr "E53: Nespárované %s%%("
+
+#, c-format
+msgid "E54: Unmatched %s("
+msgstr "E54: Nespárované %s("
+
+#, c-format
+msgid "E55: Unmatched %s)"
+msgstr "E55: Nespárované %s)"
+
+#, c-format
+msgid "E59: invalid character after %s@"
+msgstr "E59: Neprípustný znak po %s@"
+
+#, c-format
+msgid "E60: Too many complex %s{...}s"
+msgstr "E60: Príli komplexné %s{...}"
+
#, c-format
msgid "E61: Nested %s*"
-msgstr "E61: Vhniezdený %s*"
+msgstr "E61: Vnorený %s*"
#, c-format
msgid "E62: Nested %s%c"
-msgstr "E62: Vhniezdené %s%c"
+msgstr "E62: Vnorený %s%c"
+
+msgid "E63: invalid use of \\_"
+msgstr "E63: Chybne pouité \\_"
#, c-format
msgid "E64: %s%c follows nothing"
msgstr "E64: %s%c niè nenasleduje"
+msgid "E65: Illegal back reference"
+msgstr "E65: Chybná spätná referencia"
+
+msgid "E66: \\z( not allowed here"
+msgstr "E66: \\z( tu nie je povolené"
+
+msgid "E67: \\z1 et al. not allowed here"
+msgstr "E67: \\z1 a spol. tu nie je povolené"
+
+msgid "E68: Invalid character after \\z"
+msgstr "E68: Neprípustný znak po \\z"
+
+#, c-format
+msgid "E69: Missing ] after %s%%["
+msgstr "E69: Chýbajúca ] po %s%%["
+
#, c-format
-msgid "Syntax error in %s{...}"
-msgstr "Chyba syntaxe v %s{...}"
+msgid "E70: Empty %s%%[]"
+msgstr "E70: Prázdny %s%%[]"
-msgid "E361: Crash intercepted; regexp too complex?"
-msgstr "E361: Zachytené preteèenie zásobníku: príli zloitý regulárny výraz?"
+#, c-format
+msgid "E678: Invalid character after %s%%[dxouU]"
+msgstr "E678: Neprípustný znak po %s%%[dxouU]"
-msgid "E363: pattern caused out-of-stack error"
-msgstr "E363: vzor spôsobil preteèenie zásobníku"
+#, c-format
+msgid "E71: Invalid character after %s%%"
+msgstr "E71: Neprípustný znak po %s%%"
+
+#, c-format
+msgid "E769: Missing ] after %s["
+msgstr "E769: Chýbajúca ] po %s["
+
+#, c-format
+msgid "E554: Syntax error in %s{...}"
+msgstr "E554: Chyba syntaxe v %s{...}"
msgid "External submatches:\n"
msgstr "Vnútorné podradené zhody:\n"
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld riadkov zahnutých "
-
msgid " VREPLACE"
msgstr " NAHRADI VERTIKÁLNE"
@@ -3713,7 +4418,10 @@
msgstr " (nahradi vertikálne)"
msgid " Hebrew"
-msgstr " hebrejský"
+msgstr " Hebrejský"
+
+msgid " Arabic"
+msgstr " Arabský"
msgid " (lang)"
msgstr " (jazyk)"
@@ -3721,30 +4429,30 @@
msgid " (paste)"
msgstr " (vloi)"
-msgid " SELECT"
-msgstr " ZHODY"
-
msgid " VISUAL"
msgstr " VIZUÁLNE"
-msgid " BLOCK"
-msgstr " BLOK"
+msgid " VISUAL LINE"
+msgstr " VIZUÁLNY RIADOK"
-msgid " LINE"
-msgstr " RIADOK"
+msgid " VISUAL BLOCK"
+msgstr " VIZUÁLNY BLOK"
+
+msgid " SELECT"
+msgstr " ZHODY"
+
+msgid " SELECT LINE"
+msgstr " OZNAÈ RIADOK"
+
+msgid " SELECT BLOCK"
+msgstr " OZNAÈ BLOK"
msgid "recording"
msgstr "nahrávam"
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "h¾adanie dosiahlo zaèiatok, pokraèovanie od konca"
-
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "h¾adanie dosiahlo koniec, pokraèovanie od zaèiatku"
-
#, c-format
msgid "E383: Invalid search string: %s"
-msgstr "E383: Neprístupný h¾adaný reazec: %s"
+msgstr "E383: Neprípustný h¾adaný reazec: %s"
#, c-format
msgid "E384: search hit TOP without match for: %s"
@@ -3795,9 +4503,300 @@
msgid "E389: Couldn't find pattern"
msgstr "E389: Nedá sa nájs vzor"
+msgid "E759: Format error in spell file"
+msgstr "E759: Chyba formátovania v spell súbore (kontrola pravopisu)"
+
+msgid "E758: Truncated spell file"
+msgstr "E758: Odseknutý spell súbor (kontrola pravopisu)"
+
+#, c-format
+msgid "Trailing text in %s line %d: %s"
+msgstr "Prebytoèný text v %s na riadku %d: %s"
+
+#, c-format
+msgid "Affix name too long in %s line %d: %s"
+msgstr "Prípona príli dlhá v %s riadok %d: %s"
+
+msgid "E761: Format error in affix file FOL, LOW or UPP"
+msgstr "E761: Chyba formátovania v súbore prípon FOL, LOW alebo UPP (NASLEDUJE, MALÉ alebo VE¼KÉ)"
+
+msgid "E762: Character in FOL, LOW or UPP is out of range"
+msgstr "E762: Znak v FOL, LOW alebo UPP (NASLEDUJE, MALÉ alebo VE¼KÉ) je mimo rozsah"
+
+msgid "Compressing word tree..."
+msgstr "Robím kompresiu stromu slov..."
+
+msgid "E756: Spell checking is not enabled"
+msgstr "E756: Kontrola pravopisu nie je zapnutá"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr "Varovanie: Nemono nájs zoznam slov \"%s.%s.spl\" alebo \"%s.ascii.spl\""
+
+#, c-format
+msgid "Reading spell file \"%s\""
+msgstr "Èítam slovníkový súbor \"%s\""
+
+msgid "E757: This does not look like a spell file"
+msgstr "E757: Toto sa nezdá by slovníkovým súborom"
+
+msgid "E771: Old spell file, needs to be updated"
+msgstr "E771: Starý slovníkový súbor, potrebuje by zaktualizovaný"
+
+msgid "E772: Spell file is for newer version of Vim"
+msgstr "E772: Slovníkový súbor je pre noviu verziu Vim"
+
+msgid "E770: Unsupported section in spell file"
+msgstr "E770: Nepodporovaná sekcia v slovníkovom súbore"
+
+#, c-format
+msgid "Warning: region %s not supported"
+msgstr "Varovanie: región %s nie je podporovaný"
+
+#, c-format
+msgid "Reading affix file %s ..."
+msgstr "Naèítavam súbor s príponami %s ..."
+
+#, c-format
+msgid "Conversion failure for word in %s line %d: %s"
+msgstr "Konverzia slova zlyhala v %s riadok %d: %s"
+
+#, c-format
+msgid "Conversion in %s not supported: from %s to %s"
+msgstr "Konverzia v %s nie je podporovaná: z %s do %s"
+
+#, c-format
+msgid "Conversion in %s not supported"
+msgstr "Konverzia v %s nie je podporovaná"
+
+#, c-format
+msgid "Invalid value for FLAG in %s line %d: %s"
+msgstr "Neplatná hodnota pre príznak (FLAG) v %s riadok %d: %s"
+
+#, c-format
+msgid "FLAG after using flags in %s line %d: %s"
+msgstr "Príznak (FLAG) po pouití príznakov v %s riadok %d: %s"
+
+#, c-format
+msgid "Character used for SLASH must be ASCII; in %s line %d: %s"
+msgstr "Znak pouitý pre SLASH musí by ASCII; v %s riadok %d: %s"
+
+#, c-format
+msgid "Wrong COMPOUNDMAX value in %s line %d: %s"
+msgstr "Zlá hodnota COMPOUNDMAX v %s riadok %d: %s"
+
+#, c-format
+msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
+msgstr "Zlá hodnota COMPOUNDMIN v %s riadok %d: %s"
+
+#, c-format
+msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
+msgstr "Zlá hodnota COMPOUNDSYLMAX v %s riadok %d: %s"
+
+#, c-format
+msgid "Different combining flag in continued affix block in %s line %d: %s"
+msgstr "Rozdielna kombinácia príznakov v nasledujúcom bloku prípon v %s riadok %d: %s"
+
+#, c-format
+msgid "Duplicate affix in %s line %d: %s"
+msgstr "Duplicitná prípona v %s riadok %d: %s"
+
+#, c-format
+msgid ""
+"Affix also used for BAD/RAR/KEP/NEEDAFFIX/NEEDCOMPOUND in %s line %d: %s"
+msgstr ""
+"Prípona pouitá aj pre BAD/RAR/KEP/NEEDAFFIX/NEEDCOMPOUND in %s line %d: %s"
+
+#, c-format
+msgid "Expected Y or N in %s line %d: %s"
+msgstr "Oèakávane Y alebo N v %s riadok %d: %s"
+
+#, c-format
+msgid "Broken condition in %s line %d: %s"
+msgstr "Naruená podmienka v %s riadok %d: %s"
+
+#, c-format
+msgid "Expected REP count in %s line %d"
+msgstr "Oèakávam poèet REP v %s riadok %d"
+
+#, c-format
+msgid "Expected MAP count in %s line %d"
+msgstr "Oèakávam poèet MAP v %s riadok %d"
+
+#, c-format
+msgid "Duplicate character in MAP in %s line %d"
+msgstr "Opakovaný znak v MAP v %s riadok %d"
+
+#, c-format
+msgid "Unrecognized or duplicate item in %s line %d: %s"
+msgstr "Nerozpoznaná alebo opakujúca sa poloka v %s riadok %d: %s"
+
+#, c-format
+msgid "Missing FOL/LOW/UPP line in %s"
+msgstr "Chýbajúci riadok FOL/LOW/UPP v %s"
+
+msgid "COMPOUNDSYLMAX used without SYLLABLE"
+msgstr "COMPOUNDSYLMAX pouitý bez SYLLABLE"
+
+msgid "Too many postponed prefixes"
+msgstr "Príli mnoho odloených prípon"
+
+msgid "Too many compound flags"
+msgstr "Príli mnoho upravovacích príznakov"
+
+msgid "Too many posponed prefixes and/or compound flags"
+msgstr "Príli mnoho odloených prípon a/alebo upravovacích príznakov"
+
+#, c-format
+msgid "Missing SOFO%s line in %s"
+msgstr "Chýba SOFO%s riadok v %s"
+
+#, c-format
+msgid "Both SAL and SOFO lines in %s"
+msgstr "SAL a SOFO riadky zároveò v %s"
+
+#, c-format
+msgid "Flag is not a number in %s line %d: %s"
+msgstr "Príznak nie je èíslo v %s na riadku %d: %s"
+
+#, c-format
+msgid "Illegal flag in %s line %d: %s"
+msgstr "Neprípustný príznak v %s riadok %d: %s"
+
+#, c-format
+msgid "%s value differs from what is used in another .aff file"
+msgstr "Hodnota %s sa odliuje od hodnoty pouitej v inom .aff súbore"
+
+#, c-format
+msgid "Reading dictionary file %s ..."
+msgstr "Naèítavam slovník %s ..."
+
+#, c-format
+msgid "E760: No word count in %s"
+msgstr "E760: Chýajúci poèet slov v %s"
+
+#, c-format
+msgid "line %6d, word %6d - %s"
+msgstr "riadok %6d, slovo %6d - %s"
+
+#, c-format
+msgid "Duplicate word in %s line %d: %s"
+msgstr "Opakujúce sa slovo v %s riadok %d: %s"
+
+#, c-format
+msgid "First duplicate word in %s line %d: %s"
+msgstr "Prvé duplicitné slovo v %s riadok %d: %s"
+
+#, c-format
+msgid "%d duplicate word(s) in %s"
+msgstr "%d duplicitné slovo(á) v %s"
+
+#, c-format
+msgid "Ignored %d word(s) with non-ASCII characters in %s"
+msgstr "Ignorovaných %d slov s nepísmennými znakmi v %s"
+
+#, c-format
+msgid "Reading word file %s ..."
+msgstr "Naèítavam súbor so slovami %s ..."
+
+#, c-format
+msgid "Duplicate /encoding= line ignored in %s line %d: %s"
+msgstr "Duplicitný riadok /encoding= v %s riadok %d ignorovaný: %s "
+
+#, c-format
+msgid "/encoding= line after word ignored in %s line %d: %s"
+msgstr "/encoding= riadok nasledujúci po slove v %s riadok %d ignorovaný: %s"
+
+#, c-format
+msgid "Duplicate /regions= line ignored in %s line %d: %s"
+msgstr "Duplicitný riadok /regions= v %s riadok %d ignorovaný: %s"
+
+#, c-format
+msgid "Too many regions in %s line %d: %s"
+msgstr "Príli mnoho regiónov v %s riadok %d: %s"
+
+#, c-format
+msgid "/ line ignored in %s line %d: %s"
+msgstr "Riadok / v %s riadok %d ignorovaný: %s"
+
+#, c-format
+msgid "Invalid region nr in %s line %d: %s"
+msgstr "Pouíté chybné èíslo regiónu v %s riadok %d: %s"
+
+#, c-format
+msgid "Unrecognized flags in %s line %d: %s"
+msgstr "Nerozpoznaný príznak v %s riadok %d: %s"
+
+#, c-format
+msgid "Ignored %d words with non-ASCII characters"
+msgstr "Ignorovaných %d slov s nepísmennými znakmi"
+
+#, c-format
+msgid "Compressed %d of %d nodes; %d%% remaining"
+msgstr "Skomprimovaných %d z %d uzlov; %d%% zostáva"
+
+msgid "E751: Output file name must not have region name"
+msgstr "E751: Výstupné meno súboru nesmie ma názov regiónu"
+
+msgid "E754: Only up to 8 regions supported"
+msgstr "E754: Podporovaných max. 8 regiónov"
+
+#, c-format
+msgid "E755: Invalid region in %s"
+msgstr "E755: Chybný región v %s"
+
+msgid "Warning: both compounding and NOBREAK specified"
+msgstr "Varovanie: pecifikované spájanie a nezalamovanie"
+
+#, c-format
+msgid "Writing spell file %s ..."
+msgstr "Ukládám slovníkový súbor %s ..."
+
+msgid "Done!"
+msgstr "Hotovo!"
+
+#, c-format
+msgid "Estimated runtime memory use: %d bytes"
+msgstr "Ve¾kos pouívanej pamäte: %d bajtov"
+
+#, c-format
+msgid "E765: 'spellfile' does not have %ld entries"
+msgstr "E765: 'spellfile' nemá %ld poloiek"
+
+msgid "E763: Word characters differ between spell files"
+msgstr "E763: Znaky slov sa odliujú medzi slovníkovými súbormi"
+
+msgid "Sorry, no suggestions"
+msgstr "Prepáète, iadne návrhy"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "Prepáète, iba %ld návrhov"
+
+#. avoid more prompt
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "Zmeni \"%.*s\" na:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
+msgid "E752: No previous spell replacement"
+msgstr "E752: iadny predchádzajúce nahradenie pod¾a slovníka"
+
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: Nenájdené: %s"
+
+#. This should have been checked when generating the .spl
+#. * file.
+msgid "E999: duplicate char in MAP entry"
+msgstr "E999: duplicitný znak v MAP poloke"
+
#, c-format
msgid "E390: Illegal argument: %s"
-msgstr "E390: Neprístupný argument: %s"
+msgstr "E390: Neprípustný argument: %s"
#, c-format
msgid "E391: No such syntax cluster: %s"
@@ -3807,7 +4806,7 @@
msgstr "Pre tento buffer nie sú definované iadne poloky syntaxe"
msgid "syncing on C-style comments"
-msgstr "synchronizujem komentáre v C týle"
+msgstr "synchronizujem pod¾a komentárov jazyka C"
msgid "no syncing"
msgstr "iadne synchronizácie"
@@ -3853,7 +4852,13 @@
msgstr "; zhoda "
msgid " line breaks"
-msgstr " riadkov"
+msgstr " zalomení riadkov"
+
+msgid "E395: contains argument not accepted here"
+msgstr "E395: obsahuje argumenty, ktoré tu nie sú povolené"
+
+msgid "E396: containedin argument not accepted here"
+msgstr "E396: obsahuje argumenty, ktoré tu nie sú povolené"
msgid "E393: group[t]here not accepted here"
msgstr "E393: group[t]here nesmie by na tomto mieste"
@@ -3862,16 +4867,14 @@
msgid "E394: Didn't find region item for %s"
msgstr "E394: Pre %s chýba poloka regiónu"
-msgid "E395: contains argument not accepted here"
-msgstr "E395: obsahuje argumenty, ktoré tu nie sú povolené"
-
-msgid "E396: containedin argument not accepted here"
-msgstr "E396: obsahuje argumenty, ktoré tu nie sú povolené"
-
msgid "E397: Filename required"
msgstr "E397: Vyadovaný názov súboru"
#, c-format
+msgid "E747: Missing ']': %s"
+msgstr "E747: Chýba ']': %s"
+
+#, c-format
msgid "E398: Missing '=': %s"
msgstr "E398: Chýba '=': %s"
@@ -3888,7 +4891,7 @@
#, c-format
msgid "E402: Garbage after pattern: %s"
-msgstr "E402: Chyba za vzorom %s"
+msgstr "E402: Chyba za vzorom: %s"
msgid "E403: syntax sync: line continuations pattern specified twice"
msgstr "E403: synchronizácia syntaxe: vzor pokraèovania riadkov zadaný dvakrát"
@@ -3899,7 +4902,7 @@
#, c-format
msgid "E405: Missing equal sign: %s"
-msgstr "E405: Chýba znamienko rovnása: %s"
+msgstr "E405: Chýba znamienko rovná sa: %s"
#, c-format
msgid "E406: Empty argument: %s"
@@ -3921,9 +4924,12 @@
msgid "E410: Invalid :syntax subcommand: %s"
msgstr "E410: Chybný podradený príkaz :syntax : %s "
+msgid "E679: recursive loop loading syncolor.vim"
+msgstr "E679: rekurzívna sluèka pri naèítavaní syncolor.vim"
+
#, c-format
msgid "E411: highlight group not found: %s"
-msgstr "E411: skupina zvíraznenia %s nebola nájdená"
+msgstr "E411: skupina zvýraznenia %s nebola nájdená"
#, c-format
msgid "E412: Not enough arguments: \":highlight link %s\""
@@ -3938,11 +4944,11 @@
#, c-format
msgid "E415: unexpected equal sign: %s"
-msgstr "E415: neoèakávané znamienko rovnása : %s"
+msgstr "E415: neoèakávané znamienko rovná sa: %s"
#, c-format
msgid "E416: missing equal sign: %s"
-msgstr "E416: chýba znamienko rovnása: %s"
+msgstr "E416: chýba znamienko rovná sa: %s"
#, c-format
msgid "E417: missing argument: %s"
@@ -3960,24 +4966,30 @@
#, c-format
msgid "E421: Color name or number not recognized: %s"
-msgstr "E421: Názov alebo èíslo farby %s nebolo rozpoznané"
+msgstr "E421: Názov alebo èíslo farby nebolo rozpoznané: %s"
#, c-format
msgid "E422: terminal code too long: %s"
-msgstr "E422: terminálový kód %s je príli dlhý"
+msgstr "E422: terminálový kód je príli dlhý: %s"
#, c-format
msgid "E423: Illegal argument: %s"
-msgstr "E423: Neprístupný argument: %s"
+msgstr "E423: Neprípustný argument: %s"
msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: Je pouívané príli velké mnostvo odliných zvýrazòovacích vlastností"
+msgstr "E424: Pouívaných príli ve¾a odliných zvýrazòovacích vlastností"
-msgid "at bottom of tag stack"
-msgstr "koniec zoznamu tagov"
+msgid "E669: Unprintable character in group name"
+msgstr "E669: Netlaèitelný znak v mene skupiny"
-msgid "at top of tag stack"
-msgstr "zaèiatok zoznamu tagov"
+msgid "W18: Invalid character in group name"
+msgstr "W18: Chybný znak v mene skupiny"
+
+msgid "E555: at bottom of tag stack"
+msgstr "E555: na konci zoznamu tagov"
+
+msgid "E556: at top of tag stack"
+msgstr "E556: na zaèiatku zoznamu tagov"
msgid "E425: Cannot go before first matching tag"
msgstr "E425: Nedá sa skoèi pred prvý vyhovujúci tag"
@@ -3987,18 +4999,11 @@
msgstr "E426: tag %s nenájdený"
msgid " # pri kind tag"
-msgstr " # pri tag"
+msgstr " # pri typ tag"
msgid "file\n"
msgstr "súbor\n"
-#.
-#. * Ask to select a tag from the list.
-#. * When using ":silent" assume that <CR> was entered.
-#.
-msgid "Enter nr of choice (<CR> to abort): "
-msgstr "Zadajte èíslo (<CR> pre ukonèenie): "
-
msgid "E427: There is only one matching tag"
msgstr "E427: Vyhovuje iba jeden tag"
@@ -4012,7 +5017,7 @@
#. Give an indication of the number of matching tags
#, c-format
msgid "tag %d of %d%s"
-msgstr "tag %d z celkového poètu %d%s"
+msgstr "tag %d z %d%s"
msgid " or more"
msgstr " alebo viac"
@@ -4032,23 +5037,17 @@
"\n"
" # CIE¼ tag TART riadok v súbore/texte"
-msgid "Linear tag search"
-msgstr "Lineárne h¾adanie tagu"
-
-msgid "Binary tag search"
-msgstr "Binárne h¾adanie tagu"
-
#, c-format
msgid "Searching tags file %s"
msgstr "Preh¾adávam súbor tagov %s"
#, c-format
msgid "E430: Tag file path truncated for %s\n"
-msgstr "E430: Súbor tagov %s bol orezaný\n"
+msgstr "E430: Cesta k súboru tagov %s bola orezaná\n"
#, c-format
msgid "E431: Format error in tags file \"%s\""
-msgstr "E431: Chyba formátu v súbore tagov \"%s\""
+msgstr "E431: Chyba formátovania v súbore tagov \"%s\""
#, c-format
msgid "Before byte %ld"
@@ -4074,21 +5073,21 @@
msgid "defaulting to '"
msgstr "nastavujem na '"
-msgid "Cannot open termcap file"
-msgstr "Nedá sa otvori termcap súbor"
+msgid "E557: Cannot open termcap file"
+msgstr "E557: Nedá sa otvori termcap súbor"
-msgid "Terminal entry not found in terminfo"
-msgstr "Terminfo neobsahuje poloku pre tento terminál"
+msgid "E558: Terminal entry not found in terminfo"
+msgstr "E558: Terminfo neobsahuje poloku pre tento terminál"
-msgid "Terminal entry not found in termcap"
-msgstr "Termcap neobsahuje poloku pre tento terminál"
+msgid "E559: Terminal entry not found in termcap"
+msgstr "E559: Termcap neobsahuje poloku pre tento terminál"
#, c-format
msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: Termcap neobsahuje poloku pre \"%s\""
+msgstr "E436: Termcap neobsahuje poloku \"%s\""
msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: Terminál musí ma \"cm\" schopnos"
+msgstr "E437: Terminál musí ma schopnos \"cm\" (schopnos pohybu kurzora)"
#. Highlight title
msgid ""
@@ -4112,17 +5111,17 @@
msgstr "E438: u_undo: èísla riadkov sú chybné"
msgid "1 change"
-msgstr "poèet zmien: 1"
+msgstr "1 zmena"
#, c-format
msgid "%ld changes"
-msgstr "poèet zmien: %ld"
+msgstr "%ld zmien"
msgid "E439: undo list corrupt"
msgstr "E439: záznam o zmenách pokodený"
msgid "E440: undo line missing"
-msgstr "E440: chýba riadok spä"
+msgstr "E440: chýba opravný riadok"
#. Only MS VC 4.1 and earlier can do Win32s
msgid ""
@@ -4140,7 +5139,7 @@
"32 bitová GUI verzia pre MS Windows"
msgid " in Win32s mode"
-msgstr " v Win32 reime"
+msgstr " vo Win32 reime"
msgid " with OLE support"
msgstr " s OLE podporou"
@@ -4259,62 +5258,71 @@
msgid "without GUI."
msgstr "bez grafického rozhrania."
+msgid "with GTK2-GNOME GUI."
+msgstr "s grafickým rozhraním GTK2-GNOME."
+
msgid "with GTK-GNOME GUI."
-msgstr "s rozhraním GTK-GNOME."
+msgstr "s grafickým rozhraním GTK-GNOME."
+
+msgid "with GTK2 GUI."
+msgstr "s grafickým rozhraním GTK2."
msgid "with GTK GUI."
-msgstr "s rozhraním GTK."
+msgstr "s grafickým rozhraním GTK."
msgid "with X11-Motif GUI."
-msgstr "s rozhraním X11-Motif."
+msgstr "s grafickým rozhraním X11-Motif."
+
+msgid "with X11-neXtaw GUI."
+msgstr "s grafickým rozhraním X11-neXtaw."
msgid "with X11-Athena GUI."
-msgstr "s rozhraním X11-Athena."
-
-msgid "with BeOS GUI."
-msgstr "s rozhraním BeOS."
+msgstr "s grafickým rozhraním X11-Athena."
msgid "with Photon GUI."
-msgstr "s rozhraním Photon."
+msgstr "s grafickým rozhraním Photon."
msgid "with GUI."
msgstr "s grafickým rozhraním."
msgid "with Carbon GUI."
-msgstr "s Carbon grafickým rozhraním."
+msgstr "s grafickým rozhraním Carbon."
msgid "with Cocoa GUI."
-msgstr "s Cocoa grafickým rozhraním."
+msgstr "s grafickým rozhraním Cocoa."
msgid "with (classic) GUI."
-msgstr "s (klasickým) grafickým rozhraním."
+msgstr "s klasickým grafickým rozhraním."
+
+msgid "with KDE GUI."
+msgstr "s grafickým rozhraním KDE."
msgid " Features included (+) or not (-):\n"
msgstr " Vlastnosti zahrnuté (+) a nezahrnuté (-):\n"
msgid " system vimrc file: \""
-msgstr " systémový vimrc súbor: \""
+msgstr " systémový vimrc súbor: \""
msgid " user vimrc file: \""
-msgstr " uívate¾ský vimrc súbor: \""
+msgstr " uívate¾ský vimrc súbor: \""
msgid " 2nd user vimrc file: \""
-msgstr " druhý uívate¾ský vimrc súbor: \""
+msgstr " druhý uívate¾ský vimrc súbor: \""
msgid " 3rd user vimrc file: \""
-msgstr " tretí uívate¾ský vimrc súbor: \""
+msgstr " tretí uívate¾ský vimrc súbor: \""
msgid " user exrc file: \""
-msgstr " uívate¾ský exrc súbor: \""
+msgstr " uívate¾ský exrc súbor: \""
msgid " 2nd user exrc file: \""
-msgstr " druhý uívate¾ský exrc súbor: \""
+msgstr " druhý uívate¾ský exrc súbor: \""
msgid " system gvimrc file: \""
msgstr " systémový gvimrc súbor: \""
msgid " user gvimrc file: \""
-msgstr " uívate¾ský gvimrc súbor: \""
+msgstr " uívate¾ský gvimrc súbor: \""
msgid "2nd user gvimrc file: \""
msgstr "druhý uívate¾ský gvimrc súbor: \""
@@ -4323,10 +5331,10 @@
msgstr "tretí uívate¾ský gvimrc súbor: \""
msgid " system menu file: \""
-msgstr " systémový súbor s ponukou: \""
+msgstr " systémový súbor s ponukou: \""
msgid " fall-back for $VIM: \""
-msgstr " implicitná hodnota $VIM:\""
+msgstr " implicitná hodnota $VIM:\""
msgid " f-b for $VIMRUNTIME: \""
msgstr " f-b pre $VIMRUNTIME: \""
@@ -4338,76 +5346,93 @@
msgstr "Prekladaè: "
msgid "Linking: "
-msgstr "Linkujem: "
+msgstr "Zlinkované: "
msgid " DEBUG BUILD"
msgstr " PODPORA LADENIA"
msgid "VIM - Vi IMproved"
-msgstr "VIM - Vi IMpreved"
+msgstr "VIM - Vi IMproved"
msgid "version "
msgstr "verzia "
msgid "by Bram Moolenaar et al."
-msgstr "Autor: Bram Moolenaar a ïalí"
+msgstr "od Brama Moolenaara a ïalích"
msgid "Vim is open source and freely distributable"
-msgstr "Vim je vo¾ne írite¾ný program"
+msgstr "Vim je vo¾ne írite¾ný program s otvoreným kódom"
msgid "Help poor children in Uganda!"
msgstr "Pomôte chudobným deom v Ugande!"
msgid "type :help iccf<Enter> for information "
-msgstr "podrobnejie informácie získate pomocou :help iccf<Enter>"
+msgstr "zadajte :help iccf<Enter> pre informácie "
msgid "type :q<Enter> to exit "
-msgstr "zadajte :q<Enter> pre ukonèenie programu"
+msgstr "zadajte :q<Enter> pre ukonèenie programu "
msgid "type :help<Enter> or <F1> for on-line help"
-msgstr "zadajte :help<Enter> alebo <F1> pre pomocníka"
+msgstr "zadajte :help<Enter> alebo <F1> pre pomocníka "
-msgid "type :help version6<Enter> for version info"
-msgstr "zadajte :help version6<Enter> pre informácie o verzii"
+msgid "type :help version7<Enter> for version info"
+msgstr "zadajte :help version7<Enter> pre informácie o verzii"
msgid "Running in Vi compatible mode"
-msgstr "Beím v reime kompatibility s Vi"
+msgstr "Pracujem v reime kompatibility s Vi"
msgid "type :set nocp<Enter> for Vim defaults"
-msgstr "zadajte :set nocp<Enter> pre implicitné nastavenie Vim"
+msgstr "zadajte :set nocp<Enter> pre implicitné nastavenie Vim"
msgid "type :help cp-default<Enter> for info on this"
msgstr "podrobnejie informácie získate pomocou :help cp-default<Enter>"
msgid "menu Help->Orphans for information "
-msgstr "bliie informácie v menu Pomocník->Samostatné"
+msgstr "bliie informácie v ponuke Pomocník->Samostatné"
msgid "Running modeless, typed text is inserted"
-msgstr "Spúam modeless, písaný text je vloený"
+msgstr "Spúam v bezmódovom reime, písaný text je vloený"
msgid "menu Edit->Global Settings->Toggle Insert Mode "
-msgstr "menu Úpravy->Globálne monosti->Prepnú reim vloenia "
+msgstr "ponuka Úpravy->Globálne monosti->Prepnú reim vloenia "
msgid " for two modes "
msgstr " pre dva reimy "
msgid "menu Edit->Global Settings->Toggle Vi Compatible"
-msgstr "menu Úpravy->Globálne monostt->Prepnú Vi kompatibilný reím"
+msgstr "ponuka Úpravy->Globálne monostt->Prepnú Vi kompatibilný reim"
msgid " for Vim defaults "
-msgstr " pre predvolené vlastnosti Vim "
+msgstr " pre predvolené vlastnosti Vim "
+
+msgid "Sponsor Vim development!"
+msgstr "Zasponzorujte vývoj Vimu!"
+
+msgid "Become a registered Vim user!"
+msgstr "Staòte sa registrovaným uívate¾om Vimu!"
+
+msgid "type :help sponsor<Enter> for information "
+msgstr "zadajte :help sponsor<Enter> pre informácie "
+
+msgid "type :help register<Enter> for information "
+msgstr "zadajte :help register<Enter> pre informácie "
+
+msgid "menu Help->Sponsor/Register for information "
+msgstr "bliie informácie v ponuke Pomocník->Sponzor/Registrácia"
msgid "WARNING: Windows 95/98/ME detected"
msgstr "VAROVANIE: detekované Windows 95/98/ME"
msgid "type :help windows95<Enter> for info on this"
-msgstr "zadajte :help windows95<Enter> pre podrobnejie informácie"
+msgstr "zadajte :help windows95<Enter> pre podrobnejie informácie"
msgid "E441: There is no preview window"
msgstr "E441: Nenájdené iadne okno náh¾adu"
msgid "E442: Can't split topleft and botright at the same time"
-msgstr "E442: Okno sa nedá rozdeli zároveò topleft a botright"
+msgstr ""
+"E442: Okno sa nedá rozdeli zároveò v móde 'vrchný-¾avý' a 'spodný-"
+"pravý' ('topleft' a 'botright')"
msgid "E443: Cannot rotate when another window is split"
msgstr "E443: Nedá sa rotova, ak je iné okno rozdelené"
@@ -4416,7 +5441,7 @@
msgstr "E444: Posledné okno sa nedá zatvori"
msgid "Already only one window"
-msgstr "U existuje iba jedno okno"
+msgstr "Existuje u iba jedno okno"
msgid "E445: Other window contains changes"
msgstr "E445: Iné okno obsahuje zmeny"
@@ -4426,26 +5451,39 @@
#, c-format
msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: Súbor \"%s\" sa nedá v cdpath nájs"
+msgstr "E447: Súbor \"%s\" sa nedá nájs v ceste"
+
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: Nepodarilo sa nahra kninicu %s"
+
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr "Prepáète, tento príkaz je vypnutý, Perl kninica nemôe by naèítaná."
+
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr "E299: Vykonanie kódu v jazyku Perl nie je moné v bezpeènostnej schránke bez bezpeènostného modulu"
msgid "Edit with &multiple Vims"
-msgstr "Upravi s viacnásobný&m Vimom"
+msgstr "Upravi s viacerý&mi Vimmi"
msgid "Edit with single &Vim"
msgstr "Upravi s jedným &Vimom"
+msgid "Diff with Vim"
+msgstr "Porovna &Vimom"
+
msgid "Edit with &Vim"
msgstr "Upravi s &Vimom"
#. Now concatenate
-msgid "Edit with existing Vim - &"
-msgstr "Upravi s existujúcim Vimom - &"
+msgid "Edit with existing Vim - "
+msgstr "Upravi s existujúcim Vimom - "
msgid "Edits the selected file(s) with Vim"
msgstr "Upravi vybrané súbory s Vimom"
msgid "Error creating process: Check if gvim is in your path!"
-msgstr "Chyba vytváracieho procesu: Skontrolujte, èi je gvim vo vaej ceste!"
+msgstr "Chyba vytvárania procesu: Skontrolujte, èi je gvim vo vaej ceste!"
msgid "gvimext.dll error"
msgstr "chyba gvimext.dll"
@@ -4454,39 +5492,68 @@
msgstr "Príli dlhá cesta!"
msgid "--No lines in buffer--"
-msgstr "--Buffer neobsahuje iadny riadok--"
+msgstr "--Buffer neobsahuje iadne riadky--"
#.
#. * The error messages that can be shared are included here.
#. * Excluded are errors that are only used once and debugging messages.
#.
-msgid "Command aborted"
-msgstr "Príkaz preruený"
+msgid "E470: Command aborted"
+msgstr "E470: Príkaz preruený"
-msgid "Argument required"
-msgstr "Je vyadovaný argument"
+msgid "E471: Argument required"
+msgstr "E471: Je vyadovaný argument"
msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: po \\ by malo nasledova /. ? alebo &"
+msgstr "E10: po \\ by malo nasledova /, ? alebo &"
msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
msgstr ""
-"E11: Chybný príkaz v okne príkazového riadku; <Enter> spustíte, CTRL-C "
-"vypnete"
+"E11: Chybný príkaz v okne príkazového riadku; <Enter> spúa, CTRL-C ukonèuje"
msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
msgstr ""
"E12: Príkaz nie je z exrc/vimrc v aktuálnom adresári alebo pri h¾adaní tagu "
"povolený."
+msgid "E171: Missing :endif"
+msgstr "E171: Chýba :endif"
+
+msgid "E600: Missing :endtry"
+msgstr "E600: Chýba :endtry"
+
+msgid "E170: Missing :endwhile"
+msgstr "E170: Chýba :endwhile"
+
+msgid "E170: Missing :endfor"
+msgstr "E170: Chýba :endfor"
+
+msgid "E588: :endwhile without :while"
+msgstr "E588: :endwhile bez zodpovedajúceho :while"
+
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor bez zodpovedajúceho :for"
+
msgid "E13: File exists (add ! to override)"
-msgstr "E13: Súbor existuje (pouite ! pre vynútenie)"
+msgstr "E13: Súbor existuje (pouite ! pre prepísanie)"
-msgid "Command failed"
-msgstr "Príkaz zlyhal"
+msgid "E472: Command failed"
+msgstr "E472: Príkaz zlyhal"
-msgid "Internal error"
-msgstr "Vnútorná chyba"
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: Neznáma sada písiem: %s"
+
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: Neznáme písmo: %s"
+
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: Písmo \"%s\" nemá pevnú írku"
+
+msgid "E473: Internal error"
+msgstr "E473: Vnútorná chyba"
msgid "Interrupted"
msgstr "Preruené"
@@ -4494,12 +5561,12 @@
msgid "E14: Invalid address"
msgstr "E14: Chybná adresa"
-msgid "Invalid argument"
-msgstr "Chybný argument"
+msgid "E474: Invalid argument"
+msgstr "E474: Chybný argument"
-#, c-format
-msgid "Invalid argument: %s"
-msgstr "Chybný argument: %s"
+#, c-format
+msgid "E475: Invalid argument: %s"
+msgstr "E475: Chybný argument: %s"
#, c-format
msgid "E15: Invalid expression: %s"
@@ -4508,15 +5575,20 @@
msgid "E16: Invalid range"
msgstr "E16: Chybný rozsah"
-msgid "Invalid command"
-msgstr "Chybný príkaz"
+msgid "E476: Invalid command"
+msgstr "E476: Chybný príkaz"
#, c-format
msgid "E17: \"%s\" is a directory"
msgstr "E17: \"%s\" je adresárom"
-msgid "E18: Unexpected characters before '='"
-msgstr "E18: Neoèekávané znaky pred '='"
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: Vyvolanie kniniènej funkcia zlyhalo pre \"%s()\""
+
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: Nepodarilo sa nahra funkciu kninice %s"
msgid "E19: Mark has invalid line number"
msgstr "E19: Znaèka má chybné èíslo riadku"
@@ -4525,10 +5597,10 @@
msgstr "E20: Znaèka nie je nastavená"
msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: Nedá sa meni, je nastavená vo¾ba 'modifiable'"
+msgstr "E21: Nemono robi zmeny, vo¾ba 'modifiable' je vypnutá"
msgid "E22: Scripts nested too deep"
-msgstr "E22: Skript vnorený príli hlboko"
+msgstr "E22: Skripty vnorené príli hlboko"
msgid "E23: No alternate file"
msgstr "E23: iadny alternatívny súbor"
@@ -4536,37 +5608,41 @@
msgid "E24: No such abbreviation"
msgstr "E24: Taká skratka neexistuje"
-msgid "No ! allowed"
-msgstr "! nie je povolené"
+msgid "E477: No ! allowed"
+msgstr "E477: ! nie je povolený"
msgid "E25: GUI cannot be used: Not enabled at compile time"
msgstr "E25: Nedá sa pouí GUI: nebolo zapnuté pri preklade programu"
msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-msgstr "E26: Nedá sa pouí hebrejský reim: nebol zapnutý pri preklade programu\n"
+msgstr ""
+"E26: Nedá sa pouí hebrejský reim: nebol zapnutý pri preklade programu\n"
msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-msgstr "E27: Nedá sa pouí farsi reim: nebol zapnutý pri preklade programu\n"
+msgstr "E27: Nedá sa pouí farsi reim: nebol zapnutý pri preklade programu\n"
+
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: Nedá sa pouí arabic reim: nebol zapnutý pri preklade programu\n"
#, c-format
msgid "E28: No such highlight group name: %s"
-msgstr "E28: Skupina zvíraznenia %s neexistuje"
+msgstr "E28: Skupina zvýraznenia %s neexistuje"
msgid "E29: No inserted text yet"
-msgstr "E29: Zatia¾ nie je iadny vloený text"
+msgstr "E29: Zatia¾ nie je vloený iaden text"
msgid "E30: No previous command line"
msgstr "E30: iadny predchádzajúci príkazový riadok"
msgid "E31: No such mapping"
-msgstr "E31: iadne také mapovanie"
+msgstr "E31: Mapovanie nenájdené"
-msgid "No match"
-msgstr "iadna zhoda"
+msgid "E479: No match"
+msgstr "E479: iadna zhoda"
#, c-format
-msgid "No match: %s"
-msgstr "iadna zhoda: %s"
+msgid "E480: No match: %s"
+msgstr "E480: iadna zhoda: %s"
msgid "E32: No file name"
msgstr "E32: iadny názov súboru"
@@ -4580,28 +5656,32 @@
msgid "E35: No previous regular expression"
msgstr "E35: iadny predchádzajúci regulárny výraz"
-msgid "No range allowed"
-msgstr "Rozsah nie je povolený"
+msgid "E481: No range allowed"
+msgstr "E481: Rozsah nie je povolený"
msgid "E36: Not enough room"
msgstr "E36: Nedostatok miesta"
#, c-format
-msgid "Can't create file %s"
-msgstr "Nedá sa vytvori súbor %s"
-
-msgid "Can't get temp file name"
-msgstr "Nedá sa získa názov doèasného súboru"
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: iaden registrovaný server pomenovaný \"%s\""
#, c-format
-msgid "Can't open file %s"
-msgstr "Nedá sa otvori súbor %s"
+msgid "E482: Can't create file %s"
+msgstr "E482: Nedá sa vytvori súbor %s"
+
+msgid "E483: Can't get temp file name"
+msgstr "E483: Nedá sa získa názov doèasného súboru"
#, c-format
-msgid "Can't read file %s"
-msgstr "Nedá sa èíta súbor %s"
+msgid "E484: Can't open file %s"
+msgstr "E484: Nedá sa otvori súbor %s"
-msgid "E37: No write since last change (use ! to override)"
+#, c-format
+msgid "E485: Can't read file %s"
+msgstr "E485: Nedá sa èíta súbor %s"
+
+msgid "E37: No write since last change (add ! to override)"
msgstr "E37: Neuloené zmeny (pouite ! pre vynútenie)"
msgid "E38: Null argument"
@@ -4614,6 +5694,9 @@
msgid "E40: Can't open errorfile %s"
msgstr "E40: Nedá sa otvori chybový súbor %s"
+msgid "E233: cannot open display"
+msgstr "E233: nedá sa otvori displej"
+
msgid "E41: Out of memory!"
msgstr "E41: Nedostatok pamäti!"
@@ -4621,11 +5704,14 @@
msgstr "Vzor nenájdený"
#, c-format
-msgid "Pattern not found: %s"
-msgstr "Vzor nenájdený: %s"
+msgid "E486: Pattern not found: %s"
+msgstr "E486: Vzor nenájdený: %s"
-msgid "Argument must be positive"
-msgstr "Argument musí by kladný"
+msgid "E487: Argument must be positive"
+msgstr "E487: Argument musí by kladný"
+
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: iadny predchádzajúci adresár"
msgid "E42: No Errors"
msgstr "E42: iadne chyby"
@@ -4636,25 +5722,40 @@
msgid "E44: Corrupted regexp program"
msgstr "E44: Pokodený regexp program"
-msgid "E45: 'readonly' option is set (use ! to override)"
-msgstr "E45: nastavená vo¾ba 'iba_pre_èítanie' (pouite ! pre vynútenie)"
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr ""
+"E45: vo¾ba 'readonly' (iba na èítanie) je nastavená (pouite ! pre "
+"prepísanie)"
#, c-format
-msgid "E46: Cannot set read-only variable \"%s\""
-msgstr "E46: Nedá sa nastavi premenná iba_pre_èítanie \"%s\""
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: Nedá sa nastavi premenná len na èítanie \"%s\""
+
+#, c-format
+msgid "E46: Cannot set variable in the sandbox: \"%s\""
+msgstr "E46: Nedá sa nastavi premenná v bezpeènostnej schránke: \"%s\""
msgid "E47: Error while reading errorfile"
msgstr "E47: Chyba pri èítaní chybového súboru"
msgid "E48: Not allowed in sandbox"
-msgstr "E48: Nie je v bezpeènostnej schránke povolené"
+msgstr "E48: Nie je dovolené v bezpeènostnej schránke"
+
+msgid "E523: Not allowed here"
+msgstr "E523: Nie je na povolené na tomto mieste"
+
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: Nastavovanie reimu obrazovky nie je podporované"
msgid "E49: Invalid scroll size"
-msgstr "E49: Chybná hodnota premennej 'scroll'"
+msgstr "E49: Chybná hodnota ve¾kosti rolovania"
msgid "E91: 'shell' option is empty"
msgstr "E91: vo¾ba 'shell' je prázdna"
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: Chyba -- nedájú sa preèíta oznaèovacie dáta!"
+
msgid "E72: Close error on swap file"
msgstr "E72: Chyba pri uzatváraní odkladacieho súboru"
@@ -4673,14 +5774,22 @@
msgid "E77: Too many file names"
msgstr "E77: Príli mnoho názvov súborov"
-msgid "Trailing characters"
-msgstr "Nadbytoèné znaky na konci"
+msgid "E488: Trailing characters"
+msgstr "E488: Nadbytoèné znaky na konci"
msgid "E78: Unknown mark"
msgstr "E78: Neznáma znaèka"
msgid "E79: Cannot expand wildcards"
-msgstr "E79: Nedá sa expandova olíkové znaky (wildcards)"
+msgstr "E79: Nemono expandova olíkové znaky (wildcards)"
+
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr ""
+"E591: hodnota vo¾by 'winheight' (výka okna) nesmie by menia ne hodnota vo¾by 'winminheight' (minimálna výka okna)"
+
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr ""
+"E592: hodnota vo¾by 'winwidth' (írka okna) nesmie by menia ne hodnota vol¾y 'winminwidth' (minimálna írka okna)"
msgid "E80: Error while writing"
msgstr "E80: Chyba pri ukladaní"
@@ -4694,3 +5803,35 @@
msgid "E449: Invalid expression received"
msgstr "E449: Bol prijatý chybný výraz"
+msgid "E463: Region is guarded, cannot modify"
+msgstr "E463: Región je uzamknutý, nemono modifikova"
+
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans nepovo¾uje zmeny v súboroch len na èítanie"
+
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: Vnútorná chyba: %s"
+
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: vzor pouíva viac pamäte ako 'maxmempattern'"
+
+msgid "E749: empty buffer"
+msgstr "E749: prázdny buffer"
+
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: Neprípustný h¾adaný reazec alebo odde¾ovaè"
+
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: Súbor je naèítaný v inom buffere"
+
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: Vo¾ba \"%s\" nie je nastavená"
+
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "h¾adanie dosiahlo zaèiatok, pokraèovanie od konca"
+
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "h¾adanie dosiahlo koniec, pokraèovanie od zaèiatku"
+
diff --git a/src/po/sk.po b/src/po/sk.po
index 1b7b0bc..5474a55 100644
--- a/src/po/sk.po
+++ b/src/po/sk.po
@@ -1,19 +1,20 @@
# Slovak translation of vim
-# Martin Lacko <lacko@host.sk>, 2001.
-#
-# Original translations.
-#
+# Lubomir Host 'rajo' <rajo AT platon.sk>
+# 2005 - Platon Group, http://platon.sk/
+# $Revision$
+# $LastChangedDate: 2005-10-08 12:00:24 +0200 (Sat, 08 Oct 2005) $
msgid ""
msgstr ""
"Project-Id-Version: vim\n"
-"POT-Creation-Date: 2002-03-26 21:54+0100\n"
-"PO-Revision-Date: 2002-03-26 21:58CEST\n"
-"Last-Translator: Martin Lacko <lacko@host.sk>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-09-30 15:58+0200\n"
+"PO-Revision-Date: 2005-09-30 15:58+0200\n"
+"Last-Translator: Lubomir Host <rajo@platon.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.5\n"
+"X-Generator: Vim 7.x\n"
msgid "E82: Cannot allocate any buffer, exiting..."
msgstr "E82: Nedá sa alokova» buffer, konèím..."
@@ -21,35 +22,35 @@
msgid "E83: Cannot allocate buffer, using other one..."
msgstr "E83: Nedá sa alokova» buffer, pou¾ijem iný..."
-msgid "No buffers were unloaded"
-msgstr "®iadny buffer nebol nájdený"
+msgid "E515: No buffers were unloaded"
+msgstr "E515: ®iadny buffer nebol uvoµnený"
-msgid "No buffers were deleted"
-msgstr "®iadny buffer nebol vymazaný"
+msgid "E516: No buffers were deleted"
+msgstr "E516: ®iadny buffer nebol vymazaný"
-msgid "No buffers were wiped out"
-msgstr "®iadny buffer nebol vymazaný"
+msgid "E517: No buffers were wiped out"
+msgstr "E517: ®iadny buffer nebol vymazaný"
msgid "1 buffer unloaded"
-msgstr "poèet deaktivovaných bufferov: 1"
+msgstr "1 buffer uvoµnený"
#, c-format
msgid "%d buffers unloaded"
-msgstr "poèet deaktivovaných bufferov: %d"
+msgstr "%d bufferov uvoµnených"
msgid "1 buffer deleted"
-msgstr "poèet vymazaných bufferov: 1"
+msgstr "1 buffer vymazaný"
#, c-format
msgid "%d buffers deleted"
-msgstr "poèet vymazaných bufferov: %d"
+msgstr "%d bufferov vymazaných"
msgid "1 buffer wiped out"
-msgstr "poèet vymazaných bufferov: 1"
+msgstr "1 buffer odstránený"
#, c-format
msgid "%d buffers wiped out"
-msgstr "poèet vymazaných bufferov: %d"
+msgstr "%d bufferov odstránených"
msgid "E84: No modified buffer found"
msgstr "E84: Nebol nájdený ¾iadny zmenený buffer"
@@ -58,9 +59,8 @@
msgid "E85: There is no listed buffer"
msgstr "E85: Nena¹iel som ¾iadny buffer"
-#, c-format
-msgid "E86: Cannot go to buffer %ld"
-msgstr "E86: Nedá sa preskoèi» na buffer %ld"
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: Buffer %ld neexistuje"
msgid "E87: Cannot go beyond last buffer"
msgstr "E87: Za posledný buffer sa nedá preskoèi»"
@@ -68,9 +68,8 @@
msgid "E88: Cannot go before first buffer"
msgstr "E88: Pred prvý buffer sa nedá preskoèi»"
-#, c-format
-msgid "E89: No write since last change for buffer %ld (use ! to override)"
-msgstr "E89: Zmeny v bufferi %ld neboly ulo¾ené (! pre vynútenie)"
+msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgstr "E89: Zmeny v bufferi %ld neboli ulo¾ené (! pre vynútenie)"
msgid "E90: Cannot unload last buffer"
msgstr "E90: Posledný buffer sa nedá odstráni»"
@@ -98,16 +97,16 @@
msgstr "E95: Buffer takéhoto mena u¾ existuje"
msgid " [Modified]"
-msgstr " [zmenený]"
+msgstr " [Zmenený]"
msgid "[Not edited]"
-msgstr "[neupravovaný]"
+msgstr "[Neupravovaný]"
msgid "[New file]"
-msgstr "[nový súbor]"
+msgstr "[Nový súbor]"
msgid "[Read errors]"
-msgstr "[chyby pri èítaní]"
+msgstr "[Chyby pri èítaní]"
msgid "[readonly]"
msgstr "[iba pre èítanie]"
@@ -118,14 +117,14 @@
#, c-format
msgid "%ld lines --%d%%--"
-msgstr "riadkov: %ld --%d%%--"
+msgstr "%ld riadkov --%d%%--"
#, c-format
msgid "line %ld of %ld --%d%%-- col "
msgstr "riadok %ld z %ld --%d%%-- ståpec"
-msgid "[No file]"
-msgstr "[¾iadny súbor]"
+msgid "[No Name]"
+msgstr "[Bez mena]"
#. must be a help buffer
msgid "help"
@@ -135,7 +134,7 @@
msgstr "[pomocník]"
msgid "[Preview]"
-msgstr "[náhµad]"
+msgstr "[Náhµad]"
msgid "All"
msgstr "V¹etko"
@@ -146,18 +145,16 @@
msgid "Top"
msgstr "Zaèiatok"
+#, c-format
msgid ""
"\n"
"# Buffer list:\n"
msgstr ""
"\n"
-"# zoznam bufferov:\n"
+"# Zoznam bufferov:\n"
msgid "[Error List]"
-msgstr "[zoznam chýb]"
-
-msgid "[No File]"
-msgstr "[¾iadny súbor]"
+msgstr "[Zoznam chýb]"
msgid ""
"\n"
@@ -172,7 +169,7 @@
#, c-format
msgid " line=%ld id=%d name=%s"
-msgstr " line=%ld id=%d meno=%s"
+msgstr " riadok=%ld id=%d meno=%s"
#, c-format
msgid "E96: Can not diff more than %ld buffers"
@@ -182,13 +179,13 @@
msgstr "E97: Nedajú sa vytvori» porovnania"
msgid "Patch file"
-msgstr "Opravný súbor"
+msgstr "Záplatový súbor"
msgid "E98: Cannot read diff output"
msgstr "E98: Nedá sa èíta» výstup porovnania"
msgid "E99: Current buffer is not in diff mode"
-msgstr "E99: Aktuálny buffer nie je v porovnacom móde"
+msgstr "E99: Aktuálny buffer nie je v porovnávacom móde"
msgid "E100: No other buffer in diff mode"
msgstr "E100: V porovnávacom móde sa nenachádza iný buffer"
@@ -204,59 +201,67 @@
msgid "E103: Buffer \"%s\" is not in diff mode"
msgstr "E103: Buffer \"%s\" nie je v porovnávacom móde"
+# TODO: digraph
msgid "E104: Escape not allowed in digraph"
-msgstr "E104: diagraph nesmie obsahova» Escape"
+msgstr "E104: digraph nesmie obsahova» znak Escape"
-msgid "Keymap file not found"
-msgstr "Mapa kláves nenájdená"
+msgid "E544: Keymap file not found"
+msgstr "E544: Mapa kláves nenájdená"
msgid "E105: Using :loadkeymap not in a sourced file"
-msgstr "E105: Pou¾ite :loadkeymap v súbore, ktorý nie je zdrojový"
+msgstr "E105: Pou¾itý príkaz :loadkeymap v súbore, ktorý nie je interpretovaný"
-msgid " Keyword completion (^N/^P)"
-msgstr " Doplòovanie kµúèových slov (^N/^P)"
+msgid " Keyword completion (^N^P)"
+msgstr " Doplòovanie kµúèových slov (^N^P)"
#. ctrl_x_mode == 0, ^P/^N compl.
-msgid " ^X mode (^E/^Y/^L/^]/^F/^I/^K/^D/^V/^N/^P)"
-msgstr " ^X re¾im (^E/^Y/^L/^]/^F/^I/^K/^D/^V/^N/^P)"
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
+msgstr " ^X re¾im (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
-#. Scroll has it's own msgs, in it's place there is the msg for local
-#. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL) -- Acevedo
-msgid " Keyword Local completion (^N/^P)"
-msgstr " Miestne dopåòanie kµúèových slov (^N/^P)"
+msgid " Whole line completion (^L^N^P)"
+msgstr " Doplòovanie celých riadkov (^L^N^P)"
-msgid " Whole line completion (^L/^N/^P)"
-msgstr " Doplòovanie celých riadkov (^L/^N/^P)"
+msgid " File name completion (^F^N^P)"
+msgstr " Doplòovanie názvov súborov (^F^N^P)"
-msgid " File name completion (^F/^N/^P)"
-msgstr " Doplòovanie názvov súborov (^F/^N/^P)"
+msgid " Tag completion (^]^N^P)"
+msgstr " Doplòovanie tagov (^]^N^P)"
-msgid " Tag completion (^]/^N/^P)"
-msgstr " Doplòovanie tagov (^]/^N/^P)"
+msgid " Path pattern completion (^N^P)"
+msgstr " Doplòovanie vzoru ciest (^N^P)"
-msgid " Path pattern completion (^N/^P)"
-msgstr " Doplòovanie vzoru ciest (^N/^P)"
+msgid " Definition completion (^D^N^P)"
+msgstr " Doplòovanie definícií (^D^N^P)"
-msgid " Definition completion (^D/^N/^P)"
-msgstr " Doplòovanie definícií (^D/^N/^P)"
+msgid " Dictionary completion (^K^N^P)"
+msgstr " Doplòovanie podµa slovníka (^K^N^P)"
-msgid " Dictionary completion (^K/^N/^P)"
-msgstr " Doplòovanie podµa slovníka (^K/^N/^P)"
+msgid " Thesaurus completion (^T^N^P)"
+msgstr " Doplòovanie podµa lexikonu (^T^N^P)"
-msgid " Thesaurus completion (^T/^N/^P)"
-msgstr " Doplòovanie podµa tezauru (^T/^N/^P)"
+msgid " Command-line completion (^V^N^P)"
+msgstr " Doplòovanie príkazového riadka (^V^N^P)"
-msgid " Command-line completion (^V/^N/^P)"
-msgstr " Doplòovòovanie príkazového riadka (^V/^N/^P)"
+msgid " User defined completion (^U^N^P)"
+msgstr " Doplòovanie celých riadkov (^U^N^P)"
+
+msgid " Omni completion (^O^N^P)"
+msgstr " Doplòovanie tagov (^O^N^P)"
+
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " Doplòovanie celých riadkov (^S^N^P)"
+
+msgid " Keyword Local completion (^N^P)"
+msgstr " Miestne doplòovanie kµúèových slov (^N^P)"
msgid "Hit end of paragraph"
msgstr "Koniec odstavca"
-msgid "'thesaurus' option is empty"
-msgstr "voµba 'thesaurus' je prázdna"
-
msgid "'dictionary' option is empty"
-msgstr "voµba 'dictionary' je prázdna"
+msgstr "voµba 'dictionary' (slovník) je prázdna"
+
+msgid "'thesaurus' option is empty"
+msgstr "voµba 'thesaurus' (lexikon) je prázdna"
#, c-format
msgid "Scanning dictionary: %s"
@@ -272,6 +277,7 @@
msgid "Scanning: %s"
msgstr "Prehµadávam: %s"
+#, c-format
msgid "Scanning tags."
msgstr "Prehµadávam tagy."
@@ -302,26 +308,132 @@
msgid "match %d"
msgstr "zhoda %d"
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: Neoèekávané znaky v :let"
+
+msgid "E684: list index out of range: %ld"
+msgstr "E684: index v zozname je mimo rozsah: %ld"
+
#, c-format
-msgid "E106: Unknown variable: \"%s\""
-msgstr "E106: Neznáma premenná: \"%s\""
+msgid "E121: Undefined variable: %s"
+msgstr "E121: Nedefinovaná premenná: %s"
+
+msgid "E111: Missing ']'"
+msgstr "E111: Chýba ']'"
+
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: Argument %s musí by» Zoznam (List)"
+
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: Argument %s musí by» Zoznam (List) alebo Slovník (Dictionary)"
+
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: Nemo¾no pou¾i» prázdny kµúè pre Slovník (Dictionary)"
+
+msgid "E714: List required"
+msgstr "E714: vy¾aduje sa Zoznam (List)"
+
+msgid "E715: Dictionary required"
+msgstr "E715: Vy¾aduje sa Slovník (Dictionary)"
+
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: Príli¹ mnoho argumentov pre funkciu %s"
+
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: kµúè sa v Slovníku (Dictionary) nenachádza: %s"
+
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E112: Funkcia %s u¾ existuje. Pou¾ite ! pre jej nahradenie."
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: Záznam v Slovníku (Dictionary) u¾ existuje"
+
+msgid "E718: Funcref required"
+msgstr "E718: Je vy¾adovaný odkaz na Funkciu (Funcref)"
+
+msgid "E719: Cannot use [:] with a Dictionary"
+msgstr "E719: Nemo¾no pou¾it [:] so Slovníkom (Dictionary)"
+
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: Zlý typ premennej pre %s="
+
+msgid "E130: Unknown function: %s"
+msgstr "E130: Neznáma funkcia: %s"
+
+msgid "E461: Illegal variable name: %s"
+msgstr "E461: Neprípustné meno premennej: %s"
+
+msgid "E687: Less targets than List items"
+msgstr "E687: Menej cieµov ako polo¾iek Poµa (List items)"
+
+msgid "E688: More targets than List items"
+msgstr "E688: Viac cieµov ako polo¾iek Poµa (List items)"
+
+msgid "Double ; in list of variables"
+msgstr "Dvojitá ; v zozname premenných"
+
+msgid "E738: Can't list variables for %s"
+msgstr "E738: Nemo¾no vypísa» premenné pre %s"
+
+msgid "E689: Can only index a List or Dictionary"
+msgstr "E689: Indexova» mo¾no iba Zoznam (List) alebo Slovník (Dictionary)"
+
+msgid "E708: [:] must come last"
+msgstr "E708: [:] musí prís» ako posledná"
+
+msgid "E709: [:] requires a List value"
+msgstr "E709: [:] vy¾aduje hodnotu Poµa (List value)"
+
+msgid "E710: List value has more items than target"
+msgstr "E710: Hodnota Poµa (List value) má viac polo¾iek ako cieµ"
+
+msgid "E711: List value has not enough items"
+msgstr "E711: Hodnota Poµa (List value) nemá dostatok polo¾iek"
+
+msgid "E690: Missing \"in\" after :for"
+msgstr "E690: Chýba \"in\" po :for"
#, c-format
msgid "E107: Missing braces: %s"
-msgstr "E107: Chýbjú závorky: %s"
+msgstr "E107: Chýbajú zátvorky: %s"
#, c-format
msgid "E108: No such variable: \"%s\""
msgstr "E108: Premenná \"%s\" neexistuje"
+msgid "E743: variable nested too deep for (un)lock"
+msgstr "E743: premenná je príli¹ vnorená na (od)blokovanie"
+
msgid "E109: Missing ':' after '?'"
msgstr "E109: Po '?' chýba ':'"
+msgid "E691: Can only compare List with List"
+msgstr "E691: Porovnáva» mo¾no iba Zoznam so Zoznamom (List with List)"
+
+msgid "E692: Invalid operation for Lists"
+msgstr "E692: Neplatná operácia pre Zoznamy (Lists)"
+
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: Porovnáva» mo¾no iba Slovník so Slovníkom (Dictionary with Dictionary)"
+
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: Neplatná operácia pre Slovník"
+
+msgid "E693: Can only compare Funcref with Funcref"
+msgstr "E693: Porovnáva» mo¾no iba odkaz na Funkciu s odkazom na Funkciu (Funcref with Funcref)"
+
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: Neplatná operácia pre odkazy na Funkcie (Funcrefs)"
+
msgid "E110: Missing ')'"
msgstr "E110: Chýba ')'"
-msgid "E111: Missing ']'"
-msgstr "E111: Chýba ']'"
+msgid "E695: Cannot index a Funcref"
+msgstr "E695: Nemo¾no indexova» odkaz na Funkciu (Funcref)"
#, c-format
msgid "E112: Option name missing: %s"
@@ -333,73 +445,145 @@
#, c-format
msgid "E114: Missing quote: %s"
-msgstr "E114: Chýbjú uvodzovky: %s"
+msgstr "E114: Chýbajú úvodzovky: %s"
#, c-format
msgid "E115: Missing quote: %s"
-msgstr "E115: Chýbjú uvodzovky: %s"
+msgstr "E115: Chýbajú úvodzovky: %s"
+
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: Chýba èiarka v Zozname: %s"
+
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: Chýba koniec Zoznamu (List) ']': %s"
+
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Chýba dvojbodka v Slovníku (Dictionary): %s"
#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: Chybné argumenty pre funkciu %s"
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Duplikovaný kµúè v Slovníku (Dictionary): \"%s\""
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: Neznáma funkcia: %s"
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: Chýba èiarka v Slovníku (Dictionary): %s"
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: Príli¹ mnoho argumentov pre funkciu %s"
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: Chýba koniec Slovníka (Dictionary) '}': %s"
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: Príli¹ málo argumentov pre funkciu %s"
+msgid "E724: variable nested too deep for displaying"
+msgstr "E724: premenná je vnorená príli¹ hlboko pre zobrazenie"
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: Pou¾itie <SID> mimo kontext skriptu: %s"
+msgid "E699: Too many arguments"
+msgstr "E699: Príli¹ mnoho argumentov"
+#.
+#. * Yes this is ugly, I don't particularly like it either. But doing it
+#. * this way has the compelling advantage that translations need not to
+#. * be touched at all. See below what 'ok' and 'ync' are used for.
+#.
msgid "&Ok"
msgstr "&Ok"
+msgid "E737: Key already exists: %s"
+msgstr "E737: Kµúè u¾ existuje: %s"
+
#, c-format
msgid "+-%s%3ld lines: "
msgstr "+-%s%3ld riadky: "
+msgid "E700: Unknown function: %s"
+msgstr "E700: Neznáma funkcia: %s"
+
msgid ""
"&OK\n"
"&Cancel"
msgstr ""
-"&Ok\n"
+"&OK\n"
"&Zru¹i»"
+msgid "called inputrestore() more often than inputsave()"
+msgstr "funkcia inputrestore() volaná èastej¹ie ako inputsave()"
+
+msgid "E745: Range not allowed"
+msgstr "E745: Rozsah nie je povolený"
+
+msgid "E701: Invalid type for len()"
+msgstr "E701: Neplatný typ pre len()"
+
+msgid "E726: Stride is zero"
+msgstr "E726: Krok je nulový"
+
+msgid "E727: Start past end"
+msgstr "E727: Zaèiatok presahuje koniec"
+
+msgid "<empty>"
+msgstr "<prázdny>"
+
msgid "E240: No connection to Vim server"
msgstr "E240: Neexistuje pripojenie k Vim serveru"
-msgid "E277: Unable to read a server reply"
-msgstr "E227: Nemô¾em èíta» odpoveï servra"
-
-msgid "E258: Unable to send to client"
-msgstr "E258: Nemô¾em posla» klientovi"
-
#, c-format
msgid "E241: Unable to send to %s"
msgstr "E241: Nemô¾em posla» na %s"
+msgid "E277: Unable to read a server reply"
+msgstr "E227: Nemô¾em èíta» odpoveï servra"
+
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: Príli¹ mnoho symbolických odkazov (sluèka?)"
+
+msgid "E258: Unable to send to client"
+msgstr "E258: Nemô¾em posla» klientovi"
+
+msgid "E702: Sort compare function failed"
+msgstr "E702: Funkcia na utriedenie/porovnanie zlyhala"
+
msgid "(Invalid)"
msgstr "(Chybný)"
-#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: Nedefinovaná premenná: %s"
+msgid "E677: Error writing temp file"
+msgstr "E677: Chyba pri zápise doèasného súboru"
+
+msgid "E703: Using a Funcref as a number"
+msgstr "E703: Pou¾itý odkaz na Funkciu (Funcref) ako èíslo"
+
+msgid "E745: Using a List as a number"
+msgstr "E745: Zoznam (List) pou¾itý ako èíslo"
+
+msgid "E728: Using a Dictionary as a number"
+msgstr "E728: Slovník (Dictionary) pou¾itý ako èíslo"
+
+msgid "E729: using Funcref as a String"
+msgstr "E729: Odkaz na Funkciu (Funcref) pou¾itý ako Re»azec (String)"
+
+msgid "E730: using List as a String"
+msgstr "E730: Zoznam (List) pou¾itý ako Re»azec (String)"
+
+msgid "E731: using Dictionary as a String"
+msgstr "E731: Slovník (Dictionary) pou¾itý ako Re»azec (String)"
+
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: Premenná typu odkaz na Funkciu (Funcref) musí zaèína» s veµkým písmenom: %s"
#, c-format
-msgid "E122: Function %s already exists, use ! to replace"
-msgstr "E112: Funkcia %s u¾ existuje. Pou¾ite ! pre jej nahradenie."
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: Meno premennej je v konflikte s existujúcou funkciou: %s"
+
+msgid "E706: Variable type mismatch for: %s"
+msgstr "E706: Typ premennej sa nezhoduje: %s"
#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: Nedefinovaná funkcia: %s"
+msgid "E741: Value is locked: %s"
+msgstr "E741: Hodnota je uzamknutá: %s"
+
+msgid "Unknown"
+msgstr "Neznámy"
+
+msgid "E742: Cannot change value of %s"
+msgstr "E742: Nemo¾no zmeni» hodnotu %s"
+
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: premenná je vnorená príli¹ hlboko pre skopírovanie"
#, c-format
msgid "E124: Missing '(': %s"
@@ -407,42 +591,41 @@
#, c-format
msgid "E125: Illegal argument: %s"
-msgstr "E125: Neprístupný argument: %s"
+msgstr "E125: Neprípustný argument: %s"
msgid "E126: Missing :endfunction"
msgstr "E126: Chýba :endfunction"
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: Nedá sa predefinova» funkcia %s: je pou¾ívaná"
-
-#, c-format
-msgid "E128: Function name must start with a capital: %s"
-msgstr "E128: Názov funkcie musí zaèína» veµkým písmenom: %s"
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: Meno funkcie sa nezhoduje s menom interpretovaného súboru: %s"
msgid "E129: Function name required"
msgstr "E129: Je vy¾adované meno funkcie"
-msgid "function "
-msgstr "funkcia "
-
-#, c-format
-msgid "E130: Undefined function: %s"
-msgstr "E130: Nedefinovaná funkcia: %s"
+msgid "E128: Function name must start with a capital or contain a colon: %s"
+msgstr "E128: Názov funkcie musí zaèína» veµkým písmenom alebo obsahova» dvojbodku: %s"
#, c-format
msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: Nedá sa vymaza» funkcia %s: je u¾ pou¾ívaná"
+msgstr "E131: Nedá sa vymaza» funkcia %s: je pou¾ívaná"
msgid "E132: Function call depth is higher than 'maxfuncdepth'"
msgstr "E132: Zanorenie funkcií je hlb¹ie ne¾ 'maxfuncdepth'"
-#. always scroll up, don't overwrite
#, c-format
msgid "calling %s"
msgstr "volám %s"
-#. always scroll up, don't overwrite
+msgid "%s aborted"
+msgstr "%s zru¹ený"
+
+#, c-format
+msgid "%s returning #%ld"
+msgstr "%s vrátilo #%ld"
+
+msgid "%s returning %s"
+msgstr "%s vrátilo %s"
+
#, c-format
msgid "continuing in %s"
msgstr "pokraèujem v %s"
@@ -451,13 +634,6 @@
msgstr "E133: :return mimo funkciu"
#, c-format
-msgid "%s returning #%ld"
-msgstr "dokonèené %s. Návratová hodnota %ld"
-
-#, c-format
-msgid "%s returning \"%s\""
-msgstr "dokonèené %s. Návratová hodnota \"%s\""
-
msgid ""
"\n"
"# global variables:\n"
@@ -465,33 +641,45 @@
"\n"
"# globálne premenné:\n"
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\tPosledné nastavenie z "
+
#, c-format
msgid "<%s>%s%s %d, Hex %02x, Octal %03o"
msgstr "<%s>%s%s %d, ¹estnástkovo %02x, osmièkovo %03o"
+msgid "> %d, Hex %04x, Octal %o"
+msgstr "> %d, ¹estnástkovo %04x, osmièkovo %o"
+
+msgid "> %d, Hex %08x, Octal %o"
+msgstr "> %d, ¹estnástkovo %08x, osmièkovo %o"
+
msgid "E134: Move lines into themselves"
msgstr "E134: Prekrytie riadkov sebou samými"
msgid "1 line moved"
-msgstr "poèet preru¹ených riadkov: 1"
+msgstr "1 riadok presunutý"
#, c-format
msgid "%ld lines moved"
-msgstr "poèet preru¹ených riadkov: %ld"
+msgstr "%ld riadkov presunutých"
#, c-format
msgid "%ld lines filtered"
-msgstr "poèet filtrovaných riadkov: %ld"
+msgstr "%ld riadkov filtrovaných"
msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: Automatické príkazy *Filter* nesmie meni» aktuálny buffer"
+msgstr "E135: Automatické príkazy *Filter* nesmú meni» aktuálny buffer"
msgid "[No write since last change]\n"
msgstr "[Neulo¾ené zmeny]\n"
-#, c-format
-msgid "viminfo: %s in line: "
-msgstr "viminfo: %s na riadku: "
+msgid "%sviminfo: %s in line: "
+msgstr "%sviminfo: %s na riadku: "
msgid "E136: viminfo: Too many errors, skipping rest of file"
msgstr "E136: viminfo: príli¹ mnoho chýb, preskakujem zbytok súboru"
@@ -526,36 +714,39 @@
msgid "# This viminfo file was generated by Vim %s.\n"
msgstr "# Tento viminfo súbor bol vytvorený editorom Vim %s.\n"
+#, c-format
msgid ""
"# You may edit it if you're careful!\n"
"\n"
msgstr ""
-"# Pokiaµ budete opatrnný, mô¾ete ho upravova».\n"
+"# Pokiaµ budete opatrný, mô¾ete ho upravova».\n"
"\n"
+#, c-format
msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# Hodnota 'encoding' poèas zápisu tohoto súboru\n"
+msgstr "# Hodnota 'encoding' (kódovania) poèas zápisu tohoto súboru\n"
msgid "Illegal starting char"
-msgstr "Neprístupný zaèiatoèný znak"
+msgstr "Neprípustný zaèiatoèný znak"
msgid "Save As"
msgstr "Ulo¾i» ako"
-#. Overwriting a file that is loaded in another buffer is not a
-#. * good idea.
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: Súbor je naèítaný v inob buffere"
-
msgid "Write partial file?"
msgstr "Ulo¾i» neúplný súbor?"
msgid "E140: Use ! to write partial buffer"
msgstr "E140: Pou¾ite ! pre ulo¾enie neúplného bufferu"
+msgid "Overwrite existing file \"%s\"?"
+msgstr "Prepísa» existujúci súbor \"%s\"?"
+
#, c-format
-msgid "Overwrite existing file \"%.*s\"?"
-msgstr "Prepísa» súbor \"%.*s\"?"
+msgid "Swap file \"%s\" exists, overwrite anyway?"
+msgstr "Odkladací súbor \"%s\" existuje, aj tak prepísa»?"
+
+msgid "E768: Swap file exists: %s (:silent! overrides)"
+msgstr "E768: Odkladací súbor existuje: %s (pou¾ite :silent! pre prepísanie)"
#, c-format
msgid "E141: No file name for buffer %ld"
@@ -564,13 +755,12 @@
msgid "E142: File not written: Writing is disabled by 'write' option"
msgstr "E142: Súbor nebol ulo¾ený: ukladanie je zakázané voµbou 'write'"
-#, c-format
msgid ""
-"'readonly' option is set for \"%.*s\".\n"
+"'readonly' option is set for \"%s\".\n"
"Do you wish to write anyway?"
msgstr ""
-"Pre \"%.*s\" je nastavená voµba 'readonly' (iba na èítanie).\n"
-"Prajete si ju potlaèi»?"
+"Pre \"%s\" je nastavená voµba 'readonly' (iba na èítanie).\n"
+"Prajete si aj tak ulo¾i»?"
msgid "Edit File"
msgstr "Upravova» súbor"
@@ -583,24 +773,30 @@
msgstr "E144: neèíselný argument pre :z"
msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: rvim nepovoluje pou¾itie príkazov shellu"
+msgstr "E145: rvim nepovoµuje pou¾itie príkazov shellu"
msgid "E146: Regular expressions can't be delimited by letters"
msgstr "E146: Regulárne výrazy nesmú by» oddelené písmenami"
#, c-format
msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "nahradi» %s (y/n/a/q/I/^E/^Y)?"
+msgstr "nahradi» %s (y/n/a/q/l/^E/^Y)?"
msgid "(Interrupted) "
msgstr "(preru¹ený) "
+msgid "1 match"
+msgstr "1 zhoda"
+
msgid "1 substitution"
-msgstr "poèet nahradení na riadok: 1"
+msgstr "1 nahradenie"
+
+msgid "%ld matches"
+msgstr "%ld zhôd"
#, c-format
msgid "%ld substitutions"
-msgstr "poèet nahradení na riadok: %ld"
+msgstr "%ld nahradení"
msgid " on 1 line"
msgstr " na 1 riadku"
@@ -610,7 +806,7 @@
msgstr " na %ld riadkov"
msgid "E147: Cannot do :global recursive"
-msgstr "E147: global nedá sa vola» rekurzívne"
+msgstr "E147: :global sa nedá vola» rekurzívne"
msgid "E148: Regular expression missing from global"
msgstr "E148: Pri príkaze global chýba regulárny výraz"
@@ -619,15 +815,22 @@
msgid "Pattern found in every line: %s"
msgstr "Vzor nájdený na ka¾dom riadku: %s"
+#, c-format
msgid ""
"\n"
"# Last Substitute String:\n"
"$"
msgstr ""
"\n"
-"# Posledný Re»azec Podnadpisu:\n"
+"# Posledný zamieòaný re»azec:\n"
"$"
+msgid "E478: Don't panic!"
+msgstr "E478: ®iadnu paniku!"
+
+msgid "E661: Sorry, no '%s' help for %s"
+msgstr "E661: ¥utujem, ¾iadny '%s' pomocník pre %s"
+
#, c-format
msgid "E149: Sorry, no help for %s"
msgstr "E149: ¥utujem, pre %s nie je ¾iadny pomocník"
@@ -642,36 +845,39 @@
#, c-format
msgid "E152: Cannot open %s for writing"
-msgstr "E152: Nedá sa otvori» %s pre zápis"
+msgstr "E152: %s sa nedá sa otvori» pre zápis"
#, c-format
msgid "E153: Unable to open %s for reading"
-msgstr "E153: Nedá sa otvori» %s pre zápis"
+msgstr "E153: %s as nedá otvori» pre èítanie"
#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s"
-msgstr "E154: Duplicitný tag \"%s\" v súbore %s"
+msgid "E670: Mix of help file encodings within a language: %s"
+msgstr "E670: Rôzne kódovania pre súbory s pomocníkom pre jazyk: %s"
+
+msgid "E154: Duplicate tag \"%s\" in file %s/%s"
+msgstr "E154: Duplicitný tag \"%s\" v súbore %s/%s"
#, c-format
msgid "E160: Unknown sign command: %s"
-msgstr "E160: Neznáma funkcia: %s"
+msgstr "E160: Neznámu príkaz pre znaèky: %s"
msgid "E156: Missing sign name"
-msgstr "E156: Chýba identifikátor pre sign"
+msgstr "E156: Chýba meno pre znaèku"
-msgid "E255: Too many signs defined"
-msgstr "E255: Príli¹ mnoho definovaných oznaèení"
+msgid "E612: Too many signs defined"
+msgstr "E255: Príli¹ mnoho definovaných znaèiek"
#, c-format
msgid "E239: Invalid sign text: %s"
-msgstr "E239: Chybne oznaèený text: %s"
+msgstr "E239: Chybný text znaèky: %s"
#, c-format
msgid "E155: Unknown sign: %s"
-msgstr "E155: Neznáme oznaèenie: %s"
+msgstr "E155: Neznáma znaèka: %s"
msgid "E159: Missing sign number"
-msgstr "E159: Chýba èislo oznaèenia"
+msgstr "E159: Chýba èislo znaèky"
#, c-format
msgid "E158: Invalid buffer name: %s"
@@ -679,12 +885,18 @@
#, c-format
msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Chybné ID oznaèenia: %ld"
+msgstr "E157: Chybné ID znaèky: %ld"
+
+msgid " (NOT FOUND)"
+msgstr " (NENÁJDENÉ)"
+
+msgid " (not supported)"
+msgstr " (nepodporované)"
msgid "[Deleted]"
msgstr "[vymazaný]"
-msgid "Entering Debug mode. Type \"cont\" to leave."
+msgid "Entering Debug mode. Type \"cont\" to continue."
msgstr "Spú¹»am re¾im ladenia. Pre ukonèenie napí¹te \"cont\"."
#, c-format
@@ -710,9 +922,11 @@
msgid "%3d %s %s line %ld"
msgstr "%3d %s %s riadok %ld"
-#, c-format
-msgid "Save changes to \"%.*s\"?"
-msgstr "Ulo¾i» zmeny do \"%.*s\"?"
+msgid "E750: First use :profile start <fname>"
+msgstr "E750: Najprv pou¾ite príkaz :profile start <meno_suboru>"
+
+msgid "Save changes to \"%s\"?"
+msgstr "Ulo¾i» zmeny do \"%s\"?"
msgid "Untitled"
msgstr "Bez mena"
@@ -722,16 +936,20 @@
msgstr "E162: Buffer \"%s\" obsahuje neulo¾ené zmeny"
msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "Varovanie: Neèakaný vstup do iného bufferu (skontrolujte automatické príkazy)"
+msgstr ""
+"Varovanie: Neèakaný vstup do iného bufferu (skontrolujte automatické príkazy)"
msgid "E163: There is only one file to edit"
msgstr "E163: Pre úpravu bol zadaný iba jeden súbor"
msgid "E164: Cannot go before first file"
-msgstr "E164: Pred prvý súbor sa nedá preskoèi»"
+msgstr "E164: Nedá sa preskoèi» pred prvý súbor"
msgid "E165: Cannot go beyond last file"
-msgstr "E165: Za posledný súbor sa nedá preskoèi»"
+msgstr "E165: Nedá sa preskoèi» za posledný súbor"
+
+msgid "E666: compiler not supported: %s"
+msgstr "E666: prekladaè nie je podporovaný: %s"
#, c-format
msgid "Searching for \"%s\" in \"%s\""
@@ -750,7 +968,7 @@
#, c-format
msgid "Cannot source a directory: \"%s\""
-msgstr "\"%s\" nie je adresárom"
+msgstr "Nemo¾no interpretova» adresár: \"%s\""
#, c-format
msgid "could not source \"%s\""
@@ -758,7 +976,7 @@
#, c-format
msgid "line %ld: could not source \"%s\""
-msgstr "riadok %ld: nemô¾e by» zdroj \"%s\""
+msgstr "riadok %ld: nemô¾no interpretova» \"%s\""
#, c-format
msgid "sourcing \"%s\""
@@ -766,125 +984,83 @@
#, c-format
msgid "line %ld: sourcing \"%s\""
-msgstr "riadok %ld je zdrojom \"%s\""
+msgstr "riadok %ld: interpretujem \"%s\""
#, c-format
msgid "finished sourcing %s"
msgstr "dokonèená interpretácia %s"
msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: Varovanie: chybný oddeµovaè riadkov. Mo¾ná chýba ^M."
+msgstr "W15: Varovanie: chybný oddeµovaè riadkov. Mo¾no chýba ^M"
msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: :finish pou¾ité mimo interpretovaný súbor"
+msgstr "E167: príkaz :scriptencoding pou¾itý mimo interpretovaný súbor"
msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: :finish pou¾ité mimo interpretovaný súbor"
-
-msgid "No text to be printed"
-msgstr "Ïal¹í na tlaè"
-
-#, c-format
-msgid "Printing page %d (%d%%)"
-msgstr "Tlaèím stranu %d (%d%%)"
-
-#, c-format
-msgid " Copy %d of %d"
-msgstr "Kópia %d z %d"
-
-#, c-format
-msgid "Printed: %s"
-msgstr "Vytlaèené: %s"
-
-msgid "Printing aborted"
-msgstr "Tlaè bola zru¹ená"
-
-msgid "E455: Error writing to PostScript output file"
-msgstr "E455: Nedá sa zapisova» do výstupného PostScriptového súboru"
-
-msgid "E324: Can't open PostScript output file"
-msgstr "E324: Nedá sa otvori» výstupný PostScriptový súbor"
-
-#, c-format
-msgid "E456: Can't open file \"%s\""
-msgstr "E456: Nedá sa otvori» súbor \"%s\""
-
-#, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: Nedá sa èíta» PostScriptový súbor \"%s\""
-
-msgid "Sending to printer..."
-msgstr "Posielam na tlaèiareò..."
-
-msgid "E365: Failed to print PostScript file"
-msgstr "E365: PostScriptový súbor sa nepodarilo vytlaèi»"
-
-msgid "Print job sent."
-msgstr "Tlaèová úloha bola odoslaná."
+msgstr "E168: príkaz :finish pou¾itý mimo interpretovaný súbor"
#, c-format
msgid "Current %slanguage: \"%s\""
-msgstr "Aktuálny %s jazyk: \"%s\""
+msgstr "Aktuálny %sjazyk: \"%s\""
#, c-format
msgid "E197: Cannot set language to \"%s\""
msgstr "E197: Nedá sa nastavi» jazyk na \"%s\""
msgid "Entering Ex mode. Type \"visual\" to go to Normal mode."
-msgstr "Spú¹»am Ex re¾im. Napi¹te \"visual\" pre návrat do Normálního re¾imu."
+msgstr "Spú¹»am Ex re¾im. Napí¹te \"visual\" pre návrat do Normálneho re¾imu."
-#. must be at EOF
-msgid "At end-of-file"
-msgstr "Koniec súboru"
+msgid "E501: At end-of-file"
+msgstr "E501: Koniec súboru"
msgid "E169: Command too recursive"
-msgstr "E169: Príkaz je príli¹ zlo¾itý"
+msgstr "E169: Príkaz je príli¹ rekurzívny"
-msgid "E170: Missing :endwhile"
-msgstr "E170: Chýba :endwhile"
-
-msgid "E171: Missing :endif"
-msgstr "E171: Chýba :endif"
+msgid "E605: Exception not caught: %s"
+msgstr "E605: Výnimka nezachytená: %s"
msgid "End of sourced file"
-msgstr "Koniec zdrojového súboru"
+msgstr "Koniec interpretovaného súboru"
msgid "End of function"
msgstr "Koniec funkcie"
-msgid "Ambiguous use of user-defined command"
-msgstr "Nejednoznaèné pou¾itie pou¾ívateµom definovaného príkazu"
+msgid "E464: Ambiguous use of user-defined command"
+msgstr "E464: Nejednoznaèné pou¾itie pou¾ívateµom definovaného príkazu"
-msgid "Not an editor command"
-msgstr "Nie je príkazom editoru"
+msgid "E492: Not an editor command"
+msgstr "E492: Nie je príkazom editoru"
-msgid "Don't panic!"
-msgstr "®iadnu paniku!"
-
-msgid "Backwards range given"
-msgstr "Zadaný spätný rozsah"
+msgid "E493: Backwards range given"
+msgstr "E493: Zadaný spätný rozsah"
msgid "Backwards range given, OK to swap"
-msgstr "Zadaný spätný rozsah. OK odlo¾i»"
+msgstr "Zadaný spätný rozsah. OK pre zámenu"
-msgid "Use w or w>>"
-msgstr "Pou¾ite w èi w>>"
+msgid "E494: Use w or w>>"
+msgstr "E494: Pou¾ite w alebo w>>"
msgid "E319: Sorry, the command is not available in this version"
-msgstr "E319: ¥utujem, ale tento príkaz nie je implementovaný"
+msgstr "E319: ¥utujem, ale tento príkaz nie je dostupný v tejto verzii"
msgid "E172: Only one file name allowed"
msgstr "E172: Prípustný je iba jeden názov súboru"
+msgid "1 more file to edit. Quit anyway?"
+msgstr "E¹te zostáva 1 súbor k úprave. Chcete napriek tomu ukonèi» editor?"
+
#, c-format
msgid "%d more files to edit. Quit anyway?"
-msgstr "E¹te zostávajú %d súborov k úprave. Chcete napriek tomu ukonèi» editor?"
+msgstr "E¹te zostáva %d súborov k úprave. Chcete napriek tomu ukonèi» editor?"
+
+msgid "E173: 1 more file to edit"
+msgstr "E173: E¹te zostáva 1 súbor k úprave."
#, c-format
msgid "E173: %ld more files to edit"
-msgstr "E173: E¹te zostávajajú %ld súbory k úprave."
+msgstr "E173: E¹te zostáva %ld súborov k úprave."
-msgid "E174: Command already exists: use ! to redefine"
+msgid "E174: Command already exists: add ! to replace it"
msgstr "E174: Príkaz u¾ existuje: pou¾ite ! pre predefinovanie"
msgid ""
@@ -909,12 +1085,8 @@
msgid "E178: Invalid default value for count"
msgstr "E178: Chybná implicitná hodnota pre poèet"
-msgid "E179: argument required for complete"
-msgstr "E179: pre doplnenie je potrebný argument"
-
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: Chybná hodnota doplnenia: %s"
+msgid "E179: argument required for -complete"
+msgstr "E179: pre doplnenie (-complete) je potrebný argument"
#, c-format
msgid "E181: Invalid attribute: %s"
@@ -931,11 +1103,21 @@
msgstr "E184: Pou¾ívateµom definovaný príkaz %s neexistuje"
#, c-format
+msgid "E180: Invalid complete value: %s"
+msgstr "E180: Chybná hodnota doplnenia: %s"
+
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr "E468: Argument doplnenia je povolený iba pre vlastné dopåòania (completion)"
+
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: Vlastné doplnenia vy¾adujú meno funkcie ako argument"
+
+#, c-format
msgid "E185: Cannot find color scheme %s"
msgstr "E185: Schéma farieb %s nenájdená"
msgid "Greetings, Vim user!"
-msgstr "Pozdraujem, Vim pou¾ívateµ!"
+msgstr "Pozdravujem, u¾ívateµ Vimu!"
msgid "Edit File in new window"
msgstr "Upravi» súbor v novom okne"
@@ -946,18 +1128,27 @@
msgid "Append File"
msgstr "Pripoji» súbor"
+msgid "E747: Cannot change directory, buffer is modifed (add ! to override)"
+msgstr "E747: Nemo¾no zmeni» adresár, buffer je modifikovaný (pou¾ite ! pre vynútenie)"
+
msgid "E186: No previous directory"
msgstr "E186: ®iadny predchádzajúci adresár"
msgid "E187: Unknown"
msgstr "E187: Neznámy"
+msgid "E465: :winsize requires two number arguments"
+msgstr "E465: :winsize (veµkos» okna) vy¾aduje dva argumenty"
+
#, c-format
msgid "Window position: X %d, Y %d"
-msgstr "Umiestenie okna: X %d, Y %d"
+msgstr "Pozícia okna: X %d, Y %d"
msgid "E188: Obtaining window position not implemented for this platform"
-msgstr "E188: Na tejto platforme sa nedá umiestnenie okna zisti»"
+msgstr "E188: Na tejto platforme sa nedá zisti» umiestnenie okna"
+
+msgid "E466: :winpos requires two number arguments"
+msgstr "E466: :winpos (pozícia okna) vy¾aduje dva argumenty"
msgid "Save Redirection"
msgstr "Ulo¾i» presmerovanie"
@@ -971,78 +1162,157 @@
msgid "Save Setup"
msgstr "Ulo¾i» nastavenie"
-#, c-format
-msgid "E189: \"%s\" exists (use ! to override)"
+msgid "E739: Cannot create directory: %s"
+msgstr "E739: Nemo¾no vytvori» adresár: %s"
+
+msgid "E189: \"%s\" exists (add ! to override)"
msgstr "E189: \"%s\" existuje (pou¾ite ! pre vynútenie)"
#, c-format
msgid "E190: Cannot open \"%s\" for writing"
-msgstr "E190: Nedá sa otvori» \"%s\" pre zápis"
+msgstr "E190: \"%s\" sa nedá otvori» pre zápis"
#. set mark
msgid "E191: Argument must be a letter or forward/backward quote"
-msgstr "E191: Argumentem mô¾e by» iba písiemo alebo pravý èi µavý apostrof"
+msgstr "E191: Argumentem mô¾e by» iba písmeno alebo pravý èi µavý apostrof"
msgid "E192: Recursive use of :normal too deep"
-msgstr "E192: Vnorenie :normal je príli¹ hlboké"
+msgstr "E192: Rekurzívne pou¾itie príkazu :normal príli¹ hlboké"
-msgid ":if nesting too deep"
-msgstr "vnorenie :if je príli¹ hlboké"
+msgid "E194: No alternate file name to substitute for '#'"
+msgstr ""
+"E194: ®iadny alternatívny názov súboru, ktorým by bolo mo¾né nahradi» '#'"
-msgid ":endif without :if"
-msgstr ":endif bez zodpovedajúceho :if"
+msgid "E495: no autocommand file name to substitute for \"<afile>\""
+msgstr "E495: ¾iadny názov súboru, ktorým by bolo mo¾né nahradi» \"<afile>\""
-msgid ":else without :if"
-msgstr ":else bez zodpovedajúceho :if"
+msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
+msgstr "E496: ¾iadne èíslo bufferu, ktorým by bolo mo¾né nahradi» \"<abuf>\""
-msgid ":elseif without :if"
-msgstr ":elseif bez zodpovedajúceho :if"
+msgid "E497: no autocommand match name to substitute for \"<amatch>\""
+msgstr ""
+"E497: ¾iadna zhoda automatických príkazov, ktorou by bolo mo¾né nahradi» \"<amatch>"
+"\""
-msgid ":while nesting too deep"
-msgstr "vnorenie :while je príli¹ hlboké"
+msgid "E498: no :source file name to substitute for \"<sfile>\""
+msgstr "E498: ¾iadny :source súbor, ktorým by bolo mo¾né nahradi» \"<sfile>\""
-msgid ":continue without :while"
-msgstr ":continue bez zodpovedajúceho :while"
+msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
+msgstr "E499: Prázdný názov súboru pre '%' alebo '#', funguje iba s \":p:h\""
-msgid ":break without :while"
-msgstr ":break bez zodpovedajúceho :while"
+msgid "E500: Evaluates to an empty string"
+msgstr "E500: Výsledkom vyhodnotenia je prázdny re»azec"
-msgid ":endwhile without :while"
-msgstr ":endwhile bez zodpovedajúceho :while"
+msgid "E195: Cannot open viminfo file for reading"
+msgstr "E195: Súbor viminfo sa nedá sa otvori» na èítanie"
+
+msgid "E196: No digraphs in this version"
+msgstr "E196: V tejto verzi nie sú digraphy podporované"
+
+msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
+msgstr "E608: Nemo¾no spracova» výnimku :throw s preponou 'Vim'"
+
+#. always scroll up, don't overwrite
+#, c-format
+msgid "Exception thrown: %s"
+msgstr "Spracovanie výnimky: %s"
+
+#, c-format
+msgid "Exception finished: %s"
+msgstr "Výnimka ukonèená: %s"
+
+#, c-format
+msgid "Exception discarded: %s"
+msgstr "Výnimka zahodená: %s"
+
+msgid "%s, line %ld"
+msgstr "%s, riadok %ld"
+
+#. always scroll up, don't overwrite
+msgid "Exception caught: %s"
+msgstr "Zachytená výnimka: %s"
+
+#, c-format
+msgid "%s made pending"
+msgstr "%s prebieha"
+
+msgid "%s resumed"
+msgstr "%s vrátené"
+
+#, c-format
+msgid "%s discarded"
+msgstr "%s zahodené"
+
+msgid "Exception"
+msgstr "Výnimka"
+
+msgid "Error and interrupt"
+msgstr "Chyba a preru¹ené"
+
+msgid "Error"
+msgstr "Chyba"
+
+#. if (pending & CSTP_INTERRUPT)
+msgid "Interrupt"
+msgstr "Preru¹ené"
+
+msgid "E579: :if nesting too deep"
+msgstr "E579: vnorenie :if je príli¹ hlboké"
+
+msgid "E580: :endif without :if"
+msgstr "E580 :endif bez zodpovedajúceho :if"
+
+msgid "E581: :else without :if"
+msgstr "E581 :else bez zodpovedajúceho :if"
+
+msgid "E582: :elseif without :if"
+msgstr "E582 :elseif bez zodpovedajúceho :if"
+
+msgid "E583: multiple :else"
+msgstr "E583: viacnásobné :else"
+
+msgid "E584: :elseif after :else"
+msgstr "E584: :elseif nasleduje po :else"
+
+msgid "E585: :while/:for nesting too deep"
+msgstr "E585: vnorenie :while/:for je príli¹ hlboké"
+
+msgid "E586: :continue without :while or :for"
+msgstr "E586: :continue bez zodpovedajúceho :while alebo :for"
+
+msgid "E587: :break without :while or :for"
+msgstr "E587: :break bez zodpovedajúceho :while alebo :for"
+
+msgid "E732: Using :endfor with :while"
+msgstr "E732: Pou¾ité :endfor spolu s :while"
+
+msgid "E733: Using :endwhile with :for"
+msgstr "E733: Pou¾ité :endwhile spolu s :for"
+
+msgid "E601: :try nesting too deep"
+msgstr "E601: vnorenie :try je príli¹ hlboké"
+
+msgid "E603: :catch without :try"
+msgstr "E603: :catch bez :try"
+
+#. Give up for a ":catch" after ":finally" and ignore it.
+#. * Just parse.
+msgid "E604: :catch after :finally"
+msgstr "E604: :catch nasleduje po :finally"
+
+msgid "E606: :finally without :try"
+msgstr "E606: :finally bez :try"
+
+#. Give up for a multiple ":finally" and ignore it.
+msgid "E607: multiple :finally"
+msgstr "E607: viacnásobné pou¾ité :finally"
+
+msgid "E602: :endtry without :try"
+msgstr "E602: :endtry bez :try"
msgid "E193: :endfunction not inside a function"
msgstr "E193: :endfunction mimo funkciu"
-msgid "E194: No alternate file name to substitute for '#'"
-msgstr "E194: ®iadny alternatívny názov súboru, ktorým by bolo mo¾né nahradi» '#'"
-
-msgid "no autocommand file name to substitute for \"<afile>\""
-msgstr "¾iadny názov súboru, ktorým by bolo mo¾né nahradi» \"<afile>\""
-
-msgid "no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "¾iadne èíslo bufferu, ktorým by bolo mo¾né nahradi» \"<abuf>\""
-
-msgid "no autocommand match name to substitute for \"<amatch>\""
-msgstr ""
-"¾iadna zhoda automatických príkazov, ktorou by bolo mo¾né nahradi» \"<amatch>"
-"\""
-
-msgid "no :source file name to substitute for \"<sfile>\""
-msgstr "¾iadny :source súbor, ktorým by bolo mo¾né nahradi» \"<sfile>\""
-
-#, no-c-format
-msgid "Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "Prázdný názov súboru pre '%' èi '#' funguje iba s \":p:h\""
-
-msgid "Evaluates to an empty string"
-msgstr "Výsledkom vyhodnotenia je prázdny re»azec"
-
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: Nedá sa otvori» pre èítaní viminfo súbor"
-
-msgid "E196: No digraphs in this version"
-msgstr "E196: V tejto verzi nie sú diagraphy podporované"
-
msgid "tagname"
msgstr "meno tagu"
@@ -1061,16 +1331,16 @@
"# História %s (zaèínajúci najnov¹ou polo¾kou):\n"
msgid "Command Line"
-msgstr "Príkazové Riadky"
+msgstr "Príkazový riadok"
msgid "Search String"
-msgstr "Vyhµadávaný Re»azec"
+msgstr "Vyhµadávaný re»azec"
msgid "Expression"
msgstr "Výraz"
msgid "Input Line"
-msgstr "Vstupný Riadok"
+msgstr "Vstupný riadok"
msgid "E198: cmd_pchar beyond the command length"
msgstr "E198: cmd_pchar prevy¹uje då¾ku príkazu"
@@ -1079,7 +1349,7 @@
msgstr "E199: Aktívne okno alebo buffer bol vymazaný"
msgid "Illegal file name"
-msgstr "Neprístupný názov súboru"
+msgstr "Neprípustný názov súboru"
msgid "is a directory"
msgstr "je adresárom"
@@ -1094,23 +1364,23 @@
msgstr "[prístup odmietnutý]"
msgid "E200: *ReadPre autocommands made the file unreadable"
-msgstr "E200: *ReadPre automatické príkazy urobili súbor neèitateµným"
+msgstr "E200: automatické príkazy *ReadPre urobili súbor neèitateµným"
msgid "E201: *ReadPre autocommands must not change current buffer"
-msgstr "E201: *ReadPre automatické príkazy nesmú meni» aktuálny buffer"
+msgstr "E201: automatické príkazy *ReadPre nesmú meni» aktuálny buffer"
msgid "Vim: Reading from stdin...\n"
-msgstr "Vim: èítam z ¹tandardného vstupu...\n"
+msgstr "Vim: èítam zo ¹tandardného vstupu...\n"
msgid "Reading from stdin..."
-msgstr "Èítam z ¹tandardného vstupu..."
+msgstr "Èítam zo ¹tandardného vstupu..."
#. Re-opening the original file failed!
msgid "E202: Conversion made file unreadable!"
-msgstr "E202: Po konverzii je súbor neèittateµný!"
+msgstr "E202: Po konverzii je súbor neèitateµný!"
msgid "[fifo/socket]"
-msgstr "[fpomenovaná rúra/soket]"
+msgstr "[pomenovaná rúra/soket]"
msgid "[fifo]"
msgstr "[pomenovaná rúra]"
@@ -1137,11 +1407,15 @@
msgstr "[skonvertovaný]"
msgid "[crypted]"
-msgstr "[za¹ifrovaný]"
+msgstr "[¹ifrovaný]"
msgid "[CONVERSION ERROR]"
msgstr "[CHYBA PREVODU]"
+#, c-format
+msgid "[ILLEGAL BYTE in line %ld]"
+msgstr "[NEPRÍPUSTNÝ BAJT na riadku %ld]"
+
msgid "[READ ERRORS]"
msgstr "[CHYBY ÈÍTANIA]"
@@ -1154,6 +1428,9 @@
msgid "can't read output of 'charconvert'"
msgstr "nedá sa èíta» výstup 'charconvert'"
+msgid "E676: No matching autocommands for acwrite buffer"
+msgstr "E676: ®iadne vyhovujúce automatické príkazy pre acwrite buffer "
+
msgid "E203: Autocommands deleted or unloaded buffer to be written"
msgstr ""
"E203: Automatické príkazy zmazali èi deaktivovali buffer, ktorý mal by» "
@@ -1162,36 +1439,42 @@
msgid "E204: Autocommand changed number of lines in unexpected way"
msgstr "E204: Automatický príkaz neoèakávaným spôsobom zmenil poèet riadkov"
+msgid "NetBeans dissallows writes of unmodified buffers"
+msgstr "NetBeans rozhranie nedovolilo zapísa» nemodifikované buffre"
+
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "Èiastoèné zápisy nie sú povolené pre NetBeans buffre"
+
msgid "is not a file or writable device"
-msgstr "nie je súborom ani zariadením na ktoré sa dá zapisova»"
+msgstr "nie je súborom ani zapisovatelným zariadením"
-msgid "is read-only (use ! to override)"
-msgstr "je iba pre èítaníie(pou¾ite ! pre vynútenie)"
+msgid "is read-only (add ! to override)"
+msgstr "je iba pre èítanie (pou¾ite ! pre vynútenie)"
-msgid "Can't write to backup file (use ! to override)"
-msgstr "Nedá sa zapisova» do zálo¾ného súboru (pou¾ite ! pre vynútenie)"
+msgid "E506: Can't write to backup file (add ! to override)"
+msgstr "E506: Nedá sa zapisova» do zálo¾ného súboru (pou¾ite ! pre vynútenie)"
-msgid "Close error for backup file (use ! to override)"
-msgstr "Chyba pri uzatváraní zálo¾ného súboru (pou¾ite ! pre vynútenie)"
+msgid "E507: Close error for backup file (add ! to override)"
+msgstr "E507: Chyba pri uzatváraní zálo¾ného súboru (pou¾ite ! pre vynútenie)"
-msgid "Can't read file for backup (use ! to override)"
-msgstr "Nedá sa naèíta» súbor pre zálohu (pou¾ite ! pre vynútenie)"
+msgid "E508: Can't read file for backup (add ! to override)"
+msgstr "E508: Nedá sa naèíta» súbor pre zálohu (pou¾ite ! pre vynútenie)"
-msgid "Cannot create backup file (use ! to override)"
-msgstr "Nedá sa vytvori» zálo¾ný súbor (pou¾ite ! pre vynútenie)"
+msgid "E509: Cannot create backup file (add ! to override)"
+msgstr "E509: Nedá sa vytvori» zálo¾ný súbor (pou¾ite ! pre vynútenie)"
-msgid "Can't make backup file (use ! to override)"
-msgstr "Nedá sa vytvori» zálo¾ný súbor (pou¾ite ! pre vynútenie)"
+msgid "E510: Can't make backup file (add ! to override)"
+msgstr "E510: Nedá sa vytvori» zálo¾ný súbor (pou¾ite ! pre vynútenie)"
-# resource fork ?!
-msgid "The resource fork will be lost (use ! to override)"
-msgstr "'Resource fork' bude stratený (pou¾ite ! pre vynútenie)"
+# TODO: resource fork ?! Note: used only in MACOS_X version
+msgid "E460: The resource fork would be lost (add ! to override)"
+msgstr "E460: 'Resource fork' bude stratený (pou¾ite ! pre vynútenie)"
msgid "E214: Can't find temp file for writing"
msgstr "E214: Nedá sa nájs» doèasný súbor pre ukladanie"
-msgid "E213: Cannot convert (use ! to write without conversion)"
-msgstr "E213: Nedá sa previes» (pou¾ite ! pre vynútenie prevodu)"
+msgid "E213: Cannot convert (add ! to write without conversion)"
+msgstr "E213: Nedá sa spravi» konverzia (pou¾ite ! pre zápis bez konverzie)"
msgid "E166: Can't open linked file for writing"
msgstr "E166: Súbor sa nedá otvori» pre ukladanie"
@@ -1199,14 +1482,17 @@
msgid "E212: Can't open file for writing"
msgstr "E212: Súbor sa nedá otvori» pre ukladanie"
-msgid "Close failed"
-msgstr "Zatvorenie zlyhalo"
+msgid "E667: Fsync failed"
+msgstr "E667: Fsync zlyhal"
-msgid "write error, conversion failed"
-msgstr "chyba pri zápise, prevod sa nepodaril"
+msgid "E512: Close failed"
+msgstr "E512: Zatvorenie zlyhalo"
-msgid "write error (file system full?)"
-msgstr "chyba pri ukladaní (je voµné miesto na disku?)"
+msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
+msgstr "E513: chyba pri zápise, konverzia sa nepodarila (nastavte voµbu 'fenc' na prázdnu pre vynútenie)"
+
+msgid "E514: write error (file system full?)"
+msgstr "E514: chyba pri ukladaní (plný disk?)"
msgid " CONVERSION ERROR"
msgstr " CHYBA PREVODU"
@@ -1281,7 +1567,7 @@
msgstr "%ld znakov"
msgid "[noeol]"
-msgstr "[¾iadny koniec riadku]"
+msgstr "[bez znaku konca riadku]"
msgid "[Incomplete last line]"
msgstr "[neúplný posledný riadok]"
@@ -1290,7 +1576,7 @@
#. must give this prompt
#. don't use emsg() here, don't want to flush the buffers
msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "VAROVANIE: od jeho naèítania bol obsah súboru zmenený!!!!"
+msgstr "VAROVANIE: Súbor bol zmenený od jeho naèítania!!!"
msgid "Do you really want to write to it"
msgstr "Chcete ho naozaj ulo¾i»"
@@ -1301,17 +1587,16 @@
#, c-format
msgid "E209: Error closing \"%s\""
-msgstr "E209: Chyb pri uzatváraní \"%s\""
+msgstr "E209: Chyba pri uzatváraní \"%s\""
#, c-format
msgid "E210: Error reading \"%s\""
msgstr "E210: Chyba pri èítaní \"%s\""
msgid "E246: FileChangedShell autocommand deleted buffer"
-msgstr "E246: FileChangedShell automatický príkaz vymazal buffer"
+msgstr "E246: automatický príkaz FileChangedShell vymazal buffer"
-#, c-format
-msgid "E211: Warning: File \"%s\" no longer available"
+msgid "E211: File \"%s\" no longer available"
msgstr "E211: Varovanie: súbor \"%s\" u¾ nie je dostupný"
#, c-format
@@ -1319,20 +1604,30 @@
"W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
"well"
msgstr ""
-"W12: Varovanie: súbor \"%s\" bol po zaèatí úpravy zmenený a Vim tie¾ zmenil "
-"buffer"
+"W12: Varovanie: súbor \"%s\" bol po zaèatí úpravy zmenený a buffer sa tie¾ "
+"zmenil "
+
+msgid "See \":help W12\" for more info."
+msgstr "Pozrite \":help W12\" pre viac informácií."
#, c-format
msgid "W11: Warning: File \"%s\" has changed since editing started"
msgstr "W11: Varovanie: súbor \"%s\" bol po zaèatí úpravy zmenený"
+msgid "See \":help W11\" for more info."
+msgstr "Pozrite \":help W11\" pre viac informácií."
+
#, c-format
msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr "W16: Varovanie: Re¾im súboru \"%s\" bol po zaèatí úprav zmenený"
+msgstr ""
+"W16: Varovanie: Prístupové práva k súboru \"%s\" boli po zaèatí úprav zmenené"
+
+msgid "See \":help W16\" for more info."
+msgstr "Pozrite \":help W16\" pre viac informácií."
#, c-format
msgid "W13: Warning: File \"%s\" has been created after editing started"
-msgstr "W13: Varovanie: po zaèatí úpravy vytvorený súbor \"%s\""
+msgstr "W13: Varovanie: Súbor \"%s\" bol vytvorený po zaèatí úpravy"
msgid "Warning"
msgstr "Varovanie"
@@ -1344,6 +1639,9 @@
"&OK\n"
"&Naèíta» súbor"
+msgid "E462: Could not prepare for reloading \"%s\""
+msgstr "E462: Nemo¾no pripravi» na opätovné naèítanie \"%s\""
+
#, c-format
msgid "E321: Could not reload \"%s\""
msgstr "E321: nedá sa obnovi» \"%s\""
@@ -1351,6 +1649,10 @@
msgid "--Deleted--"
msgstr "--Vymazaný--"
+#, c-format
+msgid "auto-removing autocommand: %s <buffer=%d>"
+msgstr "samomazací automatický príkaz: %s <buffer=%d>"
+
#. the group doesn't exist
#, c-format
msgid "E367: No such group: \"%s\""
@@ -1358,12 +1660,15 @@
#, c-format
msgid "E215: Illegal character after *: %s"
-msgstr "E215: Neprístupný znak po *: %s"
+msgstr "E215: Neprípustný znak po *: %s"
#, c-format
msgid "E216: No such event: %s"
msgstr "E216: Udalos» %s neexistuje"
+msgid "E216: No such group or event: %s"
+msgstr "E216: Udalos» alebo skupina %s neexistuje"
+
#. Highlight title
msgid ""
"\n"
@@ -1372,8 +1677,11 @@
"\n"
"--- Automatické príkazy ---"
+msgid "E680: <buffer=%d>: invalid buffer number "
+msgstr "E680: <buffer=%d>: chybné èíslo bufferu"
+
msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: Automatické príkazy sa nedajú spusti» pre V©ETKY udalos»i"
+msgstr "E217: Automatické príkazy sa nedajú spusti» pre V©ETKY udalosti"
msgid "No matching autocommands"
msgstr "®iadne vyhovujúce automatické príkazy"
@@ -1383,16 +1691,15 @@
#, c-format
msgid "%s Auto commands for \"%s\""
-msgstr "%s automatické príkazy pre \"%s\""
+msgstr "%s Automatické príkazy pre \"%s\""
#, c-format
msgid "Executing %s"
msgstr "Spú¹»am %s"
-#. always scroll up, don't overwrite
#, c-format
msgid "autocommand %s"
-msgstr "Automatický príkaz %s"
+msgstr "automatický príkaz %s"
msgid "E219: Missing {."
msgstr "E219: Chýba {."
@@ -1400,14 +1707,18 @@
msgid "E220: Missing }."
msgstr "E220: Chýba }."
-msgid "No fold found"
-msgstr "®iadny záhyb nebol nájdený"
+msgid "E490: No fold found"
+msgstr "E490: Nebol nájdené ¾iadne vnorenie"
msgid "E350: Cannot create fold with current 'foldmethod'"
-msgstr "E350: Pomocou 'foldmethod' sa nedá vytvori» záhyb"
+msgstr "E350: Nedá sa vytvori» vnorenie s aktuálnou metódou 'foldmethod'"
msgid "E351: Cannot delete fold with current 'foldmethod'"
-msgstr "E351: Pomocou 'foldmethod' sa nedá odstráni» záhyb"
+msgstr "E351: Nedá sa zru¹i» vnorenie s aktuálnou metódou 'foldmethod'"
+
+#, c-format
+msgid "+--%3ld lines folded "
+msgstr "+--%3ld riadkov zahnutých "
msgid "E222: Add to read buffer"
msgstr "E222: Prida» do bufferu pre èítanie"
@@ -1438,60 +1749,78 @@
msgstr "®iadne mapovanie nebolo nájdené"
msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: neprístupný mód"
-
-msgid "<cannot open> "
-msgstr "<nedá sa otvori»> "
-
-#, c-format
-msgid "vim_SelFile: can't get font %s"
-msgstr "vim_SelFile: písmo %s nie je dostupné"
-
-msgid "vim_SelFile: can't return to current directory"
-msgstr "vim_SelFile: nedá sa vráti» do aktuálneho adresára"
-
-msgid "Pathname:"
-msgstr "Názov cesty:"
-
-msgid "vim_SelFile: can't get current directory"
-msgstr "vim_SelFile: nedá sa zisti» aktuálny adresár"
-
-msgid "OK"
-msgstr "OK"
-
-#. 'Cancel' button
-msgid "Cancel"
-msgstr "Zru¹i»"
-
-msgid "Vim dialog"
-msgstr "Vim dialóg"
-
-msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-msgstr "Prípravok posuvnej li¹ty: nedá sa zisti» geometria obrázku"
-
-msgid "E232: Cannot create BalloonEval with both message and callback"
-msgstr "E232: BalloonEval nedá sa vytvori» správou a zároveò spätným volaním"
+msgstr "E228: makemap: neprípustný mód"
msgid "E229: Cannot start the GUI"
-msgstr "E229: Nedá sa spusti» GUI"
+msgstr "E229: Nedá sa spusti» GUI (grafické rozhranie)"
#, c-format
msgid "E230: Cannot read from \"%s\""
msgstr "E230: Nedá sa èíta» z \"%s\""
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr "E665: Nemo¾no na¹tartova» grafické rozhranie, nenájdený ¾iaden pou¾itelný font"
+
msgid "E231: 'guifontwide' invalid"
-msgstr "E231: voµba 'guifontwide' je chybne nastavená"
+msgstr ""
+"E231: voµba 'guifontwide' (nastavenie ¹irokého písma) je chybne nastavená"
+
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: Hodnota 'imactivatekey' je nesprávne nastavená"
#, c-format
msgid "E254: Cannot allocate color %s"
msgstr "E254: Nedá sa alokova» farba %s"
-msgid "Error"
-msgstr "Chyba"
+msgid "No match at cursor, finding next"
+msgstr "®iadna zhoda na pozícii kurzora, hµadám ïalej"
+
+msgid "<cannot open> "
+msgstr "<nedá sa otvori»> "
+
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile: písmo %s nie je dostupné"
+
+msgid "E614: vim_SelFile: can't return to current directory"
+msgstr "E614: vim_SelFile: nedá sa vráti» do aktuálneho adresára"
+
+msgid "Pathname:"
+msgstr "Názov cesty:"
+
+msgid "E615: vim_SelFile: can't get current directory"
+msgstr "E615: vim_SelFile: nedá sa zisti» aktuálny adresár"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Cancel"
+msgstr "Zru¹i»"
+
+msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
+msgstr "Prípravok posuvnej li¹ty: nedá sa zisti» geometria náhµadu obrázku."
+
+msgid "Vim dialog"
+msgstr "Vim dialóg"
+
+msgid "E232: Cannot create BalloonEval with both message and callback"
+msgstr "E232: BalloonEval nedá sa vytvori» správou a zároveò spätným volaním"
msgid "Vim dialog..."
msgstr "Vim dialóg.."
+# TODO: Translate as "&Ano\n&Nie\n&Zru¹i»" ?
+msgid ""
+"&Yes\n"
+"&No\n"
+"&Cancel"
+msgstr ""
+"&Ano\n"
+"&Nie\n"
+"&Zru¹i»"
+
+msgid "Input _Methods"
+msgstr "Vstupné metódy (_Methods)"
+
msgid "VIM - Search and Replace..."
msgstr "VIM - Nájs» a nahradi»..."
@@ -1502,12 +1831,16 @@
msgstr "Vyhµada»:"
msgid "Replace with:"
-msgstr "Nový text:"
+msgstr "Nahradi» s:"
-#. exact match only button
-msgid "Match exact word only"
+#. whole word only button
+msgid "Match whole word only"
msgstr "Hµada» len celé slová"
+#. match case button
+msgid "Match case"
+msgstr "Zhoda veµkosti písmen"
+
msgid "Direction"
msgstr "Smer"
@@ -1518,64 +1851,68 @@
msgid "Down"
msgstr "Dolu"
-#. 'Find Next' button
msgid "Find Next"
msgstr "Nájs» ïal¹ie"
-#. 'Replace' button
msgid "Replace"
msgstr "Nahradi»"
-#. 'Replace All' button
msgid "Replace All"
msgstr "Nahradi» V¹etko"
-msgid "E233: cannot open display"
-msgstr "E233: nedá sa otvori» displej"
+msgid "Vim: Received \"die\" request from session manager\n"
+msgstr "Vim: Prijatá po¾iadavka na ukonèenie (die) od mana¾éra sedení\n"
-#, c-format
-msgid "E234: Unknown fontset: %s"
-msgstr "E234: Neznáma sada písiem: %s"
+msgid "Vim: Main window unexpectedly destroyed\n"
+msgstr "Vim: Hlavné okno neoèakávane zru¹ené\n"
msgid "Font Selection"
msgstr "Výber Písma"
-#, c-format
-msgid "E235: Unknown font: %s"
-msgstr "E235: Neznáme písmo: %s"
-
-#, c-format
-msgid "E236: Font \"%s\" is not fixed-width"
-msgstr "E236: Písmo \"%s\" nemá pevnú ¹írku"
-
msgid "Used CUT_BUFFER0 instead of empty selection"
msgstr "Pou¾itý CUT_BUFFER0 namiesto prázdneho výberu"
-msgid "Filter"
-msgstr "Filter"
+msgid "&Filter"
+msgstr "&Filter"
+
+msgid "&Cancel"
+msgstr "&Zru¹i»"
msgid "Directories"
msgstr "Adresáre"
-msgid "Help"
-msgstr "Pomocník"
+msgid "Filter"
+msgstr "Filter"
+
+msgid "&Help"
+msgstr "&Pomocník"
msgid "Files"
msgstr "Súbory"
+msgid "&OK"
+msgstr "&OK"
+
msgid "Selection"
msgstr "Výber"
-msgid "Undo"
-msgstr "Spä»"
+msgid "Find &Next"
+msgstr "Nájs» ïa&l¹ie"
-#, c-format
-msgid "E235: Can't load Zap font '%s'"
-msgstr "E235: Nemô¾em naèíta» chybný font '%s'"
+msgid "&Replace"
+msgstr "&Nahradi»"
-#, c-format
-msgid "E235: Can't use font %s"
-msgstr "E235: Nedá sa pou¾í» písmo %s"
+msgid "Replace &All"
+msgstr "Nahradi» &V¹etko"
+
+msgid "&Undo"
+msgstr "&Spä»"
+
+msgid "E610: Can't load Zap font '%s'"
+msgstr "E610: Nemô¾em naèíta» chybný font '%s'"
+
+msgid "E611: Can't use font %s"
+msgstr "E611: Nedá sa pou¾í» písmo %s"
msgid ""
"\n"
@@ -1584,25 +1921,36 @@
"\n"
"Posielam správu na ukonèenie synovského procesu.\n"
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: Nemo¾no nájs» okno s titulkom \"%s\""
+
#, c-format
msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr ""
-"E243: Argument nie je podporovaný: \n"
-"-%s\"; Pou¾ite OLE verziu."
+msgstr "E243: Argument nie je podporovaný: \"-%s\"; Pou¾ite OLE verziu."
-#. TODO: May be changed this message
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: Chyba -- nedájú sa preèíta» oznaèovacie dáta!"
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: Nemo¾no otvori» okno vnútri MDI aplikácie"
msgid "Find string (use '\\\\' to find a '\\')"
msgstr "Nájs» re»azec (pou¾ite '\\\\' ak chete nájs» '\\')"
+# Following warning can be ignored:
+# msgfmt -v --statistics --check -C --check-accelerators="&" -o sk.mo sk.po
+# sk.po:2497: msgstr lacks the keyboard accelerator mark '&'
msgid "Find & Replace (use '\\\\' to find a '\\')"
msgstr "Nájs» a Nahradi» (pou¾ite '\\\\' ak chcete nájs» '\\')"
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+msgid "Not Used"
+msgstr "[neupravovaný]"
+
+msgid "Directory\t*.nothing\n"
+msgstr "Adresár\t*.niè\n"
+
msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
msgstr ""
-"Vim E458: Nedá sa alokova» polo¾ka mapy farieb. Niektoré farby mô¾u by» "
+"Vim E458: Nedá sa alokova» polo¾ka mapy farieb, niektoré farby mô¾u by» "
"nesprávne"
#, c-format
@@ -1629,9 +1977,8 @@
msgid "Font1: %s\n"
msgstr "Písmo1: %s\n"
-#, c-format
-msgid "Font%d width is not twice that of font0\n"
-msgstr "Písmo%d nie je dvakrát ¹ir¹ie ako písmo0\n"
+msgid "Font%ld width is not twice that of font0\n"
+msgstr "Písmo%ld nie je dvakrát ¹ir¹ie ako písmo0\n"
#, c-format
msgid "Font0 width: %ld\n"
@@ -1645,12 +1992,128 @@
"©írka písma1: %ld\n"
"\n"
+msgid "Invalid font specification"
+msgstr "Chybná ¹pecifikácia písma"
+
+msgid "&Dismiss"
+msgstr "&Zru¹i»"
+
+msgid "no specific match"
+msgstr "¾iadna ¹pecifická zhoda"
+
+msgid "Vim - Font Selector"
+msgstr "Vim - Výber písma"
+
+msgid "Name:"
+msgstr "Meno:"
+
+#. create toggle button
+msgid "Show size in Points"
+msgstr "Ukazuj veµkos» v bodoch"
+
+msgid "Encoding:"
+msgstr "Kódujem:"
+
+msgid "Font:"
+msgstr "Písmo:"
+
+msgid "Style:"
+msgstr "©týl"
+
+msgid "Size:"
+msgstr "Veµkos»:"
+
msgid "E256: Hangul automata ERROR"
-msgstr "E256: Hangul automata ERROR"
+msgstr "E256: Hangul ERROR - chyba kórejského spôsobu vkladania znakov"
+
+msgid "E550: Missing colon"
+msgstr "E550: Chýba dvojbodka"
+
+msgid "E551: Illegal component"
+msgstr "E551: Neprípustný komponent"
+
+msgid "E552: digit expected"
+msgstr "E552: oèakávaná èíslica"
#, c-format
-msgid "Usage: cs[cope] %s"
-msgstr "Pou¾itie: cs[cope] %s"
+msgid "Page %d"
+msgstr "Strana %d"
+
+msgid "No text to be printed"
+msgstr "®iadny text na tlaè"
+
+#, c-format
+msgid "Printing page %d (%d%%)"
+msgstr "Tlaèím stranu %d (%d%%)"
+
+#, c-format
+msgid " Copy %d of %d"
+msgstr " Kópia %d z %d"
+
+#, c-format
+msgid "Printed: %s"
+msgstr "Vytlaèené: %s"
+
+msgid "Printing aborted"
+msgstr "Tlaè bola zru¹ená"
+
+msgid "E455: Error writing to PostScript output file"
+msgstr "E455: Nedá sa zapisova» do výstupného PostScriptového súboru"
+
+msgid "E624: Can't open file \"%s\""
+msgstr "E624: Nedá sa otvori» súbor \"%s\""
+
+#, c-format
+msgid "E457: Can't read PostScript resource file \"%s\""
+msgstr "E457: Nedá sa èíta» PostScriptový súbor \"%s\""
+
+msgid "E618: file \"%s\" is not a PostScript resource file"
+msgstr "E618: súbor \"%s\" nie je vo formáte PostScript"
+
+msgid "E619: file \"%s\" is not a supported PostScript resource file"
+msgstr "E619: súbor \"%s\" nie je podporvaný PostScriptový súbor"
+
+#, c-format
+msgid "E621: \"%s\" resource file has wrong version"
+msgstr "E621: \"%s\" zdrojový súbor má zlé èíslo verzie"
+
+msgid "E673: Incompatible multi-byte encoding and character set."
+msgstr "E673: nekompatibilné viacbajtové kódovanie a znaková sada."
+
+msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
+msgstr "E674: voµba printmbcharset nemô¾e by» prázdna pri viacbajtovom kódovaní."
+
+msgid "E675: No default font specified for multi-byte printing."
+msgstr "E675: Nie je ¹pecifikované ¾iadne písmo pre viacbajtové tlaèenie."
+
+msgid "E324: Can't open PostScript output file"
+msgstr "E324: Nedá sa otvori» výstupný PostScriptový súbor"
+
+#, c-format
+msgid "E456: Can't open file \"%s\""
+msgstr "E456: Nedá sa otvori» súbor \"%s\""
+
+msgid "E456: Can't find PostScript resource file \"prolog.ps\""
+msgstr "E456: Nemo¾no nájs» PostScriptový zdrojový súbor \"prolog.ps\""
+
+msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
+msgstr "E456: Nemo¾no nájs» PostScriptový zdrojový súbor \"cidfont.ps\""
+
+msgid "E456: Can't find PostScript resource file \"%s.ps\""
+msgstr "E456: Nemo¾no nájs» PostScriptový zdrojový súbor \"%s.ps\""
+
+#, c-format
+msgid "E620: Unable to convert to print encoding \"%s\""
+msgstr "E620: Nemo¾no skonvertova» do kódovania na tlaèenie \"%s\""
+
+msgid "Sending to printer..."
+msgstr "Posielam na tlaèiareò..."
+
+msgid "E365: Failed to print PostScript file"
+msgstr "E365: PostScriptový súbor sa nepodarilo vytlaèi»"
+
+msgid "Print job sent."
+msgstr "Tlaèová úloha bola odoslaná."
msgid "Add a new database"
msgstr "Prida» novú databázu"
@@ -1670,100 +2133,110 @@
msgid "Show connections"
msgstr "Zobrazi» spojenia"
-msgid "This cscope command does not support splitting the window.\n"
-msgstr "Táto cscope príkaz nepodporuje rozdeµovanie okna.\n"
+msgid "E560: Usage: cs[cope] %s"
+msgstr "E560: Pou¾itie: cs[cope] %s"
-msgid "Usage: cstag <ident>"
-msgstr "Pou¾itie: cstag <odsadenie>"
+msgid "This cscope command does not support splitting the window.\n"
+msgstr "Tento cscope príkaz nepodporuje rozdeµovanie okna.\n"
+
+msgid "E562: Usage: cstag <ident>"
+msgstr "E562: Pou¾itie: cstag <odsadenie>"
msgid "E257: cstag: tag not found"
msgstr "E257: cstag: tag nenájdený"
-#, c-format
-msgid "stat(%s) error: %d"
-msgstr "stat(%s) chyba: %d"
+msgid "E563: stat(%s) error: %d"
+msgstr "E563: stat(%s) chyba: %d"
+
+msgid "E563: stat error"
+msgstr "E563: chyba stat"
+
+msgid "E564: %s is not a directory or a valid cscope database"
+msgstr "E564: %s nie je ani adresárom ani správnou cscope databázou"
#, c-format
msgid "Added cscope database %s"
msgstr "Pridaná cscope databáza %s"
-#, c-format
-msgid "%s is not a directory or a valid cscope database"
-msgstr "%s nie je ani adresárom ani správnou cscope databázou"
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: chyba pri èítaní cscope spojenia %ld"
-#, c-format
-msgid "error reading cscope connection %d"
-msgstr "chyba pri èítaní cscope spojenia %d"
+msgid "E561: unknown cscope search type"
+msgstr "E561: neznámy typ cscope hµadania"
-msgid "unknown cscope search type"
-msgstr "neznámy typ cscope hµadania"
+msgid "E566: Could not create cscope pipes"
+msgstr "E566: Nedajú sa vytvori» cscope rúry"
-msgid "Could not create cscope pipes"
-msgstr "Nedajú sa vytvori» cscope rúry"
+msgid "E622: Could not fork for cscope"
+msgstr "E622: Nemo¾no spusti» proces pre cscope"
msgid "cs_create_connection exec failed"
msgstr "spustenie cs_create_connection zlyhalo"
+msgid "E623: Could not spawn cscope process"
+msgstr "E623: Nedajú sa vytvori» cscope rúry"
+
msgid "cs_create_connection: fdopen for to_fp failed"
msgstr "cs_create_connection: volanie fdopen pre to_fp zlyhalo"
msgid "cs_create_connection: fdopen for fr_fp failed"
msgstr "cs_create_connection: volanie fdopen pre fr_fp zlyhalo"
-msgid "no cscope connections"
-msgstr "¾iadne cscope spojenia"
+msgid "E567: no cscope connections"
+msgstr "E567: ¾iadne cscope spojenia"
#, c-format
msgid "E259: no matches found for cscope query %s of %s"
msgstr "E259: cscope hµadanie %s vo vzore %s nena¹lo ¾iadnu zhodu"
+#, c-format
+msgid "E469: invalid cscopequickfix flag %c for %c"
+msgstr "E469: chybný cscopequickfix príznak %c pre %c"
+
msgid "cscope commands:\n"
msgstr "príkazy cscope:\n"
-#, c-format
-msgid "%-5s: %-30s (Usage: %s)\n"
-msgstr "%-5s: %-30s (Pou¾itie: %s)\n"
+msgid "%-5s: %-30s (Usage: %s)"
+msgstr "%-5s: %-30s (Pou¾itie: %s)"
-msgid "duplicate cscope database not added"
-msgstr "duplicitná cscope databáza nebola pridaná"
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: nemo¾no otvori» cscope databázu: %s"
-msgid "maximum number of cscope connections reached"
-msgstr "dosiahnutý maximálny poèet cscope spojení"
+msgid "E626: cannot get cscope database information"
+msgstr "E626: nemo¾no získa» cscope databázové informácie"
-msgid "E260: cscope connection not found"
-msgstr "E260: cscope spojenie nenájdené"
+msgid "E568: duplicate cscope database not added"
+msgstr "E568: duplicitná cscope databáza nebola pridaná"
+
+msgid "E569: maximum number of cscope connections reached"
+msgstr "E569: dosiahnutý maximálny poèet cscope spojení"
#, c-format
msgid "E261: cscope connection %s not found"
msgstr "E261: cscope spojenie %s nenájdené"
-msgid "cscope connection closed"
-msgstr "cscope spojenie ukonèené"
-
-#, c-format
-msgid "cscope connection %s closed\n"
-msgstr "cscope spojenie %s ukonèené\n"
+msgid "cscope connection %s closed"
+msgstr "cscope spojenie %s ukonèené"
#. should not reach here
-msgid "fatal error in cs_manage_matches"
-msgstr "osudová chyba v cs_manage_matches"
+msgid "E570: fatal error in cs_manage_matches"
+msgstr "E570: vá¾na chyba v cs_manage_matches"
-#, c-format
-msgid "E262: error reading cscope connection %d"
-msgstr "E262: chyba pri èítaní cscope spojenia %d"
+msgid "Cscope tag: %s"
+msgstr "Cscope tag: %s"
-msgid "couldn't malloc\n"
-msgstr "volanie malloc zlyhalo\n"
-
-#, c-format
-msgid "Cscope tag: %s\n"
-msgstr "Cscope tag: %s\n"
-
-msgid " # line"
-msgstr " # riadok"
+msgid ""
+"\n"
+" # line"
+msgstr ""
+"\n"
+" # riadok"
msgid "filename / context / line\n"
-msgstr "názov súboru/ kontext/ riadok\n"
+msgstr "názov súboru/ kontext / riadok\n"
+
+msgid "E609: Cscope error: %s"
+msgstr "E609: Chyba cscope: %s"
msgid "All cscope databases reset"
msgstr "V¹etky cscope databáze resetované"
@@ -1772,24 +2245,72 @@
msgstr "¾iadne cscope spojenia\n"
msgid " # pid database name prepend path\n"
-msgstr " # pid názov databáze predpona cesty\n"
+msgstr " # pid názov databázy predpona cesty\n"
-#, c-format
-msgid "%2d %-5ld %-34s <none>\n"
-msgstr "%2d %-5ld %-34s <¾iadny>\n"
+msgid ""
+"???: Sorry, this command is disabled, the MzScheme library could not be "
+"loaded."
+msgstr "???: Prepáète, tento príkaz je vypnutý, MzScheme kni¾nica nemô¾e by» naèítaná."
-#, c-format
-msgid "E370: Could not load library %s"
-msgstr "E370: Nepodarilo sa nahra» kni¾nicu %s"
+msgid "invalid expression"
+msgstr "chybný výraz"
-#, c-format
-msgid "E448: Could not load library function %s"
-msgstr "E448: Nepodarilo sa nahra» funkciu kni¾nice %s"
+msgid "expressions disabled at compile time"
+msgstr "podpora výrazov bola vypnutá pri preklade programu"
+
+msgid "hidden option"
+msgstr "skrytá voµba"
+
+msgid "unknown option"
+msgstr "neznáma voµba"
+
+msgid "window index is out of range"
+msgstr "èíslo okna mimo rozsah"
+
+msgid "couldn't open buffer"
+msgstr "nemo¾no otvori» buffer"
+
+msgid "cannot save undo information"
+msgstr "nedajú sa ulo¾i» zálo¾ne (opravné) informácie"
+
+msgid "cannot delete line"
+msgstr "nedá sa vymaza» riadok"
+
+msgid "cannot replace line"
+msgstr "nedá sa nahradi» riadok"
+
+msgid "cannot insert line"
+msgstr "nedá sa vlo¾i» riadok"
+
+msgid "string cannot contain newlines"
+msgstr "re»azec nesmie obsahova» znaky nového riadku"
+
+msgid "Vim error: ~a"
+msgstr "Chyba Vim: ~a"
+
+msgid "Vim error"
+msgstr "Chyba Vim"
+
+msgid "buffer is invalid"
+msgstr "buffer je neplatný"
+
+msgid "window is invalid"
+msgstr "okno je neplatné"
+
+msgid "linenr out of range"
+msgstr "èíslo riadka mimo rozsah"
+
+msgid "not allowed in the Vim sandbox"
+msgstr "nie je dovolené v bezpeènostnej schránke"
msgid ""
"E263: Sorry, this command is disabled, the Python library could not be "
"loaded."
-msgstr "E262: Prepáète, tento príkaz je vypnutý, Python kni¾nica nemô¾e by»naèítaná."
+msgstr ""
+"E262: Prepáète, tento príkaz je vypnutý, Python kni¾nica nemô¾e by» naèítaná."
+
+msgid "E659: Cannot invoke Python recursively"
+msgstr "E659: Python nemô¾e by» spustený rekurzívne"
msgid "can't delete OutputObject attributes"
msgstr "nedá sa vymaza» vlastnos» OutputObject"
@@ -1806,12 +2327,6 @@
msgid "E264: Python: Error initialising I/O objects"
msgstr "E264: Python: Chyba pri inicializácii I/O objektov"
-msgid "invalid expression"
-msgstr "chybný výraz"
-
-msgid "expressions disabled at compile time"
-msgstr "podpora výrazov bola vypnutá pri preklade programu"
-
msgid "attempt to refer to deleted buffer"
msgstr "pokus o odkaz na vymazaný buffer"
@@ -1852,23 +2367,10 @@
msgid "no such window"
msgstr "¾iadne také okno"
-msgid "cannot save undo information"
-msgstr "nedajú sa ulo¾i» spätné informácie"
-
-msgid "cannot delete line"
-msgstr "nedá sa vymaza» riadok"
-
-msgid "cannot replace line"
-msgstr "nedá sa nahradi» riadok"
-
-msgid "cannot insert line"
-msgstr "nedá sa vlo¾i» riadok"
-
-msgid "string cannot contain newlines"
-msgstr "re»azec nesmie obsahova» znaky nového riadku"
-
-msgid "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
-msgstr "E266: Prepáète, tento príkaz je vypnutý, Ruby kni¾nica nemô¾e by» naèítaná."
+msgid ""
+"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
+msgstr ""
+"E266: Prepáète, tento príkaz je vypnutý, Ruby kni¾nica nemô¾e by» naèítaná."
#, c-format
msgid "E273: unknown longjmp status %d"
@@ -1932,7 +2434,7 @@
"Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
"$PATH).\n"
msgstr ""
-"Zlihalo pripojenie na SNiFF+, Preverte prostredie (sniffemacs sa musí "
+"Zlyhalo pripojenie na SNiFF+, Preverte prostredie (sniffemacs sa musí "
"nachádza» v $PATH).\n"
msgid "E274: Sniff: Error during read. Disconnected"
@@ -1969,9 +2471,6 @@
msgid "not implemented yet"
msgstr "nie je e¹te podporované"
-msgid "unknown option"
-msgstr "neznáma voµba"
-
#. ???
msgid "cannot set line(s)"
msgstr "nedajú sa nastavi» riadky"
@@ -1990,19 +2489,21 @@
msgstr "neznámy príznak: "
msgid "unknown vimOption"
-msgstr "neznáma vimMo¾nos»"
+msgstr "neznáma voµba (vimOption)"
msgid "keyboard interrupt"
msgstr "preru¹enie z klávesnice"
msgid "vim error"
-msgstr "chyba vim"
+msgstr "chyba Vim"
msgid "cannot create buffer/window command: object is being deleted"
-msgstr "nedá sa vytvori» príkaz bufferu/okna: objekt vymazaný"
+msgstr "nedá sa vytvori» príkaz bufferu/okna: objekt bude vymazaný"
-msgid "cannot register callback command: buffer/window is already being deleted"
-msgstr "nedá sa zaregistrova» príkaz spätného volania: buffer/okno u¾ bol vymazaný"
+msgid ""
+"cannot register callback command: buffer/window is already being deleted"
+msgstr ""
+"nedá sa zaregistrova» príkaz spätného volania: buffer/okno u¾ bol vymazaný"
#. This should never happen. Famous last word?
msgid ""
@@ -2013,41 +2514,41 @@
"vim-dev@vim.org"
msgid "cannot register callback command: buffer/window reference not found"
-msgstr "nedá sa zaregistrova» príkaz spätného volania: odkaz na buffer/okno nenájdený"
-
-msgid "Sorry, this command is disabled: the Tcl library could not be loaded."
-msgstr "Prepáète, tento príkaz je vypnutý, Tcl kni¾nica nemô¾e by» naèítaná."
-
-msgid "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
msgstr ""
-"E281: TCL CHYBA: návratový kód nie je celé èíslo!? Oznamte, presím, tuto "
+"nedá sa zaregistrova» príkaz spätného volania: odkaz na buffer/okno nenájdený"
+
+msgid ""
+"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
+msgstr ""
+"E571: Prepáète, tento príkaz je vypnutý, Tcl kni¾nica nemô¾e by» naèítaná."
+
+msgid ""
+"E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
+msgstr ""
+"E281: TCL CHYBA: návratový kód nie je celé èíslo!? Oznámte, prosím, túto "
"chybu na vim-dev@vim.org"
+#, c-format
+msgid "E572: exit code %d"
+msgstr "E572: návratový kód %d"
+
msgid "cannot get line"
msgstr "nedá sa preèíta» riadok"
msgid "Unable to register a command server name"
msgstr "Nemô¾em zaregistrova» meno príkazového servra"
-#, c-format
-msgid "E247: no registered server named \"%s\""
-msgstr "E247: meno registrovaného servra \"%s\" neexistuje"
-
msgid "E248: Failed to send command to the destination program"
msgstr "E248: Chyba poèas prenosu príkazu do cieµového programu"
-#, c-format
-msgid "Invalid server id used: %s"
-msgstr "Pou¾íté chybné id servra: %s"
-
-msgid "E249: couldn't read VIM instance registry property"
-msgstr "E249: nemô¾em èíta» VIM registrovú vlastnos»"
+msgid "E573: Invalid server id used: %s"
+msgstr "E573: Pou¾íté chybné èíslo servera: %s"
msgid "E251: VIM instance registry property is badly formed. Deleted!"
-msgstr "E251: VIM registrová ¾iados» je zle formulovaná. Vymazané!"
+msgstr "E251: VIM registrová vlastnos» je zle formátovaná. Vymazané!"
-msgid "Unknown option"
-msgstr "Neznáma voµba"
+msgid "Unknown option argument"
+msgstr "Neznámy parameter voµby"
msgid "Too many edit arguments"
msgstr "Príli¹ mnoho upravovacích argumentov"
@@ -2055,33 +2556,33 @@
msgid "Argument missing after"
msgstr "Chýba argument po"
-msgid "Garbage after option"
-msgstr "Chyby za voµbou"
+msgid "Garbage after option argument"
+msgstr "Chyby za parametrom voµby"
-msgid "Too many \"+command\" or \"-c command\" arguments"
-msgstr "Príli¹ mnoho \"+príkaz\" èi \"-c príkaz\" argumentov"
+msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
+msgstr "Príli¹ mnoho \"+príkaz\", \"-c príkaz\" alebo \"--cmd príkaz\" argumentov"
msgid "Invalid argument for"
msgstr "Chybný argument pre"
+#, c-format
+msgid "%d files to edit\n"
+msgstr "%d súborov pre úpravu\n"
+
msgid "This Vim was not compiled with the diff feature."
msgstr "Tento Vim nebol kompilovaný s porovnávacími funkciami."
msgid "Attempt to open script file again: \""
msgstr "Pokus o opätovné otvorenie skriptu: \""
-msgid "\"\n"
-msgstr "\"\n"
-
msgid "Cannot open for reading: \""
msgstr "Nedá sa otvori» pre zápis: \""
msgid "Cannot open for script output: \""
msgstr "Nedá sa otvori» pre výstup skriptu: \""
-#, c-format
-msgid "%d files to edit\n"
-msgstr "poèet súborov pre úpravu: %d\n"
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim: Chyba: Chyba spú¹»ania gvim pre NetBeans\n"
msgid "Vim: Warning: Output is not to a terminal\n"
msgstr "Vim: Varovanie: Výstup nesmeruje na terminál\n"
@@ -2105,10 +2606,10 @@
"Podrobnej¹ie informácie získáte pomocou \"vim -h\"\n"
msgid "[file ..] edit specified file(s)"
-msgstr "[súbor ..] .. upravi» súbor(y)"
+msgstr "[súbor ..] .. upravi» súbor(y)"
msgid "- read text from stdin"
-msgstr "- èíta» text z ¹tandardného vstupu"
+msgstr "- èíta» text z ¹tandardného vstupu"
msgid "-t tag edit file where tag is defined"
msgstr "-t tag upravi» súbor na mieste definície tagu"
@@ -2133,7 +2634,11 @@
" or:"
msgstr ""
"\n"
-" alebo"
+" alebo:"
+
+#. TODO: is translation correct?
+msgid "where case is ignored prepend / to make flag upper case"
+msgstr "v prípade, ¾e je ignorovaná veµkos» písmen, pou¾ite znak '/' na zaèiatku, aby mal príznak význam veµkého písmena"
msgid ""
"\n"
@@ -2148,19 +2653,20 @@
msgstr "--\t\t\tMô¾u nasledova» iba názvy súborov"
msgid "--literal\t\tDon't expand wildcards"
-msgstr "--literal\t\tnepodarilo sa expandova» ¾olíkové znaky (wildcards)"
+msgstr "--literal\t\tNexpandova» ¾olíkové znaky (wildcards)"
msgid "-register\t\tRegister this gvim for OLE"
-msgstr "-register\t\tprihlási» gvim na OLE"
+msgstr "-register\t\tPrihlási» gvim na OLE"
msgid "-unregister\t\tUnregister gvim for OLE"
-msgstr "-register\t\todhlási» gvim z OLE"
+msgstr "-register\t\tOdhlási» gvim z OLE"
msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-msgstr "-g\t\t\tspusti» v GUI móde (rovnaké ako \"gvim\")"
+msgstr "-g\t\t\tSpusti» v grafickom (GUI) móde (rovnaké ako \"gvim\")"
-msgid "-f\t\t\tForeground: Don't fork when starting GUI"
-msgstr "-f\t\t\tPopredie: pri spustení GUI sa neoddelí od shellu"
+msgid "-f or --nofork\tForeground: Don't fork when starting GUI"
+msgstr ""
+"-f alebo --nofork\tPopredie: Pri spustení grafického (GUI) módu sa nepresunie do pozadia"
msgid "-v\t\t\tVi mode (like \"vi\")"
msgstr "-v\t\t\tVi mód (rovnaké ako \"vi\")"
@@ -2175,10 +2681,10 @@
msgstr "-d\t\t\tPorovnávací mód (rovnaké ako \"vimdiff\")"
msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\tJednoduchý mód (rovnaké ako \"evim\", modeless)"
+msgstr "-y\t\t\tJednoduchý mód (rovnaké ako \"evim\", bezmódový)"
msgid "-R\t\t\tReadonly mode (like \"view\")"
-msgstr "-R\t\t\tMód iba_pre_èítanie (ako \"view\")"
+msgstr "-R\t\t\tMód iba pre èítanie (ako \"view\")"
msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
msgstr "-Z\t\t\tObmedzený mód (rovnaké ako \"rvim\")"
@@ -2187,7 +2693,7 @@
msgstr "-m\t\t\tZmeny (ukladanie súborov) zakázané"
msgid "-M\t\t\tModifications in text not allowed"
-msgstr "-M\t\t\tZmeny v texte nie sú povolené"
+msgstr "-M\t\t\tZmeny v texte zakázané"
msgid "-b\t\t\tBinary mode"
msgstr "-b\t\t\tBinárny mód"
@@ -2208,13 +2714,13 @@
msgstr "-D\t\t\tLadiaci mód"
msgid "-n\t\t\tNo swap file, use memory only"
-msgstr "-n\t\t\tNebude vytvára» odkladací súbor, bude pou¾íva» iba pamä»"
+msgstr "-n\t\t\tNevytvára» odkladací súbor, pou¾íva» iba pamä»"
msgid "-r\t\t\tList swap files and exit"
-msgstr "-r\t\t\tVypí¹e zoznam odkladacích súborov a skonèí"
+msgstr "-r\t\t\tVypí¹ zoznam odkladacích súborov a skonèi"
msgid "-r (with file name)\tRecover crashed session"
-msgstr "-r názov súboru\tObnoví preru¹ené sedenie"
+msgstr "-r (s názvom súboru)\tObnoví preru¹ené sedenie"
msgid "-L\t\t\tSame as -r"
msgstr "-L\t\t\tRovnaké ako -r"
@@ -2225,11 +2731,14 @@
msgid "-dev <device>\t\tUse <device> for I/O"
msgstr "-dev <zariadenie>\t\tPou¾i» <zariadenie> pre I/O"
-msgid "-H\t\t\tstart in Hebrew mode"
-msgstr "-H\t\t\tna spusteníe v hebrejskom móde"
+msgid "-A\t\t\tstart in Arabic mode"
+msgstr "-A\t\t\tspusti v Arabic móde"
-msgid "-F\t\t\tstart in Farsi mode"
-msgstr "-F\t\t\tna spusteníe vo Farsi móde"
+msgid "-H\t\t\tStart in Hebrew mode"
+msgstr "-H\t\t\tspusti v hebrejskom móde"
+
+msgid "-F\t\t\tStart in Farsi mode"
+msgstr "-F\t\t\tspusti vo Farsi móde"
msgid "-T <terminal>\tSet terminal type to <terminal>"
msgstr "-T <terminál>\tNastaví typ terminálu na <terminál>"
@@ -2241,13 +2750,13 @@
msgstr "-U <gvimrc>\t\tPou¾ije <gvimrc> namiesto akéhokoµvek .gvimrc"
msgid "--noplugin\t\tDon't load plugin scripts"
-msgstr "--noplugin\t\tNenahrá 'plugin' skripty"
+msgstr "--noplugin\t\tNenahrá zásuvné moduly(plugin skripty)"
msgid "-o[N]\t\tOpen N windows (default: one for each file)"
msgstr "-o[N]\t\tOtvorí N okien (implicitne jedno pre ka¾dý súbor)"
-msgid "-O[N]\t\tlike -o but split vertically"
-msgstr "-O[N]\t\tako -o ale rozdelí vertikálne"
+msgid "-O[N]\t\tLike -o but split vertically"
+msgstr "-O[N]\t\tAko -o ale rozdelí vertikálne"
msgid "+\t\t\tStart at end of file"
msgstr "+\t\t\tNastaví kurzor na koniec súboru"
@@ -2256,13 +2765,14 @@
msgstr "+<riadok>\t\tNastaví kurzor na <riadok>"
msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
-msgstr "--cmd <príkaz>\t\tVykoná <príkaz> pred nahraním vimrc súboru"
+msgstr "--cmd <príkaz>\t\tVykoná <príkaz> pred nahratím vimrc súboru"
msgid "-c <command>\t\tExecute <command> after loading the first file"
-msgstr "-c <príkaz>\t\tPo nahraní prvého súboru vykoná <príkaz>"
+msgstr "-c <príkaz>\t\tPo nahratí prvého súboru vykoná <príkaz>"
msgid "-S <session>\t\tSource file <session> after loading the first file"
-msgstr "-S <sedenie>\t\tPo nahrání prvého súboru vykoná príkazy v súbore <sedenie>"
+msgstr ""
+"-S <sedenie>\t\tPo nahratí prvého súboru vykoná príkazy v súbore <sedenie>"
msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
msgstr "-s <skript>\t\tNaèíta príkazy normálneho módu zo <skriptu>"
@@ -2277,19 +2787,25 @@
msgstr "-x\t\t\tÚprava za¹ifrovaných súborov"
msgid "-display <display>\tConnect vim to this particular X-server"
-msgstr "-display <displej>\tSpustí vim na <displej>"
+msgstr "-display <displej>\tPripojí vim na príslu¹ný X-server"
msgid "-X\t\t\tDo not connect to X server"
msgstr "-X\t\t\tNepripojí sa k X serveru"
-msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-msgstr "--socketid <xid>\tOtvorí Vim vnútri iného GTK programu."
+msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+msgstr "--remote <súbory>\tUpravi» <súbory> na Vim servri ak je to mo¾né"
-msgid "--remote <files>\tEdit <files> in a Vim server and exit"
-msgstr "--remote <súbory>\tUpravi» <súbory> na Vim servri a skonèi»"
+msgid "--remote-silent <files> Same, don't complain if there is no server"
+msgstr "--remote-silent <súbory>\tTo isté, ale nes»a¾uj si, ak neexistuje server"
-msgid "--remote-wait <files> As --remote but wait for files to have been edited"
-msgstr "--remote-wait <súbory>\tAko --remote ale èaká na súbory pre ukonèenie úprav"
+msgid ""
+"--remote-wait <files> As --remote but wait for files to have been edited"
+msgstr ""
+"--remote-wait <súbory>\tAko --remote ale èaká na súbory pre ukonèenie úprav"
+
+msgid ""
+"--remote-wait-silent <files> Same, don't complain if there is no server"
+msgstr "--remote-wait-silent <súbory>\tTo isté, ale nes»a¾uj si, ak neexistuje server"
msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
msgstr "--remote-send <voµby>\tOdo¹le <voµby> na Vim server a skonèí"
@@ -2306,25 +2822,32 @@
msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
msgstr "-i <viminfo>\t\tPou¾ije <viminfo> namiesto akéhokoµvek .viminfo"
-msgid "-h\t\t\tprint Help (this message) and exit"
-msgstr "-h\t\t\tVypí¹e túto nápovedu a skonèí"
+msgid "-h or --help\tPrint Help (this message) and exit"
+msgstr "-h alebo --help\tVypí¹e túto nápovedu a skonèí"
-msgid "--version\t\tprint version information and exit"
-msgstr "--version\t\tvypí¹e informácie o verzii a skonèí"
+msgid "--version\t\tPrint version information and exit"
+msgstr "--version\t\tVypí¹e informácie o verzii a skonèí"
msgid ""
"\n"
"Arguments recognised by gvim (Motif version):\n"
msgstr ""
"\n"
-"Argumenty pre gvim (Motif verzia):\n"
+"Argumenty dostupné pre gvim (Motif verzia):\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (neXtaw version):\n"
+msgstr ""
+"\n"
+"Argumenty dostupné pre gvim (neXtaw verzia):\n"
msgid ""
"\n"
"Arguments recognised by gvim (Athena version):\n"
msgstr ""
"\n"
-"Argumenty pre gvim (Athena verzia):\n"
+"Argumenty dostupné pre gvim (Athena verzia):\n"
msgid "-display <display>\tRun vim on <display>"
msgstr "-display <displej>\tSpustí vim na <displej>"
@@ -2371,6 +2894,7 @@
msgid "+reverse\t\tDon't use reverse video (also: +rv)"
msgstr "+reverse\t\tNepou¾ije reverzné farby (tie¾ +rv)"
+# TODO: howto translate 'resource' in this case?
msgid "-xrm <resource>\tSet the specified resource"
msgstr "-xrm <resource>\tNastaví zadaný <resource>"
@@ -2379,49 +2903,72 @@
"Arguments recognised by gvim (RISC OS version):\n"
msgstr ""
"\n"
-"Argumenty pre gvim (RISC OS verzia):\n"
+"Argumenty dostupné pre gvim (RISC OS verzia):\n"
msgid "--columns <number>\tInitial width of window in columns"
-msgstr "--columns <poèet>\t<poèet> ståpcov na okno"
+msgstr "--columns <poèet>\tPoèiatoèná ¹írka okna v ståpcoch"
msgid "--rows <number>\tInitial height of window in rows"
-msgstr "--rows <poèet>\t<poèet> riadkov na okno"
+msgstr "--rows <poèet>\tPoèiatoèná vý¹ka okna v riadkoch"
msgid ""
"\n"
"Arguments recognised by gvim (GTK+ version):\n"
msgstr ""
"\n"
-"Argumenty pre gvim (GTK+ verzia):\n"
+"Argumenty dostupné pre gvim (GTK+ verzia):\n"
msgid "-display <display>\tRun vim on <display> (also: --display)"
-msgstr "-display <displej>\tspustí vim na <displej> (tie¾ --display)"
+msgstr "-display <displej>\tSpustí vim na <displej> (tie¾ --display)"
-msgid "--help\t\tShow Gnome arguments"
-msgstr "--help\t\tVypí¹e Gnome argumenty"
+msgid "--role <role>\tSet a unique role to identify the main window"
+msgstr "-role <rola>\tNastaví unikátnu rolu pre identifikáciu hlavného okna"
+
+msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
+msgstr "--socketid <xid>\tOtvorí Vim vnútri iného GTK programu."
+
+msgid ""
+"\n"
+"Arguments recognised by kvim (KDE version):\n"
+msgstr ""
+"\n"
+"Argumenty dostupné pre kvim (KDE verzia):\n"
+
+msgid "-black\t\tUse reverse video"
+msgstr "-black\t\tPou¾ije reverzné farby"
+
+msgid "-tip\t\t\tDisplay the tip dialog on startup"
+msgstr "-tip\t\t\tZobraz tip pri ¹tarte"
+
+msgid "-notip\t\tDisable the tip dialog"
+msgstr "-notip\t\tNezobrazuj tip pri ¹tarte"
+
+msgid "--display <display>\tRun vim on <display>"
+msgstr "-display <displej>\tSpustí vim na <displej>"
+
+msgid "-P <parent title>\tOpen Vim inside parent application"
+msgstr "-P <titulok rodièa>\tOtvor Vim vnútri materskej aplikácie"
+
+msgid "No display"
+msgstr "Bez grafického rozhrania"
#. Failed to send, abort.
-msgid ""
-"\n"
-"Send failed.\n"
-msgstr ""
-"\n"
-"Odoslanie zlyhalo.\n"
+msgid ": Send failed.\n"
+msgstr ": Odoslanie zlyhalo.\n"
#. Let vim start normally.
-msgid ""
-"\n"
-"Send failed. Trying to execute locally\n"
-msgstr ""
-"\n"
-"Odoslanie zlyhalo. Pokú¹am sa spusti» lokálne\n"
+msgid ": Send failed. Trying to execute locally\n"
+msgstr ": Odoslanie zlyhalo. Pokú¹am sa spusti» lokálne\n"
#, c-format
msgid "%d of %d edited"
msgstr "%d upravených súborov z %d"
-msgid "Send expression failed.\n"
-msgstr "Odoslanie výrazu zlyhalo.\n"
+msgid "No display: Send expression failed.\n"
+msgstr "®iaden graf. mód: Odoslanie výrazu zlyhalo.\n"
+
+msgid ": Send expression failed.\n"
+msgstr ": Odoslanie výrazu zlyhalo.\n"
msgid "No marks set"
msgstr "Nie sú nastavené ¾iadne znaèky"
@@ -2446,6 +2993,15 @@
"\n"
" skok riadok ståpec súbor/text"
+#. Highlight title
+msgid ""
+"\n"
+"change line col text"
+msgstr ""
+"\n"
+"znaèka riadok ståpec text"
+
+#, c-format
msgid ""
"\n"
"# File marks:\n"
@@ -2454,6 +3010,7 @@
"# Súborové znaèky:\n"
#. Write the jumplist with -'
+#, c-format
msgid ""
"\n"
"# Jumplist (newest first):\n"
@@ -2461,6 +3018,7 @@
"\n"
"# Zoznam skokov (zaèínajúci najnov¹ou polo¾kou):\n"
+#, c-format
msgid ""
"\n"
"# History of marks within files (newest to oldest):\n"
@@ -2471,11 +3029,11 @@
msgid "Missing '>'"
msgstr "Chýba '>'"
-msgid "Not a valid codepage"
-msgstr "Chybná kódová stránka"
+msgid "E543: Not a valid codepage"
+msgstr "E543: Chybná kódová stránka"
msgid "E284: Cannot set IC values"
-msgstr "E284: Nedjú sa nastavi» IC hodnoty"
+msgstr "E284: Nedajú sa nastavi» IC hodnoty"
msgid "E285: Failed to create input context"
msgstr "E285: Nepodarilo sa vytvori» vstupný kontext"
@@ -2493,7 +3051,7 @@
msgstr "E289: vstupná metóda nepodporuje môj 'preedit' typ"
msgid "E290: over-the-spot style requires fontset"
-msgstr "E290: Nadbodový ¹týl vy¾aduje fontset"
+msgstr "E290: Nadbodový ¹týl vy¾aduje sadu fontov (fontset)"
msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
msgstr "E291: Máte GTK+ verziu star¹iu ne¾ 1.2.3. Stavová plocha vypnutá."
@@ -2517,7 +3075,7 @@
msgstr "E297: Chyba pri ukladaní do odkladacieho súboru"
msgid "E300: Swap file already exists (symlink attack?)"
-msgstr "E300: Odkladací súbor u¾ existuje!"
+msgstr "E300: Odkladací súbor u¾ existuje (symlink útok?)"
msgid "E298: Didn't get block nr 0?"
msgstr "E298: Nedá sa získa» blok 0?"
@@ -2537,17 +3095,18 @@
#, c-format
msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
-msgstr "E303: Nedá sa otvori» odkladací súbor pre \"%s\", oprava nie je nemo¾ná"
+msgstr "E303: Nedá sa otvori» odkladací súbor pre \"%s\", oprava nemo¾ná"
-msgid "E304: ml_timestamp: Didn't get block 0??"
-msgstr "E304: ml_timestamp: nedá sa získa» blok 0??"
+msgid "E304: ml_upd_block0(): Didn't get block 0??"
+msgstr "E304: ml_upd_block0(): nedá sa získa» blok 0??"
#, c-format
msgid "E305: No swap file found for %s"
msgstr "E305: Odkladací súbor pre %s nebol nájdený"
msgid "Enter number of swap file to use (0 to quit): "
-msgstr "Zadajte èíslo odkladacieho súboru, ktorý sa má pou¾it (0 pre ukonèenie): "
+msgstr ""
+"Zadajte èíslo odkladacieho súboru, ktorý sa má pou¾it (0 pre ukonèenie): "
#, c-format
msgid "E306: Cannot open %s"
@@ -2588,14 +3147,14 @@
#, c-format
msgid "Using swap file \"%s\""
-msgstr "Pou¾ívám odkladací súbor \"%s\""
+msgstr "Pou¾ívam odkladací súbor \"%s\""
#, c-format
msgid "Original file \"%s\""
msgstr "Pôvodný súbor \"%s\""
msgid "E308: Warning: Original file may have been changed"
-msgstr "E308: Varovanie: Pôvodný súbor mohl by» zmenený"
+msgstr "E308: Varovanie: Pôvodný súbor mohol by» zmenený"
#, c-format
msgid "E309: Unable to read block 1 from %s"
@@ -2624,7 +3183,7 @@
msgstr "od ??? po ???END mô¾u by» riadky pomie¹ané"
msgid "??? from here until ???END lines may have been inserted/deleted"
-msgstr "od ??? po ???END mô¾u by» vlo¾ené/vymazané riadky"
+msgstr "od ??? po ???END mô¾u by» riadky vlo¾ené/vymazané"
msgid "???END"
msgstr "???KONIEC"
@@ -2632,8 +3191,13 @@
msgid "E311: Recovery Interrupted"
msgstr "E311: Obnova preru¹ená"
-msgid "E312: Errors detected while recovering; look for lines starting with ???"
-msgstr "E312: V priebehu obnovy do¹lo k chybám; skontrolujte riadky zaèínajúce na ???"
+msgid ""
+"E312: Errors detected while recovering; look for lines starting with ???"
+msgstr ""
+"E312: V priebehu obnovy do¹lo k chybám; skontrolujte riadky zaèínajúce na ???"
+
+msgid "See \":help E312\" for more information."
+msgstr "Pozrite \":help E312\" pre ïal¹ie informácie"
msgid "Recovery completed. You should check if everything is OK."
msgstr "Obnova dokonèená. Skontrolujte, èi je v¹etko v poriadku."
@@ -2646,12 +3210,12 @@
"(Zvá¾te ulo¾enie tohoto súboru pod iným menom\n"
msgid "and run diff with the original file to check for changes)\n"
-msgstr "a pomocou programu diff zistite zmeny oproti pôvodnému súboru.)\n"
+msgstr "a pomocou programu diff zistite zmeny oproti pôvodnému súboru)\n"
msgid ""
"Delete the .swp file afterwards.\n"
"\n"
-msgstr "Potom vyma¾te odkladací súbor.\n"
+msgstr "Potom vyma¾te odkladací súbor s príponou .swp.\n"
#. use msg() to start the scrolling properly
msgid "Swap files found:"
@@ -2670,29 +3234,29 @@
msgstr " -- ¾iadne --\n"
msgid " owned by: "
-msgstr " vlastník: "
+msgstr " vlastník: "
msgid " dated: "
-msgstr " dátum vytvorenia: "
+msgstr " dátum vytvorenia: "
msgid " dated: "
-msgstr " dátum vytvorenia: "
+msgstr " dátum vytvorenia: "
msgid " [from Vim version 3.0]"
msgstr " [od Vim verzie 3.0]"
msgid " [does not look like a Vim swap file]"
-msgstr " [nevypadá ako odkladací súbor Vim]"
+msgstr " [nevyzerá ako odkladací súbor Vim]"
msgid " file name: "
-msgstr " názov súboru: "
+msgstr " názov súboru: "
msgid ""
"\n"
" modified: "
msgstr ""
"\n"
-" dátum zmeny: "
+" zmenený: "
msgid "YES"
msgstr "ÁNO"
@@ -2705,10 +3269,10 @@
" user name: "
msgstr ""
"\n"
-" u¾ívateµské meno: "
+" u¾ívateµské meno: "
msgid " host name: "
-msgstr " názov poèítaèa: "
+msgstr " názov poèítaèa: "
msgid ""
"\n"
@@ -2722,10 +3286,10 @@
" process ID: "
msgstr ""
"\n"
-" ID procesu : "
+" ID procesu : "
msgid " (still running)"
-msgstr " (stále aktívny)"
+msgstr " (stále be¾í)"
msgid ""
"\n"
@@ -2748,7 +3312,7 @@
msgstr " [nedá sa otvori»]"
msgid "E313: Cannot preserve, there is no swap file"
-msgstr "E313: Nedá sa zachova» - odkladací súbor neexistuje."
+msgstr "E313: Nedá sa zachova» - odkladací súbor neexistuje"
msgid "File preserved"
msgstr "Súbor zachovaný"
@@ -2765,16 +3329,16 @@
msgstr "E316: ml_get: nedá sa nájs» riadok %ld"
msgid "E317: pointer block id wrong 3"
-msgstr "E317: chybné id ukazovateµa na blok 3"
+msgstr "E317: chybné èíslo ukazovateµa na blok 3"
msgid "stack_idx should be 0"
-msgstr "stack_idx by malo ma» hodnotu 3"
+msgstr "stack_idx by mal ma» hodnotu 3"
msgid "E318: Updated too many blocks?"
msgstr "E318: Aktualizovaných príli¹ veµa blokov?"
msgid "E317: pointer block id wrong 4"
-msgstr "E317: chybné id ukazovateµa na blok 4"
+msgstr "E317: chybné èíslo ukazovateµa na blok 4"
msgid "deleted block 1?"
msgstr "vymazaný blok 1?"
@@ -2784,7 +3348,7 @@
msgstr "E320: Nedá sa nájs» riadok %ld"
msgid "E317: pointer block id wrong"
-msgstr "E317: chybné id ukazovateµa na blok"
+msgstr "E317: chybné èíslo ukazovateµa na blok"
msgid "pe_line_count is zero"
msgstr "pe_line_count má nulovú hodnotu"
@@ -2801,7 +3365,7 @@
msgstr "Nárast veµkosti zásobníku"
msgid "E317: pointer block id wrong 2"
-msgstr "E317: chybný id ukazovateµa na blok 2"
+msgstr "E317: chybný èíslo ukazovateµa na blok 2"
msgid "E325: ATTENTION"
msgstr "E325: POZOR"
@@ -2814,7 +3378,7 @@
"Nájdený odkladací súbor s menom \""
msgid "While opening file \""
-msgstr "Pri otváraní súboru\""
+msgstr "Pri otváraní súboru \""
msgid " NEWER than swap file!\n"
msgstr " NOV©Í ako odkladací súbor!\n"
@@ -2833,7 +3397,7 @@
" nemali dve rôzne verzie toho istého súboru.\n"
msgid " Quit, or continue with caution.\n"
-msgstr " Ukonèite program, alebo opatrnne pokraèujte v úpravách.\n"
+msgstr " Ukonèite program, alebo opatrne pokraèujte v úpravách.\n"
msgid ""
"\n"
@@ -2850,7 +3414,7 @@
" to recover the changes (see \":help recovery\").\n"
msgstr ""
"\"\n"
-" pre obnovenie zmien (viz \":help recovery)\".\n"
+" pre obnovenie zmien (viï \":help recovery)\".\n"
msgid " If you did this already, delete the swap file \""
msgstr " Pokiaµ ste tak u¾ urobili, tak vyma¾te odkladací súbor \""
@@ -2878,25 +3442,29 @@
"&Open Read-Only\n"
"&Edit anyway\n"
"&Recover\n"
-"&Quit"
+"&Quit\n"
+"&Abort"
msgstr ""
"&Otvori» iba pre èítanie\n"
"&Pokraèova» v úpravách\n"
"O&bnovi» súbor\n"
-"&Koniec"
+"&Koniec\n"
+"&Zru¹i»"
msgid ""
"&Open Read-Only\n"
"&Edit anyway\n"
"&Recover\n"
"&Quit\n"
+"&Abort\n"
"&Delete it"
msgstr ""
"&Otvori» iba pre èítanie\n"
"&Pokraèovat v úpravách\n"
"O&bnovi» súbor\n"
"&Koniec\n"
-"&Zmaza»"
+"&Zru¹i»\n"
+"Z&maza»"
msgid "E326: Too many swap files found"
msgstr "E326: Príli¹ mnoho odkladacích súborov"
@@ -2907,14 +3475,14 @@
msgid "E328: Menu only exists in another mode"
msgstr "E328: Ponuka existuje iba v inom móde"
-msgid "E329: No menu of that name"
-msgstr "E329: Ponuka tohoto mena neexistuje"
+msgid "E329: No menu \"%s\""
+msgstr "E329: Ponuka \"%s\" neexistuje"
msgid "E330: Menu path must not lead to a sub-menu"
msgstr "E330: Cesta ponuky nesmie vies» do podponuky"
msgid "E331: Must not add menu items directly to menu bar"
-msgstr "E331: Polo¾ky ponuky sa nedjú pridáva» priamo na li¹tu"
+msgstr "E331: Polo¾ky ponuky sa nejdú pridáva» priamo na li¹tu"
msgid "E332: Separator cannot be part of a menu path"
msgstr "E332: Oddeµovaè nesmie by» èas»ou cesty ponuky"
@@ -2936,7 +3504,7 @@
#, c-format
msgid "E334: Menu not found: %s"
-msgstr "E334: Vzor nenájdený: %s"
+msgstr "E334: Ponuka nenájdená: %s"
#, c-format
msgid "E335: Menu not defined for %s mode"
@@ -2956,49 +3524,37 @@
msgid "line %4ld:"
msgstr "riadok %4ld:"
-msgid "[string too long]"
-msgstr "[príli¹ dlhý re»azec]"
+#, c-format
+msgid "E354: Invalid register name: '%s'"
+msgstr "E354: '%s' nie je prístupné meno registru"
msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "Správca správ: Martin Lacko <lacko@host.sk>"
+msgstr "Správca prekladu: Lubomir Host <rajo@platon.sk>"
msgid "Interrupt: "
msgstr "Preru¹enie: "
-msgid "Hit ENTER to continue"
-msgstr "Pokraèovanie stlaèením ENTER"
-
-msgid "Hit ENTER or type command to continue"
-msgstr "Pre pokraèovanie stlaète ENTER alebo zadajte príkaz"
+msgid "Press ENTER or type command to continue"
+msgstr "Stlaète ENTER alebo zadajte príkaz pre pokraèovanie"
msgid "-- More --"
msgstr "-- Pokraèovanie --"
-msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
-msgstr " (RET/BS: riadok, MEDZERNÍK/b: stránka, d/u: 0.5 stránky, q: koniec)"
-
-msgid " (RET: line, SPACE: page, d: half page, q: quit)"
-msgstr " (RET: riadok, MEDZERNÍK: stránka, d: 0.5 stránky, q: koniec)"
+msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " MEDZERA/d/j: obrazovka/stránka/riadok dole, b/u/k: hore, q: koniec"
msgid "Question"
msgstr "Otázka"
+# TODO: Translate as "&Ano\n&Nie" ?
msgid ""
"&Yes\n"
"&No"
msgstr ""
-"Án&o\n"
+"&Ano\n"
"&Nie"
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"Án&o\n"
-"&Nie\n"
-"&Zru¹i»"
-
+# TODO: Translate as "&Ano\n&Nie\n&Ulo¾i» v¹etko\nZahodi» &v¹etko\n&Zru¹i»" ?
msgid ""
"&Yes\n"
"&No\n"
@@ -3006,42 +3562,59 @@
"&Discard All\n"
"&Cancel"
msgstr ""
-"Án&o\n"
+"&Ano\n"
"&Nie\n"
"&Ulo¾i» v¹etko\n"
"Zahodi» &v¹etko\n"
"&Zru¹i»"
+msgid "Select Directory dialog"
+msgstr "Dialóg pre vytvorenie adresára"
+
msgid "Save File dialog"
msgstr "Dialóg pre ukladanie súborov"
msgid "Open File dialog"
msgstr "Dialóg pre otváranie súborov"
-#. TODO: non-GUI file selector here
msgid "E338: Sorry, no file browser in console mode"
msgstr "E338: ¥utujem, ale konzolová verzia nepodporuje prehliadaè súborov"
+msgid "E766: Insufficient arguments for printf()"
+msgstr "E766: Chybné argumenty pre funkciu printf()"
+
+msgid "E767: Too many arguments to printf()"
+msgstr "E767: Príli¹ mnoho argumentov pre funkciu printf()"
+
msgid "W10: Warning: Changing a readonly file"
msgstr "W10: Varovanie: mením súbor iba pre èítanie"
+msgid "Type number or click with mouse (<Enter> cancels): "
+msgstr "Zadajte èíslo ale kliknite my¹ou (<Enter> zru¹í): "
+
+msgid "Choice number (<Enter> cancels): "
+msgstr "Zvoµte èíslo (<Enter> zru¹í): "
+
msgid "1 more line"
-msgstr "poèet nových riadkov: 1"
+msgstr "1 nový riadok"
msgid "1 line less"
-msgstr "poèet vymazaných riadkov: 1"
+msgstr "1 vymazaný riadok"
#, c-format
msgid "%ld more lines"
-msgstr "poèet nových riadkov: %ld"
+msgstr "%ld nových riadkov"
#, c-format
msgid "%ld fewer lines"
-msgstr "poèet vymazaných riadkov: %ld"
+msgstr "%ld vymazaných riadkov"
msgid " (Interrupted)"
msgstr " (Preru¹ené)"
+msgid "Beep!"
+msgstr "Piip!"
+
msgid "Vim: preserving files...\n"
msgstr "Vim: zachovávam súbory...\n"
@@ -3049,6 +3622,7 @@
msgid "Vim: Finished.\n"
msgstr "Vim: ukonèený\n"
+#, c-format
msgid "ERROR: "
msgstr "CHYBA: "
@@ -3058,8 +3632,7 @@
"[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n"
msgstr ""
"\n"
-"[bajtov] celkom uvolnené-alokované %lu-%lu, vyu¾ité %lu, maximálne vyu¾itie %"
-"lu\n"
+"[bajtov] celkom uvolnené-alokované %lu-%lu, vyu¾ité %lu, maximálne vyu¾itie %lu\n"
#, c-format
msgid ""
@@ -3078,35 +3651,35 @@
#, c-format
msgid "E342: Out of memory! (allocating %lu bytes)"
-msgstr "E342: Nedostatok pamäte! (alokujem %lu bytov)"
+msgstr "E342: Nedostatok pamäte! (alokujem %lu bajtov)"
#, c-format
msgid "Calling shell to execute: \"%s\""
msgstr "Volám shell na spustenie: \"%s\""
-msgid "Missing colon"
-msgstr "Chýba dvojbodka"
+msgid "E545: Missing colon"
+msgstr "E545: Chýba dvojbodka"
-msgid "Illegal mode"
-msgstr "Neprístupný mód"
+msgid "E546: Illegal mode"
+msgstr "E546: Neprípustný mód"
-msgid "Illegal mouseshape"
-msgstr "Chybný tvar my¹i"
+msgid "E547: Illegal mouseshape"
+msgstr "E547: Chybný tvar my¹i"
-msgid "digit expected"
-msgstr "oèakávaná èíslica"
+msgid "E548: digit expected"
+msgstr "E548: oèakávaná èíslica"
-msgid "Illegal percentage"
-msgstr "Neprístupné precento"
+msgid "E549: Illegal percentage"
+msgstr "E549: Neprípustné percento"
msgid "Enter encryption key: "
msgstr "Zadajte ¹ifrovací kµúè: "
msgid "Enter same key again: "
-msgstr "Vlo¾te kµúè znova: "
+msgstr "Vlo¾te ten istý kµúè znova: "
msgid "Keys don't match!"
-msgstr "Kµúè nie je správny!"
+msgstr "Kµúèe sa nezhodujú!"
#, c-format
msgid ""
@@ -3114,11 +3687,11 @@
"followed by '%s'."
msgstr ""
"E343: Chybná cesta: '**[èíslo] musí by» buï na konci cesty, alebo musí by»\n"
-"nasledované '%s. Viz :help path."
+"nasledované '%s. Viï :help path."
#, c-format
msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: Adresár \"%s\" sa nedá v cdpath nájs»"
+msgstr "E344: Adresár \"%s\" sa nedá nájs» v cdpath"
#, c-format
msgid "E345: Can't find file \"%s\" in path"
@@ -3132,8 +3705,25 @@
msgid "E347: No more file \"%s\" found in path"
msgstr "E347: ®iadny ïal¹í súbor \"%s\" nebol v ceste nájdený"
-msgid "Illegal component"
-msgstr "Neprístupný komponent"
+#. Get here when the server can't be found.
+msgid "Cannot connect to Netbeans #2"
+msgstr "Nedá sa pripoji» na Netbeans #2"
+
+msgid "Cannot connect to Netbeans"
+msgstr "Nedá sa pripoji» na Netbeans"
+
+#, c-format
+msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+msgstr "E668: Zlé prístupové práva pre súbor s informáciami pre NetBeans spojenie: \"%s\""
+
+msgid "read from Netbeans socket"
+msgstr "èítanie z Netbeans soketu"
+
+msgid "E658: NetBeans connection lost for buffer %ld"
+msgstr "E658: Stratené NetBeans spojenie pre buffer %ld"
+
+msgid "E505: "
+msgstr "E505: "
msgid "Warning: terminal cannot highlight"
msgstr "Varovanie: terminál nepodporuje zvýrazòovanie"
@@ -3145,56 +3735,77 @@
msgstr "E349: Pod kurzorom nie je ¾iadny identifikátor"
msgid "E352: Cannot erase folds with current 'foldmethod'"
-msgstr "E352: Pomocou 'foldmethod' sa nedá vymaza» záhyb"
+msgstr "E352: Pomocou 'foldmethod' sa nedá vymaza» vnorenie"
+
+msgid "E664: changelist is empty"
+msgstr "E664: zoznam zmien je prázdny"
+
+msgid "E662: At start of changelist"
+msgstr "E662: Na zaèiatku zoznamu zmien"
+
+msgid "E663: At end of changelist"
+msgstr "E663: Na konci zoznamu zmien"
+
+msgid "Type :quit<Enter> to exit Vim"
+msgstr "Zadajte :quit<Enter> pre ukonèenie programu Vim"
#, c-format
msgid "1 line %sed 1 time"
-msgstr "poèet riadkov posunutých naraz pomocou %s : 1"
+msgstr "poèet riadkov upravených naraz pomocou %s: 1"
#, c-format
msgid "1 line %sed %d times"
-msgstr "poèet riadkov posunutých %s krát pomocou %d s : 1"
+msgstr "1 riadok upravený pomocou %s %d krát"
#, c-format
msgid "%ld lines %sed 1 time"
-msgstr "%ld riadkov posunutých naraz pomocou %s"
+msgstr "%ld riadkov upravených naraz pomocou %s"
#, c-format
msgid "%ld lines %sed %d times"
-msgstr "%ld riadkov posunutých pomocou %s %d krát"
+msgstr "%ld riadkov upravených pomocou %s %d krát"
#, c-format
msgid "%ld lines to indent... "
-msgstr "poèet riadkov pre odsadenie: %ld"
+msgstr "%ld riadkov pre odsadenie..."
msgid "1 line indented "
-msgstr "poèet riadkov pre odsadenie: 1 "
+msgstr "1 riadok odsadený "
#, c-format
msgid "%ld lines indented "
-msgstr "poèet odsadených riadkov: %ld"
+msgstr "%ld riadkov odsadených "
+
+msgid "E748: No previously used register"
+msgstr "E748: ®iadny predtým pou¾ívaný register"
#. must display the prompt
msgid "cannot yank; delete anyway"
msgstr "nedá sa kopírova»; napriek tomu vymazané"
msgid "1 line changed"
-msgstr "poèet zmenených riadkov: 1"
+msgstr "1 riadok zmenený"
#, c-format
msgid "%ld lines changed"
-msgstr "poèet zmenených riadkov: %ld"
+msgstr "%ld zmenených riadkov"
#, c-format
msgid "freeing %ld lines"
-msgstr "poèet uvolòovaných riadkov: %ld"
+msgstr "uvolòujem %ld riadkov"
+
+msgid "block of 1 line yanked"
+msgstr "skopírovaný blok 1 riadku"
msgid "1 line yanked"
-msgstr "poèet skopírovaných riadkov: 1"
+msgstr "1 riadok skopírovaný"
+
+msgid "block of %ld lines yanked"
+msgstr "skopírovaný blok %ld riadkov"
#, c-format
msgid "%ld lines yanked"
-msgstr "poèet skopírovaných riadkov: %ld"
+msgstr "%ld skopírovaných riadkov"
#, c-format
msgid "E353: Nothing in register %s"
@@ -3209,8 +3820,9 @@
"--- Registre ---"
msgid "Illegal register name"
-msgstr "Neprístupný názov registru"
+msgstr "Neprípustný názov registra"
+#, c-format
msgid ""
"\n"
"# Registers:\n"
@@ -3218,141 +3830,146 @@
"\n"
"# Registre:\n"
-#, c-format
-msgid "Unknown register type %d"
-msgstr "%d nie je známým typom registru"
-
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: '%s' nie je prístupné meno registru"
+msgid "E574: Unknown register type %d"
+msgstr "E574: Neznámy typ registra %d"
#, c-format
msgid "%ld Cols; "
-msgstr "%ld Buniek; "
+msgstr "%ld Ståpcov; "
#, c-format
msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Vybraných %s%ld z %ld riadkov; %ld zo %ld slov; %ld z %ld Bytov"
+msgstr "Vybraných %s%ld z %ld Riadkov; %ld zo %ld Slov; %ld z %ld Bajtov"
+
+msgid ""
+"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Bytes"
+msgstr "Vybraných %s%ld z %ld Riadkov; %ld zo %ld Slov; %ld z %ld Znakov; %ld z %ld Bajtov"
#, c-format
msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Bunka %s z %s; Riadok %ld z %ld; Slovo %ld z %ld; Byte %ld z %ld"
+msgstr "Ståpec %s z %s; Riadok %ld z %ld; Slovo %ld z %ld; Bajt %ld z %ld"
+
+#, c-format
+msgid ""
+"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
+"%ld"
+msgstr "Ståpec %s z %s; Riadok %ld z %ld; Slovo %ld z %ld; Znak %ld z %ld; Bajt %ld z %ld"
#, c-format
msgid "(+%ld for BOM)"
msgstr "(+%ld pre BOM)"
+msgid "%<%f%h%m%=Page %N"
+msgstr "%<%f%h%m%=Strana %N"
+
msgid "Thanks for flying Vim"
-msgstr "Ïakujem za pou¾itie Vim"
+msgstr "Ïakujeme za pou¾itie Vim"
-msgid "Option not supported"
-msgstr "Voµba nie je podporovaná"
+msgid "E518: Unknown option"
+msgstr "E518: Neznáma voµba"
-msgid "Not allowed in a modeline"
-msgstr "Nie je v modeline povolené"
+msgid "E519: Option not supported"
+msgstr "E519: Voµba nie je podporovaná"
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tOstatné nastavenie z "
+msgid "E520: Not allowed in a modeline"
+msgstr "E520: Nie je v modeline povolené"
-msgid "Number required after ="
-msgstr "Po = je vy¾adované èíslo"
+msgid "E521: Number required after ="
+msgstr "E521: Po = je vy¾adované èíslo"
-msgid "Not found in termcap"
-msgstr "Nenájdený v termcapu"
+msgid "E522: Not found in termcap"
+msgstr "E522: Nenájdený v termcape"
#, c-format
-msgid "Illegal character <%s>"
-msgstr "Neprístupný znak <%s>"
+msgid "E539: Illegal character <%s>"
+msgstr "E539: Neprípustný znak <%s>"
-msgid "Not allowed here"
-msgstr "Toto nie je na tomto mieste povolené"
+msgid "E529: Cannot set 'term' to empty string"
+msgstr "E529: Voµba 'term' nemô¾e by» prázdna"
-msgid "Cannot set 'term' to empty string"
-msgstr "Voµba 'term' nemô¾e by» prázdna"
+msgid "E530: Cannot change term in GUI"
+msgstr "E530: V grafickom móde (GUI) sa nedá meni» typ terminálu"
-msgid "Cannot change term in GUI"
-msgstr "V GUI sa nedá meni» term"
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531: Pou¾ite \"gui\" pre spustenie GUI"
-msgid "Use \":gui\" to start the GUI"
-msgstr "Pou¾ite \"gui\" pre spustenie GUI"
+msgid "E589: 'backupext' and 'patchmode' are equal"
+msgstr "E589: voµby 'backupext' a 'patchmode' majú rovnakú hodnotu"
-msgid "'backupext' and 'patchmode' are equal"
-msgstr "voµby 'backupext' a 'patchmode' majú rovnakú hodnotu"
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617: Nedá sa zmeni» v grafickom rozhraní GTK+ 2"
-msgid "Zero length string"
-msgstr "Re»azec s nulovou då¾kou"
+msgid "E524: Missing colon"
+msgstr "E524: Chýba dvojbodka"
+
+msgid "E525: Zero length string"
+msgstr "E525: Re»azec s nulovou då¾kou"
#, c-format
-msgid "Missing number after <%s>"
-msgstr "Po <%s> chýba èíslo"
+msgid "E526: Missing number after <%s>"
+msgstr "E526: Po <%s> chýba èíslo"
-msgid "Missing comma"
-msgstr "Chýba èiarka"
+msgid "E527: Missing comma"
+msgstr "E527: Chýba èiarka"
-msgid "Must specify a ' value"
-msgstr "Je nutné zada» hodnotu '"
+msgid "E528: Must specify a ' value"
+msgstr "E528: Je nutné zada» hodnotu '"
-msgid "contains unprintable character"
-msgstr "obsahuje netlaèiteµné znaky"
+msgid "E595: contains unprintable or wide character"
+msgstr "E595: obsahuje netlaèiteµné znaky"
-msgid "Invalid font(s)"
-msgstr "Chybné písma"
+msgid "E596: Invalid font(s)"
+msgstr "E596: Chybné písma"
-msgid "can't select fontset"
-msgstr "nedá sa vybra» sada písiem"
+msgid "E597: can't select fontset"
+msgstr "E597: nedá sa vybra» sada písiem"
-msgid "Invalid fontset"
-msgstr "Chybná sada písiem"
+msgid "E598: Invalid fontset"
+msgstr "E598: Chybná sada písiem"
-msgid "can't select wide font"
-msgstr "nedá sa vybra» ¹iroký font"
+msgid "E533: can't select wide font"
+msgstr "E533: nedá sa vybra» ¹iroký font"
-msgid "Invalid wide font"
-msgstr "Chybné ¹iroké písmo"
+msgid "E534: Invalid wide font"
+msgstr "E534: Chybné ¹iroké písmo"
#, c-format
-msgid "Illegal character after <%c>"
-msgstr "Neprístupný znak po <%c>"
+msgid "E535: Illegal character after <%c>"
+msgstr "E535: Neprípustný znak po <%c>"
-msgid "comma required"
-msgstr "je nutná èiarka"
+msgid "E536: comma required"
+msgstr "E536: je nutná èiarka"
#, c-format
-msgid "'commentstring' must be empty or contain %s"
-msgstr "'komentár' musí by» prázdny alebo musí obsahova» %s"
+msgid "E537: 'commentstring' must be empty or contain %s"
+msgstr "E537: 'commentstring' (komentár) musí by» prázdny alebo musí obsahova» %s"
-msgid "No mouse support"
-msgstr "Bez podpory my¹i"
+msgid "E538: No mouse support"
+msgstr "E538: Bez podpory my¹i"
-msgid "Unclosed expression sequence"
-msgstr "Neuzatvorené zoskupenie výrazov"
+msgid "E540: Unclosed expression sequence"
+msgstr "E540: Neuzatvorené zoskupenie výrazov"
-msgid "too many items"
-msgstr "príli¹ mnoho polo¾iek"
+msgid "E541: too many items"
+msgstr "E541: príli¹ mnoho polo¾iek"
-msgid "unbalanced groups"
-msgstr "nevyvá¾ené skupiny"
+msgid "E542: unbalanced groups"
+msgstr "E542: nevyvá¾ené skupiny"
-msgid "A preview window already exists"
-msgstr "Okno náhµadu u¾ existuje"
+msgid "E590: A preview window already exists"
+msgstr "E590: Okno náhµadu u¾ existuje"
-msgid "'winheight' cannot be smaller than 'winminheight'"
-msgstr "hodnota voµby 'winheight' nesmie by» men¹ia ne¾ hodnota voµby 'winminheight'"
-
-msgid "'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "hodnota voµby 'winwidth' nesmie by» men¹ia ne¾ hodnota volµy 'winminwidth'"
+msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
+msgstr "W17: Mód Arabic vy¾aduje kódovanie UTF-8, nastavte to príkazom ':set encoding=utf-8'"
#, c-format
-msgid "Need at least %d lines"
-msgstr "Minimálne potrebný poèet riadkov: %d"
+msgid "E593: Need at least %d lines"
+msgstr "E593: Minimálny potrebný poèet riadkov je %d"
#, c-format
-msgid "Need at least %d columns"
-msgstr "Minimálne potrebný poèet ståpcov: %d"
+msgid "E594: Need at least %d columns"
+msgstr "E594: Minimálne potrebný poèet ståpcov je %d"
#, c-format
msgid "E355: Unknown option: %s"
@@ -3377,7 +3994,7 @@
"--- Local option values ---"
msgstr ""
"\n"
-"--- Nastavenie globálnych volieb ---"
+"--- Nastavenie lokálnych volieb ---"
msgid ""
"\n"
@@ -3408,7 +4025,7 @@
#, c-format
msgid "Need %s version %ld\n"
-msgstr "Potrebný %s verzia %ld\n"
+msgstr "Potrebná %s verzia %ld\n"
msgid "Cannot open NIL:\n"
msgstr "Nedá sa otvori» NIL:\n"
@@ -3423,9 +4040,6 @@
msgid "cannot change console mode ?!\n"
msgstr "nemô¾em zmeni» konzolový mód ?!\n"
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: Nastavovanie re¾imu obrazovky nie je podporované"
-
msgid "mch_get_shellsize: not a console??\n"
msgstr "mch_get_shellsize: nie je konzolou??\n"
@@ -3454,10 +4068,6 @@
msgid "'columns' is not 80, cannot execute external commands"
msgstr "'ståpce' nie je 80, nemô¾em spusti» externý príkaz"
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: Vyvolanie kni¾niènej funkcia zlyhalo pre \"%s()\""
-
msgid "E237: Printer selection failed"
msgstr "E237: Zlyhal výber tlaèiarne"
@@ -3466,16 +4076,13 @@
msgstr "%s na %s"
#, c-format
-msgid "E448: Unknown font: %s"
-msgstr "E448: Neznáme písmo: %s"
+msgid "E613: Unknown printer font: %s"
+msgstr "E613: Neznámy font tlaèiarne: %s"
#, c-format
msgid "E238: Print error: %s"
msgstr "E238: Chyba tlaèe: %s"
-msgid "Unknown"
-msgstr "Neznámy"
-
#, c-format
msgid "Printing '%s'"
msgstr "Tlaèím '%s'"
@@ -3492,25 +4099,34 @@
msgstr "E366: Chybná 'osfiletype' voµba - pou¾itie Textu"
msgid "Vim: Double signal, exiting\n"
-msgstr "VIm: dvojitý signál, konèím\n"
+msgstr "Vim: dvojitý signál, konèím\n"
#, c-format
msgid "Vim: Caught deadly signal %s\n"
msgstr "Vim: Zachytený smrtiaci signál %s\n"
+#, c-format
msgid "Vim: Caught deadly signal\n"
msgstr "Vim: Zachytený smrtiaci signál\n"
#, c-format
msgid "Opening the X display took %ld msec"
-msgstr "Otváram X displej - zaberie %ld msec"
+msgstr "Otvorenie X displej zabralo %ld msec"
+
+#. KDE sometimes produces X error that we want to ignore
+msgid ""
+"\n"
+"Vim: Got X error but we continue...\n"
+msgstr ""
+"\n"
+"Vim: Chyba X ale pokraèujem ...\n"
msgid ""
"\n"
"Vim: Got X error\n"
msgstr ""
"\n"
-"Vim: chyba X\n"
+"Vim: Chyba X\n"
msgid "Testing the X display failed"
msgstr "Testovanie X displeja zlyhalo"
@@ -3560,12 +4176,41 @@
"\n"
"Príkaz ukonèený\n"
+msgid "XSMP lost ICE connection"
+msgstr "XSMP stratilo ICE spojenie"
+
+#, c-format
+msgid "dlerror = \"%s\""
+msgstr "dlerror = \"%s\""
+
msgid "Opening the X display failed"
msgstr "Otvorenie X displeja zlyhalo"
+msgid "XSMP handling save-yourself request"
+msgstr "XSMP spracuváva po¾iadavku na samoulo¾enie"
+
+msgid "XSMP opening connection"
+msgstr "XSMP otvára spojenie"
+
+msgid "XSMP ICE connection watch failed"
+msgstr "XSMP kontrola spojenia ICE zlyhala"
+
+#, c-format
+msgid "XSMP SmcOpenConnection failed: %s"
+msgstr "XSMP SmcOpenConnection zlyhalo: %s"
+
msgid "At line"
msgstr "Na riadku"
+msgid "Could not load vim32.dll!"
+msgstr "Nemô¾em nahra» vim32.dll!"
+
+msgid "VIM Error"
+msgstr "VIM Chyba"
+
+msgid "Could not fix up function pointers to the DLL!"
+msgstr "Nemô¾em opravi» odkazy funkcií na DLL!"
+
#, c-format
msgid "shell returned %d"
msgstr "návratová hodnota shellu %d"
@@ -3598,15 +4243,6 @@
msgid "Vim Warning"
msgstr "Vim Varovanie"
-msgid "Could not load vim32.dll!"
-msgstr "Nemô¾em nahra» vim32.dll!"
-
-msgid "VIM Error"
-msgstr "VIM Chyba"
-
-msgid "Could not fix up function pointers to the DLL!"
-msgstr "Nemô¾em opravi» odkazy funkcie na DLL!"
-
#, c-format
msgid "E372: Too many %%%c in format string"
msgstr "E372: Príli¹ mnoho %%%c vo formátovacom re»azci"
@@ -3620,7 +4256,8 @@
#, c-format
msgid "E375: Unsupported %%%c in format string"
-msgstr "E375: Nepodporovaná formátová ¹pecifikácia %%%c vo formátovacom re»azci"
+msgstr ""
+"E375: Nepodporovaná formátová ¹pecifikácia %%%c vo formátovacom re»azci"
#, c-format
msgid "E376: Invalid %%%c in format string prefix"
@@ -3636,12 +4273,12 @@
msgid "E379: Missing or empty directory name"
msgstr "E379: Chýbajúci alebo prázdny názov adresára"
-msgid "No more items"
-msgstr "®iadne ïal¹ie polo¾ky"
+msgid "E553: No more items"
+msgstr "E553: ®iadne ïal¹ie polo¾ky"
#, c-format
msgid "(%d of %d)%s%s: "
-msgstr "(%d/%d)%s%s: "
+msgstr "(%d z %d)%s%s: "
msgid " (line deleted)"
msgstr " (riadok vymazaný)"
@@ -3654,43 +4291,111 @@
#, c-format
msgid "error list %d of %d; %d errors"
-msgstr "zoznam chýb %d z %d; poèet chýb: %d"
+msgstr "zoznam chýb %d z %d; %d chýb"
msgid "E382: Cannot write, 'buftype' option is set"
msgstr "E382: Nedá sa ulo¾i», je nastavená voµba 'buftype'"
+msgid "E683: File name missing or invalid pattern"
+msgstr "E683: Chýba meno súboru alebo chybný vzor"
+
+msgid "Cannot open file \"%s\""
+msgstr "Nedá sa otvori» súbor \"%s\""
+
+msgid "E681: Buffer is not loaded"
+msgstr "E681: Buffer nie je naèítaný"
+
+#, c-format
+msgid "E369: invalid item in %s%%[]"
+msgstr "E369: chybná polo¾ka v %s%%[]"
+
msgid "E339: Pattern too long"
msgstr "E339: Vzor je príli¹ dlhý"
+msgid "E50: Too many \\z("
+msgstr "E50: Príli¹ mnoho \\z("
+
+#, c-format
+msgid "E51: Too many %s("
+msgstr "E51: Príli¹ mnoho %s("
+
+msgid "E52: Unmatched \\z("
+msgstr "E52: Nespárované \\z("
+
+#, c-format
+msgid "E53: Unmatched %s%%("
+msgstr "E53: Nespárované %s%%("
+
+#, c-format
+msgid "E54: Unmatched %s("
+msgstr "E54: Nespárované %s("
+
+#, c-format
+msgid "E55: Unmatched %s)"
+msgstr "E55: Nespárované %s)"
+
+#, c-format
+msgid "E59: invalid character after %s@"
+msgstr "E59: Neprípustný znak po %s@"
+
+#, c-format
+msgid "E60: Too many complex %s{...}s"
+msgstr "E60: Príli¹ komplexné %s{...}"
+
#, c-format
msgid "E61: Nested %s*"
-msgstr "E61: Vhniezdený %s*"
+msgstr "E61: Vnorený %s*"
#, c-format
msgid "E62: Nested %s%c"
-msgstr "E62: Vhniezdené %s%c"
+msgstr "E62: Vnorený %s%c"
+
+msgid "E63: invalid use of \\_"
+msgstr "E63: Chybne pou¾ité \\_"
#, c-format
msgid "E64: %s%c follows nothing"
msgstr "E64: %s%c niè nenasleduje"
+msgid "E65: Illegal back reference"
+msgstr "E65: Chybná spätná referencia"
+
+msgid "E66: \\z( not allowed here"
+msgstr "E66: \\z( tu nie je povolené"
+
+msgid "E67: \\z1 et al. not allowed here"
+msgstr "E67: \\z1 a spol. tu nie je povolené"
+
+msgid "E68: Invalid character after \\z"
+msgstr "E68: Neprípustný znak po \\z"
+
+#, c-format
+msgid "E69: Missing ] after %s%%["
+msgstr "E69: Chýbajúca ] po %s%%["
+
#, c-format
-msgid "Syntax error in %s{...}"
-msgstr "Chyba syntaxe v %s{...}"
+msgid "E70: Empty %s%%[]"
+msgstr "E70: Prázdny %s%%[]"
-msgid "E361: Crash intercepted; regexp too complex?"
-msgstr "E361: Zachytené preteèenie zásobníku: príli¹ zlo¾itý regulárny výraz?"
+#, c-format
+msgid "E678: Invalid character after %s%%[dxouU]"
+msgstr "E678: Neprípustný znak po %s%%[dxouU]"
-msgid "E363: pattern caused out-of-stack error"
-msgstr "E363: vzor spôsobil preteèenie zásobníku"
+#, c-format
+msgid "E71: Invalid character after %s%%"
+msgstr "E71: Neprípustný znak po %s%%"
+
+#, c-format
+msgid "E769: Missing ] after %s["
+msgstr "E769: Chýbajúca ] po %s["
+
+#, c-format
+msgid "E554: Syntax error in %s{...}"
+msgstr "E554: Chyba syntaxe v %s{...}"
msgid "External submatches:\n"
msgstr "Vnútorné podradené zhody:\n"
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld riadkov zahnutých "
-
msgid " VREPLACE"
msgstr " NAHRADI« VERTIKÁLNE"
@@ -3713,7 +4418,10 @@
msgstr " (nahradi» vertikálne)"
msgid " Hebrew"
-msgstr " hebrejský"
+msgstr " Hebrejský"
+
+msgid " Arabic"
+msgstr " Arabský"
msgid " (lang)"
msgstr " (jazyk)"
@@ -3721,30 +4429,30 @@
msgid " (paste)"
msgstr " (vlo¾i»)"
-msgid " SELECT"
-msgstr " ZHODY"
-
msgid " VISUAL"
msgstr " VIZUÁLNE"
-msgid " BLOCK"
-msgstr " BLOK"
+msgid " VISUAL LINE"
+msgstr " VIZUÁLNY RIADOK"
-msgid " LINE"
-msgstr " RIADOK"
+msgid " VISUAL BLOCK"
+msgstr " VIZUÁLNY BLOK"
+
+msgid " SELECT"
+msgstr " ZHODY"
+
+msgid " SELECT LINE"
+msgstr " OZNAÈ RIADOK"
+
+msgid " SELECT BLOCK"
+msgstr " OZNAÈ BLOK"
msgid "recording"
msgstr "nahrávam"
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "hµadanie dosiahlo zaèiatok, pokraèovanie od konca"
-
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "hµadanie dosiahlo koniec, pokraèovanie od zaèiatku"
-
#, c-format
msgid "E383: Invalid search string: %s"
-msgstr "E383: Neprístupný hµadaný re»azec: %s"
+msgstr "E383: Neprípustný hµadaný re»azec: %s"
#, c-format
msgid "E384: search hit TOP without match for: %s"
@@ -3795,9 +4503,300 @@
msgid "E389: Couldn't find pattern"
msgstr "E389: Nedá sa nájs» vzor"
+msgid "E759: Format error in spell file"
+msgstr "E759: Chyba formátovania v spell súbore (kontrola pravopisu)"
+
+msgid "E758: Truncated spell file"
+msgstr "E758: Odseknutý spell súbor (kontrola pravopisu)"
+
+#, c-format
+msgid "Trailing text in %s line %d: %s"
+msgstr "Prebytoèný text v %s na riadku %d: %s"
+
+#, c-format
+msgid "Affix name too long in %s line %d: %s"
+msgstr "Prípona príli¶ dlhá v %s riadok %d: %s"
+
+msgid "E761: Format error in affix file FOL, LOW or UPP"
+msgstr "E761: Chyba formátovania v súbore prípon FOL, LOW alebo UPP (NASLEDUJE, MALÉ alebo VE¥KÉ)"
+
+msgid "E762: Character in FOL, LOW or UPP is out of range"
+msgstr "E762: Znak v FOL, LOW alebo UPP (NASLEDUJE, MALÉ alebo VE¥KÉ) je mimo rozsah"
+
+msgid "Compressing word tree..."
+msgstr "Robím kompresiu stromu slov..."
+
+msgid "E756: Spell checking is not enabled"
+msgstr "E756: Kontrola pravopisu nie je zapnutá"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr "Varovanie: Nemo¾no nájs» zoznam slov \"%s.%s.spl\" alebo \"%s.ascii.spl\""
+
+#, c-format
+msgid "Reading spell file \"%s\""
+msgstr "Èítam slovníkový súbor \"%s\""
+
+msgid "E757: This does not look like a spell file"
+msgstr "E757: Toto sa nezdá by» slovníkovým súborom"
+
+msgid "E771: Old spell file, needs to be updated"
+msgstr "E771: Starý slovníkový súbor, potrebuje by» zaktualizovaný"
+
+msgid "E772: Spell file is for newer version of Vim"
+msgstr "E772: Slovníkový súbor je pre nov¹iu verziu Vim"
+
+msgid "E770: Unsupported section in spell file"
+msgstr "E770: Nepodporovaná sekcia v slovníkovom súbore"
+
+#, c-format
+msgid "Warning: region %s not supported"
+msgstr "Varovanie: región %s nie je podporovaný"
+
+#, c-format
+msgid "Reading affix file %s ..."
+msgstr "Naèítavam súbor s príponami %s ..."
+
+#, c-format
+msgid "Conversion failure for word in %s line %d: %s"
+msgstr "Konverzia slova zlyhala v %s riadok %d: %s"
+
+#, c-format
+msgid "Conversion in %s not supported: from %s to %s"
+msgstr "Konverzia v %s nie je podporovaná: z %s do %s"
+
+#, c-format
+msgid "Conversion in %s not supported"
+msgstr "Konverzia v %s nie je podporovaná"
+
+#, c-format
+msgid "Invalid value for FLAG in %s line %d: %s"
+msgstr "Neplatná hodnota pre príznak (FLAG) v %s riadok %d: %s"
+
+#, c-format
+msgid "FLAG after using flags in %s line %d: %s"
+msgstr "Príznak (FLAG) po pou¾ití príznakov v %s riadok %d: %s"
+
+#, c-format
+msgid "Character used for SLASH must be ASCII; in %s line %d: %s"
+msgstr "Znak pou¾itý pre SLASH musí by» ASCII; v %s riadok %d: %s"
+
+#, c-format
+msgid "Wrong COMPOUNDMAX value in %s line %d: %s"
+msgstr "Zlá hodnota COMPOUNDMAX v %s riadok %d: %s"
+
+#, c-format
+msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
+msgstr "Zlá hodnota COMPOUNDMIN v %s riadok %d: %s"
+
+#, c-format
+msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
+msgstr "Zlá hodnota COMPOUNDSYLMAX v %s riadok %d: %s"
+
+#, c-format
+msgid "Different combining flag in continued affix block in %s line %d: %s"
+msgstr "Rozdielna kombinácia príznakov v nasledujúcom bloku prípon v %s riadok %d: %s"
+
+#, c-format
+msgid "Duplicate affix in %s line %d: %s"
+msgstr "Duplicitná prípona v %s riadok %d: %s"
+
+#, c-format
+msgid ""
+"Affix also used for BAD/RAR/KEP/NEEDAFFIX/NEEDCOMPOUND in %s line %d: %s"
+msgstr ""
+"Prípona pou¾itá aj pre BAD/RAR/KEP/NEEDAFFIX/NEEDCOMPOUND in %s line %d: %s"
+
+#, c-format
+msgid "Expected Y or N in %s line %d: %s"
+msgstr "Oèakávane Y alebo N v %s riadok %d: %s"
+
+#, c-format
+msgid "Broken condition in %s line %d: %s"
+msgstr "Naru¹ená podmienka v %s riadok %d: %s"
+
+#, c-format
+msgid "Expected REP count in %s line %d"
+msgstr "Oèakávam poèet REP v %s riadok %d"
+
+#, c-format
+msgid "Expected MAP count in %s line %d"
+msgstr "Oèakávam poèet MAP v %s riadok %d"
+
+#, c-format
+msgid "Duplicate character in MAP in %s line %d"
+msgstr "Opakovaný znak v MAP v %s riadok %d"
+
+#, c-format
+msgid "Unrecognized or duplicate item in %s line %d: %s"
+msgstr "Nerozpoznaná alebo opakujúca sa polo¾ka v %s riadok %d: %s"
+
+#, c-format
+msgid "Missing FOL/LOW/UPP line in %s"
+msgstr "Chýbajúci riadok FOL/LOW/UPP v %s"
+
+msgid "COMPOUNDSYLMAX used without SYLLABLE"
+msgstr "COMPOUNDSYLMAX pou¾itý bez SYLLABLE"
+
+msgid "Too many postponed prefixes"
+msgstr "Príli¹ mnoho odlo¾ených prípon"
+
+msgid "Too many compound flags"
+msgstr "Príli¹ mnoho upravovacích príznakov"
+
+msgid "Too many posponed prefixes and/or compound flags"
+msgstr "Príli¹ mnoho odlo¾ených prípon a/alebo upravovacích príznakov"
+
+#, c-format
+msgid "Missing SOFO%s line in %s"
+msgstr "Chýba SOFO%s riadok v %s"
+
+#, c-format
+msgid "Both SAL and SOFO lines in %s"
+msgstr "SAL a SOFO riadky zároveò v %s"
+
+#, c-format
+msgid "Flag is not a number in %s line %d: %s"
+msgstr "Príznak nie je èíslo v %s na riadku %d: %s"
+
+#, c-format
+msgid "Illegal flag in %s line %d: %s"
+msgstr "Neprípustný príznak v %s riadok %d: %s"
+
+#, c-format
+msgid "%s value differs from what is used in another .aff file"
+msgstr "Hodnota %s sa odli¹uje od hodnoty pou¾itej v inom .aff súbore"
+
+#, c-format
+msgid "Reading dictionary file %s ..."
+msgstr "Naèítavam slovník %s ..."
+
+#, c-format
+msgid "E760: No word count in %s"
+msgstr "E760: Chýajúci poèet slov v %s"
+
+#, c-format
+msgid "line %6d, word %6d - %s"
+msgstr "riadok %6d, slovo %6d - %s"
+
+#, c-format
+msgid "Duplicate word in %s line %d: %s"
+msgstr "Opakujúce sa slovo v %s riadok %d: %s"
+
+#, c-format
+msgid "First duplicate word in %s line %d: %s"
+msgstr "Prvé duplicitné slovo v %s riadok %d: %s"
+
+#, c-format
+msgid "%d duplicate word(s) in %s"
+msgstr "%d duplicitné slovo(á) v %s"
+
+#, c-format
+msgid "Ignored %d word(s) with non-ASCII characters in %s"
+msgstr "Ignorovaných %d slov s nepísmennými znakmi v %s"
+
+#, c-format
+msgid "Reading word file %s ..."
+msgstr "Naèítavam súbor so slovami %s ..."
+
+#, c-format
+msgid "Duplicate /encoding= line ignored in %s line %d: %s"
+msgstr "Duplicitný riadok /encoding= v %s riadok %d ignorovaný: %s "
+
+#, c-format
+msgid "/encoding= line after word ignored in %s line %d: %s"
+msgstr "/encoding= riadok nasledujúci po slove v %s riadok %d ignorovaný: %s"
+
+#, c-format
+msgid "Duplicate /regions= line ignored in %s line %d: %s"
+msgstr "Duplicitný riadok /regions= v %s riadok %d ignorovaný: %s"
+
+#, c-format
+msgid "Too many regions in %s line %d: %s"
+msgstr "Príli¹ mnoho regiónov v %s riadok %d: %s"
+
+#, c-format
+msgid "/ line ignored in %s line %d: %s"
+msgstr "Riadok / v %s riadok %d ignorovaný: %s"
+
+#, c-format
+msgid "Invalid region nr in %s line %d: %s"
+msgstr "Pou¾íté chybné èíslo regiónu v %s riadok %d: %s"
+
+#, c-format
+msgid "Unrecognized flags in %s line %d: %s"
+msgstr "Nerozpoznaný príznak v %s riadok %d: %s"
+
+#, c-format
+msgid "Ignored %d words with non-ASCII characters"
+msgstr "Ignorovaných %d slov s nepísmennými znakmi"
+
+#, c-format
+msgid "Compressed %d of %d nodes; %d%% remaining"
+msgstr "Skomprimovaných %d z %d uzlov; %d%% zostáva"
+
+msgid "E751: Output file name must not have region name"
+msgstr "E751: Výstupné meno súboru nesmie ma» názov regiónu"
+
+msgid "E754: Only up to 8 regions supported"
+msgstr "E754: Podporovaných max. 8 regiónov"
+
+#, c-format
+msgid "E755: Invalid region in %s"
+msgstr "E755: Chybný región v %s"
+
+msgid "Warning: both compounding and NOBREAK specified"
+msgstr "Varovanie: ¹pecifikované spájanie a nezalamovanie"
+
+#, c-format
+msgid "Writing spell file %s ..."
+msgstr "Ukládám slovníkový súbor %s ..."
+
+msgid "Done!"
+msgstr "Hotovo!"
+
+#, c-format
+msgid "Estimated runtime memory use: %d bytes"
+msgstr "Veµkos» pou¾ívanej pamäte: %d bajtov"
+
+#, c-format
+msgid "E765: 'spellfile' does not have %ld entries"
+msgstr "E765: 'spellfile' nemá %ld polo¾iek"
+
+msgid "E763: Word characters differ between spell files"
+msgstr "E763: Znaky slov sa odli¹ujú medzi slovníkovými súbormi"
+
+msgid "Sorry, no suggestions"
+msgstr "Prepáète, ¾iadne návrhy"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "Prepáète, iba %ld návrhov"
+
+#. avoid more prompt
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "Zmeni» \"%.*s\" na:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
+msgid "E752: No previous spell replacement"
+msgstr "E752: ®iadny predchádzajúce nahradenie podµa slovníka"
+
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: Nenájdené: %s"
+
+#. This should have been checked when generating the .spl
+#. * file.
+msgid "E999: duplicate char in MAP entry"
+msgstr "E999: duplicitný znak v MAP polo¾ke"
+
#, c-format
msgid "E390: Illegal argument: %s"
-msgstr "E390: Neprístupný argument: %s"
+msgstr "E390: Neprípustný argument: %s"
#, c-format
msgid "E391: No such syntax cluster: %s"
@@ -3807,7 +4806,7 @@
msgstr "Pre tento buffer nie sú definované ¾iadne polo¾ky syntaxe"
msgid "syncing on C-style comments"
-msgstr "synchronizujem komentáre v C ¹týle"
+msgstr "synchronizujem podµa komentárov jazyka C"
msgid "no syncing"
msgstr "¾iadne synchronizácie"
@@ -3853,7 +4852,13 @@
msgstr "; zhoda "
msgid " line breaks"
-msgstr " riadkov"
+msgstr " zalomení riadkov"
+
+msgid "E395: contains argument not accepted here"
+msgstr "E395: obsahuje argumenty, ktoré tu nie sú povolené"
+
+msgid "E396: containedin argument not accepted here"
+msgstr "E396: obsahuje argumenty, ktoré tu nie sú povolené"
msgid "E393: group[t]here not accepted here"
msgstr "E393: group[t]here nesmie by» na tomto mieste"
@@ -3862,16 +4867,14 @@
msgid "E394: Didn't find region item for %s"
msgstr "E394: Pre %s chýba polo¾ka regiónu"
-msgid "E395: contains argument not accepted here"
-msgstr "E395: obsahuje argumenty, ktoré tu nie sú povolené"
-
-msgid "E396: containedin argument not accepted here"
-msgstr "E396: obsahuje argumenty, ktoré tu nie sú povolené"
-
msgid "E397: Filename required"
msgstr "E397: Vy¾adovaný názov súboru"
#, c-format
+msgid "E747: Missing ']': %s"
+msgstr "E747: Chýba ']': %s"
+
+#, c-format
msgid "E398: Missing '=': %s"
msgstr "E398: Chýba '=': %s"
@@ -3888,7 +4891,7 @@
#, c-format
msgid "E402: Garbage after pattern: %s"
-msgstr "E402: Chyba za vzorom %s"
+msgstr "E402: Chyba za vzorom: %s"
msgid "E403: syntax sync: line continuations pattern specified twice"
msgstr "E403: synchronizácia syntaxe: vzor pokraèovania riadkov zadaný dvakrát"
@@ -3899,7 +4902,7 @@
#, c-format
msgid "E405: Missing equal sign: %s"
-msgstr "E405: Chýba znamienko rovnása: %s"
+msgstr "E405: Chýba znamienko rovná sa: %s"
#, c-format
msgid "E406: Empty argument: %s"
@@ -3921,9 +4924,12 @@
msgid "E410: Invalid :syntax subcommand: %s"
msgstr "E410: Chybný podradený príkaz :syntax : %s "
+msgid "E679: recursive loop loading syncolor.vim"
+msgstr "E679: rekurzívna sluèka pri naèítavaní syncolor.vim"
+
#, c-format
msgid "E411: highlight group not found: %s"
-msgstr "E411: skupina zvíraznenia %s nebola nájdená"
+msgstr "E411: skupina zvýraznenia %s nebola nájdená"
#, c-format
msgid "E412: Not enough arguments: \":highlight link %s\""
@@ -3938,11 +4944,11 @@
#, c-format
msgid "E415: unexpected equal sign: %s"
-msgstr "E415: neoèakávané znamienko rovnása : %s"
+msgstr "E415: neoèakávané znamienko rovná sa: %s"
#, c-format
msgid "E416: missing equal sign: %s"
-msgstr "E416: chýba znamienko rovnása: %s"
+msgstr "E416: chýba znamienko rovná sa: %s"
#, c-format
msgid "E417: missing argument: %s"
@@ -3960,24 +4966,30 @@
#, c-format
msgid "E421: Color name or number not recognized: %s"
-msgstr "E421: Názov alebo èíslo farby %s nebolo rozpoznané"
+msgstr "E421: Názov alebo èíslo farby nebolo rozpoznané: %s"
#, c-format
msgid "E422: terminal code too long: %s"
-msgstr "E422: terminálový kód %s je príli¹ dlhý"
+msgstr "E422: terminálový kód je príli¹ dlhý: %s"
#, c-format
msgid "E423: Illegal argument: %s"
-msgstr "E423: Neprístupný argument: %s"
+msgstr "E423: Neprípustný argument: %s"
msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: Je pou¾ívané príli¹ velké mno¾stvo odli¹ných zvýrazòovacích vlastností"
+msgstr "E424: Pou¾ívaných príli¹ veµa odli¹ných zvýrazòovacích vlastností"
-msgid "at bottom of tag stack"
-msgstr "koniec zoznamu tagov"
+msgid "E669: Unprintable character in group name"
+msgstr "E669: Netlaèitelný znak v mene skupiny"
-msgid "at top of tag stack"
-msgstr "zaèiatok zoznamu tagov"
+msgid "W18: Invalid character in group name"
+msgstr "W18: Chybný znak v mene skupiny"
+
+msgid "E555: at bottom of tag stack"
+msgstr "E555: na konci zoznamu tagov"
+
+msgid "E556: at top of tag stack"
+msgstr "E556: na zaèiatku zoznamu tagov"
msgid "E425: Cannot go before first matching tag"
msgstr "E425: Nedá sa skoèi» pred prvý vyhovujúci tag"
@@ -3987,18 +4999,11 @@
msgstr "E426: tag %s nenájdený"
msgid " # pri kind tag"
-msgstr " # pri tag"
+msgstr " # pri typ tag"
msgid "file\n"
msgstr "súbor\n"
-#.
-#. * Ask to select a tag from the list.
-#. * When using ":silent" assume that <CR> was entered.
-#.
-msgid "Enter nr of choice (<CR> to abort): "
-msgstr "Zadajte èíslo (<CR> pre ukonèenie): "
-
msgid "E427: There is only one matching tag"
msgstr "E427: Vyhovuje iba jeden tag"
@@ -4012,7 +5017,7 @@
#. Give an indication of the number of matching tags
#, c-format
msgid "tag %d of %d%s"
-msgstr "tag %d z celkového poètu %d%s"
+msgstr "tag %d z %d%s"
msgid " or more"
msgstr " alebo viac"
@@ -4032,23 +5037,17 @@
"\n"
" # CIE¥ tag ©TART riadok v súbore/texte"
-msgid "Linear tag search"
-msgstr "Lineárne hµadanie tagu"
-
-msgid "Binary tag search"
-msgstr "Binárne hµadanie tagu"
-
#, c-format
msgid "Searching tags file %s"
msgstr "Prehµadávam súbor tagov %s"
#, c-format
msgid "E430: Tag file path truncated for %s\n"
-msgstr "E430: Súbor tagov %s bol orezaný\n"
+msgstr "E430: Cesta k súboru tagov %s bola orezaná\n"
#, c-format
msgid "E431: Format error in tags file \"%s\""
-msgstr "E431: Chyba formátu v súbore tagov \"%s\""
+msgstr "E431: Chyba formátovania v súbore tagov \"%s\""
#, c-format
msgid "Before byte %ld"
@@ -4074,21 +5073,21 @@
msgid "defaulting to '"
msgstr "nastavujem na '"
-msgid "Cannot open termcap file"
-msgstr "Nedá sa otvori» termcap súbor"
+msgid "E557: Cannot open termcap file"
+msgstr "E557: Nedá sa otvori» termcap súbor"
-msgid "Terminal entry not found in terminfo"
-msgstr "Terminfo neobsahuje polo¾ku pre tento terminál"
+msgid "E558: Terminal entry not found in terminfo"
+msgstr "E558: Terminfo neobsahuje polo¾ku pre tento terminál"
-msgid "Terminal entry not found in termcap"
-msgstr "Termcap neobsahuje polo¾ku pre tento terminál"
+msgid "E559: Terminal entry not found in termcap"
+msgstr "E559: Termcap neobsahuje polo¾ku pre tento terminál"
#, c-format
msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: Termcap neobsahuje polo¾ku pre \"%s\""
+msgstr "E436: Termcap neobsahuje polo¾ku \"%s\""
msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: Terminál musí ma» \"cm\" schopnos»"
+msgstr "E437: Terminál musí ma» schopnos» \"cm\" (schopnos» pohybu kurzora)"
#. Highlight title
msgid ""
@@ -4112,17 +5111,17 @@
msgstr "E438: u_undo: èísla riadkov sú chybné"
msgid "1 change"
-msgstr "poèet zmien: 1"
+msgstr "1 zmena"
#, c-format
msgid "%ld changes"
-msgstr "poèet zmien: %ld"
+msgstr "%ld zmien"
msgid "E439: undo list corrupt"
msgstr "E439: záznam o zmenách po¹kodený"
msgid "E440: undo line missing"
-msgstr "E440: chýba riadok spä»"
+msgstr "E440: chýba opravný riadok"
#. Only MS VC 4.1 and earlier can do Win32s
msgid ""
@@ -4140,7 +5139,7 @@
"32 bitová GUI verzia pre MS Windows"
msgid " in Win32s mode"
-msgstr " v Win32 re¾ime"
+msgstr " vo Win32 re¾ime"
msgid " with OLE support"
msgstr " s OLE podporou"
@@ -4259,62 +5258,71 @@
msgid "without GUI."
msgstr "bez grafického rozhrania."
+msgid "with GTK2-GNOME GUI."
+msgstr "s grafickým rozhraním GTK2-GNOME."
+
msgid "with GTK-GNOME GUI."
-msgstr "s rozhraním GTK-GNOME."
+msgstr "s grafickým rozhraním GTK-GNOME."
+
+msgid "with GTK2 GUI."
+msgstr "s grafickým rozhraním GTK2."
msgid "with GTK GUI."
-msgstr "s rozhraním GTK."
+msgstr "s grafickým rozhraním GTK."
msgid "with X11-Motif GUI."
-msgstr "s rozhraním X11-Motif."
+msgstr "s grafickým rozhraním X11-Motif."
+
+msgid "with X11-neXtaw GUI."
+msgstr "s grafickým rozhraním X11-neXtaw."
msgid "with X11-Athena GUI."
-msgstr "s rozhraním X11-Athena."
-
-msgid "with BeOS GUI."
-msgstr "s rozhraním BeOS."
+msgstr "s grafickým rozhraním X11-Athena."
msgid "with Photon GUI."
-msgstr "s rozhraním Photon."
+msgstr "s grafickým rozhraním Photon."
msgid "with GUI."
msgstr "s grafickým rozhraním."
msgid "with Carbon GUI."
-msgstr "s Carbon grafickým rozhraním."
+msgstr "s grafickým rozhraním Carbon."
msgid "with Cocoa GUI."
-msgstr "s Cocoa grafickým rozhraním."
+msgstr "s grafickým rozhraním Cocoa."
msgid "with (classic) GUI."
-msgstr "s (klasickým) grafickým rozhraním."
+msgstr "s klasickým grafickým rozhraním."
+
+msgid "with KDE GUI."
+msgstr "s grafickým rozhraním KDE."
msgid " Features included (+) or not (-):\n"
msgstr " Vlastnosti zahrnuté (+) a nezahrnuté (-):\n"
msgid " system vimrc file: \""
-msgstr " systémový vimrc súbor: \""
+msgstr " systémový vimrc súbor: \""
msgid " user vimrc file: \""
-msgstr " u¾ívateµský vimrc súbor: \""
+msgstr " u¾ívateµský vimrc súbor: \""
msgid " 2nd user vimrc file: \""
-msgstr " druhý u¾ívateµský vimrc súbor: \""
+msgstr " druhý u¾ívateµský vimrc súbor: \""
msgid " 3rd user vimrc file: \""
-msgstr " tretí u¾ívateµský vimrc súbor: \""
+msgstr " tretí u¾ívateµský vimrc súbor: \""
msgid " user exrc file: \""
-msgstr " u¾ívateµský exrc súbor: \""
+msgstr " u¾ívateµský exrc súbor: \""
msgid " 2nd user exrc file: \""
-msgstr " druhý u¾ívateµský exrc súbor: \""
+msgstr " druhý u¾ívateµský exrc súbor: \""
msgid " system gvimrc file: \""
msgstr " systémový gvimrc súbor: \""
msgid " user gvimrc file: \""
-msgstr " u¾ívateµský gvimrc súbor: \""
+msgstr " u¾ívateµský gvimrc súbor: \""
msgid "2nd user gvimrc file: \""
msgstr "druhý u¾ívateµský gvimrc súbor: \""
@@ -4323,10 +5331,10 @@
msgstr "tretí u¾ívateµský gvimrc súbor: \""
msgid " system menu file: \""
-msgstr " systémový súbor s ponukou: \""
+msgstr " systémový súbor s ponukou: \""
msgid " fall-back for $VIM: \""
-msgstr " implicitná hodnota $VIM:\""
+msgstr " implicitná hodnota $VIM:\""
msgid " f-b for $VIMRUNTIME: \""
msgstr " f-b pre $VIMRUNTIME: \""
@@ -4338,76 +5346,93 @@
msgstr "Prekladaè: "
msgid "Linking: "
-msgstr "Linkujem: "
+msgstr "Zlinkované: "
msgid " DEBUG BUILD"
msgstr " PODPORA LADENIA"
msgid "VIM - Vi IMproved"
-msgstr "VIM - Vi IMpreved"
+msgstr "VIM - Vi IMproved"
msgid "version "
msgstr "verzia "
msgid "by Bram Moolenaar et al."
-msgstr "Autor: Bram Moolenaar a ïal¹í"
+msgstr "od Brama Moolenaara a ïal¹ích"
msgid "Vim is open source and freely distributable"
-msgstr "Vim je voµne ¹íriteµný program"
+msgstr "Vim je voµne ¹íriteµný program s otvoreným kódom"
msgid "Help poor children in Uganda!"
msgstr "Pomô¾te chudobným de»om v Ugande!"
msgid "type :help iccf<Enter> for information "
-msgstr "podrobnej¹ie informácie získate pomocou :help iccf<Enter>"
+msgstr "zadajte :help iccf<Enter> pre informácie "
msgid "type :q<Enter> to exit "
-msgstr "zadajte :q<Enter> pre ukonèenie programu"
+msgstr "zadajte :q<Enter> pre ukonèenie programu "
msgid "type :help<Enter> or <F1> for on-line help"
-msgstr "zadajte :help<Enter> alebo <F1> pre pomocníka"
+msgstr "zadajte :help<Enter> alebo <F1> pre pomocníka "
-msgid "type :help version6<Enter> for version info"
-msgstr "zadajte :help version6<Enter> pre informácie o verzii"
+msgid "type :help version7<Enter> for version info"
+msgstr "zadajte :help version7<Enter> pre informácie o verzii"
msgid "Running in Vi compatible mode"
-msgstr "Be¾ím v re¾ime kompatibility s Vi"
+msgstr "Pracujem v re¾ime kompatibility s Vi"
msgid "type :set nocp<Enter> for Vim defaults"
-msgstr "zadajte :set nocp<Enter> pre implicitné nastavenie Vim"
+msgstr "zadajte :set nocp<Enter> pre implicitné nastavenie Vim"
msgid "type :help cp-default<Enter> for info on this"
msgstr "podrobnej¹ie informácie získate pomocou :help cp-default<Enter>"
msgid "menu Help->Orphans for information "
-msgstr "bli¾¹ie informácie v menu Pomocník->Samostatné"
+msgstr "bli¾¹ie informácie v ponuke Pomocník->Samostatné"
msgid "Running modeless, typed text is inserted"
-msgstr "Spú¹»am modeless, písaný text je vlo¾ený"
+msgstr "Spú¹»am v bezmódovom re¾ime, písaný text je vlo¾ený"
msgid "menu Edit->Global Settings->Toggle Insert Mode "
-msgstr "menu Úpravy->Globálne mo¾nosti->Prepnú» re¾im vlo¾enia "
+msgstr "ponuka Úpravy->Globálne mo¾nosti->Prepnú» re¾im vlo¾enia "
msgid " for two modes "
msgstr " pre dva re¾imy "
msgid "menu Edit->Global Settings->Toggle Vi Compatible"
-msgstr "menu Úpravy->Globálne mo¾nostt->Prepnú» Vi kompatibilný re¾ím"
+msgstr "ponuka Úpravy->Globálne mo¾nostt->Prepnú» Vi kompatibilný re¾im"
msgid " for Vim defaults "
-msgstr " pre predvolené vlastnosti Vim "
+msgstr " pre predvolené vlastnosti Vim "
+
+msgid "Sponsor Vim development!"
+msgstr "Zasponzorujte vývoj Vimu!"
+
+msgid "Become a registered Vim user!"
+msgstr "Staòte sa registrovaným u¾ívateµom Vimu!"
+
+msgid "type :help sponsor<Enter> for information "
+msgstr "zadajte :help sponsor<Enter> pre informácie "
+
+msgid "type :help register<Enter> for information "
+msgstr "zadajte :help register<Enter> pre informácie "
+
+msgid "menu Help->Sponsor/Register for information "
+msgstr "bli¾¹ie informácie v ponuke Pomocník->Sponzor/Registrácia"
msgid "WARNING: Windows 95/98/ME detected"
msgstr "VAROVANIE: detekované Windows 95/98/ME"
msgid "type :help windows95<Enter> for info on this"
-msgstr "zadajte :help windows95<Enter> pre podrobnej¹ie informácie"
+msgstr "zadajte :help windows95<Enter> pre podrobnej¹ie informácie"
msgid "E441: There is no preview window"
msgstr "E441: Nenájdené ¾iadne okno náhµadu"
msgid "E442: Can't split topleft and botright at the same time"
-msgstr "E442: Okno sa nedá rozdeli» zároveò topleft a botright"
+msgstr ""
+"E442: Okno sa nedá rozdeli» zároveò v móde 'vrchný-µavý' a 'spodný-"
+"pravý' ('topleft' a 'botright')"
msgid "E443: Cannot rotate when another window is split"
msgstr "E443: Nedá sa rotova», ak je iné okno rozdelené"
@@ -4416,7 +5441,7 @@
msgstr "E444: Posledné okno sa nedá zatvori»"
msgid "Already only one window"
-msgstr "U¾ existuje iba jedno okno"
+msgstr "Existuje u¾ iba jedno okno"
msgid "E445: Other window contains changes"
msgstr "E445: Iné okno obsahuje zmeny"
@@ -4426,26 +5451,39 @@
#, c-format
msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: Súbor \"%s\" sa nedá v cdpath nájs»"
+msgstr "E447: Súbor \"%s\" sa nedá nájs» v ceste"
+
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: Nepodarilo sa nahra» kni¾nicu %s"
+
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr "Prepáète, tento príkaz je vypnutý, Perl kni¾nica nemô¾e by» naèítaná."
+
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr "E299: Vykonanie kódu v jazyku Perl nie je mo¾né v bezpeènostnej schránke bez bezpeènostného modulu"
msgid "Edit with &multiple Vims"
-msgstr "Upravi» s viacnásobný&m Vimom"
+msgstr "Upravi» s viacerý&mi Vimmi"
msgid "Edit with single &Vim"
msgstr "Upravi» s jedným &Vimom"
+msgid "Diff with Vim"
+msgstr "Porovna» &Vimom"
+
msgid "Edit with &Vim"
msgstr "Upravi» s &Vimom"
#. Now concatenate
-msgid "Edit with existing Vim - &"
-msgstr "Upravi» s existujúcim Vimom - &"
+msgid "Edit with existing Vim - "
+msgstr "Upravi» s existujúcim Vimom - "
msgid "Edits the selected file(s) with Vim"
msgstr "Upravi» vybrané súbory s Vimom"
msgid "Error creating process: Check if gvim is in your path!"
-msgstr "Chyba vytváracieho procesu: Skontrolujte, èi je gvim vo va¹ej ceste!"
+msgstr "Chyba vytvárania procesu: Skontrolujte, èi je gvim vo va¹ej ceste!"
msgid "gvimext.dll error"
msgstr "chyba gvimext.dll"
@@ -4454,39 +5492,68 @@
msgstr "Príli¹ dlhá cesta!"
msgid "--No lines in buffer--"
-msgstr "--Buffer neobsahuje ¾iadny riadok--"
+msgstr "--Buffer neobsahuje ¾iadne riadky--"
#.
#. * The error messages that can be shared are included here.
#. * Excluded are errors that are only used once and debugging messages.
#.
-msgid "Command aborted"
-msgstr "Príkaz preru¹ený"
+msgid "E470: Command aborted"
+msgstr "E470: Príkaz preru¹ený"
-msgid "Argument required"
-msgstr "Je vy¾adovaný argument"
+msgid "E471: Argument required"
+msgstr "E471: Je vy¾adovaný argument"
msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: po \\ by malo nasledova» /. ? alebo &"
+msgstr "E10: po \\ by malo nasledova» /, ? alebo &"
msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
msgstr ""
-"E11: Chybný príkaz v okne príkazového riadku; <Enter> spustíte, CTRL-C "
-"vypnete"
+"E11: Chybný príkaz v okne príkazového riadku; <Enter> spú¹»a, CTRL-C ukonèuje"
msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
msgstr ""
"E12: Príkaz nie je z exrc/vimrc v aktuálnom adresári alebo pri hµadaní tagu "
"povolený."
+msgid "E171: Missing :endif"
+msgstr "E171: Chýba :endif"
+
+msgid "E600: Missing :endtry"
+msgstr "E600: Chýba :endtry"
+
+msgid "E170: Missing :endwhile"
+msgstr "E170: Chýba :endwhile"
+
+msgid "E170: Missing :endfor"
+msgstr "E170: Chýba :endfor"
+
+msgid "E588: :endwhile without :while"
+msgstr "E588: :endwhile bez zodpovedajúceho :while"
+
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor bez zodpovedajúceho :for"
+
msgid "E13: File exists (add ! to override)"
-msgstr "E13: Súbor existuje (pou¾ite ! pre vynútenie)"
+msgstr "E13: Súbor existuje (pou¾ite ! pre prepísanie)"
-msgid "Command failed"
-msgstr "Príkaz zlyhal"
+msgid "E472: Command failed"
+msgstr "E472: Príkaz zlyhal"
-msgid "Internal error"
-msgstr "Vnútorná chyba"
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: Neznáma sada písiem: %s"
+
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: Neznáme písmo: %s"
+
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: Písmo \"%s\" nemá pevnú ¹írku"
+
+msgid "E473: Internal error"
+msgstr "E473: Vnútorná chyba"
msgid "Interrupted"
msgstr "Preru¹ené"
@@ -4494,12 +5561,12 @@
msgid "E14: Invalid address"
msgstr "E14: Chybná adresa"
-msgid "Invalid argument"
-msgstr "Chybný argument"
+msgid "E474: Invalid argument"
+msgstr "E474: Chybný argument"
-#, c-format
-msgid "Invalid argument: %s"
-msgstr "Chybný argument: %s"
+#, c-format
+msgid "E475: Invalid argument: %s"
+msgstr "E475: Chybný argument: %s"
#, c-format
msgid "E15: Invalid expression: %s"
@@ -4508,15 +5575,20 @@
msgid "E16: Invalid range"
msgstr "E16: Chybný rozsah"
-msgid "Invalid command"
-msgstr "Chybný príkaz"
+msgid "E476: Invalid command"
+msgstr "E476: Chybný príkaz"
#, c-format
msgid "E17: \"%s\" is a directory"
msgstr "E17: \"%s\" je adresárom"
-msgid "E18: Unexpected characters before '='"
-msgstr "E18: Neoèekávané znaky pred '='"
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: Vyvolanie kni¾niènej funkcia zlyhalo pre \"%s()\""
+
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: Nepodarilo sa nahra» funkciu kni¾nice %s"
msgid "E19: Mark has invalid line number"
msgstr "E19: Znaèka má chybné èíslo riadku"
@@ -4525,10 +5597,10 @@
msgstr "E20: Znaèka nie je nastavená"
msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: Nedá sa meni», je nastavená voµba 'modifiable'"
+msgstr "E21: Nemo¾no robi» zmeny, voµba 'modifiable' je vypnutá"
msgid "E22: Scripts nested too deep"
-msgstr "E22: Skript vnorený príli¹ hlboko"
+msgstr "E22: Skripty vnorené príli¹ hlboko"
msgid "E23: No alternate file"
msgstr "E23: ®iadny alternatívny súbor"
@@ -4536,37 +5608,41 @@
msgid "E24: No such abbreviation"
msgstr "E24: Taká skratka neexistuje"
-msgid "No ! allowed"
-msgstr "! nie je povolené"
+msgid "E477: No ! allowed"
+msgstr "E477: ! nie je povolený"
msgid "E25: GUI cannot be used: Not enabled at compile time"
msgstr "E25: Nedá sa pou¾í» GUI: nebolo zapnuté pri preklade programu"
msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-msgstr "E26: Nedá sa pou¾í» hebrejský re¾im: nebol zapnutý pri preklade programu\n"
+msgstr ""
+"E26: Nedá sa pou¾í» hebrejský re¾im: nebol zapnutý pri preklade programu\n"
msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-msgstr "E27: Nedá sa pou¾í» farsi re¾im: nebol zapnutý pri preklade programu\n"
+msgstr "E27: Nedá sa pou¾í» farsi re¾im: nebol zapnutý pri preklade programu\n"
+
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: Nedá sa pou¾í» arabic re¾im: nebol zapnutý pri preklade programu\n"
#, c-format
msgid "E28: No such highlight group name: %s"
-msgstr "E28: Skupina zvíraznenia %s neexistuje"
+msgstr "E28: Skupina zvýraznenia %s neexistuje"
msgid "E29: No inserted text yet"
-msgstr "E29: Zatiaµ nie je ¾iadny vlo¾ený text"
+msgstr "E29: Zatiaµ nie je vlo¾ený ¾iaden text"
msgid "E30: No previous command line"
msgstr "E30: ®iadny predchádzajúci príkazový riadok"
msgid "E31: No such mapping"
-msgstr "E31: ®iadne také mapovanie"
+msgstr "E31: Mapovanie nenájdené"
-msgid "No match"
-msgstr "®iadna zhoda"
+msgid "E479: No match"
+msgstr "E479: ®iadna zhoda"
#, c-format
-msgid "No match: %s"
-msgstr "®iadna zhoda: %s"
+msgid "E480: No match: %s"
+msgstr "E480: ®iadna zhoda: %s"
msgid "E32: No file name"
msgstr "E32: ®iadny názov súboru"
@@ -4580,28 +5656,32 @@
msgid "E35: No previous regular expression"
msgstr "E35: ®iadny predchádzajúci regulárny výraz"
-msgid "No range allowed"
-msgstr "Rozsah nie je povolený"
+msgid "E481: No range allowed"
+msgstr "E481: Rozsah nie je povolený"
msgid "E36: Not enough room"
msgstr "E36: Nedostatok miesta"
#, c-format
-msgid "Can't create file %s"
-msgstr "Nedá sa vytvori» súbor %s"
-
-msgid "Can't get temp file name"
-msgstr "Nedá sa získa» názov doèasného súboru"
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: ¾iaden registrovaný server pomenovaný \"%s\""
#, c-format
-msgid "Can't open file %s"
-msgstr "Nedá sa otvori» súbor %s"
+msgid "E482: Can't create file %s"
+msgstr "E482: Nedá sa vytvori» súbor %s"
+
+msgid "E483: Can't get temp file name"
+msgstr "E483: Nedá sa získa» názov doèasného súboru"
#, c-format
-msgid "Can't read file %s"
-msgstr "Nedá sa èíta» súbor %s"
+msgid "E484: Can't open file %s"
+msgstr "E484: Nedá sa otvori» súbor %s"
-msgid "E37: No write since last change (use ! to override)"
+#, c-format
+msgid "E485: Can't read file %s"
+msgstr "E485: Nedá sa èíta» súbor %s"
+
+msgid "E37: No write since last change (add ! to override)"
msgstr "E37: Neulo¾ené zmeny (pou¾ite ! pre vynútenie)"
msgid "E38: Null argument"
@@ -4614,6 +5694,9 @@
msgid "E40: Can't open errorfile %s"
msgstr "E40: Nedá sa otvori» chybový súbor %s"
+msgid "E233: cannot open display"
+msgstr "E233: nedá sa otvori» displej"
+
msgid "E41: Out of memory!"
msgstr "E41: Nedostatok pamäti!"
@@ -4621,11 +5704,14 @@
msgstr "Vzor nenájdený"
#, c-format
-msgid "Pattern not found: %s"
-msgstr "Vzor nenájdený: %s"
+msgid "E486: Pattern not found: %s"
+msgstr "E486: Vzor nenájdený: %s"
-msgid "Argument must be positive"
-msgstr "Argument musí by» kladný"
+msgid "E487: Argument must be positive"
+msgstr "E487: Argument musí by» kladný"
+
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: ®iadny predchádzajúci adresár"
msgid "E42: No Errors"
msgstr "E42: ®iadne chyby"
@@ -4636,25 +5722,40 @@
msgid "E44: Corrupted regexp program"
msgstr "E44: Po¹kodený regexp program"
-msgid "E45: 'readonly' option is set (use ! to override)"
-msgstr "E45: nastavená voµba 'iba_pre_èítanie' (pou¾ite ! pre vynútenie)"
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr ""
+"E45: voµba 'readonly' (iba na èítanie) je nastavená (pou¾ite ! pre "
+"prepísanie)"
#, c-format
-msgid "E46: Cannot set read-only variable \"%s\""
-msgstr "E46: Nedá sa nastavi» premenná iba_pre_èítanie \"%s\""
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: Nedá sa nastavi» premenná len na èítanie \"%s\""
+
+#, c-format
+msgid "E46: Cannot set variable in the sandbox: \"%s\""
+msgstr "E46: Nedá sa nastavi» premenná v bezpeènostnej schránke: \"%s\""
msgid "E47: Error while reading errorfile"
msgstr "E47: Chyba pri èítaní chybového súboru"
msgid "E48: Not allowed in sandbox"
-msgstr "E48: Nie je v bezpeènostnej schránke povolené"
+msgstr "E48: Nie je dovolené v bezpeènostnej schránke"
+
+msgid "E523: Not allowed here"
+msgstr "E523: Nie je na povolené na tomto mieste"
+
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: Nastavovanie re¾imu obrazovky nie je podporované"
msgid "E49: Invalid scroll size"
-msgstr "E49: Chybná hodnota premennej 'scroll'"
+msgstr "E49: Chybná hodnota veµkosti rolovania"
msgid "E91: 'shell' option is empty"
msgstr "E91: voµba 'shell' je prázdna"
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: Chyba -- nedájú sa preèíta» oznaèovacie dáta!"
+
msgid "E72: Close error on swap file"
msgstr "E72: Chyba pri uzatváraní odkladacieho súboru"
@@ -4673,14 +5774,22 @@
msgid "E77: Too many file names"
msgstr "E77: Príli¹ mnoho názvov súborov"
-msgid "Trailing characters"
-msgstr "Nadbytoèné znaky na konci"
+msgid "E488: Trailing characters"
+msgstr "E488: Nadbytoèné znaky na konci"
msgid "E78: Unknown mark"
msgstr "E78: Neznáma znaèka"
msgid "E79: Cannot expand wildcards"
-msgstr "E79: Nedá sa expandova» ¾olíkové znaky (wildcards)"
+msgstr "E79: Nemo¾no expandova» ¾olíkové znaky (wildcards)"
+
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr ""
+"E591: hodnota voµby 'winheight' (vý¹ka okna) nesmie by» men¹ia ne¾ hodnota voµby 'winminheight' (minimálna vý¹ka okna)"
+
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr ""
+"E592: hodnota voµby 'winwidth' (¹írka okna) nesmie by» men¹ia ne¾ hodnota volµy 'winminwidth' (minimálna ¹írka okna)"
msgid "E80: Error while writing"
msgstr "E80: Chyba pri ukladaní"
@@ -4694,3 +5803,35 @@
msgid "E449: Invalid expression received"
msgstr "E449: Bol prijatý chybný výraz"
+msgid "E463: Region is guarded, cannot modify"
+msgstr "E463: Región je uzamknutý, nemo¾no modifikova»"
+
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans nepovoµuje zmeny v súboroch len na èítanie"
+
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: Vnútorná chyba: %s"
+
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: vzor pou¾íva viac pamäte ako 'maxmempattern'"
+
+msgid "E749: empty buffer"
+msgstr "E749: prázdny buffer"
+
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: Neprípustný hµadaný re»azec alebo oddeµovaè"
+
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: Súbor je naèítaný v inom buffere"
+
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: Voµba \"%s\" nie je nastavená"
+
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "hµadanie dosiahlo zaèiatok, pokraèovanie od konca"
+
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "hµadanie dosiahlo koniec, pokraèovanie od zaèiatku"
+
diff --git a/src/search.c b/src/search.c
index f4e8f61..85689fc 100644
--- a/src/search.c
+++ b/src/search.c
@@ -3550,7 +3550,7 @@
{
if (*p_sel == 'e')
++curwin->w_cursor.col;
- if (sol)
+ if (sol && gchar_cursor() != NUL)
inc(&curwin->w_cursor); /* include the line break */
VIsual = start_pos;
VIsual_mode = 'v';
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 14778fc..06c4173 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -47,7 +47,7 @@
-rm -rf X* viminfo
.in.out:
- -rm -rf $*.failed test.ok X* viminfo
+ -rm -rf $*.failed test.ok test.out X* viminfo
cp $*.ok test.ok
# Sleep a moment to avoid that the xterm title is messed up
@-sleep .2
diff --git a/src/testdir/test51.in b/src/testdir/test51.in
index 49c88ec..b4f45d1 100644
--- a/src/testdir/test51.in
+++ b/src/testdir/test51.in
@@ -10,7 +10,7 @@
:hi NewGroup term=bold cterm=italic ctermfg=DarkBlue ctermbg=Grey gui= guifg=#00ff00 guibg=Cyan
:hi Group2 term= cterm=
:hi Group3 term=underline cterm=bold
-:redir >test.out
+:redir! >test.out
:hi NewGroup
:hi Group2
:hi Group3
diff --git a/src/vim.h b/src/vim.h
index d00f844..16dc879 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -1274,6 +1274,10 @@
# define O_EXTRA 0
#endif
+#ifndef O_NOFOLLOW
+# define O_NOFOLLOW 0
+#endif
+
#ifndef W_OK
# define W_OK 2 /* for systems that don't have W_OK in unistd.h */
#endif
