diff options
73 files changed, 1337 insertions, 3180 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 65e4bbd672..7fdbad8fca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -257,11 +257,10 @@ if(HAS_DIAG_COLOR_FLAG) add_definitions(-fdiagnostics-color=auto) endif() -option( - TRAVIS_CI_BUILD "Travis CI build. Extra compilation flags will be set." OFF) +option(TRAVIS_CI_BUILD "Travis/QuickBuild CI. Extra flags will be set." OFF) if(TRAVIS_CI_BUILD) - message(STATUS "Travis CI build enabled.") + message(STATUS "Travis/QuickBuild CI build enabled.") add_definitions(-Werror) if(DEFINED ENV{BUILD_32BIT}) # Get some test coverage for unsigned char @@ -342,8 +341,8 @@ if((CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN) AND NOT CMAKE_C_COMPILER_ID MA message(FATAL_ERROR "Sanitizers are only supported for Clang.") endif() -if(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") - message(STATUS "detected OpenBSD; disabled jemalloc. #5318") +if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD|FreeBSD") + message(STATUS "detected OpenBSD/FreeBSD; disabled jemalloc. #5318") option(ENABLE_JEMALLOC "enable jemalloc" OFF) else() option(ENABLE_JEMALLOC "enable jemalloc" ON) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 54bed1e72e..f7389ece75 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -90,6 +90,15 @@ Each pull request must pass the automated builds ([travis CI] and [quickbuild]). a commit that contains only style changes. - [How to investigate QuickBuild failures](https://github.com/neovim/neovim/pull/4718#issuecomment-217631350) +QuickBuild uses this invocation: + + mkdir -p build/${params.get("buildType")} \ + && cd build/${params.get("buildType")} \ + && cmake -G "Unix Makefiles" -DBUSTED_OUTPUT_TYPE=TAP -DCMAKE_BUILD_TYPE=${params.get("buildType")} + -DTRAVIS_CI_BUILD=ON ../.. && ${node.getAttribute("make", "make")} + VERBOSE=1 nvim unittest-prereqs functionaltest-prereqs + + ### Coverity [Coverity](https://scan.coverity.com/projects/neovim-neovim) runs against the diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index cced1a8d04..69498dc1a1 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -100,6 +100,20 @@ add_custom_target( ${GENERATED_PACKAGE_TAGS} ) +# Optional targets for nvim.desktop file and icon. +find_program(XDG_MENU_PRG xdg-desktop-menu) +find_program(XDG_ICON_PRG xdg-icon-resource) +if(XDG_MENU_PRG) + add_custom_target(desktop-file + COMMAND xdg-desktop-menu install --novendor ${PROJECT_SOURCE_DIR}/runtime/nvim.desktop) + # add_dependencies(runtime desktop-file) +endif() +if(XDG_ICON_PRG) + add_custom_target(desktop-icon + COMMAND xdg-icon-resource install --novendor --size 128 ${PROJECT_SOURCE_DIR}/runtime/nvim.png) + # add_dependencies(runtime desktop-icon) +endif() + # CMake is painful here. It will create the destination using the user's # current umask, and we don't want that. And we don't just want to install # the target directory, as it will mess with existing permissions. So this diff --git a/runtime/autoload/man.vim b/runtime/autoload/man.vim index 251e6eee41..a6be00c0a9 100644 --- a/runtime/autoload/man.vim +++ b/runtime/autoload/man.vim @@ -39,7 +39,6 @@ function! man#open_page(count, count1, mods, ...) abort let sect = string(a:count) endif let [sect, name, path] = s:verify_exists(sect, name) - let page = s:get_page(path) catch call s:error(v:exception) return @@ -52,6 +51,15 @@ function! man#open_page(count, count1, mods, ...) abort else noautocmd execute 'silent' a:mods 'split' fnameescape(bufname) endif + + try + let page = s:get_page(path) + catch + close + call s:error(v:exception) + return + endtry + let b:man_sect = sect call s:put_page(page) endfunction @@ -125,8 +133,8 @@ function! s:put_page(page) abort setlocal noreadonly silent keepjumps %delete _ silent put =a:page - " Remove all backspaced characters. - execute 'silent keeppatterns keepjumps %substitute,.\b,,e'.(&gdefault?'':'g') + " Remove all backspaced/escape characters. + execute 'silent keeppatterns keepjumps %substitute,.\b\|\e\[\d\+m,,e'.(&gdefault?'':'g') while getline(1) =~# '^\s*$' silent keepjumps 1delete _ endwhile @@ -311,8 +319,8 @@ function! s:format_candidate(path, psect) abort endfunction function! man#init_pager() abort - " Remove all backspaced characters. - execute 'silent keeppatterns keepjumps %substitute,.\b,,e'.(&gdefault?'':'g') + " Remove all backspaced/escape characters. + execute 'silent keeppatterns keepjumps %substitute,.\b\|\e\[\d\+m,,e'.(&gdefault?'':'g') if getline(1) =~# '^\s*$' silent keepjumps 1delete _ else diff --git a/runtime/autoload/provider/clipboard.vim b/runtime/autoload/provider/clipboard.vim index 36232b99db..1bcc1dea74 100644 --- a/runtime/autoload/provider/clipboard.vim +++ b/runtime/autoload/provider/clipboard.vim @@ -78,6 +78,12 @@ function! provider#clipboard#Executable() abort let s:copy['*'] = s:copy['+'] let s:paste['*'] = s:paste['+'] return 'doitclient' + elseif executable('win32yank') + let s:copy['+'] = 'win32yank -i --crlf' + let s:paste['+'] = 'win32yank -o --lf' + let s:copy['*'] = s:copy['+'] + let s:paste['*'] = s:paste['+'] + return 'win32yank' endif let s:err = 'clipboard: No clipboard tool available. See :help clipboard' diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 69c8d0285a..9aa60657e0 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -784,8 +784,16 @@ equal" and "is" can be used. This compares the key/values of the |Dictionary| recursively. Ignoring case means case is ignored when comparing item values. *E694* -A |Funcref| can only be compared with a |Funcref| and only "equal" and "not -equal" can be used. Case is never ignored. +A |Funcref| can only be compared with a |Funcref| and only "equal", "not +equal", "is" and "isnot" can be used. Case is never ignored. Whether +arguments or a Dictionary are bound (with a partial) matters. The +Dictionaries must also be equal (or the same, in case of "is") and the +arguments must be equal (or the same). + +To compare Funcrefs to see if they refer to the same function, ignoring bound +Dictionary and arguments, use |get()| to get the function name: > + if get(Part1, 'name') == get(Part2, 'name') + " Part1 and Part2 refer to the same function When using "is" or "isnot" with a |List| or a |Dictionary| this checks if the expressions are referring to the same |List| or |Dictionary| instance. A copy @@ -2109,7 +2117,7 @@ remote_peek({serverid} [, {retvar}]) remote_read({serverid}) String read reply string remote_send({server}, {string} [, {idvar}]) String send key sequence -remove({list}, {idx} [, {end}]) any remove items {idx}-{end} from {list} +remove({list}, {idx} [, {end}]) any remove items {idx}-{end} from {list} remove({dict}, {key}) any remove entry {key} from {dict} rename({from}, {to}) Number rename (move) file from {from} to {to} repeat({expr}, {count}) String repeat {expr} {count} times @@ -2201,7 +2209,7 @@ synconcealed({lnum}, {col}) List info about concealing synstack({lnum}, {col}) List stack of syntax IDs at {lnum} and {col} system({cmd} [, {input}]) String output of shell command/filter {cmd} systemlist({cmd} [, {input}]) List output of shell command/filter {cmd} -tabpagebuflist([{arg}]) List list of buffer numbers in tab page +tabpagebuflist([{arg}]) List list of buffer numbers in tab page tabpagenr([{arg}]) Number number of current or last tab page tabpagewinnr({tabarg}[, {arg}]) Number number of current window in tab page @@ -3087,7 +3095,10 @@ execute({command} [, {silent}]) *execute()* The default is 'silent'. Note that with "silent!", unlike `:redir`, error messages are dropped. - This function is not available in the |sandbox|. + To get a list of lines use |split()| on the result: > + split(execute('args'), "\n") + +< This function is not available in the |sandbox|. Note: If nested, an outer execute() will not observe output of the inner calls. Note: Text attributes (highlights) are not captured. diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt index 336d9681ed..d15815191e 100644 --- a/runtime/doc/filetype.txt +++ b/runtime/doc/filetype.txt @@ -1,4 +1,4 @@ -*filetype.txt* For Vim version 7.4. Last change: 2015 Dec 06 +*filetype.txt* For Vim version 7.4. Last change: 2016 Jun 20 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt index ca341af200..ad1611133a 100644 --- a/runtime/doc/helphelp.txt +++ b/runtime/doc/helphelp.txt @@ -185,7 +185,7 @@ command: > < *:helpt* *:helptags* - *E154* *E150* *E151* *E152* *E153* *E670* + *E154* *E150* *E151* *E152* *E153* *E670* *E856* :helpt[ags] [++t] {dir} Generate the help tags file(s) for directory {dir}. When {dir} is ALL then all "doc" directories in diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt index 6e96d9b816..496ccbc703 100644 --- a/runtime/doc/indent.txt +++ b/runtime/doc/indent.txt @@ -810,7 +810,7 @@ PHP indenting can be altered in several ways by modifying the values of some global variables: *php-comment* *PHP_autoformatcomment* -To not enable auto-formating of comments by default (if you want to use your +To not enable auto-formatting of comments by default (if you want to use your own 'formatoptions'): > :let g:PHP_autoformatcomment = 0 diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index 991ecf8fb2..53b152dc06 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -1,4 +1,4 @@ -*map.txt* For Vim version 7.4. Last change: 2016 Jun 10 +*map.txt* For Vim version 7.4. Last change: 2016 Jul 06 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1268,6 +1268,7 @@ completion can be enabled: -complete=mapping mapping name -complete=menu menus -complete=option options + -complete=packadd optional package |pack-add| names -complete=shellcmd Shell command -complete=sign |:sign| suboptions -complete=syntax syntax file names |'syntax'| diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index d332e0053a..97d56af369 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1238,8 +1238,8 @@ A jump table for the options with a short description can be found at |Q_op|. Only non-printable keys are allowed. The key can be specified as a single character, but it is difficult to type. The preferred way is to use the <> notation. Examples: > - :set cedit=<C-Y> - :set cedit=<Esc> + :exe "set cedit=\<C-Y>" + :exe "set cedit=\<Esc>" < |Nvi| also has this option, but it only uses the first character. See |cmdwin|. @@ -5200,10 +5200,10 @@ A jump table for the options with a short description can be found at |Q_op|. has been used since the last search command. *shada-n* n Name of the shada file. The name must immediately follow - the 'n'. Must be the last one! If the "-i" argument was - given when starting Vim, that file name overrides the one - given here with 'shada'. Environment variables are expanded - when opening the file, not when setting the option. + the 'n'. Must be at the end of the option! If the "-i" + argument was given when starting Vim, that file name overrides + the one given here with 'shada'. Environment variables are + expanded when opening the file, not when setting the option. *shada-r* r Removable media. The argument is a string (up to the next ','). This parameter can be given several times. Each @@ -7074,7 +7074,7 @@ A jump table for the options with a short description can be found at |Q_op|. *'writedelay'* *'wd'* 'writedelay' 'wd' number (default 0) global - The number of microseconds to wait for each character sent to the + The number of milliseconds to wait for each character sent to the screen. When non-zero, characters are sent to the terminal one by one. For debugging purposes. diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index e94723f337..0b7907e364 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -30,10 +30,14 @@ positions in files. For example, |:vimgrep| finds pattern matches. You can use the positions in a script with the |getqflist()| function. Thus you can do a lot more than the edit/compile/fix cycle! -You should save your compiler's error messages to a file and start vim with -"vim -q filename". An easy way to do this is with the |:make| command (see -below). The 'errorformat' option should be set to match the error messages -from your compiler (see |errorformat| below). +If you have the error messages in a file you can start Vim with: > + vim -q filename + +From inside Vim an easy way to run a command and handle the output is with the +|:make| command (see below). + +The 'errorformat' option should be set to match the error messages from your +compiler (see |errorformat| below). *location-list* *E776* A location list is similar to a quickfix list and contains a list of positions @@ -42,8 +46,8 @@ have a separate location list. A location list can be associated with only one window. The location list is independent of the quickfix list. When a window with a location list is split, the new window gets a copy of the -location list. When there are no references to a location list, the location -list is destroyed. +location list. When there are no longer any references to a location list, +the location list is destroyed. The following quickfix commands can be used. The location list commands are similar to the quickfix commands, replacing the 'c' prefix in the quickfix diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index 2b5ed33f06..a7644fab84 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -813,6 +813,7 @@ Short explanation of each option: *option-list* 'printmbcharset' 'pmbcs' CJK character set to be used for :hardcopy 'printmbfont' 'pmbfn' font names to be used for CJK output of :hardcopy 'printoptions' 'popt' controls the format of :hardcopy output +'prompt' 'prompt' enable prompt in Ex mode 'pumheight' 'ph' maximum height of the popup menu 'pythondll' name of the Python 2 dynamic library 'pythonthreedll' name of the Python 3 dynamic library diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index b58b3c7853..9284aaea58 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1,4 +1,4 @@ -*starting.txt* For Vim version 7.4. Last change: 2016 Jun 12 +*starting.txt* For Vim version 7.4. Last change: 2016 Jul 03 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt index b0e5386224..191b0871f4 100644 --- a/runtime/doc/usr_41.txt +++ b/runtime/doc/usr_41.txt @@ -611,6 +611,7 @@ String manipulation: *string-functions* byteidxcomp() like byteidx() but count composing characters repeat() repeat a string multiple times eval() evaluate a string expression + execute() execute an Ex command and get the output List manipulation: *list-functions* get() get an item without error for wrong index @@ -944,12 +945,13 @@ Various: *various-functions* shiftwidth() effective value of 'shiftwidth' + wordcount() get byte/word/char count of buffer + taglist() get list of matching tags tagfiles() get a list of tags files py3eval() evaluate Python expression (|+python3|) pyeval() evaluate Python expression (|+python|) - wordcount() get byte/word/char count of buffer ============================================================================== *41.7* Defining a function diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index 3c1472446d..7d08a6f32a 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -1,4 +1,4 @@ -*various.txt* For Vim version 7.4. Last change: 2016 Mar 20 +*various.txt* For Vim version 7.4. Last change: 2016 Jul 09 VIM REFERENCE MANUAL by Bram Moolenaar @@ -416,9 +416,12 @@ m *+xpm_w32* Win32 GUI only: pixmap support |w32-xpm-support| shown on the screen. When [!] is included, an existing file is overwritten. When [!] is omitted, and {file} exists, this command fails. + Only one ":redir" can be active at a time. Calls to ":redir" will close any active redirection before - starting redirection to the new target. + starting redirection to the new target. For recursive + use check out |execute()|. + To stop the messages and commands from being echoed to the screen, put the commands in a function and call it with ":silent call Function()". @@ -456,6 +459,8 @@ m *+xpm_w32* Win32 GUI only: pixmap support |w32-xpm-support| redirection starts, if the variable is removed or locked or the variable type is changed, then further command output messages will cause errors. + To get the output of one command the |execute()| + function can be used. :redi[r] =>> {var} Append messages to an existing variable. Only string variables can be used. diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index ae0bd5a867..20002c1118 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -47,7 +47,6 @@ these differences. - 'langnoremap' is set by default - 'laststatus' defaults to 2 (statusline is always shown) - 'listchars' defaults to "tab:> ,trail:-,nbsp:+" -- 'mouse' defaults to "a" - 'nocompatible' is always set - 'nrformats' defaults to "bin,hex" - 'sessionoptions' doesn't include "options" diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 93886d5379..24587c56dc 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1015,7 +1015,7 @@ au BufNewFile,BufRead *.jgr setf jgraph au BufNewFile,BufRead *.jov,*.j73,*.jovial setf jovial " JSON -au BufNewFile,BufRead *.json,*.jsonp setf json +au BufNewFile,BufRead *.json,*.jsonp,*.webmanifest setf json " Kixtart au BufNewFile,BufRead *.kix setf kix diff --git a/runtime/ftplugin/python.vim b/runtime/ftplugin/python.vim index 9e2c5a763e..df5dab8afc 100644 --- a/runtime/ftplugin/python.vim +++ b/runtime/ftplugin/python.vim @@ -2,7 +2,7 @@ " Language: python " Maintainer: James Sully <sullyj3@gmail.com> " Previous Maintainer: Johannes Zellner <johannes@zellner.org> -" Last Change: Fri, 10 June 2016 +" Last Change: Wed, 29 June 2016 " https://github.com/sullyj3/vim-ftplugin-python if exists("b:did_ftplugin") | finish | endif @@ -22,28 +22,38 @@ setlocal omnifunc=pythoncomplete#Complete set wildignore+=*.pyc -nnoremap <silent> <buffer> ]] :call <SID>Python_jump('/^\(class\\|def\)\>')<cr> -nnoremap <silent> <buffer> [[ :call <SID>Python_jump('?^\(class\\|def\)\>')<cr> -nnoremap <silent> <buffer> ]m :call <SID>Python_jump('/^\s*\(class\\|def\)\>')<cr> -nnoremap <silent> <buffer> [m :call <SID>Python_jump('?^\s*\(class\\|def\)\>')<cr> +nnoremap <silent> <buffer> ]] :call <SID>Python_jump('n', '\v%$\|^(class\|def)>', 'W')<cr> +nnoremap <silent> <buffer> [[ :call <SID>Python_jump('n', '\v^(class\|def)>', 'Wb')<cr> +nnoremap <silent> <buffer> ]m :call <SID>Python_jump('n', '\v%$\|^\s*(class\|def)>', 'W')<cr> +nnoremap <silent> <buffer> [m :call <SID>Python_jump('n', '\v^\s*(class\|def)>', 'Wb')<cr> + +xnoremap <silent> <buffer> ]] :call <SID>Python_jump('x', '\v%$\|^(class\|def)>', 'W')<cr> +xnoremap <silent> <buffer> [[ :call <SID>Python_jump('x', '\v^(class\|def)>', 'Wb')<cr> +xnoremap <silent> <buffer> ]m :call <SID>Python_jump('x', '\v%$\|^\s*(class\|def)>', 'W')<cr> +xnoremap <silent> <buffer> [m :call <SID>Python_jump('x', '\v^\s*(class\|def)>', 'Wb')<cr> if !exists('*<SID>Python_jump') - fun! <SID>Python_jump(motion) range + fun! <SID>Python_jump(mode, motion, flags) range + if a:mode == 'x' + normal! gv + endif + + normal! 0 + let cnt = v:count1 - let save = @/ " save last search pattern mark ' while cnt > 0 - silent! exe a:motion - let cnt = cnt - 1 + call search(a:motion, a:flags) + let cnt = cnt - 1 endwhile - call histdel('/', -1) - let @/ = save " restore last search pattern + + normal! ^ endfun endif if has("browsefilter") && !exists("b:browsefilter") let b:browsefilter = "Python Files (*.py)\t*.py\n" . - \ "All Files (*.*)\t*.*\n" + \ "All Files (*.*)\t*.*\n" endif " As suggested by PEP8. diff --git a/runtime/indent/sh.vim b/runtime/indent/sh.vim index d05bb3770f..aca110f504 100644 --- a/runtime/indent/sh.vim +++ b/runtime/indent/sh.vim @@ -3,9 +3,15 @@ " Maintainer: Christian Brabandt <cb@256bit.org> " Previous Maintainer: Peter Aronoff <telemachus@arpinum.org> " Original Author: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2016-02-15 +" Latest Revision: 2016-06-27 " License: Vim (see :h license) " Repository: https://github.com/chrisbra/vim-sh-indent +" Changelog: +" 20160627: - detect heredocs correctly +" 20160213: - detect function definition correctly +" 20160202: - use shiftwidth() function +" 20151215: - set b:undo_indent variable +" 20150728: - add foreach detection for zsh if exists("b:did_indent") finish @@ -102,6 +108,8 @@ function! GetShIndent() endif elseif s:is_case_break(line) let ind -= s:indent_value('case-breaks') + elseif s:is_here_doc(line) + let ind = 0 endif return ind @@ -160,6 +168,14 @@ function! s:is_case_break(line) return a:line =~ '^\s*;[;&]' endfunction +function! s:is_here_doc(line) + if a:line =~ '^\w\+$' + let here_pat = '<<-\?'. s:escape(a:line). '\$' + return search(here_pat, 'bnW') > 0 + endif + return 0 +endfunction + function! s:is_case_ended(line) return s:is_case_break(a:line) || a:line =~ ';[;&]\s*\%(#.*\)\=$' endfunction @@ -172,5 +188,9 @@ function! s:is_case_empty(line) endif endfunction +function! s:escape(pattern) + return '\V'. escape(a:pattern, '\\') +endfunction + let &cpo = s:cpo_save unlet s:cpo_save diff --git a/runtime/indent/vim.vim b/runtime/indent/vim.vim index 7ec7df849e..8ebfa12caf 100644 --- a/runtime/indent/vim.vim +++ b/runtime/indent/vim.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Vim script " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2016 Apr 19 +" Last Change: 2016 Jun 27 " Only load this indent file when no other was loaded. if exists("b:did_indent") @@ -60,7 +60,7 @@ function GetVimIndentIntern() else let ind = ind + shiftwidth() * 3 endif - elseif prev_text =~ '^\s*aug\%[roup]' && prev_text !~ '^\s*aug\%[roup]\s*!\=\s\+[eE][nN][dD]' + elseif prev_text =~ '^\s*aug\%[roup]\s\+' && prev_text !~ '^\s*aug\%[roup]\s\+[eE][nN][dD]\>' let ind = ind + shiftwidth() else " A line starting with :au does not increment/decrement indent. @@ -89,7 +89,7 @@ function GetVimIndentIntern() " Subtract a 'shiftwidth' on a :endif, :endwhile, :catch, :finally, :endtry, " :endfun, :else and :augroup END. - if cur_text =~ '^\s*\(ene\@!\|cat\|fina\|el\|aug\%[roup]\s*!\=\s\+[eE][nN][dD]\)' + if cur_text =~ '^\s*\(ene\@!\|cat\|fina\|el\|aug\%[roup]\s\+[eE][nN][dD]\)' let ind = ind - shiftwidth() endif diff --git a/runtime/keymap/vietnamese-telex_utf-8.vim b/runtime/keymap/vietnamese-telex_utf-8.vim new file mode 100644 index 0000000000..f9fd055d14 --- /dev/null +++ b/runtime/keymap/vietnamese-telex_utf-8.vim @@ -0,0 +1,196 @@ +" Vim Keymap file for Vietnamese through Telex method +" Maintainer: Raphael McSinyx <vn.mcsinyx@gmail.com> +" Last Change: 2016-06-13 + +scriptencoding utf-8 + +let b:keymap_name = "vi" + +loadkeymap + +A\\ A +AF À +AS à +AR Ả +AX à +AJ Ạ+ +AW Ä‚ +AW\\ Ä‚ +AWF Ằ +AWS Ắ +AWR Ẳ +AWX Ẵ +AWJ Ặ + +AA  +AA\\  +AAF Ầ +AAS Ấ +AAR Ẩ +AAX Ẫ +AAJ Ậ + +D\\ D +DD Ä + +E E +E\\ E +EF È +ES É +ER Ẻ +EX Ẽ +EJ Ẹ + +EE Ê +EE\\ Ê +EEF Ề +EES Ế +EER Ể +EEX Ễ +EEJ Ệ + +I\\ I +IF ÃŒ +IS à +IR Ỉ +IX Ĩ +IJ Ị + +O\\ O +OF Ã’ +OS Ó +OR Ỏ +OX Õ +OJ Ọ + +OO Ô +OO\\ Ô +OOF á»’ +OOS á» +OOR á»” +OOX á»– +OOJ Ộ + +OW Æ +OW\\ Æ +OWF Ờ +OWS Ớ +OWR Ở +OWX á» +OWJ Ợ + +U\\ U +UF Ù +US Ú +UR Ủ +UX Ũ +UJ Ụ + +UW Ư +UW\\ Ư +UWF Ừ +UWS Ứ +UWR Ử +UWX á»® +UWJ á»° + +Y\\ Y +YF Ỳ +YS à +YR Ỷ +YX Ỹ +YJ á»´ + +a\\ a +af à +as á +ar ả +ax ã +aj ạ + +aw ă +aw\\ ă +awf ằ +aws ắ +awr ẳ +awx ẵ +awj ặ + +aa â +aa\\ â +aaf ầ +aas ấ +aar ẩ +aax ẫ +aaj Ạ+ +d\\ d +dd Ä‘ + +e\\ e +ef è +es é +er ẻ +ex ẽ +ej ẹ + +ee ê +ee\\ ê +eef á» +ees ế +eer ể +eex á»… +eej ệ + +i\\ i +if ì +is à +ir ỉ +ix Ä© +ij ị + +o\\ o +of ò +os ó +or á» +ox õ +oj á» + +oo ô +oo\\ ô +oof ồ +oos ố +oor ổ +oox á»— +ooj á»™ + +ow Æ¡ +ow\\ Æ¡ +owf á» +ows á»› +owr ở +owx ỡ +owj ợ + +u\\ u +uf ù +us ú +ur ủ +ux Å© +uj ụ + +uw Æ° +uw\\ Æ° +uwf ừ +uws ứ +uwr á» +uwx ữ +uwj á»± + +y\\ y +yf ỳ +ys ý +yr á»· +yx ỹ +yj ỵ diff --git a/runtime/keymap/vietnamese-vni_utf-8.vim b/runtime/keymap/vietnamese-vni_utf-8.vim new file mode 100644 index 0000000000..c9312c6854 --- /dev/null +++ b/runtime/keymap/vietnamese-vni_utf-8.vim @@ -0,0 +1,196 @@ +" Vim Keymap file for Vietnamese through VNI method +" Maintainer: Raphael McSinyx <vn.mcsinyx@gmail.com> +" Last Change: 2016-06-13 + +scriptencoding utf-8 + +let b:keymap_name = "vi" + +loadkeymap + +A\\ A +A1 à +A2 À +A3 Ả +A4 à +A5 Ạ+ +A8 Ä‚ +A8\\ Ä‚ +A81 Ắ +A82 Ằ +A83 Ẳ +A84 Ẵ +A85 Ặ + +A6  +A6\\  +A61 Ấ +A62 Ầ +A63 Ẩ +A64 Ẫ +A65 Ậ + +D D +D\\ D +D9 Ä + +E\\ E +E1 É +E2 È +E3 Ẻ +E4 Ẽ +E5 Ẹ + +E6 Ê +E6\\ Ê +E61 Ế +E62 Ề +E63 Ể +E64 Ễ +E65 Ệ + +I\\ I +I1 à +I2 ÃŒ +I3 Ỉ +I4 Ĩ +I5 Ị + +O\\ O +O1 Ó +O2 Ã’ +O3 Ỏ +O4 Õ +O5 Ọ + +O6 Ô +O6\\ Ô +O61 á» +O62 á»’ +O63 á»” +O64 á»– +O65 Ộ + +O7 Æ +O7\\ Æ +O71 Ớ +O72 Ờ +O73 Ở +O74 á» +O75 Ợ + +U\\ U +U1 Ú +U2 Ù +U3 Ủ +U4 Ũ +U5 Ụ + +U7 Ư +U7\\ Ư +U71 Ứ +U72 Ừ +U73 Ử +U74 á»® +U75 á»° + +Y\\ Y +Y1 à +Y2 Ỳ +Y3 Ỷ +Y4 Ỹ +Y5 á»´ + +a\\ a +a1 á +a2 à +a3 ả +a4 ã +a5 ạ + +a8 ă +a8\\ ă +a81 ắ +a82 ằ +a83 ẳ +a84 ẵ +a85 ặ + +a6 â +a6\\ â +a61 ấ +a62 ầ +a63 ẩ +a64 ẫ +a65 Ạ+ +d\\ d +d9 Ä‘ + +e\\ e +e1 é +e2 è +e3 ẻ +e4 ẽ +e5 ẹ + +e6 ê +e6\\ ê +e61 ế +e62 á» +e63 ể +e64 á»… +e65 ệ + +i\\ i +i1 à +i2 ì +i3 ỉ +i4 Ä© +i5 ị + +o\\ o +o1 ó +o2 ò +o3 á» +o4 õ +o5 á» + +o6 ô +o6\\ ô +o61 ố +o62 ồ +o63 ổ +o64 á»— +o65 á»™ + +o7 Æ¡ +o7\\ Æ¡ +o71 á»› +o72 á» +o73 ở +o74 ỡ +o75 ợ + +u\\ u +u1 ú +u2 ù +u3 ủ +u4 Å© +u5 ụ + +u7 Æ° +u7\\ Æ° +u71 ứ +u72 ừ +u73 á» +u74 ữ +u75 á»± + +y\\ y +y1 ý +y2 ỳ +y3 á»· +y4 ỹ +y5 ỵ diff --git a/runtime/nvim.desktop b/runtime/nvim.desktop new file mode 100644 index 0000000000..be6a2eda82 --- /dev/null +++ b/runtime/nvim.desktop @@ -0,0 +1,81 @@ +[Desktop Entry] +Name=Neovim +GenericName=Text Editor +GenericName[de]=Texteditor +Comment=Edit text files +Comment[af]=Redigeer tekslêers +Comment[am]=የጽሑá á‹á‹áˆŽá‰½ ያስተካáŠáˆ‰ +Comment[ar]=Øرّر ملÙات نصية +Comment[az]=MÉ™tn fayllarını redaktÉ™ edin +Comment[be]=Ð Ñдагаваньне Ñ‚ÑкÑтавых файлаў +Comment[bg]=Редактиране на текÑтови файлове +Comment[bn]=টেকà§à¦¸à§à¦Ÿ ফাইল à¦à¦¡à¦¿à¦Ÿ করà§à¦¨ +Comment[bs]=Izmijeni tekstualne datoteke +Comment[ca]=Edita fitxers de text +Comment[cs]=Úprava textových souborů +Comment[cy]=Golygu ffeiliau testun +Comment[da]=Redigér tekstfiler +Comment[de]=Textdateien bearbeiten +Comment[el]=ΕπεξεÏγασία αÏχείων κειμÎνου +Comment[en_CA]=Edit text files +Comment[en_GB]=Edit text files +Comment[es]=Edita archivos de texto +Comment[et]=Redigeeri tekstifaile +Comment[eu]=Editatu testu-fitxategiak +Comment[fa]=ویرایش پرونده‌های متنی +Comment[fi]=Muokkaa tekstitiedostoja +Comment[fr]=Édite des fichiers texte +Comment[ga]=Eagar comhad Téacs +Comment[gu]=લખાણ ફાઇલોમાં ફેરફાર કરો +Comment[he]=ערוך קבצי טקסט +Comment[hi]=पाठफ़ाइलें संपादित करें +Comment[hr]=UreÄ‘ivanje tekstualne datoteke +Comment[hu]=Szövegfájlok szerkesztése +Comment[id]=Edit file teks +Comment[it]=Modifica file di testo +Comment[ja]=テã‚ストファイルを編集ã—ã¾ã™ +Comment[kn]=ಪಠà³à²¯ ಕಡತಗಳನà³à²¨à³ ಸಂಪಾದಿಸೠ+Comment[ko]=í…스트 파ì¼ì„ 편집합니다 +Comment[lt]=Redaguoti tekstines bylas +Comment[lv]=Rediģēt teksta failus +Comment[mk]=Уреди текÑтуални фајлови +Comment[ml]=വാചക രചനകളൠതിരàµà´¤àµà´¤àµà´• +Comment[mn]=ТекÑÑ‚ файл боловÑруулах +Comment[mr]=गदà¥à¤¯ फाइल संपादित करा +Comment[ms]=Edit fail teks +Comment[nb]=Rediger tekstfiler +Comment[ne]=पाठफाइललाई संशोधन गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ +Comment[nl]=Tekstbestanden bewerken +Comment[nn]=Rediger tekstfiler +Comment[no]=Rediger tekstfiler +Comment[or]=ପାଠàଯ ଫାଇଲଗàଡ଼ିକà ସମàପାଦନ କରନàତà +Comment[pa]=ਪਾਠਫਾਇਲਾਂ ਸੰਪਾਦਨ +Comment[pl]=Edytor plików tekstowych +Comment[pt]=Editar ficheiros de texto +Comment[pt_BR]=Edite arquivos de texto +Comment[ro]=Editare fiÅŸiere text +Comment[ru]=Редактор текÑтовых файлов +Comment[sk]=Úprava textových súborov +Comment[sl]=Urejanje datotek z besedili +Comment[sq]=Përpuno files teksti +Comment[sr]=Измени текÑтуалне датотеке +Comment[sr@Latn]=Izmeni tekstualne datoteke +Comment[sv]=Redigera textfiler +Comment[ta]=உரை கோபà¯à®ªà¯à®•à®³à¯ˆ தொகà¯à®•à¯à®•à®µà¯à®®à¯ +Comment[th]=à¹à¸à¹‰à¹„ขà¹à¸Ÿà¹‰à¸¡à¸‚้à¸à¸„วาม +Comment[tk]=Metin faýllary editle +Comment[tr]=Metin dosyalarını düzenle +Comment[uk]=Редактор текÑтових файлів +Comment[vi]=Soạn thảo táºp tin văn bản +Comment[wa]=Asspougnî des fitchîs tecses +Comment[zh_CN]=编辑文本文件 +Comment[zh_TW]=編輯文å—檔 +TryExec=nvim +Exec=nvim %F +Terminal=true +Type=Application +Keywords=Text;editor; +Icon=nvim +Categories=Utility;TextEditor; +StartupNotify=false +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; diff --git a/runtime/nvim.png b/runtime/nvim.png Binary files differnew file mode 100644 index 0000000000..dbc65ef363 --- /dev/null +++ b/runtime/nvim.png diff --git a/runtime/syntax/c.vim b/runtime/syntax/c.vim index 3fe3256059..57d99ab1e9 100644 --- a/runtime/syntax/c.vim +++ b/runtime/syntax/c.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: C " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2016 Apr 10 +" Last Change: 2016 Jul 07 " Quit when a (custom) syntax file was already loaded if exists("b:current_syntax") @@ -295,7 +295,7 @@ if !exists("c_no_ansi") || exists("c_ansi_constants") || exists("c_gnu") syn keyword cConstant SCHAR_MIN SINT_MIN SLONG_MIN SSHRT_MIN syn keyword cConstant SCHAR_MAX SINT_MAX SLONG_MAX SSHRT_MAX if !exists("c_no_c99") - syn keyword cConstant __func__ + syn keyword cConstant __func__ __VA_ARGS__ syn keyword cConstant LLONG_MIN LLONG_MAX ULLONG_MAX syn keyword cConstant INT8_MIN INT16_MIN INT32_MIN INT64_MIN syn keyword cConstant INT8_MAX INT16_MAX INT32_MAX INT64_MAX diff --git a/runtime/syntax/cpp.vim b/runtime/syntax/cpp.vim index c7a68388be..fefd0ff7b0 100644 --- a/runtime/syntax/cpp.vim +++ b/runtime/syntax/cpp.vim @@ -2,7 +2,7 @@ " Language: C++ " Current Maintainer: vim-jp (https://github.com/vim-jp/vim-cpp) " Previous Maintainer: Ken Shan <ccshan@post.harvard.edu> -" Last Change: 2015 Nov 10 +" Last Change: 2016 Jul 07 " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -80,6 +80,7 @@ if version >= 508 || !exists("did_cpp_syntax_inits") HiLink cppConstant Constant HiLink cppRawStringDelimiter Delimiter HiLink cppRawString String + HiLink cppNumber Number delcommand HiLink endif diff --git a/runtime/syntax/pf.vim b/runtime/syntax/pf.vim index 1a8f34bbba..81add10e7e 100644 --- a/runtime/syntax/pf.vim +++ b/runtime/syntax/pf.vim @@ -2,30 +2,22 @@ " Language: OpenBSD packet filter configuration (pf.conf) " Original Author: Camiel Dobbelaar <cd@sentia.nl> " Maintainer: Lauri Tirkkonen <lotheac@iki.fi> -" Last Change: 2013 Apr 02 +" Last Change: 2016 Jul 06 -" 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") +if exists("b:current_syntax") finish endif setlocal foldmethod=syntax +syn iskeyword @,48-57,_,-,+ syn sync fromstart syn cluster pfNotLS contains=pfTodo,pfVarAssign -syn keyword pfCmd altq anchor antispoof binat nat pass -syn keyword pfCmd queue rdr scrub table set -syn keyword pfService auth bgp domain finger ftp http https ident -syn keyword pfService imap irc isakmp kerberos mail nameserver nfs -syn keyword pfService nntp ntp pop3 portmap pptp rpcbind rsync smtp -syn keyword pfService snmp snmptrap socks ssh sunrpc syslog telnet -syn keyword pfService tftp www +syn keyword pfCmd anchor antispoof block include match pass queue +syn keyword pfCmd queue set table +syn match pfCmd /^\s*load\sanchor\>/ syn keyword pfTodo TODO XXX contained syn keyword pfWildAddr all any -syn match pfCmd /block\s/ syn match pfComment /#.*$/ contains=pfTodo syn match pfCont /\\$/ syn match pfErrClose /}/ @@ -34,43 +26,81 @@ syn match pfIPv6 /[a-fA-F0-9:]*::[a-fA-F0-9:.]*/ syn match pfIPv6 /[a-fA-F0-9:]\+:[a-fA-F0-9:]\+:[a-fA-F0-9:.]\+/ syn match pfNetmask /\/\d\+/ syn match pfNum /[a-zA-Z0-9_:.]\@<!\d\+[a-zA-Z0-9_:.]\@!/ -syn match pfTable /<\s*[a-zA-Z][a-zA-Z0-9_]*\s*>/ +syn match pfTable /<\s*[a-zA-Z0-9_:][a-zA-Z0-9_:.-]*\s*>/ syn match pfVar /$[a-zA-Z][a-zA-Z0-9_]*/ syn match pfVarAssign /^\s*[a-zA-Z][a-zA-Z0-9_]*\s*=/me=e-1 syn region pfFold1 start=/^#\{1}>/ end=/^#\{1,3}>/me=s-1 transparent fold syn region pfFold2 start=/^#\{2}>/ end=/^#\{2,3}>/me=s-1 transparent fold syn region pfFold3 start=/^#\{3}>/ end=/^#\{3}>/me=s-1 transparent fold syn region pfList start=/{/ end=/}/ transparent contains=ALLBUT,pfErrClose,@pfNotLS -syn region pfString start=/"/ end=/"/ transparent contains=ALLBUT,pfString,@pfNotLS -syn region pfString start=/'/ end=/'/ transparent contains=ALLBUT,pfString,@pfNotLS +syn region pfString start=/"/ skip=/\\"/ end=/"/ contains=pfIPv4,pfIPv6,pfNetmask,pfTable,pfVar +syn region pfString start=/'/ skip=/\\'/ end=/'/ contains=pfIPv4,pfIPv6,pfNetmask,pfTable,pfVar -" Define the default highlighting. -" 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_c_syn_inits") - if version < 508 - let did_c_syn_inits = 1 - command -nargs=+ HiLink hi link <args> - else - command -nargs=+ HiLink hi def link <args> - endif +syn keyword pfService 802-11-iapp Microsoft-SQL-Monitor +syn keyword pfService Microsoft-SQL-Server NeXTStep NextStep +syn keyword pfService afpovertcp afs3-bos afs3-callback afs3-errors +syn keyword pfService afs3-fileserver afs3-kaserver afs3-prserver +syn keyword pfService afs3-rmtsys afs3-update afs3-vlserver +syn keyword pfService afs3-volser amt-redir-tcp amt-redir-tls +syn keyword pfService amt-soap-http amt-soap-https asf-rmcp at-echo +syn keyword pfService at-nbp at-rtmp at-zis auth authentication +syn keyword pfService bfd-control bfd-echo bftp bgp bgpd biff bootpc +syn keyword pfService bootps canna cddb cddbp chargen chat cmd +syn keyword pfService cmip-agent cmip-man comsat conference +syn keyword pfService conserver courier csnet-ns cso-ns cvspserver +syn keyword pfService daap datametrics daytime dhcpd-sync +syn keyword pfService dhcpv6-client dhcpv6-server discard domain +syn keyword pfService echo efs eklogin ekshell ekshell2 epmap eppc +syn keyword pfService exec finger ftp ftp-data git gopher hostname +syn keyword pfService hostnames hprop http https hunt hylafax iapp +syn keyword pfService icb ident imap imap2 imap3 imaps ingreslock +syn keyword pfService ipp iprop ipsec-msft ipsec-nat-t ipx irc +syn keyword pfService isakmp iscsi isisd iso-tsap kauth kdc kerberos +syn keyword pfService kerberos-adm kerberos-iv kerberos-sec +syn keyword pfService kerberos_master kf kip klogin kpasswd kpop +syn keyword pfService krb524 krb_prop krbupdate krcmd kreg kshell kx +syn keyword pfService l2tp ldap ldaps ldp link login mail mdns +syn keyword pfService mdnsresponder microsoft-ds ms-sql-m ms-sql-s +syn keyword pfService msa msp mtp mysql name nameserver netbios-dgm +syn keyword pfService netbios-ns netbios-ssn netnews netplan netrjs +syn keyword pfService netstat netwall newdate nextstep nfs nfsd +syn keyword pfService nicname nnsp nntp ntalk ntp null openwebnet +syn keyword pfService ospf6d ospfapi ospfd photuris pop2 pop3 pop3pw +syn keyword pfService pop3s poppassd portmap postgresql postoffice +syn keyword pfService pptp presence printer prospero prospero-np +syn keyword pfService puppet pwdgen qotd quote radacct radius +syn keyword pfService radius-acct rdp readnews remotefs resource rfb +syn keyword pfService rfe rfs rfs_server ripd ripng rje rkinit rlp +syn keyword pfService routed router rpc rpcbind rsync rtelnet rtsp +syn keyword pfService sa-msg-port sane-port sftp shell sieve silc +syn keyword pfService sink sip smtp smtps smux snmp snmp-trap +syn keyword pfService snmptrap snpp socks source spamd spamd-cfg +syn keyword pfService spamd-sync spooler spop3 ssdp ssh submission +syn keyword pfService sunrpc supdup supfiledbg supfilesrv support +syn keyword pfService svn svrloc swat syslog syslog-tls systat +syn keyword pfService tacacs tacas+ talk tap tcpmux telnet tempo +syn keyword pfService tftp time timed timeserver timserver tsap +syn keyword pfService ttylink ttytst ub-dns-control ulistserv untp +syn keyword pfService usenet users uucp uucp-path uucpd vnc vxlan +syn keyword pfService wais webster who whod whois www x400 x400-snd +syn keyword pfService xcept xdmcp xmpp-bosh xmpp-client xmpp-server +syn keyword pfService z3950 zabbix-agent zabbix-trapper zebra +syn keyword pfService zebrasrv - HiLink pfCmd Statement - HiLink pfComment Comment - HiLink pfCont Statement - HiLink pfErrClose Error - HiLink pfIPv4 Type - HiLink pfIPv6 Type - HiLink pfNetmask Constant - HiLink pfNum Constant - HiLink pfService Constant - HiLink pfTable Identifier - HiLink pfTodo Todo - HiLink pfVar Identifier - HiLink pfVarAssign Identifier - HiLink pfWildAddr Type - - delcommand HiLink -endif +hi def link pfCmd Statement +hi def link pfComment Comment +hi def link pfCont Statement +hi def link pfErrClose Error +hi def link pfIPv4 Type +hi def link pfIPv6 Type +hi def link pfNetmask Constant +hi def link pfNum Constant +hi def link pfService Constant +hi def link pfString String +hi def link pfTable Identifier +hi def link pfTodo Todo +hi def link pfVar Identifier +hi def link pfVarAssign Identifier +hi def link pfWildAddr Type let b:current_syntax = "pf" diff --git a/runtime/syntax/rst.vim b/runtime/syntax/rst.vim index b3c89f8352..ef07b22676 100644 --- a/runtime/syntax/rst.vim +++ b/runtime/syntax/rst.vim @@ -2,7 +2,7 @@ " Language: reStructuredText documentation format " Maintainer: Marshall Ward <marshall.ward@gmail.com> " Previous Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2016-01-05 +" Latest Revision: 2016-06-17 if exists("b:current_syntax") finish @@ -137,7 +137,7 @@ syn match rstStandaloneHyperlink contains=@NoSpell \ "\<\%(\%(\%(https\=\|file\|ftp\|gopher\)://\|\%(mailto\|news\):\)[^[:space:]'\"<>]\+\|www[[:alnum:]_-]*\.[[:alnum:]_-]\+\.[^[:space:]'\"<>]\+\)[[:alnum:]/]" syn region rstCodeBlock contained matchgroup=rstDirective - \ start=+\%(sourcecode\|code\%(-block\)\=\)::\_s*\n\ze\z(\s\+\)+ + \ start=+\%(sourcecode\|code\%(-block\)\=\)::\s\+\w*\_s*\n\ze\z(\s\+\)+ \ skip=+^$+ \ end=+^\z1\@!+ \ contains=@NoSpell @@ -153,10 +153,11 @@ for code in g:rst_syntax_code_list " guard against setting 'isk' option which might cause problems (issue #108) let prior_isk = &l:iskeyword exe 'syn include @rst'.code.' syntax/'.code.'.vim' - exe 'syn region rstDirective'.code.' matchgroup=rstDirective fold ' - \.'start=#\%(sourcecode\|code\%(-block\)\=\)::\s\+'.code.'\_s*\n\ze\z(\s\+\)# ' - \.'skip=#^$# ' - \.'end=#^\z1\@!# contains=@NoSpell,@rst'.code + exe 'syn region rstDirective'.code.' matchgroup=rstDirective fold' + \.' start=#\%(sourcecode\|code\%(-block\)\=\)::\s\+'.code.'\_s*\n\ze\z(\s\+\)#' + \.' skip=#^$#' + \.' end=#^\z1\@!#' + \.' contains=@NoSpell,@rst'.code exe 'syn cluster rstDirectives add=rstDirective'.code " reset 'isk' setting, if it has been changed if &l:iskeyword !=# prior_isk @@ -185,10 +186,11 @@ hi def link rstHyperlinkTarget String hi def link rstExDirective String hi def link rstSubstitutionDefinition rstDirective hi def link rstDelimiter Delimiter -" TODO: I dunno... -hi def rstEmphasis term=italic cterm=italic gui=italic +hi def link rstEmphasis Underlined hi def link rstStrongEmphasis Special -"term=bold cterm=bold gui=bold +" TODO Append these atttributes somehow +"hi def rstEmphasis term=italic cterm=italic gui=italic +"hi def rstStrongEmphasis term=bold cterm=bold gui=bold hi def link rstInterpretedTextOrHyperlinkReference Identifier hi def link rstInlineLiteral String hi def link rstSubstitutionReference PreProc diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim index c51bd9aa45..711971ea4a 100644 --- a/runtime/syntax/sh.vim +++ b/runtime/syntax/sh.vim @@ -2,15 +2,15 @@ " Language: shell (sh) Korn shell (ksh) bash (sh) " Maintainer: Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz> " Previous Maintainer: Lennart Schultz <Lennart.Schultz@ecmwf.int> -" Last Change: May 02, 2016 -" Version: 151 +" Last Change: Jun 10, 2016 +" Version: 152 " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH " For options and settings, please use: :help ft-sh-syntax " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr) " For version 5.x: Clear all syntax items {{{1 " For version 6.x: Quit when a syntax file was already loaded -if version < 600 +if v:version < 600 syntax clear elseif exists("b:current_syntax") finish @@ -173,7 +173,7 @@ if exists("b:is_kornshell") || exists("b:is_bash") " Touch: {{{1 " ===== - syn match shTouch '\<touch\>[^;#]*' skipwhite nextgroup=shTouchList contains=shTouchCmd + syn match shTouch '\<touch\>[^;#]*' skipwhite nextgroup=shComment contains=shTouchCmd syn match shTouchCmd '\<touch\>' contained endif @@ -333,9 +333,10 @@ endif "================================ syn match shNumber "\<\d\+\>#\=" syn match shNumber "-\=\.\=\d\+\>#\=" -syn match shCtrlSeq "\\\d\d\d\|\\[abcfnrtv0]" contained +syn match shCtrlSeq "\\\d\d\d\|\\[abcfnrtv0]" contained if exists("b:is_bash") - syn match shSpecial "\\\o\o\o\|\\x\x\x\|\\c[^"]\|\\[abefnrtv]" contained + syn match shSpecial "[^\\]\(\\\\\)*\zs\\\o\o\o\|\\x\x\x\|\\c[^"]\|\\[abefnrtv]" contained + syn match shSpecial "^\(\\\\\)*\zs\\\o\o\o\|\\x\x\x\|\\c[^"]\|\\[abefnrtv]" contained endif if exists("b:is_bash") syn region shExSingleQuote matchgroup=shQuote start=+\$'+ skip=+\\\\\|\\.+ end=+'+ contains=shStringSpecial,shSpecial @@ -346,11 +347,13 @@ elseif !exists("g:sh_no_error") endif syn region shSingleQuote matchgroup=shQuote start=+'+ end=+'+ contains=@Spell syn region shDoubleQuote matchgroup=shQuote start=+\%(\%(\\\\\)*\\\)\@<!"+ skip=+\\"+ end=+"+ contains=@shDblQuoteList,shStringSpecial,@Spell -syn match shStringSpecial "[^[:print:] \t]" contained -syn match shStringSpecial "\%(\\\\\)*\\[\\"'`$()#]" -syn match shSpecial "[^\\]\zs\%(\\\\\)*\\[\\"'`$()#]" +syn match shStringSpecial "[^[:print:] \t]" contained +syn match shStringSpecial "[^\\]\zs\%(\\\\\)*\\[\\"'`$()#]" +syn match shSpecial "[^\\]\zs\%(\\\\\)*\\[\\"'`$()#]" nextgroup=shBkslshSnglQuote,shBkslshDblQuote syn match shSpecial "^\%(\\\\\)*\\[\\"'`$()#]" -syn match shMoreSpecial "\%(\\\\\)*\\[\\"'`$()#]" nextgroup=shMoreSpecial contained +syn match shMoreSpecial "[^\\]\zs\%(\\\\\)*\\[\\"'`$()#]" nextgroup=shMoreSpecial contained +syn region shBkslshSnglQuote contained matchgroup=shQuote start=+'+ end=+'+ contains=@Spell +syn region shBkslshDblQuote contained matchgroup=shQuote start=+"+ skip=+\\"+ end=+"+ contains=@shDblQuoteList,shStringSpecial,@Spell " Comments: {{{1 "========== @@ -363,31 +366,21 @@ syn match shQuickComment contained "#.*$" " Here Documents: {{{1 " ========================================= -if version < 600 - syn region shHereDoc matchgroup=shHereDoc01 start="<<\s*\**END[a-zA-Z_0-9]*\**" matchgroup=shHereDoc01 end="^END[a-zA-Z_0-9]*$" contains=@shDblQuoteList - syn region shHereDoc matchgroup=shHereDoc02 start="<<-\s*\**END[a-zA-Z_0-9]*\**" matchgroup=shHereDoc02 end="^\s*END[a-zA-Z_0-9]*$" contains=@shDblQuoteList - syn region shHereDoc matchgroup=shHereDoc03 start="<<\s*\**EOF\**" matchgroup=shHereDoc03 end="^EOF$" contains=@shDblQuoteList - syn region shHereDoc matchgroup=shHereDoc04 start="<<-\s*\**EOF\**" matchgroup=shHereDoc04 end="^\s*EOF$" contains=@shDblQuoteList - syn region shHereDoc matchgroup=shHereDoc05 start="<<\s*\**\.\**" matchgroup=shHereDoc05 end="^\.$" contains=@shDblQuoteList - syn region shHereDoc matchgroup=shHereDoc06 start="<<-\s*\**\.\**" matchgroup=shHereDoc06 end="^\s*\.$" contains=@shDblQuoteList - -else - ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc07 start="<<\s*\\\=\z([^ \t|]\+\)" matchgroup=shHereDoc07 end="^\z1\s*$" contains=@shDblQuoteList - ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc08 start="<<\s*\"\z([^ \t|]\+\)\"" matchgroup=shHereDoc08 end="^\z1\s*$" - ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc09 start="<<-\s*\z([^ \t|]\+\)" matchgroup=shHereDoc09 end="^\s*\z1\s*$" contains=@shDblQuoteList - ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc10 start="<<-\s*'\z([^ \t|]\+\)'" matchgroup=shHereDoc10 end="^\s*\z1\s*$" - ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc11 start="<<\s*'\z([^ \t|]\+\)'" matchgroup=shHereDoc11 end="^\z1\s*$" - ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc12 start="<<-\s*\"\z([^ \t|]\+\)\"" matchgroup=shHereDoc12 end="^\s*\z1\s*$" - ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc13 start="<<\s*\\\_$\_s*\z([^ \t|]\+\)" matchgroup=shHereDoc13 end="^\z1\s*$" contains=@shDblQuoteList - ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc14 start="<<\s*\\\_$\_s*'\z([^ \t|]\+\)'" matchgroup=shHereDoc14 end="^\z1\s*$" - ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc15 start="<<\s*\\\_$\_s*\"\z([^ \t|]\+\)\"" matchgroup=shHereDoc15 end="^\z1\s*$" - ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc16 start="<<-\s*\\\_$\_s*\z([^ \t|]\+\)" matchgroup=shHereDoc16 end="^\s*\z1\s*$" - ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc17 start="<<-\s*\\\_$\_s*\\\z([^ \t|]\+\)" matchgroup=shHereDoc17 end="^\s*\z1\s*$" - ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc18 start="<<-\s*\\\_$\_s*'\z([^ \t|]\+\)'" matchgroup=shHereDoc18 end="^\s*\z1\s*$" - ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc19 start="<<-\s*\\\_$\_s*\"\z([^ \t|]\+\)\"" matchgroup=shHereDoc19 end="^\s*\z1\s*$" - ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc20 start="<<\\\z([^ \t|]\+\)" matchgroup=shHereDoc20 end="^\z1\s*$" - ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc21 start="<<-\s*\\\z([^ \t|]\+\)" matchgroup=shHereDoc21 end="^\s*\z1\s*$" -endif +ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc01 start="<<\s*\\\=\z([^ \t|]\+\)" matchgroup=shHereDoc01 end="^\z1\s*$" contains=@shDblQuoteList +ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc02 start="<<\s*\"\z([^ \t|]\+\)\"" matchgroup=shHereDoc02 end="^\z1\s*$" +ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc03 start="<<-\s*\z([^ \t|]\+\)" matchgroup=shHereDoc03 end="^\s*\z1\s*$" contains=@shDblQuoteList +ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc04 start="<<-\s*'\z([^ \t|]\+\)'" matchgroup=shHereDoc04 end="^\s*\z1\s*$" +ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc05 start="<<\s*'\z([^ \t|]\+\)'" matchgroup=shHereDoc05 end="^\z1\s*$" +ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc06 start="<<-\s*\"\z([^ \t|]\+\)\"" matchgroup=shHereDoc06 end="^\s*\z1\s*$" +ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc07 start="<<\s*\\\_$\_s*\z([^ \t|]\+\)" matchgroup=shHereDoc07 end="^\z1\s*$" contains=@shDblQuoteList +ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc08 start="<<\s*\\\_$\_s*'\z([^ \t|]\+\)'" matchgroup=shHereDoc08 end="^\z1\s*$" +ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc09 start="<<\s*\\\_$\_s*\"\z([^ \t|]\+\)\"" matchgroup=shHereDoc09 end="^\z1\s*$" +ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc10 start="<<-\s*\\\_$\_s*\z([^ \t|]\+\)" matchgroup=shHereDoc10 end="^\s*\z1\s*$" +ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc11 start="<<-\s*\\\_$\_s*\\\z([^ \t|]\+\)" matchgroup=shHereDoc11 end="^\s*\z1\s*$" +ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc12 start="<<-\s*\\\_$\_s*'\z([^ \t|]\+\)'" matchgroup=shHereDoc12 end="^\s*\z1\s*$" +ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc13 start="<<-\s*\\\_$\_s*\"\z([^ \t|]\+\)\"" matchgroup=shHereDoc13 end="^\s*\z1\s*$" +ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc14 start="<<\\\z([^ \t|]\+\)" matchgroup=shHereDoc14 end="^\z1\s*$" +ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc15 start="<<-\s*\\\z([^ \t|]\+\)" matchgroup=shHereDoc15 end="^\s*\z1\s*$" " Here Strings: {{{1 " ============= @@ -702,12 +695,6 @@ hi def link shHereDoc12 shRedir hi def link shHereDoc13 shRedir hi def link shHereDoc14 shRedir hi def link shHereDoc15 shRedir -hi def link shHereDoc16 shRedir -hi def link shHereDoc17 shRedir -hi def link shHereDoc18 shRedir -hi def link shHereDoc19 shRedir -hi def link shHereDoc20 shRedir -hi def link shHereDoc21 shRedir " Delete shell folding commands {{{1 " ============================= diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim index 9d91402bc8..e560573e6e 100644 --- a/runtime/syntax/tex.vim +++ b/runtime/syntax/tex.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: TeX " Maintainer: Charles E. Campbell <NdrchipO@ScampbellPfamily.AbizM> -" Last Change: May 02, 2016 -" Version: 95 +" Last Change: Jun 17, 2016 +" Version: 97 " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX " " Notes: {{{1 @@ -83,12 +83,12 @@ else let s:tex_conceal= g:tex_conceal endif if !exists("g:tex_superscripts") - let s:tex_superscripts= "[0-9a-zA-W.,:;+-<>/()=]" + let s:tex_superscripts= '[0-9a-zA-W.,:;+-<>/()=]' else let s:tex_superscripts= g:tex_superscripts endif if !exists("g:tex_subscripts") - let s:tex_subscripts= "[0-9aehijklmnoprstuvx,+-/().]" + let s:tex_subscripts= '[0-9aehijklmnoprstuvx,+-/().]' else let s:tex_subscripts= g:tex_subscripts endif @@ -206,16 +206,16 @@ endif " Try to flag {} and () mismatches: {{{1 if s:tex_fast =~# 'm' if !s:tex_no_error - syn region texMatcher matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]" end="}" transparent contains=@texMatchGroup,texError - syn region texMatcher matchgroup=Delimiter start="\[" end="]" transparent contains=@texMatchGroup,texError,@NoSpell + syn region texMatcher matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]" end="}" transparent contains=@texMatchGroup,texError + syn region texMatcher matchgroup=Delimiter start="\[" end="]" transparent contains=@texMatchGroup,texError,@NoSpell else - syn region texMatcher matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]" end="}" transparent contains=@texMatchGroup - syn region texMatcher matchgroup=Delimiter start="\[" end="]" transparent contains=@texMatchGroup + syn region texMatcher matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]" end="}" transparent contains=@texMatchGroup + syn region texMatcher matchgroup=Delimiter start="\[" end="]" transparent contains=@texMatchGroup endif if !s:tex_nospell - syn region texParen start="(" end=")" transparent contains=@texMatchGroup,@Spell + syn region texParen start="(" end=")" transparent contains=@texMatchGroup,@Spell else - syn region texParen start="(" end=")" transparent contains=@texMatchGroup + syn region texParen start="(" end=")" transparent contains=@texMatchGroup endif endif if !s:tex_no_error @@ -266,7 +266,7 @@ syn match texLigature "\\\([ijolL]\|ae\|oe\|ss\|AA\|AE\|OE\)$" syn match texBeginEnd "\\begin\>\|\\end\>" nextgroup=texBeginEndName if s:tex_fast =~# 'm' syn region texBeginEndName matchgroup=Delimiter start="{" end="}" contained nextgroup=texBeginEndModifier contains=texComment - syn region texBeginEndModifier matchgroup=Delimiter start="\[" end="]" contained contains=texComment,@NoSpell + syn region texBeginEndModifier matchgroup=Delimiter start="\[" end="]" contained contains=texComment,@texMathZones,@NoSpell endif " \documentclass, \documentstyle, \usepackage: {{{1 @@ -1136,9 +1136,21 @@ if has("conceal") && &enc == 'utf-8' call s:SuperSub('texSubscript','_','9','₉') call s:SuperSub('texSubscript','_','a','â‚') call s:SuperSub('texSubscript','_','e','â‚‘') + call s:SuperSub('texSubscript','_','h','â‚•') call s:SuperSub('texSubscript','_','i','áµ¢') + call s:SuperSub('texSubscript','_','j','â±¼') + call s:SuperSub('texSubscript','_','k','â‚–') + call s:SuperSub('texSubscript','_','l','â‚—') + call s:SuperSub('texSubscript','_','m','ₘ') + call s:SuperSub('texSubscript','_','n','â‚™') call s:SuperSub('texSubscript','_','o','â‚’') + call s:SuperSub('texSubscript','_','p','â‚š') + call s:SuperSub('texSubscript','_','r','áµ£') + call s:SuperSub('texSubscript','_','s','â‚›') + call s:SuperSub('texSubscript','_','t','â‚œ') call s:SuperSub('texSubscript','_','u','ᵤ') + call s:SuperSub('texSubscript','_','v','áµ¥') + call s:SuperSub('texSubscript','_','x','â‚“') call s:SuperSub('texSubscript','_',',','ï¸') call s:SuperSub('texSubscript','_','+','â‚Š') call s:SuperSub('texSubscript','_','-','â‚‹') @@ -1154,6 +1166,7 @@ if has("conceal") && &enc == 'utf-8' call s:SuperSub('texSubscript','_','\\phi\>' ,'ᵩ') call s:SuperSub('texSubscript','_','\\gamma\>','ᵧ') call s:SuperSub('texSubscript','_','\\chi\>' ,'ᵪ') + delfun s:SuperSub endif diff --git a/src/clint.py b/src/clint.py index 0c9f55c71e..ce31822ada 100755 --- a/src/clint.py +++ b/src/clint.py @@ -3166,11 +3166,20 @@ def CheckLanguage(filename, clean_lines, linenum, file_extension, # Check if some verboten C functions are being used. if Search(r'\bsprintf\b', line): error(filename, linenum, 'runtime/printf', 5, - 'Never use sprintf. Use snprintf instead.') - match = Search(r'\b(strcpy|strcat)\b', line) + 'Use snprintf instead of sprintf.') + match = Search(r'\b(strncpy|STRNCPY)\b', line) if match: error(filename, linenum, 'runtime/printf', 4, - 'Almost always, snprintf is better than %s' % match.group(1)) + 'Use xstrlcpy or snprintf instead of %s (unless this is from Vim)' + % match.group(1)) + match = Search(r'\b(strcpy)\b', line) + if match: + error(filename, linenum, 'runtime/printf', 4, + 'Use xstrlcpy or snprintf instead of %s' % match.group(1)) + match = Search(r'\b(STRNCAT|strncat|strcat|vim_strcat)\b', line) + if match: + error(filename, linenum, 'runtime/printf', 4, + 'Use xstrlcat or snprintf instead of %s' % match.group(1)) # Check for suspicious usage of "if" like # } if (a == b) { diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index f2b75dca2a..5a658691ce 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -292,18 +292,40 @@ target_link_libraries(nvim ${NVIM_EXEC_LINK_LIBRARIES}) install_helper(TARGETS nvim) if(WIN32) - # Copy DLLs to bin/ and install them along with nvim - add_custom_target(nvim_dll_deps ALL DEPENDS nvim + # Copy DLLs and third-party tools to bin/ and install them along with nvim + add_custom_target(nvim_runtime_deps ALL + COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_BINARY_DIR}/windows_runtime_deps/ + ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + install(DIRECTORY ${PROJECT_BINARY_DIR}/windows_runtime_deps/ + DESTINATION ${CMAKE_INSTALL_BINDIR}) + + foreach(BIN win32yank.exe) + unset(BIN_PATH CACHE) + find_program(BIN_PATH ${BIN}) + if(NOT BIN_PATH) + message(FATAL_ERROR "Unable to find external dependency ${BIN}") + endif() + + add_custom_target(external_${BIN} + COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/windows_runtime_deps + COMMAND ${CMAKE_COMMAND} + "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}" + -DBINARY="${BIN_PATH}" + -DDST=${PROJECT_BINARY_DIR}/windows_runtime_deps + -P ${PROJECT_SOURCE_DIR}/cmake/WindowsDllCopy.cmake + COMMAND ${CMAKE_COMMAND} -E copy ${BIN_PATH} ${PROJECT_BINARY_DIR}/windows_runtime_deps/ + COMMENT "${BIN_PATH}") + add_dependencies(nvim_runtime_deps "external_${BIN}") + endforeach() + + add_custom_target(nvim_dll_deps DEPENDS nvim COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/windows_runtime_deps COMMAND ${CMAKE_COMMAND} "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}" -DBINARY="${PROJECT_BINARY_DIR}/bin/nvim${CMAKE_EXECUTABLE_SUFFIX}" -DDST=${PROJECT_BINARY_DIR}/windows_runtime_deps - -P ${PROJECT_SOURCE_DIR}/cmake/WindowsDllCopy.cmake - COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_BINARY_DIR}/windows_runtime_deps/ - ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) - install(DIRECTORY ${PROJECT_BINARY_DIR}/windows_runtime_deps/ - DESTINATION ${CMAKE_INSTALL_BINDIR}) + -P ${PROJECT_SOURCE_DIR}/cmake/WindowsDllCopy.cmake) + add_dependencies(nvim_runtime_deps nvim_dll_deps) endif() if(CLANG_ASAN_UBSAN) diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c index f37e996f06..1732ee0bae 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -310,7 +310,7 @@ void nvim_set_current_dir(String dir, Error *err) } char string[MAXPATHL]; - strncpy(string, dir.data, dir.size); + memcpy(string, dir.data, dir.size); string[dir.size] = NUL; try_start(); diff --git a/src/nvim/edit.c b/src/nvim/edit.c index bb946337b5..95c33916f1 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -3847,13 +3847,11 @@ static int ins_compl_get_exp(pos_T *ini) if ((compl_cont_status & CONT_ADDING) && len == compl_length) { if (pos->lnum < ins_buf->b_ml.ml_line_count) { - /* Try next line, if any. the new word will be - * "join" as if the normal command "J" was used. - * IOSIZE is always greater than - * compl_length, so the next STRNCPY always - * works -- Acevedo */ + // Try next line, if any. the new word will be "join" as if the + // normal command "J" was used. IOSIZE is always greater than + // compl_length, so the next STRNCPY always works -- Acevedo STRNCPY(IObuff, ptr, len); - ptr = ml_get_buf(ins_buf, pos->lnum + 1, FALSE); + ptr = ml_get_buf(ins_buf, pos->lnum + 1, false); tmp_ptr = ptr = skipwhite(ptr); /* Find start of next word. */ tmp_ptr = find_word_start(tmp_ptr); diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 6b14d21da7..9c041ca790 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -9748,60 +9748,54 @@ static void f_function(typval_T *argvars, typval_T *rettv, FunPtr fptr) } } if (dict_idx > 0 || arg_idx > 0 || arg_pt != NULL) { - partial_T *pt = (partial_T *)xcalloc(1, sizeof(partial_T)); + partial_T *const pt = xcalloc(1, sizeof(*pt)); // result is a VAR_PARTIAL - if (pt != NULL) { - if (arg_idx > 0 || (arg_pt != NULL && arg_pt->pt_argc > 0)) { - listitem_T *li; + if (arg_idx > 0 || (arg_pt != NULL && arg_pt->pt_argc > 0)) { + const int arg_len = (arg_pt == NULL ? 0 : arg_pt->pt_argc); + const int lv_len = (list == NULL ? 0 : list->lv_len); + + pt->pt_argc = arg_len + lv_len; + pt->pt_argv = xmalloc(sizeof(pt->pt_argv[0]) * pt->pt_argc); + if (pt->pt_argv == NULL) { + xfree(pt); + xfree(name); + return; + } else { int i = 0; - int arg_len = 0; - int lv_len = 0; - - if (arg_pt != NULL) { - arg_len = arg_pt->pt_argc; + for (; i < arg_len; i++) { + copy_tv(&arg_pt->pt_argv[i], &pt->pt_argv[i]); } - if (list != NULL) { - lv_len = list->lv_len; - } - pt->pt_argc = arg_len + lv_len; - pt->pt_argv = (typval_T *)xmalloc(sizeof(typval_T) * pt->pt_argc); - if (pt->pt_argv == NULL) { - xfree(pt); - xfree(name); - return; - } else { - for (i = 0; i < arg_len; i++) { - copy_tv(&arg_pt->pt_argv[i], &pt->pt_argv[i]); - } - if (lv_len > 0) { - for (li = list->lv_first; li != NULL; li = li->li_next) { - copy_tv(&li->li_tv, &pt->pt_argv[i++]); - } + if (lv_len > 0) { + for (listitem_T *li = list->lv_first; + li != NULL; + li = li->li_next) { + copy_tv(&li->li_tv, &pt->pt_argv[i++]); } } } + } - // For "function(dict.func, [], dict)" and "func" is a partial - // use "dict". That is backwards compatible. - if (dict_idx > 0) { - // The dict is bound explicitly, pt_auto is false - pt->pt_dict = argvars[dict_idx].vval.v_dict; + // For "function(dict.func, [], dict)" and "func" is a partial + // use "dict". That is backwards compatible. + if (dict_idx > 0) { + // The dict is bound explicitly, pt_auto is false + pt->pt_dict = argvars[dict_idx].vval.v_dict; + (pt->pt_dict->dv_refcount)++; + } else if (arg_pt != NULL) { + // If the dict was bound automatically the result is also + // bound automatically. + pt->pt_dict = arg_pt->pt_dict; + pt->pt_auto = arg_pt->pt_auto; + if (pt->pt_dict != NULL) { (pt->pt_dict->dv_refcount)++; - } else if (arg_pt != NULL) { - // If the dict was bound automatically the result is also - // bound automatically. - pt->pt_dict = arg_pt->pt_dict; - pt->pt_auto = arg_pt->pt_auto; - if (pt->pt_dict != NULL) { - (pt->pt_dict->dv_refcount)++; - } } - - pt->pt_refcount = 1; - pt->pt_name = name; - func_ref(pt->pt_name); } + + pt->pt_refcount = 1; + pt->pt_name = name; + func_ref(pt->pt_name); + rettv->v_type = VAR_PARTIAL; rettv->vval.v_partial = pt; } else { @@ -22320,7 +22314,7 @@ char_u *get_return_cmd(void *rettv) } STRCPY(IObuff, ":return "); - STRNCPY(IObuff + 8, s, IOSIZE - 8); + STRLCPY(IObuff + 8, s, IOSIZE - 8); if (STRLEN(s) + 8 >= IOSIZE) STRCPY(IObuff + IOSIZE - 4, "..."); xfree(tofree); diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index 69eed33736..e6e85a3f6c 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -357,12 +357,12 @@ static int sort_compare(const void *s1, const void *s2) // We need to copy one line into "sortbuf1", because there is no // guarantee that the first pointer becomes invalid when obtaining the // second one. - STRNCPY(sortbuf1, ml_get(l1.lnum) + l1.st_u.line.start_col_nr, - l1.st_u.line.end_col_nr - l1.st_u.line.start_col_nr + 1); - sortbuf1[l1.st_u.line.end_col_nr - l1.st_u.line.start_col_nr] = 0; - STRNCPY(sortbuf2, ml_get(l2.lnum) + l2.st_u.line.start_col_nr, - l2.st_u.line.end_col_nr - l2.st_u.line.start_col_nr + 1); - sortbuf2[l2.st_u.line.end_col_nr - l2.st_u.line.start_col_nr] = 0; + memcpy(sortbuf1, ml_get(l1.lnum) + l1.st_u.line.start_col_nr, + l1.st_u.line.end_col_nr - l1.st_u.line.start_col_nr + 1); + sortbuf1[l1.st_u.line.end_col_nr - l1.st_u.line.start_col_nr] = NUL; + memcpy(sortbuf2, ml_get(l2.lnum) + l2.st_u.line.start_col_nr, + l2.st_u.line.end_col_nr - l2.st_u.line.start_col_nr + 1); + sortbuf2[l2.st_u.line.end_col_nr - l2.st_u.line.start_col_nr] = NUL; result = sort_ic ? STRICMP(sortbuf1, sortbuf2) : STRCMP(sortbuf1, sortbuf2); @@ -1404,36 +1404,34 @@ char_u *make_filter_cmd(char_u *cmd, char_u *itmp, char_u *otmp) : "(%s)"; vim_snprintf(buf, len, fmt, (char *)cmd); } else { - strncpy(buf, (char *) cmd, len); + xstrlcpy(buf, (char *)cmd, len); } if (itmp != NULL) { - strncat(buf, " < ", len); - strncat(buf, (char *) itmp, len); + xstrlcat(buf, " < ", len - 1); + xstrlcat(buf, (const char *)itmp, len - 1); } #else // For shells that don't understand braces around commands, at least allow // the use of commands in a pipe. - strncpy(buf, cmd, len); + xstrlcpy(buf, cmd, len); if (itmp != NULL) { - char_u *p; - // If there is a pipe, we have to put the '<' in front of it. // Don't do this when 'shellquote' is not empty, otherwise the // redirection would be inside the quotes. if (*p_shq == NUL) { - p = strchr(buf, '|'); + char *const p = strchr(buf, '|'); if (p != NULL) { *p = NUL; } } - strncat(buf, " < ", len); - strncat(buf, (char *) itmp, len); + xstrlcat(buf, " < ", len); + xstrlcat(buf, (const char *)itmp, len); if (*p_shq == NUL) { - p = strchr(cmd, '|'); + const char *const p = strchr((const char *)cmd, '|'); if (p != NULL) { - strncat(buf, " ", len); // Insert a space before the '|' for DOS - strncat(buf, p, len); + xstrlcat(buf, " ", len - 1); // Insert a space before the '|' for DOS + xstrlcat(buf, p, len - 1); } } } @@ -4814,9 +4812,13 @@ void fix_help_buffer(void) vimconv_T vc; char_u *cp; - /* Find all "doc/ *.txt" files in this directory. */ - add_pathsep((char *)NameBuff); - STRCAT(NameBuff, "doc/*.??[tx]"); + // Find all "doc/ *.txt" files in this directory. + if (!add_pathsep((char *)NameBuff) + || STRLCAT(NameBuff, "doc/*.??[tx]", + sizeof(NameBuff)) >= MAXPATHL) { + EMSG(_(e_fnametoolong)); + continue; + } // Note: We cannot just do `&NameBuff` because it is a statically sized array // so `NameBuff == &NameBuff` according to C semantics. @@ -4979,8 +4981,12 @@ static void helptags_one(char_u *dir, char_u *ext, char_u *tagfname, // Find all *.txt files. size_t dirlen = STRLCPY(NameBuff, dir, sizeof(NameBuff)); - STRCAT(NameBuff, "/**/*"); // NOLINT - STRCAT(NameBuff, ext); + if (dirlen >= MAXPATHL + || STRLCAT(NameBuff, "/**/*", sizeof(NameBuff)) >= MAXPATHL // NOLINT + || STRLCAT(NameBuff, ext, sizeof(NameBuff)) >= MAXPATHL) { + EMSG(_(e_fnametoolong)); + return; + } // Note: We cannot just do `&NameBuff` because it is a statically sized array // so `NameBuff == &NameBuff` according to C semantics. @@ -4993,13 +4999,16 @@ static void helptags_one(char_u *dir, char_u *ext, char_u *tagfname, return; } - /* - * Open the tags file for writing. - * Do this before scanning through all the files. - */ - STRLCPY(NameBuff, dir, sizeof(NameBuff)); - add_pathsep((char *)NameBuff); - STRNCAT(NameBuff, tagfname, sizeof(NameBuff) - dirlen - 2); + // + // Open the tags file for writing. + // Do this before scanning through all the files. + // + memcpy(NameBuff, dir, dirlen + 1); + if (!add_pathsep((char *)NameBuff) + || STRLCAT(NameBuff, tagfname, sizeof(NameBuff)) >= MAXPATHL) { + EMSG(_(e_fnametoolong)); + return; + } fd_tags = mch_fopen((char *)NameBuff, "w"); if (fd_tags == NULL) { EMSG2(_("E152: Cannot open %s for writing"), NameBuff); @@ -5173,8 +5182,12 @@ static void do_helptags(char_u *dirname, bool add_help_tags) // Get a list of all files in the help directory and in subdirectories. STRLCPY(NameBuff, dirname, sizeof(NameBuff)); - add_pathsep((char *)NameBuff); - STRCAT(NameBuff, "**"); + if (!add_pathsep((char *)NameBuff) + || STRLCAT(NameBuff, "**", sizeof(NameBuff)) >= MAXPATHL) { + EMSG(_(e_fnametoolong)); + xfree(dirname); + return; + } // Note: We cannot just do `&NameBuff` because it is a statically sized array // so `NameBuff == &NameBuff` according to C semantics. diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index e205901635..4070e9fe5b 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -3854,7 +3854,7 @@ static char_u *replace_makeprg(exarg_T *eap, char_u *p, char_u **cmdlinep) ptr = new_cmdline; while ((pos = (char_u *)strstr((char *)program, "$*")) != NULL) { i = (int)(pos - program); - STRNCPY(ptr, program, i); + memcpy(ptr, program, i); STRCPY(ptr += i, p); ptr += len; program = pos + 2; diff --git a/src/nvim/file_search.c b/src/nvim/file_search.c index 03cb504f17..d733ba311a 100644 --- a/src/nvim/file_search.c +++ b/src/nvim/file_search.c @@ -193,7 +193,6 @@ typedef struct ff_search_ctx_T { static char_u e_pathtoolong[] = N_("E854: path too long for completion"); - /* * Initialization routine for vim_findfile(). * @@ -1371,6 +1370,11 @@ find_file_in_path_option ( char_u *buf = NULL; int rel_to_curdir; + if (rel_fname != NULL && path_with_url((const char *)rel_fname)) { + // Do not attempt to search "relative" to a URL. #6009 + rel_fname = NULL; + } + if (first == TRUE) { /* copy file name into NameBuff, expanding environment variables */ save_char = ptr[len]; diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 12206c1680..d433afab3e 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -4982,8 +4982,8 @@ buf_check_timestamp ( set_vim_var_string(VV_WARNINGMSG, tbuf, -1); if (can_reload) { if (*mesg2 != NUL) { - strncat(tbuf, "\n", tbuf_len); - strncat(tbuf, mesg2, tbuf_len); + xstrlcat(tbuf, "\n", tbuf_len - 1); + xstrlcat(tbuf, mesg2, tbuf_len - 1); } if (do_dialog(VIM_WARNING, (char_u *) _("Warning"), (char_u *) tbuf, (char_u *) _("&OK\n&Load File"), 1, NULL, true) == 2) { @@ -4991,8 +4991,8 @@ buf_check_timestamp ( } } else if (State > NORMAL_BUSY || (State & CMDLINE) || already_warned) { if (*mesg2 != NUL) { - strncat(tbuf, "; ", tbuf_len); - strncat(tbuf, mesg2, tbuf_len); + xstrlcat(tbuf, "; ", tbuf_len - 1); + xstrlcat(tbuf, mesg2, tbuf_len - 1); } EMSG(tbuf); retval = 2; diff --git a/src/nvim/fold.c b/src/nvim/fold.c index dcd32acfb7..d964da371a 100644 --- a/src/nvim/fold.c +++ b/src/nvim/fold.c @@ -1608,7 +1608,7 @@ static void foldAddMarker(linenr_T lnum, char_u *marker, size_t markerlen) STRLCPY(newline + line_len, marker, markerlen + 1); else { STRCPY(newline + line_len, cms); - STRNCPY(newline + line_len + (p - cms), marker, markerlen); + memcpy(newline + line_len + (p - cms), marker, markerlen); STRCPY(newline + line_len + (p - cms) + markerlen, p + 2); } @@ -1673,7 +1673,8 @@ static void foldDelMarker(linenr_T lnum, char_u *marker, size_t markerlen) if (u_save(lnum - 1, lnum + 1) == OK) { /* Make new line: text-before-marker + text-after-marker */ newline = xmalloc(STRLEN(line) - len + 1); - STRNCPY(newline, line, p - line); + assert(p >= line); + memcpy(newline, line, (size_t)(p - line)); STRCPY(newline + (p - line), p + len); ml_replace(lnum, newline, FALSE); } diff --git a/src/nvim/globals.h b/src/nvim/globals.h index e3c84cb852..baa85c01f8 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -1215,6 +1215,7 @@ EXTERN char_u e_invalidreg[] INIT(= N_("E850: Invalid register name")); EXTERN char_u e_dirnotf[] INIT(= N_( "E919: Directory not found in '%s': \"%s\"")); EXTERN char_u e_unsupportedoption[] INIT(= N_("E519: Option not supported")); +EXTERN char_u e_fnametoolong[] INIT(= N_("E856: Filename too long")); EXTERN char top_bot_msg[] INIT(= N_("search hit TOP, continuing at BOTTOM")); diff --git a/src/nvim/hardcopy.c b/src/nvim/hardcopy.c index cb0415a486..c2dc6231f1 100644 --- a/src/nvim/hardcopy.c +++ b/src/nvim/hardcopy.c @@ -1544,8 +1544,8 @@ static int prt_find_resource(char *name, struct prt_ps_resource_S *resource) /* Look for named resource file in runtimepath */ STRCPY(buffer, "print"); add_pathsep((char *)buffer); - vim_strcat(buffer, (char_u *)name, MAXPATHL); - vim_strcat(buffer, (char_u *)".ps", MAXPATHL); + xstrlcat((char *)buffer, name, MAXPATHL); + xstrlcat((char *)buffer, ".ps", MAXPATHL); resource->filename[0] = NUL; retval = (do_in_runtimepath(buffer, 0, prt_resource_name, resource->filename) && resource->filename[0] != NUL); diff --git a/src/nvim/memory.c b/src/nvim/memory.c index 92ead873ae..25fa2f150e 100644 --- a/src/nvim/memory.c +++ b/src/nvim/memory.c @@ -364,29 +364,58 @@ char *xstpncpy(char *restrict dst, const char *restrict src, size_t maxlen) } } -/// xstrlcpy - Copy a %NUL terminated string into a sized buffer -/// -/// Compatible with *BSD strlcpy: the result is always a valid -/// NUL-terminated string that fits in the buffer (unless, -/// of course, the buffer size is zero). It does not pad -/// out the result like strncpy() does. -/// -/// @param dst Where to copy the string to -/// @param src Where to copy the string from -/// @param size Size of destination buffer -/// @return Length of the source string (i.e.: strlen(src)) -size_t xstrlcpy(char *restrict dst, const char *restrict src, size_t size) +/// xstrlcpy - Copy a NUL-terminated string into a sized buffer +/// +/// Compatible with *BSD strlcpy: the result is always a valid NUL-terminated +/// string that fits in the buffer (unless, of course, the buffer size is +/// zero). It does not pad out the result like strncpy() does. +/// +/// @param dst Buffer to store the result +/// @param src String to be copied +/// @param dsize Size of `dst` +/// @return strlen(src). If retval >= dstsize, truncation occurs. +size_t xstrlcpy(char *restrict dst, const char *restrict src, size_t dsize) FUNC_ATTR_NONNULL_ALL { - size_t ret = strlen(src); + size_t slen = strlen(src); - if (size) { - size_t len = (ret >= size) ? size - 1 : ret; + if (dsize) { + size_t len = MIN(slen, dsize - 1); memcpy(dst, src, len); dst[len] = '\0'; } - return ret; + return slen; // Does not include NUL. +} + +/// Appends `src` to string `dst` of size `dsize` (unlike strncat, dsize is the +/// full size of `dst`, not space left). At most dsize-1 characters +/// will be copied. Always NUL terminates. `src` and `dst` may overlap. +/// +/// @see vim_strcat from Vim. +/// @see strlcat from OpenBSD. +/// +/// @param dst Buffer to be appended-to. Must have a NUL byte. +/// @param src String to put at the end of `dst` +/// @param dsize Size of `dst` including NUL byte. Must be greater than 0. +/// @return strlen(src) + strlen(initial dst) +/// If retval >= dsize, truncation occurs. +size_t xstrlcat(char *const dst, const char *const src, const size_t dsize) + FUNC_ATTR_NONNULL_ALL +{ + assert(dsize > 0); + const size_t dlen = strlen(dst); + assert(dlen < dsize); + const size_t slen = strlen(src); + + if (slen > dsize - dlen - 1) { + memmove(dst + dlen, src, dsize - dlen - 1); + dst[dsize - 1] = '\0'; + } else { + memmove(dst + dlen, src, slen + 1); + } + + return slen + dlen; // Does not include NUL. } /// strdup() wrapper diff --git a/src/nvim/message.c b/src/nvim/message.c index 749fa8a706..91dd042777 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -381,20 +381,17 @@ static int other_sourcing_name(void) return FALSE; } -/* - * Get the message about the source, as used for an error message. - * Returns an allocated string with room for one more character. - * Returns NULL when no message is to be given. - */ +/// Get the message about the source, as used for an error message. +/// Returns an allocated string with room for one more character. +/// Returns NULL when no message is to be given. static char_u *get_emsg_source(void) { - char_u *Buf, *p; - if (sourcing_name != NULL && other_sourcing_name()) { - p = (char_u *)_("Error detected while processing %s:"); - Buf = xmalloc(STRLEN(sourcing_name) + STRLEN(p)); - sprintf((char *)Buf, (char *)p, sourcing_name); - return Buf; + char_u *p = (char_u *)_("Error detected while processing %s:"); + size_t len = STRLEN(sourcing_name) + STRLEN(p) + 1; + char_u *buf = xmalloc(len); + snprintf((char *)buf, len, (char *)p, sourcing_name); + return buf; } return NULL; } diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c index 71aa6e83e5..ba26381e23 100644 --- a/src/nvim/misc1.c +++ b/src/nvim/misc1.c @@ -2507,8 +2507,9 @@ void msgmore(long n) vim_snprintf((char *)msg_buf, MSG_BUF_LEN, _("%" PRId64 " fewer lines"), (int64_t)pn); } - if (got_int) - vim_strcat(msg_buf, (char_u *)_(" (Interrupted)"), MSG_BUF_LEN); + if (got_int) { + xstrlcat((char *)msg_buf, _(" (Interrupted)"), MSG_BUF_LEN); + } if (msg(msg_buf)) { set_keep_msg(msg_buf, 0); keep_msg_more = TRUE; diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 9db02de2a6..b17b4c584e 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -1130,6 +1130,7 @@ static int normal_execute(VimState *state, int key) start_selection(); unshift_special(&s->ca); s->idx = find_command(s->ca.cmdchar); + assert(s->idx >= 0); } else if ((nv_cmds[s->idx].cmd_flags & NV_SSS) && (mod_mask & MOD_MASK_SHIFT)) { start_selection(); diff --git a/src/nvim/options.lua b/src/nvim/options.lua index 859658e40d..fd68d1cde0 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -1572,7 +1572,7 @@ return { full_name='mouse', type='string', list='flags', scope={'global'}, varname='p_mouse', - defaults={if_true={vi="", vim="a"}} + defaults={if_true={vi="", vim=""}} }, { full_name='mousefocus', abbreviation='mousef', diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c index 109b5c7175..747a34d8ce 100644 --- a/src/nvim/os/env.c +++ b/src/nvim/os/env.c @@ -112,11 +112,11 @@ int64_t os_get_pid(void) #endif } -/// Get the hostname of the machine running Neovim. +/// Gets the hostname of the current machine. /// -/// @param hostname Buffer to store the hostname. -/// @param len Length of `hostname`. -void os_get_hostname(char *hostname, size_t len) +/// @param hostname Buffer to store the hostname. +/// @param size Size of `hostname`. +void os_get_hostname(char *hostname, size_t size) { #ifdef HAVE_SYS_UTSNAME_H struct utsname vutsname; @@ -124,8 +124,7 @@ void os_get_hostname(char *hostname, size_t len) if (uname(&vutsname) < 0) { *hostname = '\0'; } else { - strncpy(hostname, vutsname.nodename, len - 1); - hostname[len - 1] = '\0'; + xstrlcpy(hostname, vutsname.nodename, size); } #else // TODO(unknown): Implement this for windows. diff --git a/src/nvim/os/os_defs.h b/src/nvim/os/os_defs.h index 5e164b54a5..14c210c69c 100644 --- a/src/nvim/os/os_defs.h +++ b/src/nvim/os/os_defs.h @@ -16,7 +16,7 @@ #define BASENAMELEN (NAME_MAX - 5) // Use the system path length if it makes sense. -#if defined(PATH_MAX) && (PATH_MAX > 1000) +#if defined(PATH_MAX) && (PATH_MAX > 1024) # define MAXPATHL PATH_MAX #else # define MAXPATHL 1024 diff --git a/src/nvim/path.c b/src/nvim/path.c index 3d1def8dd4..374d72ddd3 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -391,15 +391,22 @@ char *concat_fnames_realloc(char *fname1, const char *fname2, bool sep) fname2, len2, sep); } -/* - * Add a path separator to a file name, unless it already ends in a path - * separator. - */ -void add_pathsep(char *p) +/// Adds a path separator to a filename, unless it already ends in one. +/// +/// @return `true` if the path separator was added or already existed. +/// `false` if the filename is too long. +bool add_pathsep(char *p) FUNC_ATTR_NONNULL_ALL { - if (*p != NUL && !after_pathsep(p, p + strlen(p))) - strcat(p, PATHSEPSTR); + const size_t len = strlen(p); + if (*p != NUL && !after_pathsep(p, p + len)) { + const size_t pathsep_len = sizeof(PATHSEPSTR); + if (len > MAXPATHL - pathsep_len) { + return false; + } + memcpy(p + len, PATHSEPSTR, pathsep_len); + } + return true; } /// Get an allocated copy of the full path to a file. @@ -579,7 +586,7 @@ static size_t do_path_expand(garray_T *gap, const char_u *path, } if (has_mbyte) { len = (size_t)(*mb_ptr2len)(path_end); - STRNCPY(p, path_end, len); + memcpy(p, path_end, len); p += len; path_end += len; } else @@ -2181,7 +2188,8 @@ static int path_get_absolute_path(const char_u *fname, char_u *buf, relative_directory[0] = '/'; relative_directory[1] = NUL; } else { - STRNCPY(relative_directory, fname, p-fname); + assert(p >= fname); + memcpy(relative_directory, fname, (size_t)(p - fname)); relative_directory[p-fname] = NUL; } end_of_path = (char *) (p + 1); diff --git a/src/nvim/po/eo.po b/src/nvim/po/eo.po index d0a47d6e9b..b7bc6397ef 100644 --- a/src/nvim/po/eo.po +++ b/src/nvim/po/eo.po @@ -23,8 +23,8 @@ msgid "" msgstr "" "Project-Id-Version: Vim(Esperanto)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-29 23:03+0200\n" -"PO-Revision-Date: 2016-03-29 23:05+0200\n" +"POT-Creation-Date: 2016-07-02 16:21+0200\n" +"PO-Revision-Date: 2016-07-02 17:05+0200\n" "Last-Translator: Dominique PELLÉ <dominique.pelle@gmail.com>\n" "Language-Team: \n" "Language: eo\n" @@ -32,98 +32,76 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../api/private/helpers.c:201 #, fuzzy -msgid "Unable to get option value" -msgstr "fiaskis akiri valoron de opcio" +#~ msgid "Unable to get option value" +#~ msgstr "fiaskis akiri valoron de opcio" -#: ../api/private/helpers.c:204 #, fuzzy -msgid "internal error: unknown option type" -msgstr "interna eraro: neniu vim-a listero" +#~ msgid "internal error: unknown option type" +#~ msgstr "interna eraro: neniu vim-a listero" -#: ../buffer.c:92 msgid "[Location List]" msgstr "[Listo de lokoj]" # DP: Ĉu vere indas traduki Quickfix? -#: ../buffer.c:93 msgid "[Quickfix List]" msgstr "[Listo de rapidriparoj]" -#: ../buffer.c:94 msgid "E855: Autocommands caused command to abort" msgstr "E855: AÅtokomandoj haltigis komandon" -#: ../buffer.c:135 msgid "E82: Cannot allocate any buffer, exiting..." msgstr "E82: Ne eblas disponigi iun ajn bufron, nun eliras..." -#: ../buffer.c:138 msgid "E83: Cannot allocate buffer, using other one..." msgstr "E83: Ne eblas disponigi bufron, nun uzas alian..." -#: ../buffer.c:763 msgid "E515: No buffers were unloaded" msgstr "E515: Neniu bufro estis malÅargita" -#: ../buffer.c:765 msgid "E516: No buffers were deleted" msgstr "E516: Neniu bufro estis forviÅita" -#: ../buffer.c:767 msgid "E517: No buffers were wiped out" msgstr "E517: Neniu bufro estis detruita" -#: ../buffer.c:772 msgid "1 buffer unloaded" msgstr "1 bufro malÅargita" -#: ../buffer.c:774 #, c-format msgid "%d buffers unloaded" msgstr "%d bufroj malÅargitaj" -#: ../buffer.c:777 msgid "1 buffer deleted" msgstr "1 bufro forviÅita" -#: ../buffer.c:779 #, c-format msgid "%d buffers deleted" msgstr "%d bufroj forviÅitaj" -#: ../buffer.c:782 msgid "1 buffer wiped out" msgstr "1 bufro detruita" -#: ../buffer.c:784 #, c-format msgid "%d buffers wiped out" msgstr "%d bufroj detruitaj" -#: ../buffer.c:806 msgid "E90: Cannot unload last buffer" msgstr "E90: Ne eblas malÅargi la lastan bufron" -#: ../buffer.c:874 msgid "E84: No modified buffer found" msgstr "E84: Neniu modifita bufro trovita" #. back where we started, didn't find anything. -#: ../buffer.c:903 msgid "E85: There is no listed buffer" msgstr "E85: Estas neniu listigita bufro" -#: ../buffer.c:915 msgid "E87: Cannot go beyond last buffer" msgstr "E87: Ne eblas iri preter la lastan bufron" -#: ../buffer.c:917 msgid "E88: Cannot go before first buffer" msgstr "E88: Ne eblas iri antaÅ la unuan bufron" -#: ../buffer.c:945 #, c-format msgid "" "E89: No write since last change for buffer %<PRId64> (add ! to override)" @@ -132,103 +110,80 @@ msgstr "" "transpasi)" #. wrap around (may cause duplicates) -#: ../buffer.c:1423 msgid "W14: Warning: List of file names overflow" msgstr "W14: Averto: Listo de dosiernomoj troas" -#: ../buffer.c:1555 ../quickfix.c:3361 #, c-format msgid "E92: Buffer %<PRId64> not found" msgstr "E92: Bufro %<PRId64> ne trovita" -#: ../buffer.c:1798 #, c-format msgid "E93: More than one match for %s" msgstr "E93: Pli ol unu kongruo kun %s" -#: ../buffer.c:1800 #, c-format msgid "E94: No matching buffer for %s" msgstr "E94: Neniu bufro kongruas kun %s" -#: ../buffer.c:2161 #, c-format msgid "line %<PRId64>" msgstr "linio %<PRId64>" -#: ../buffer.c:2233 msgid "E95: Buffer with this name already exists" msgstr "E95: Bufro kun tiu nomo jam ekzistas" -#: ../buffer.c:2498 msgid " [Modified]" msgstr "[Modifita]" -#: ../buffer.c:2501 msgid "[Not edited]" msgstr "[Ne redaktita]" -#: ../buffer.c:2504 msgid "[New file]" msgstr "[Nova dosiero]" -#: ../buffer.c:2505 msgid "[Read errors]" msgstr "[Eraroj de legado]" -#: ../buffer.c:2506 ../buffer.c:3217 ../fileio.c:1807 ../screen.c:4895 msgid "[RO]" msgstr "[Nurlegebla]" -#: ../buffer.c:2507 ../fileio.c:1807 msgid "[readonly]" msgstr "[nurlegebla]" -#: ../buffer.c:2524 #, c-format msgid "1 line --%d%%--" msgstr "1 linio --%d%%--" -#: ../buffer.c:2526 #, c-format msgid "%<PRId64> lines --%d%%--" msgstr "%<PRId64> linioj --%d%%--" -#: ../buffer.c:2530 #, c-format msgid "line %<PRId64> of %<PRId64> --%d%%-- col " msgstr "linio %<PRId64> de %<PRId64> --%d%%-- kol " -#: ../buffer.c:2632 ../buffer.c:4292 ../memline.c:1554 msgid "[No Name]" msgstr "[Neniu nomo]" #. must be a help buffer -#: ../buffer.c:2667 msgid "help" msgstr "helpo" -#: ../buffer.c:3225 ../screen.c:4883 msgid "[Help]" msgstr "[Helpo]" -#: ../buffer.c:3254 ../screen.c:4887 msgid "[Preview]" msgstr "[AntaÅvido]" -#: ../buffer.c:3528 msgid "All" msgstr "Ĉio" -#: ../buffer.c:3528 msgid "Bot" msgstr "Subo" -#: ../buffer.c:3531 msgid "Top" msgstr "Supro" -#: ../buffer.c:4244 msgid "" "\n" "# Buffer list:\n" @@ -236,12 +191,10 @@ msgstr "" "\n" "# Listo de bufroj:\n" -#: ../buffer.c:4289 msgid "[Scratch]" msgstr "[Malneto]" # DP: Vidu ":help sign-support" por klarigo pri "Sign" -#: ../buffer.c:4529 msgid "" "\n" "--- Signs ---" @@ -249,200 +202,153 @@ msgstr "" "\n" "--- Emfazaj simbolaĵoj ---" -#: ../buffer.c:4538 #, c-format msgid "Signs for %s:" msgstr "Emfazaj simbolaĵoj de %s:" -#: ../buffer.c:4543 #, c-format msgid " line=%<PRId64> id=%d name=%s" msgstr " linio=%<PRId64> id=%d nomo=%s" -#: ../cursor_shape.c:68 msgid "E545: Missing colon" msgstr "E545: Mankas dupunkto" -#: ../cursor_shape.c:70 ../cursor_shape.c:94 msgid "E546: Illegal mode" msgstr "E546: ReÄimo nepermesata" -#: ../cursor_shape.c:134 msgid "E548: digit expected" msgstr "E548: cifero atendata" -#: ../cursor_shape.c:138 msgid "E549: Illegal percentage" msgstr "E549: Nevalida procento" -#: ../diff.c:146 #, c-format msgid "E96: Can not diff more than %<PRId64> buffers" msgstr "E96: Ne eblas dosierdiferenci pli ol %<PRId64> bufrojn" -#: ../diff.c:753 msgid "E810: Cannot read or write temp files" msgstr "E810: Ne eblas legi aÅ skribi provizorajn dosierojn" -#: ../diff.c:755 msgid "E97: Cannot create diffs" msgstr "E97: Ne eblas krei dosierdiferencojn" -#: ../diff.c:966 msgid "E816: Cannot read patch output" msgstr "E816: Ne eblas legi eliron de flikilo \"patch\"" -#: ../diff.c:1220 msgid "E98: Cannot read diff output" msgstr "E98: Ne eblas legi eliron de dosierdiferencilo \"diff\"" -#: ../diff.c:2081 msgid "E99: Current buffer is not in diff mode" msgstr "E99: Aktuala bufro ne estas en dosierdiferenca reÄimo" -#: ../diff.c:2100 msgid "E793: No other buffer in diff mode is modifiable" msgstr "E793: Neniu alia bufro en dosierdiferenca reÄimo estas modifebla" -#: ../diff.c:2102 msgid "E100: No other buffer in diff mode" msgstr "E100: Neniu alia bufro en dosierdiferenca reÄimo" -#: ../diff.c:2112 msgid "E101: More than two buffers in diff mode, don't know which one to use" msgstr "E101: Pli ol du bufroj en dosierdiferenca reÄimo, ne scias kiun uzi" -#: ../diff.c:2141 #, c-format msgid "E102: Can't find buffer \"%s\"" msgstr "E102: Ne eblas trovi bufron \"%s\"" -#: ../diff.c:2152 #, c-format msgid "E103: Buffer \"%s\" is not in diff mode" msgstr "E103: Bufro \"%s\" ne estas en dosierdiferenca reÄimo" -#: ../diff.c:2193 msgid "E787: Buffer changed unexpectedly" msgstr "E787: Bufro ÅanÄiÄis neatendite" -#: ../digraph.c:1598 msgid "E104: Escape not allowed in digraph" msgstr "E104: Eskapsigno nepermesebla en duliteraĵo" -#: ../digraph.c:1760 msgid "E544: Keymap file not found" msgstr "E544: Dosiero de klavmapo ne troveblas" -#: ../digraph.c:1785 msgid "E105: Using :loadkeymap not in a sourced file" msgstr "E105: Uzo de \":loadkeymap\" nur eblas en vim-skripto" -#: ../digraph.c:1821 msgid "E791: Empty keymap entry" msgstr "E791: Malplena rikordo en klavmapo" -#: ../edit.c:82 msgid " Keyword completion (^N^P)" msgstr " Kompletigo de Ålosilvorto (^N^P)" #. ctrl_x_mode == 0, ^P/^N compl. -#: ../edit.c:83 msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)" msgstr " ReÄimo ^X (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)" -#: ../edit.c:85 msgid " Whole line completion (^L^N^P)" msgstr " Kompletigo de tuta linio (^L^N^P)" -#: ../edit.c:86 msgid " File name completion (^F^N^P)" msgstr " Kompletigo de dosiernomo (^F^N^P)" -#: ../edit.c:87 msgid " Tag completion (^]^N^P)" msgstr " Kompletigo de etikedo (^]^N^P)" -#: ../edit.c:88 msgid " Path pattern completion (^N^P)" msgstr " Kompletigo de Åablona dosierindiko (^N^P)" -#: ../edit.c:89 msgid " Definition completion (^D^N^P)" msgstr " Kompletigo de difino (^D^N^P)" -#: ../edit.c:91 msgid " Dictionary completion (^K^N^P)" msgstr " Kompletigo de vortaro (^K^N^P)" -#: ../edit.c:92 msgid " Thesaurus completion (^T^N^P)" msgstr " Kompletigo de tezaÅro (^T^N^P)" -#: ../edit.c:93 msgid " Command-line completion (^V^N^P)" msgstr " Kompletigo de komanda linio (^V^N^P)" -#: ../edit.c:94 msgid " User defined completion (^U^N^P)" msgstr " Kompletigo difinita de uzanto (^U^N^P)" # DP: Ĉu eblas trovi pli bonan tradukon? -#: ../edit.c:95 msgid " Omni completion (^O^N^P)" msgstr " Kompletigo Omni (^O^N^P)" -#: ../edit.c:96 msgid " Spelling suggestion (s^N^P)" msgstr " Sugesto de literumo (s^N^P)" -#: ../edit.c:97 msgid " Keyword Local completion (^N^P)" msgstr " Kompletigo loka de Ålosilvorto (^N/^P)" -#: ../edit.c:100 msgid "Hit end of paragraph" msgstr "Atingis finon de alineo" -#: ../edit.c:101 msgid "E839: Completion function changed window" msgstr "E839: Kompletiga funkcio ÅanÄis la fenestron" -#: ../edit.c:102 msgid "E840: Completion function deleted text" msgstr "E840: Kompletiga funkcio forviÅis tekston" -#: ../edit.c:1847 msgid "'dictionary' option is empty" msgstr "La opcio 'dictionary' estas malplena" -#: ../edit.c:1848 msgid "'thesaurus' option is empty" msgstr "La opcio 'thesaurus' estas malplena" -#: ../edit.c:2655 #, c-format msgid "Scanning dictionary: %s" msgstr "Analizas vortaron: %s" -#: ../edit.c:3079 msgid " (insert) Scroll (^E/^Y)" msgstr " (enmeto) Rulumo (^E/^Y)" -#: ../edit.c:3081 msgid " (replace) Scroll (^E/^Y)" msgstr " (anstataÅigo) Rulumo (^E/^Y)" -#: ../edit.c:3587 #, c-format msgid "Scanning: %s" msgstr "Analizas: %s" -#: ../edit.c:3614 msgid "Scanning tags." msgstr "Analizas etikedojn." -#: ../edit.c:4519 msgid " Adding" msgstr " Aldonanta" @@ -450,426 +356,337 @@ msgstr " Aldonanta" #. * be called before line = ml_get(), or when this address is no #. * longer needed. -- Acevedo. #. -#: ../edit.c:4562 msgid "-- Searching..." msgstr "-- Serĉanta..." -#: ../edit.c:4618 msgid "Back at original" msgstr "Reveninta al originalo" -#: ../edit.c:4621 msgid "Word from other line" msgstr "Vorto el alia linio" -#: ../edit.c:4624 msgid "The only match" msgstr "La sola kongruo" -#: ../edit.c:4680 #, c-format msgid "match %d of %d" msgstr "kongruo %d de %d" -#: ../edit.c:4684 #, c-format msgid "match %d" msgstr "kongruo %d" -#: ../eval.c:137 msgid "E18: Unexpected characters in :let" msgstr "E18: Neatenditaj signoj en \":let\"" -#: ../eval.c:138 #, c-format msgid "E684: list index out of range: %<PRId64>" msgstr "E684: indekso de listo ekster limoj: %<PRId64>" -#: ../eval.c:139 #, c-format msgid "E121: Undefined variable: %s" msgstr "E121: Nedifinita variablo: %s" -#: ../eval.c:140 msgid "E111: Missing ']'" msgstr "E111: Mankas ']'" -#: ../eval.c:141 #, c-format msgid "E686: Argument of %s must be a List" msgstr "E686: Argumento de %s devas esti Listo" -#: ../eval.c:143 #, c-format msgid "E712: Argument of %s must be a List or Dictionary" msgstr "E712: Argumento de %s devas esti Listo aÅ Vortaro" -#: ../eval.c:145 msgid "E714: List required" msgstr "E714: Listo bezonata" -#: ../eval.c:146 msgid "E715: Dictionary required" msgstr "E715: Vortaro bezonata" -#: ../eval.c:147 +msgid "E928: String required" +msgstr "E928: Ĉeno bezonata" + #, c-format msgid "E118: Too many arguments for function: %s" msgstr "E118: Tro da argumentoj por funkcio: %s" -#: ../eval.c:148 #, c-format msgid "E716: Key not present in Dictionary: %s" msgstr "E716: Åœlosilo malekzistas en Vortaro: %s" -#: ../eval.c:150 #, c-format msgid "E122: Function %s already exists, add ! to replace it" msgstr "E122: La funkcio %s jam ekzistas (aldonu ! por anstataÅigi Äin)" -#: ../eval.c:151 msgid "E717: Dictionary entry already exists" msgstr "E717: Rikordo de vortaro jam ekzistas" -#: ../eval.c:152 msgid "E718: Funcref required" msgstr "E718: Funcref bezonata" -#: ../eval.c:153 msgid "E719: Cannot use [:] with a Dictionary" msgstr "E719: Uzo de [:] ne eblas kun Vortaro" -#: ../eval.c:154 #, c-format msgid "E734: Wrong variable type for %s=" msgstr "E734: Nevalida datumtipo de variablo de %s=" -#: ../eval.c:155 #, c-format msgid "E130: Unknown function: %s" msgstr "E130: Nekonata funkcio: %s" -#: ../eval.c:156 #, c-format msgid "E461: Illegal variable name: %s" msgstr "E461: Nevalida nomo de variablo: %s" -#: ../eval.c:157 msgid "E806: using Float as a String" msgstr "E806: uzo de Glitpunktnombro kiel Ĉeno" -#: ../eval.c:1830 msgid "E687: Less targets than List items" msgstr "E687: Malpli da celoj ol Listeroj" -#: ../eval.c:1834 msgid "E688: More targets than List items" msgstr "E688: Pli da celoj ol Listeroj" -#: ../eval.c:1906 msgid "Double ; in list of variables" msgstr "Duobla ; en listo de variabloj" -#: ../eval.c:2078 #, c-format msgid "E738: Can't list variables for %s" msgstr "E738: Ne eblas listigi variablojn de %s" -#: ../eval.c:2391 msgid "E689: Can only index a List or Dictionary" msgstr "E689: Nur eblas indeksi Liston aÅ Vortaron" -#: ../eval.c:2396 msgid "E708: [:] must come last" msgstr "E708: [:] devas esti laste" -#: ../eval.c:2439 msgid "E709: [:] requires a List value" msgstr "E709: [:] bezonas listan valoron" -#: ../eval.c:2674 msgid "E710: List value has more items than target" msgstr "E710: Lista valoro havas pli da eroj ol la celo" -#: ../eval.c:2678 msgid "E711: List value has not enough items" msgstr "E711: Lista valoro ne havas sufiĉe da eroj" -#: ../eval.c:2867 msgid "E690: Missing \"in\" after :for" msgstr "E690: \"in\" mankas post \":for\"" -#: ../eval.c:3063 #, c-format msgid "E107: Missing parentheses: %s" msgstr "E107: Mankas krampoj: %s" -#: ../eval.c:3263 #, c-format msgid "E108: No such variable: \"%s\"" msgstr "E108: Ne estas tia variablo: \"%s\"" -#: ../eval.c:3333 msgid "E743: variable nested too deep for (un)lock" msgstr "E743: variablo ingita tro profunde por malÅlosi" -#: ../eval.c:3630 msgid "E109: Missing ':' after '?'" msgstr "E109: Mankas ':' post '?'" -#: ../eval.c:3893 msgid "E691: Can only compare List with List" msgstr "E691: Eblas nur kompari Liston kun Listo" -#: ../eval.c:3895 msgid "E692: Invalid operation for Lists" msgstr "E692: Nevalida operacio de Listoj" -#: ../eval.c:3915 msgid "E735: Can only compare Dictionary with Dictionary" msgstr "E735: Eblas nur kompari Vortaron kun Vortaro" -#: ../eval.c:3917 msgid "E736: Invalid operation for Dictionary" msgstr "E736: Nevalida operacio de Vortaro" -#: ../eval.c:3932 msgid "E693: Can only compare Funcref with Funcref" msgstr "E693: Eblas nur kompari Funcref kun Funcref" -#: ../eval.c:3934 msgid "E694: Invalid operation for Funcrefs" msgstr "E694: Nevalida operacio de Funcref-oj" -#: ../eval.c:4277 msgid "E804: Cannot use '%' with Float" msgstr "E804: Ne eblas uzi '%' kun Glitpunktnombro" -#: ../eval.c:4478 msgid "E110: Missing ')'" msgstr "E110: Mankas ')'" -#: ../eval.c:4609 msgid "E695: Cannot index a Funcref" msgstr "E695: Ne eblas indeksi Funcref" msgid "E909: Cannot index a special variable" msgstr "E909: Ne eblas indeksi specialan variablon" -#: ../eval.c:4839 #, c-format msgid "E112: Option name missing: %s" msgstr "E112: Mankas nomo de opcio: %s" -#: ../eval.c:4855 #, c-format msgid "E113: Unknown option: %s" msgstr "E113: Nekonata opcio: %s" -#: ../eval.c:4904 #, c-format msgid "E114: Missing quote: %s" msgstr "E114: Mankas citilo: %s" -#: ../eval.c:5020 #, c-format msgid "E115: Missing quote: %s" msgstr "E115: Mankas citilo: %s" -#: ../eval.c:5084 #, c-format msgid "E696: Missing comma in List: %s" msgstr "E696: Mankas komo en Listo: %s" -#: ../eval.c:5091 #, c-format msgid "E697: Missing end of List ']': %s" msgstr "E697: Mankas fino de Listo ']': %s" -#: ../eval.c:5750 msgid "Not enough memory to set references, garbage collection aborted!" msgstr "Ne sufiĉa memoro por valorigi referencojn, senrubigado ĉesigita!" -#: ../eval.c:6475 #, c-format msgid "E720: Missing colon in Dictionary: %s" msgstr "E720: Mankas dupunkto en la vortaro: %s" -#: ../eval.c:6499 #, c-format msgid "E721: Duplicate key in Dictionary: \"%s\"" msgstr "E721: Ripetita Ålosilo en la vortaro: \"%s\"" -#: ../eval.c:6517 #, c-format msgid "E722: Missing comma in Dictionary: %s" msgstr "E722: Mankas komo en la vortaro: %s" -#: ../eval.c:6524 #, c-format msgid "E723: Missing end of Dictionary '}': %s" msgstr "E723: Mankas fino de vortaro '}': %s" -#: ../eval.c:6555 msgid "E724: variable nested too deep for displaying" msgstr "E724: variablo ingita tro profunde por vidigi" -#: ../eval.c:7188 #, c-format msgid "E740: Too many arguments for function %s" msgstr "E740: Tro da argumentoj por funkcio: %s" -#: ../eval.c:7190 #, c-format msgid "E116: Invalid arguments for function %s" msgstr "E116: Nevalidaj argumentoj por funkcio: %s" -#: ../eval.c:7377 #, c-format msgid "E117: Unknown function: %s" msgstr "E117: Nekonata funkcio: %s" -#: ../eval.c:7383 #, c-format msgid "E119: Not enough arguments for function: %s" msgstr "E119: Ne sufiĉe da argumentoj por funkcio: %s" -#: ../eval.c:7387 #, c-format msgid "E120: Using <SID> not in a script context: %s" msgstr "E120: <SID> estas uzata ekster kunteksto de skripto: %s" -#: ../eval.c:7391 #, c-format msgid "E725: Calling dict function without Dictionary: %s" msgstr "E725: Alvoko de funkcio dict sen Vortaro: %s" -#: ../eval.c:7453 msgid "E808: Number or Float required" msgstr "E808: Nombro aÅ Glitpunktnombro bezonata" -#: ../eval.c:7503 msgid "add() argument" msgstr "argumento de add()" -#: ../eval.c:7907 msgid "E699: Too many arguments" msgstr "E699: Tro da argumentoj" -#: ../eval.c:8073 msgid "E785: complete() can only be used in Insert mode" msgstr "E785: complete() uzeblas nur en Enmeta reÄimo" -#: ../eval.c:8156 msgid "&Ok" msgstr "&Bone" -#: ../eval.c:8676 #, c-format msgid "E737: Key already exists: %s" msgstr "E737: Åœlosilo jam ekzistas: %s" -#: ../eval.c:8692 msgid "extend() argument" msgstr "argumento de extend()" -#: ../eval.c:8915 msgid "map() argument" msgstr "argumento de map()" -#: ../eval.c:8916 msgid "filter() argument" msgstr "argumento de filter()" -#: ../eval.c:9229 #, c-format msgid "+-%s%3ld lines: " msgstr "+-%s%3ld linioj: " -#: ../eval.c:9291 #, c-format msgid "E700: Unknown function: %s" msgstr "E700: Nekonata funkcio: %s" -#: ../eval.c:10729 msgid "called inputrestore() more often than inputsave()" msgstr "alvokis inputrestore() pli ofte ol inputsave()" -#: ../eval.c:10771 msgid "insert() argument" msgstr "argumento de insert()" -#: ../eval.c:10841 msgid "E786: Range not allowed" msgstr "E786: Amplekso nepermesebla" -#: ../eval.c:11140 msgid "E701: Invalid type for len()" msgstr "E701: Nevalida datumtipo de len()" -#: ../eval.c:11980 msgid "E726: Stride is zero" msgstr "E726: PaÅo estas nul" -#: ../eval.c:11982 msgid "E727: Start past end" msgstr "E727: Komenco preter fino" -#: ../eval.c:12024 ../eval.c:15297 msgid "<empty>" msgstr "<malplena>" -#: ../eval.c:12282 msgid "remove() argument" msgstr "argumento de remove()" -#: ../eval.c:12466 msgid "E655: Too many symbolic links (cycle?)" msgstr "E655: Tro da simbolaj ligiloj (ĉu estas ciklo?)" -#: ../eval.c:12593 msgid "reverse() argument" msgstr "argumento de reverse()" -#: ../eval.c:13721 +#, c-format +msgid "E927: Invalid action: '%s'" +msgstr "E927: Nevalida ago: '%s'" + msgid "sort() argument" msgstr "argumento de sort()" -#: ../eval.c:13721 #, fuzzy -msgid "uniq() argument" -msgstr "argumento de add()" +#~ msgid "uniq() argument" +#~ msgstr "argumento de add()" -#: ../eval.c:13776 msgid "E702: Sort compare function failed" msgstr "E702: Ordiga funkcio fiaskis" -#: ../eval.c:13806 #, fuzzy -msgid "E882: Uniq compare function failed" -msgstr "E702: Ordiga funkcio fiaskis" +#~ msgid "E882: Uniq compare function failed" +#~ msgstr "E702: Ordiga funkcio fiaskis" -#: ../eval.c:14085 msgid "(Invalid)" msgstr "(Nevalida)" -#: ../eval.c:14590 msgid "E677: Error writing temp file" msgstr "E677: Eraro dum skribo de provizora dosiero" -#: ../eval.c:16159 msgid "E805: Using a Float as a Number" msgstr "E805: Uzo de Glitpunktnombro kiel Nombro" -#: ../eval.c:16162 msgid "E703: Using a Funcref as a Number" msgstr "E703: Uzo de Funcref kiel Nombro" -#: ../eval.c:16170 msgid "E745: Using a List as a Number" msgstr "E745: Uzo de Listo kiel Nombro" -#: ../eval.c:16173 msgid "E728: Using a Dictionary as a Number" msgstr "E728: Uzo de Vortaro kiel Nombro" @@ -885,155 +702,123 @@ msgstr "E893: Uzo de Listo kiel Glitpunktnombro" msgid "E894: Using a Dictionary as a Float" msgstr "E894: Uzo de Vortaro kiel Glitpunktnombro" -#: ../eval.c:16259 msgid "E729: using Funcref as a String" msgstr "E729: uzo de Funcref kiel Ĉeno" -#: ../eval.c:16262 msgid "E730: using List as a String" msgstr "E730: uzo de Listo kiel Ĉeno" -#: ../eval.c:16265 msgid "E731: using Dictionary as a String" msgstr "E731: uzo de Vortaro kiel Ĉeno" msgid "E908: using an invalid value as a String" msgstr "E908: uzo de nevalida valoro kiel Ĉeno" -#: ../eval.c:16619 #, c-format msgid "E706: Variable type mismatch for: %s" msgstr "E706: Nekongrua datumtipo de variablo: %s" -#: ../eval.c:16705 #, c-format msgid "E795: Cannot delete variable %s" msgstr "E795: Ne eblas forviÅi variablon %s" -#: ../eval.c:16724 #, c-format msgid "E704: Funcref variable name must start with a capital: %s" msgstr "E704: Nomo de variablo Funcref devas finiÄi per majusklo: %s" -#: ../eval.c:16732 #, c-format msgid "E705: Variable name conflicts with existing function: %s" msgstr "E705: Nomo de variablo konfliktas kun ekzistanta funkcio: %s" -#: ../eval.c:16763 #, c-format msgid "E741: Value is locked: %s" msgstr "E741: Valoro estas Ålosita: %s" -#: ../eval.c:16764 ../eval.c:16769 ../message.c:1839 msgid "Unknown" msgstr "Nekonata" -#: ../eval.c:16768 #, c-format msgid "E742: Cannot change value of %s" msgstr "E742: Ne eblas ÅanÄi valoron de %s" -#: ../eval.c:16838 msgid "E698: variable nested too deep for making a copy" msgstr "E698: variablo ingita tro profunde por fari kopion" -#: ../eval.c:17249 #, c-format msgid "E123: Undefined function: %s" msgstr "E123: Nedifinita funkcio: %s" -#: ../eval.c:17260 #, c-format msgid "E124: Missing '(': %s" msgstr "E124: Mankas '(': %s" -#: ../eval.c:17293 msgid "E862: Cannot use g: here" msgstr "E862: Ne eblas uzi g: ĉi tie" -#: ../eval.c:17312 #, c-format msgid "E125: Illegal argument: %s" msgstr "E125: Nevalida argumento: %s" -#: ../eval.c:17323 #, c-format msgid "E853: Duplicate argument name: %s" msgstr "E853: Ripetita nomo de argumento: %s" -#: ../eval.c:17416 msgid "E126: Missing :endfunction" msgstr "E126: Mankas \":endfunction\"" -#: ../eval.c:17537 #, c-format msgid "E707: Function name conflicts with variable: %s" msgstr "E707: Nomo de funkcio konfliktas kun variablo: %s" -#: ../eval.c:17549 #, c-format msgid "E127: Cannot redefine function %s: It is in use" msgstr "E127: Ne eblas redifini funkcion %s: Estas nuntempe uzata" -#: ../eval.c:17604 #, c-format msgid "E746: Function name does not match script file name: %s" msgstr "E746: Nomo de funkcio ne kongruas kun dosiernomo de skripto: %s" -#: ../eval.c:17716 msgid "E129: Function name required" msgstr "E129: Nomo de funkcio bezonata" -#: ../eval.c:17824 #, fuzzy, c-format -msgid "E128: Function name must start with a capital or \"s:\": %s" -msgstr "E128: Nomo de funkcio devas eki per majusklo aÅ enhavi dupunkton: %s" +#~ msgid "E128: Function name must start with a capital or \"s:\": %s" +#~ msgstr "E128: Nomo de funkcio devas eki per majusklo aÅ enhavi dupunkton: %s" -#: ../eval.c:17833 #, fuzzy, c-format -msgid "E884: Function name cannot contain a colon: %s" -msgstr "E128: Nomo de funkcio devas eki per majusklo aÅ enhavi dupunkton: %s" +#~ msgid "E884: Function name cannot contain a colon: %s" +#~ msgstr "E128: Nomo de funkcio devas eki per majusklo aÅ enhavi dupunkton: %s" -#: ../eval.c:18336 #, c-format msgid "E131: Cannot delete function %s: It is in use" msgstr "E131: Ne eblas forviÅi funkcion %s: Estas nuntempe uzata" -#: ../eval.c:18441 msgid "E132: Function call depth is higher than 'maxfuncdepth'" msgstr "E132: Profundo de funkcia alvoko superas 'maxfuncdepth'" -#: ../eval.c:18568 #, c-format msgid "calling %s" msgstr "alvokas %s" -#: ../eval.c:18651 #, c-format msgid "%s aborted" msgstr "%s ĉesigita" -#: ../eval.c:18653 #, c-format msgid "%s returning #%<PRId64>" msgstr "%s liveras #%<PRId64>" -#: ../eval.c:18670 #, c-format msgid "%s returning %s" msgstr "%s liveras %s" -#: ../eval.c:18691 ../ex_cmds2.c:2695 #, c-format msgid "continuing in %s" msgstr "daÅrigas en %s" -#: ../eval.c:18795 msgid "E133: :return not inside a function" msgstr "E133: \":return\" ekster funkcio" -#: ../eval.c:19159 msgid "" "\n" "# global variables:\n" @@ -1041,7 +826,6 @@ msgstr "" "\n" "# mallokaj variabloj:\n" -#: ../eval.c:19254 msgid "" "\n" "\tLast set from " @@ -1049,104 +833,82 @@ msgstr "" "\n" "\tLaste Åaltita de " -#: ../eval.c:19272 msgid "No old files" msgstr "Neniu malnova dosiero" -#: ../ex_cmds.c:122 #, c-format msgid "<%s>%s%s %d, Hex %02x, Octal %03o" msgstr "<%s>%s%s %d, Deksesuma %02x, Okuma %03o" -#: ../ex_cmds.c:145 #, c-format msgid "> %d, Hex %04x, Octal %o" msgstr "> %d, Deksesuma %04x, Okuma %o" -#: ../ex_cmds.c:146 #, c-format msgid "> %d, Hex %08x, Octal %o" msgstr "> %d, Deksesuma %08x, Okuma %o" -#: ../ex_cmds.c:684 msgid "E134: Move lines into themselves" msgstr "E134: Movas liniojn en ilin mem" -#: ../ex_cmds.c:747 msgid "1 line moved" msgstr "1 linio movita" -#: ../ex_cmds.c:749 #, c-format msgid "%<PRId64> lines moved" msgstr "%<PRId64> linioj movitaj" -#: ../ex_cmds.c:1175 #, c-format msgid "%<PRId64> lines filtered" msgstr "%<PRId64> linioj filtritaj" -#: ../ex_cmds.c:1194 msgid "E135: *Filter* Autocommands must not change current buffer" msgstr "E135: *Filtraj* AÅtokomandoj ne rajtas ÅanÄi aktualan bufron" -#: ../ex_cmds.c:1244 msgid "[No write since last change]\n" msgstr "[Neniu skribo de post lasta ÅanÄo]\n" -#: ../ex_cmds.c:1424 #, c-format msgid "%sviminfo: %s in line: " msgstr "%sviminfo: %s en linio: " -#: ../ex_cmds.c:1431 msgid "E136: viminfo: Too many errors, skipping rest of file" msgstr "E136: viminfo: Tro da eraroj, nun ignoras la reston de la dosiero" -#: ../ex_cmds.c:1458 #, c-format msgid "Reading viminfo file \"%s\"%s%s%s" msgstr "Legado de dosiero viminfo \"%s\"%s%s%s" -#: ../ex_cmds.c:1460 msgid " info" msgstr " informo" -#: ../ex_cmds.c:1461 msgid " marks" msgstr " markoj" -#: ../ex_cmds.c:1462 msgid " oldfiles" msgstr " malnovaj dosieroj" -#: ../ex_cmds.c:1463 msgid " FAILED" msgstr " FIASKIS" #. avoid a wait_return for this message, it's annoying -#: ../ex_cmds.c:1541 #, c-format msgid "E137: Viminfo file is not writable: %s" msgstr "E137: Dosiero viminfo ne skribeblas: %s" -#: ../ex_cmds.c:1626 #, c-format msgid "E138: Can't write viminfo file %s!" msgstr "E138: Ne eblas skribi dosieron viminfo %s!" -#: ../ex_cmds.c:1635 #, c-format msgid "Writing viminfo file \"%s\"" msgstr "Skribas dosieron viminfo \"%s\"" #. Write the info: -#: ../ex_cmds.c:1720 #, c-format msgid "# This viminfo file was generated by Vim %s.\n" msgstr "# Tiu dosiero viminfo estis kreita de Vim %s.\n" -#: ../ex_cmds.c:1722 msgid "" "# You may edit it if you're careful!\n" "\n" @@ -1154,47 +916,37 @@ msgstr "" "# Vi povas redakti Äin se vi estas singarda.\n" "\n" -#: ../ex_cmds.c:1723 msgid "# Value of 'encoding' when this file was written\n" msgstr "# Valoro de 'encoding' kiam tiu dosiero estis kreita\n" -#: ../ex_cmds.c:1800 msgid "Illegal starting char" msgstr "Nevalida eka signo" -#: ../ex_cmds.c:2162 msgid "Write partial file?" msgstr "Ĉu skribi partan dosieron?" -#: ../ex_cmds.c:2166 msgid "E140: Use ! to write partial buffer" msgstr "E140: Uzu ! por skribi partan bufron" -#: ../ex_cmds.c:2281 #, c-format msgid "Overwrite existing file \"%s\"?" msgstr "Ĉu anstataÅigi ekzistantan dosieron \"%s\"?" -#: ../ex_cmds.c:2317 #, c-format msgid "Swap file \"%s\" exists, overwrite anyway?" msgstr "Permutodosiero .swp \"%s\" ekzistas, ĉu tamen anstataÅigi Äin?" -#: ../ex_cmds.c:2326 #, c-format msgid "E768: Swap file exists: %s (:silent! overrides)" msgstr "E768: Permutodosiero .swp ekzistas: %s (:silent! por transpasi)" -#: ../ex_cmds.c:2381 #, c-format msgid "E141: No file name for buffer %<PRId64>" msgstr "E141: Neniu dosiernomo de bufro %<PRId64>" -#: ../ex_cmds.c:2412 msgid "E142: File not written: Writing is disabled by 'write' option" msgstr "E142: Dosiero ne skribita: Skribo malÅaltita per la opcio 'write'" -#: ../ex_cmds.c:2434 #, c-format msgid "" "'readonly' option is set for \"%s\".\n" @@ -1203,7 +955,6 @@ msgstr "" "La opcio 'readonly' estas Åaltita por \"%s\".\n" "Ĉu vi tamen volas skribi?" -#: ../ex_cmds.c:2439 #, c-format msgid "" "File permissions of \"%s\" are read-only.\n" @@ -1214,84 +965,66 @@ msgstr "" "BonÅance Äi eble skribeblus.\n" "Ĉu vi volas provi?" -#: ../ex_cmds.c:2451 #, c-format msgid "E505: \"%s\" is read-only (add ! to override)" msgstr "E505: \"%s\" estas nurlegebla (aldonu ! por transpasi)" -#: ../ex_cmds.c:3120 #, c-format msgid "E143: Autocommands unexpectedly deleted new buffer %s" msgstr "E143: AÅtokomandoj neatendite forviÅis novan bufron %s" -#: ../ex_cmds.c:3313 msgid "E144: non-numeric argument to :z" msgstr "E144: nenumera argumento de :z" -#: ../ex_cmds.c:3404 msgid "E145: Shell commands not allowed in rvim" msgstr "E145: Åœelkomandoj nepermeseblaj en rvim" -#: ../ex_cmds.c:3498 msgid "E146: Regular expressions can't be delimited by letters" msgstr "E146: Ne eblas limigi regulesprimon per literoj" -#: ../ex_cmds.c:3964 #, c-format msgid "replace with %s (y/n/a/q/l/^E/^Y)?" msgstr "ĉu anstataÅigi per %s (y/n/a/q/l/^E/^Y)?" -#: ../ex_cmds.c:4379 msgid "(Interrupted) " msgstr "(Interrompita) " -#: ../ex_cmds.c:4384 msgid "1 match" msgstr "1 kongruo" -#: ../ex_cmds.c:4384 msgid "1 substitution" msgstr "1 anstataÅigo" -#: ../ex_cmds.c:4387 #, c-format msgid "%<PRId64> matches" msgstr "%<PRId64> kongruoj" -#: ../ex_cmds.c:4388 #, c-format msgid "%<PRId64> substitutions" msgstr "%<PRId64> anstataÅigoj" -#: ../ex_cmds.c:4392 msgid " on 1 line" msgstr " en 1 linio" -#: ../ex_cmds.c:4395 #, c-format msgid " on %<PRId64> lines" msgstr " en %<PRId64> linioj" -#: ../ex_cmds.c:4438 msgid "E147: Cannot do :global recursive" msgstr "E147: Ne eblas fari \":global\" rekursie" # DP: global estas por ":global" do mi ne tradukis Äin -#: ../ex_cmds.c:4467 msgid "E148: Regular expression missing from global" msgstr "E148: Regulesprimo mankas el global" -#: ../ex_cmds.c:4508 #, c-format msgid "Pattern found in every line: %s" msgstr "Åœablono trovita en ĉiuj linioj: %s" -#: ../ex_cmds.c:4510 #, c-format msgid "Pattern not found: %s" msgstr "Åœablono ne trovita: %s" -#: ../ex_cmds.c:4587 msgid "" "\n" "# Last Substitute String:\n" @@ -1302,46 +1035,37 @@ msgstr "" "$" # This message should *so* be E42! -#: ../ex_cmds.c:4679 msgid "E478: Don't panic!" msgstr "E478: Ne paniku!" -#: ../ex_cmds.c:4717 #, c-format msgid "E661: Sorry, no '%s' help for %s" msgstr "E661: BedaÅrinde estas neniu helpo '%s' por %s" -#: ../ex_cmds.c:4719 #, c-format msgid "E149: Sorry, no help for %s" msgstr "E149: BedaÅrinde estas neniu helpo por %s" -#: ../ex_cmds.c:4751 #, c-format msgid "Sorry, help file \"%s\" not found" msgstr "BedaÅrinde, la helpdosiero \"%s\" ne troveblas" -#: ../ex_cmds.c:5323 #, c-format msgid "E150: Not a directory: %s" msgstr "E150: Ne estas dosierujo: %s" -#: ../ex_cmds.c:5446 #, c-format msgid "E152: Cannot open %s for writing" msgstr "E152: Ne eblas malfermi %s en skribreÄimo" -#: ../ex_cmds.c:5471 #, c-format msgid "E153: Unable to open %s for reading" msgstr "E153: Ne eblas malfermi %s en legreÄimo" -#: ../ex_cmds.c:5500 #, c-format msgid "E670: Mix of help file encodings within a language: %s" msgstr "E670: Miksaĵo de kodoprezento de helpa dosiero en lingvo: %s" -#: ../ex_cmds.c:5565 #, c-format msgid "E154: Duplicate tag \"%s\" in file %s/%s" msgstr "E154: Ripetita etikedo \"%s\" en dosiero %s/%s" @@ -1350,56 +1074,44 @@ msgstr "E154: Ripetita etikedo \"%s\" en dosiero %s/%s" msgid "E160: Unknown sign command: %s" msgstr "E160: Nekonata simbola komando: %s" -#: ../ex_cmds.c:5704 msgid "E156: Missing sign name" msgstr "E156: Mankas nomo de simbolo" -#: ../ex_cmds.c:5746 msgid "E612: Too many signs defined" msgstr "E612: Tro da simboloj estas difinitaj" -#: ../ex_cmds.c:5813 #, c-format msgid "E239: Invalid sign text: %s" msgstr "E239: Nevalida teksto de simbolo: %s" -#: ../ex_cmds.c:5844 ../ex_cmds.c:6035 #, c-format msgid "E155: Unknown sign: %s" msgstr "E155: Nekonata simbolo: %s" -#: ../ex_cmds.c:5877 msgid "E159: Missing sign number" msgstr "E159: Mankas numero de simbolo" -#: ../ex_cmds.c:5971 #, c-format msgid "E158: Invalid buffer name: %s" msgstr "E158: Nevalida nomo de bufro: %s" -#: ../ex_cmds.c:6008 #, c-format msgid "E157: Invalid sign ID: %<PRId64>" msgstr "E157: Nevalida identigilo de simbolo: %<PRId64>" -#: ../ex_cmds.c:6066 msgid " (not supported)" msgstr " (nesubtenata)" -#: ../ex_cmds.c:6169 msgid "[Deleted]" msgstr "[ForviÅita]" -#: ../ex_cmds2.c:139 msgid "Entering Debug mode. Type \"cont\" to continue." msgstr "Eniras sencimigan reÄimon. Tajpu \"cont\" por daÅrigi." -#: ../ex_cmds2.c:143 ../ex_docmd.c:759 #, c-format msgid "line %<PRId64>: %s" msgstr "linio %<PRId64>: %s" -#: ../ex_cmds2.c:145 #, c-format msgid "cmd: %s" msgstr "kmd: %s" @@ -1411,231 +1123,180 @@ msgstr "kadro estas nul" msgid "frame at highest level: %d" msgstr "kadro je la plej alta nivelo: %d" -#: ../ex_cmds2.c:322 #, c-format msgid "Breakpoint in \"%s%s\" line %<PRId64>" msgstr "Kontrolpunkto en \"%s%s\" linio %<PRId64>" -#: ../ex_cmds2.c:581 #, c-format msgid "E161: Breakpoint not found: %s" msgstr "E161: Kontrolpunkto ne trovita: %s" -#: ../ex_cmds2.c:611 msgid "No breakpoints defined" msgstr "Neniu kontrolpunkto estas difinita" -#: ../ex_cmds2.c:617 #, c-format msgid "%3d %s %s line %<PRId64>" msgstr "%3d %s %s linio %<PRId64>" -#: ../ex_cmds2.c:942 msgid "E750: First use \":profile start {fname}\"" msgstr "E750: Uzu unue \":profile start {dosiernomo}\"" -#: ../ex_cmds2.c:1269 #, c-format msgid "Save changes to \"%s\"?" msgstr "Ĉu konservi ÅanÄojn al \"%s\"?" -#: ../ex_cmds2.c:1271 ../ex_docmd.c:8851 msgid "Untitled" msgstr "Sen titolo" -#: ../ex_cmds2.c:1421 #, c-format msgid "E162: No write since last change for buffer \"%s\"" msgstr "E162: Neniu skribo de post la lasta ÅanÄo por bufro \"%s\"" -#: ../ex_cmds2.c:1480 msgid "Warning: Entered other buffer unexpectedly (check autocommands)" msgstr "Averto: Eniris neatendite alian bufron (kontrolu aÅtokomandojn)" -#: ../ex_cmds2.c:1826 msgid "E163: There is only one file to edit" msgstr "E163: Estas nur unu redaktenda dosiero" -#: ../ex_cmds2.c:1828 msgid "E164: Cannot go before first file" msgstr "E164: Ne eblas iri antaÅ ol la unuan dosieron" -#: ../ex_cmds2.c:1830 msgid "E165: Cannot go beyond last file" msgstr "E165: Ne eblas iri preter la lastan dosieron" -#: ../ex_cmds2.c:2175 #, c-format msgid "E666: compiler not supported: %s" msgstr "E666: kompililo nesubtenata: %s" -#: ../ex_cmds2.c:2257 #, c-format msgid "Searching for \"%s\" in \"%s\"" msgstr "Serĉado de \"%s\" en \"%s\"" -#: ../ex_cmds2.c:2284 #, c-format msgid "Searching for \"%s\"" msgstr "Serĉado de \"%s\"" -#: ../ex_cmds2.c:2307 #, c-format msgid "not found in '%s': \"%s\"" msgstr "ne trovita en '%s: \"%s\"" -#: ../ex_cmds2.c:2472 #, c-format msgid "Cannot source a directory: \"%s\"" msgstr "Ne eblas ruli dosierujon: \"%s\"" -#: ../ex_cmds2.c:2518 #, c-format msgid "could not source \"%s\"" msgstr "ne eblis ruli \"%s\"" -#: ../ex_cmds2.c:2520 #, c-format msgid "line %<PRId64>: could not source \"%s\"" msgstr "linio %<PRId64>: ne eblis ruli \"%s\"" -#: ../ex_cmds2.c:2535 #, c-format msgid "sourcing \"%s\"" msgstr "rulas \"%s\"" -#: ../ex_cmds2.c:2537 #, c-format msgid "line %<PRId64>: sourcing \"%s\"" msgstr "linio %<PRId64>: rulas \"%s\"" -#: ../ex_cmds2.c:2693 #, c-format msgid "finished sourcing %s" msgstr "finis ruli %s" -#: ../ex_cmds2.c:2765 msgid "modeline" msgstr "reÄimlinio" -#: ../ex_cmds2.c:2767 msgid "--cmd argument" msgstr "--cmd argumento" -#: ../ex_cmds2.c:2769 msgid "-c argument" msgstr "-c argumento" -#: ../ex_cmds2.c:2771 msgid "environment variable" msgstr "medivariablo" -#: ../ex_cmds2.c:2773 msgid "error handler" msgstr "erartraktilo" -#: ../ex_cmds2.c:3020 msgid "W15: Warning: Wrong line separator, ^M may be missing" msgstr "W15: Averto: NeÄusta disigilo de linio, ^M eble mankas" -#: ../ex_cmds2.c:3139 msgid "E167: :scriptencoding used outside of a sourced file" msgstr "E167: \":scriptencoding\" uzita ekster rulita dosiero" -#: ../ex_cmds2.c:3166 msgid "E168: :finish used outside of a sourced file" msgstr "E168: \":finish\" uzita ekster rulita dosiero" -#: ../ex_cmds2.c:3389 #, c-format msgid "Current %slanguage: \"%s\"" msgstr "Aktuala %slingvo: \"%s\"" -#: ../ex_cmds2.c:3404 #, c-format msgid "E197: Cannot set language to \"%s\"" msgstr "E197: Ne eblas ÅanÄi la lingvon al \"%s\"" #. don't redisplay the window #. don't wait for return -#: ../ex_docmd.c:387 msgid "Entering Ex mode. Type \"visual\" to go to Normal mode." msgstr "Eniras reÄimon Ex. Tajpu \"visual\" por iri al reÄimo Normala." -#: ../ex_docmd.c:428 msgid "E501: At end-of-file" msgstr "E501: Ĉe fino-de-dosiero" -#: ../ex_docmd.c:513 msgid "E169: Command too recursive" msgstr "E169: Komando tro rekursia" -#: ../ex_docmd.c:1006 #, c-format msgid "E605: Exception not caught: %s" msgstr "E605: Escepto nekaptita: %s" -#: ../ex_docmd.c:1085 msgid "End of sourced file" msgstr "Fino de rulita dosiero" -#: ../ex_docmd.c:1086 msgid "End of function" msgstr "Fino de funkcio" -#: ../ex_docmd.c:1628 msgid "E464: Ambiguous use of user-defined command" msgstr "E464: Ambigua uzo de komando difinita de uzanto" -#: ../ex_docmd.c:1638 msgid "E492: Not an editor command" msgstr "E492: Ne estas redaktila komando" -#: ../ex_docmd.c:1729 msgid "E493: Backwards range given" msgstr "E493: Inversa amplekso donita" -#: ../ex_docmd.c:1733 msgid "Backwards range given, OK to swap" msgstr "Inversa amplekso donita, permuteblas" #. append #. typed wrong -#: ../ex_docmd.c:1787 msgid "E494: Use w or w>>" msgstr "E494: Uzu w aÅ w>>" -#: ../ex_docmd.c:3454 msgid "E319: The command is not available in this version" msgstr "E319: BedaÅrinde, tiu komando ne haveblas en tiu versio" -#: ../ex_docmd.c:3752 msgid "E172: Only one file name allowed" msgstr "E172: Nur unu dosiernomo permesebla" -#: ../ex_docmd.c:4238 msgid "1 more file to edit. Quit anyway?" msgstr "1 plia redaktenda dosiero. Ĉu tamen eliri?" -#: ../ex_docmd.c:4242 #, c-format msgid "%d more files to edit. Quit anyway?" msgstr "%d pliaj redaktendaj dosieroj. Ĉu tamen eliri?" -#: ../ex_docmd.c:4248 msgid "E173: 1 more file to edit" msgstr "E173: 1 plia redaktenda dosiero" -#: ../ex_docmd.c:4250 #, c-format msgid "E173: %<PRId64> more files to edit" msgstr "E173: %<PRId64> pliaj redaktendaj dosieroj" -#: ../ex_docmd.c:4320 msgid "E174: Command already exists: add ! to replace it" msgstr "E174: La komando jam ekzistas: aldonu ! por anstataÅigi Äin" -#: ../ex_docmd.c:4432 msgid "" "\n" " Name Args Address Complete Definition" @@ -1643,352 +1304,273 @@ msgstr "" "\n" " Nomo Argumentoj Adreso Kompleto Difino" -#: ../ex_docmd.c:4516 msgid "No user-defined commands found" msgstr "Neniu komando difinita de uzanto trovita" -#: ../ex_docmd.c:4538 msgid "E175: No attribute specified" msgstr "E175: Neniu atributo specifita" -#: ../ex_docmd.c:4583 msgid "E176: Invalid number of arguments" msgstr "E176: Nevalida nombro de argumentoj" -#: ../ex_docmd.c:4594 msgid "E177: Count cannot be specified twice" msgstr "E177: Kvantoro ne povas aperi dufoje" -#: ../ex_docmd.c:4603 msgid "E178: Invalid default value for count" msgstr "E178: Nevalida defaÅlta valoro de kvantoro" -#: ../ex_docmd.c:4625 msgid "E179: argument required for -complete" msgstr "E179: argumento bezonata por -complete" -#: ../ex_docmd.c:4933 msgid "E179: argument required for -addr" msgstr "E179: argumento bezonata por -addr" -#: ../ex_docmd.c:4635 #, c-format msgid "E181: Invalid attribute: %s" msgstr "E181: Nevalida atributo: %s" -#: ../ex_docmd.c:4678 msgid "E182: Invalid command name" msgstr "E182: Nevalida komanda nomo" -#: ../ex_docmd.c:4691 msgid "E183: User defined commands must start with an uppercase letter" msgstr "E183: Komandoj difinataj de uzanto devas eki per majusklo" -#: ../ex_docmd.c:4696 msgid "E841: Reserved name, cannot be used for user defined command" msgstr "E841: Rezervita nomo, neuzebla por komando difinita de uzanto" -#: ../ex_docmd.c:4751 #, c-format msgid "E184: No such user-defined command: %s" msgstr "E184: Neniu komando-difinita-de-uzanto kiel: %s" -#: ../ex_docmd.c:5516 #, c-format msgid "E180: Invalid address type value: %s" msgstr "E180: Nevalida valoro de tipo de adreso: %s" -#: ../ex_docmd.c:5219 #, c-format msgid "E180: Invalid complete value: %s" msgstr "E180: Nevalida valoro de kompletigo: %s" -#: ../ex_docmd.c:5225 msgid "E468: Completion argument only allowed for custom completion" msgstr "" "E468: Argumento de kompletigo nur permesebla por kompletigo difinita de " "uzanto" -#: ../ex_docmd.c:5231 msgid "E467: Custom completion requires a function argument" msgstr "E467: Uzula kompletigo bezonas funkcian argumenton" -#: ../ex_docmd.c:5257 #, c-format msgid "E185: Cannot find color scheme '%s'" msgstr "E185: Ne eblas trovi agordaron de koloroj '%s'" -#: ../ex_docmd.c:5263 msgid "Greetings, Vim user!" msgstr "Bonvenon, uzanto de Vim!" -#: ../ex_docmd.c:5431 msgid "E784: Cannot close last tab page" msgstr "E784: Ne eblas fermi lastan langeton" -#: ../ex_docmd.c:5462 msgid "Already only one tab page" msgstr "Jam nur unu langeto" -#: ../ex_docmd.c:6004 #, c-format msgid "Tab page %d" msgstr "Langeto %d" -#: ../ex_docmd.c:6295 msgid "No swap file" msgstr "Neniu permutodosiero .swp" -#: ../ex_docmd.c:6478 msgid "E747: Cannot change directory, buffer is modified (add ! to override)" msgstr "" "E747: Ne eblas ÅanÄi dosierujon, bufro estas ÅanÄita (aldonu ! por transpasi)" -#: ../ex_docmd.c:6485 msgid "E186: No previous directory" msgstr "E186: Neniu antaÅa dosierujo" -#: ../ex_docmd.c:6530 msgid "E187: Unknown" msgstr "E187: Nekonata" -#: ../ex_docmd.c:6610 msgid "E465: :winsize requires two number arguments" msgstr "E465: \":winsize\" bezonas du numerajn argumentojn" -#: ../ex_docmd.c:6655 msgid "E188: Obtaining window position not implemented for this platform" msgstr "" "E188: Akiro de pozicio de fenestro ne estas realigita por tiu platformo" -#: ../ex_docmd.c:6662 msgid "E466: :winpos requires two number arguments" msgstr "E466: \":winpos\" bezonas du numerajn argumentojn" -#: ../ex_docmd.c:7241 #, c-format msgid "E739: Cannot create directory: %s" msgstr "E739: Ne eblas krei dosierujon %s" -#: ../ex_docmd.c:7268 #, c-format msgid "E189: \"%s\" exists (add ! to override)" msgstr "E189: \"%s\" ekzistas (aldonu ! por transpasi)" -#: ../ex_docmd.c:7273 #, c-format msgid "E190: Cannot open \"%s\" for writing" msgstr "E190: Ne eblas malfermi \"%s\" por skribi" #. set mark -#: ../ex_docmd.c:7294 msgid "E191: Argument must be a letter or forward/backward quote" msgstr "E191: Argumento devas esti litero, citilo aÅ retrocitilo" -#: ../ex_docmd.c:7333 msgid "E192: Recursive use of :normal too deep" msgstr "E192: Tro profunda rekursia alvoko de \":normal\"" -#: ../ex_docmd.c:7807 msgid "E194: No alternate file name to substitute for '#'" msgstr "E194: Neniu alterna dosiernomo por anstataÅigi al '#'" -#: ../ex_docmd.c:7841 msgid "E495: no autocommand file name to substitute for \"<afile>\"" msgstr "E495: neniu dosiernomo de aÅtokomando por anstataÅigi al \"<afile>\"" -#: ../ex_docmd.c:7850 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\"" msgstr "" "E496: neniu numero de bufro de aÅtokomando por anstataÅigi al \"<abuf>\"" # DP: ĉu match estas verbo aÅ nomo en la angla version? # AM: ĉi tie, nomo, Åajnas al mi -#: ../ex_docmd.c:7861 msgid "E497: no autocommand match name to substitute for \"<amatch>\"" msgstr "" "E497: neniu nomo de kongruo de aÅtokomando por anstataÅigi al \"<amatch>\"" -#: ../ex_docmd.c:7870 msgid "E498: no :source file name to substitute for \"<sfile>\"" msgstr "E498: neniu dosiernomo \":source\" por anstataÅigi al \"<sfile>\"" -#: ../ex_docmd.c:7876 msgid "E842: no line number to use for \"<slnum>\"" msgstr "E842: neniu uzebla numero de linio por \"<slnum>\"" -#: ../ex_docmd.c:7903 #, fuzzy, c-format -msgid "E499: Empty file name for '%' or '#', only works with \":p:h\"" -msgstr "E499: Malplena dosiernomo por '%' aÅ '#', nur funkcias kun \":p:h\"" +#~ msgid "E499: Empty file name for '%' or '#', only works with \":p:h\"" +#~ msgstr "E499: Malplena dosiernomo por '%' aÅ '#', nur funkcias kun \":p:h\"" -#: ../ex_docmd.c:7905 msgid "E500: Evaluates to an empty string" msgstr "E500: Liveras malplenan ĉenon" -#: ../ex_docmd.c:8838 msgid "E195: Cannot open viminfo file for reading" msgstr "E195: Ne eblas malfermi dosieron viminfo en lega reÄimo" -#: ../ex_eval.c:464 msgid "E608: Cannot :throw exceptions with 'Vim' prefix" msgstr "E608: Ne eblas lanĉi (:throw) escepton kun prefikso 'Vim'" #. always scroll up, don't overwrite -#: ../ex_eval.c:496 #, c-format msgid "Exception thrown: %s" msgstr "Escepto lanĉita: %s" -#: ../ex_eval.c:545 #, c-format msgid "Exception finished: %s" msgstr "Escepto finiÄis: %s" -#: ../ex_eval.c:546 #, c-format msgid "Exception discarded: %s" msgstr "Escepto ne konservita: %s" -#: ../ex_eval.c:588 ../ex_eval.c:634 #, c-format msgid "%s, line %<PRId64>" msgstr "%s, linio %<PRId64>" #. always scroll up, don't overwrite -#: ../ex_eval.c:608 #, c-format msgid "Exception caught: %s" msgstr "Kaptis escepton: %s" -#: ../ex_eval.c:676 #, c-format msgid "%s made pending" msgstr "%s iÄis atendanta(j)" -#: ../ex_eval.c:679 #, c-format msgid "%s resumed" msgstr "%s daÅrigita(j)" -#: ../ex_eval.c:683 #, c-format msgid "%s discarded" msgstr "%s ne konservita(j)" -#: ../ex_eval.c:708 msgid "Exception" msgstr "Escepto" -#: ../ex_eval.c:713 msgid "Error and interrupt" msgstr "Eraro kaj interrompo" -#: ../ex_eval.c:715 msgid "Error" msgstr "Eraro" #. if (pending & CSTP_INTERRUPT) -#: ../ex_eval.c:717 msgid "Interrupt" msgstr "Interrompo" -#: ../ex_eval.c:795 msgid "E579: :if nesting too deep" msgstr "E579: \":if\" tro profunde ingita" -#: ../ex_eval.c:830 msgid "E580: :endif without :if" msgstr "E580: \":endif\" sen \":if\"" -#: ../ex_eval.c:873 msgid "E581: :else without :if" msgstr "E581: \":else\" sen \":if\"" -#: ../ex_eval.c:876 msgid "E582: :elseif without :if" msgstr "E582: \":elseif\" sen \":if\"" -#: ../ex_eval.c:880 msgid "E583: multiple :else" msgstr "E583: pluraj \":else\"" -#: ../ex_eval.c:883 msgid "E584: :elseif after :else" msgstr "E584: \":elseif\" post \":else\"" -#: ../ex_eval.c:941 msgid "E585: :while/:for nesting too deep" msgstr "E585: \":while/:for\" ingita tro profunde" -#: ../ex_eval.c:1028 msgid "E586: :continue without :while or :for" msgstr "E586: \":continue\" sen \":while\" aÅ \":for\"" -#: ../ex_eval.c:1061 msgid "E587: :break without :while or :for" msgstr "E587: \":break\" sen \":while\" aÅ \":for\"" -#: ../ex_eval.c:1102 msgid "E732: Using :endfor with :while" msgstr "E732: Uzo de \":endfor\" kun \":while\"" -#: ../ex_eval.c:1104 msgid "E733: Using :endwhile with :for" msgstr "E733: Uzo de \":endwhile\" kun \":for\"" -#: ../ex_eval.c:1247 msgid "E601: :try nesting too deep" msgstr "E601: \":try\" ingita tro profunde" -#: ../ex_eval.c:1317 msgid "E603: :catch without :try" msgstr "E603: \":catch\" sen \":try\"" #. Give up for a ":catch" after ":finally" and ignore it. #. * Just parse. -#: ../ex_eval.c:1332 msgid "E604: :catch after :finally" msgstr "E604: \":catch\" post \":finally\"" -#: ../ex_eval.c:1451 msgid "E606: :finally without :try" msgstr "E606: \":finally\" sen \":try\"" #. Give up for a multiple ":finally" and ignore it. -#: ../ex_eval.c:1467 msgid "E607: multiple :finally" msgstr "E607: pluraj \":finally\"" -#: ../ex_eval.c:1571 msgid "E602: :endtry without :try" msgstr "E602: \":endtry\" sen \":try\"" -#: ../ex_eval.c:2026 msgid "E193: :endfunction not inside a function" msgstr "E193: \":endfunction\" ekster funkcio" -#: ../ex_getln.c:1643 msgid "E788: Not allowed to edit another buffer now" msgstr "E788: Ne eblas redakti alian bufron nun" -#: ../ex_getln.c:1656 msgid "E811: Not allowed to change buffer information now" msgstr "E811: Ne eblas ÅanÄi informon de bufro nun" -#: ../ex_getln.c:3178 msgid "tagname" msgstr "nomo de etikedo" -#: ../ex_getln.c:3181 msgid " kind file\n" msgstr " tipo de dosiero\n" -#: ../ex_getln.c:4799 msgid "'history' option is zero" msgstr "opcio 'history' estas nul" -#: ../ex_getln.c:5046 #, c-format msgid "" "\n" @@ -1997,35 +1579,30 @@ msgstr "" "\n" "# Historio %s (de plej nova al plej malnova):\n" -#: ../ex_getln.c:5047 msgid "Command Line" msgstr "Komanda linio" -#: ../ex_getln.c:5048 msgid "Search String" msgstr "Serĉa ĉeno" -#: ../ex_getln.c:5049 msgid "Expression" msgstr "Esprimo" -#: ../ex_getln.c:5050 msgid "Input Line" msgstr "Eniga linio" -#: ../ex_getln.c:5117 +msgid "Debug Line" +msgstr "Sencimiga linio" + msgid "E198: cmd_pchar beyond the command length" msgstr "E198: cmd_pchar preter la longo de komando" -#: ../ex_getln.c:5279 msgid "E199: Active window or buffer deleted" msgstr "E199: Aktiva fenestro aÅ bufro forviÅita" -#: ../file_search.c:203 msgid "E854: path too long for completion" msgstr "E854: tro longa vojo por kompletigo" -#: ../file_search.c:446 #, c-format msgid "" "E343: Invalid path: '**[number]' must be at the end of the path or be " @@ -2034,208 +1611,160 @@ msgstr "" "E343: Nevalida vojo: '**[nombro]' devas esti ĉe la fino de la vojo aÅ " "sekvita de '%s'." -#: ../file_search.c:1505 #, c-format msgid "E344: Can't find directory \"%s\" in cdpath" msgstr "E344: Ne eblas trovi dosierujon \"%s\" en cdpath" -#: ../file_search.c:1508 #, c-format msgid "E345: Can't find file \"%s\" in path" msgstr "E345: Ne eblas trovi dosieron \"%s\" en serĉvojo" -#: ../file_search.c:1512 #, c-format msgid "E346: No more directory \"%s\" found in cdpath" msgstr "E346: Ne plu trovis dosierujon \"%s\" en cdpath" -#: ../file_search.c:1515 #, c-format msgid "E347: No more file \"%s\" found in path" msgstr "E347: Ne plu trovis dosieron \"%s\" en serĉvojo" -#: ../fileio.c:137 msgid "E812: Autocommands changed buffer or buffer name" msgstr "E812: AÅtokomandoj ÅanÄis bufron aÅ nomon de bufro" -#: ../fileio.c:368 msgid "Illegal file name" msgstr "Nevalida dosiernomo" -#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578 msgid "is a directory" msgstr "estas dosierujo" -#: ../fileio.c:397 msgid "is not a file" msgstr "ne estas dosiero" -#: ../fileio.c:508 ../fileio.c:3522 msgid "[New File]" msgstr "[Nova dosiero]" -#: ../fileio.c:511 msgid "[New DIRECTORY]" msgstr "[Nova DOSIERUJO]" -#: ../fileio.c:529 ../fileio.c:532 msgid "[File too big]" msgstr "[Dosiero tro granda]" -#: ../fileio.c:534 msgid "[Permission Denied]" msgstr "[Permeso rifuzita]" -#: ../fileio.c:653 msgid "E200: *ReadPre autocommands made the file unreadable" msgstr "E200: La aÅtokomandoj *ReadPre igis la dosieron nelegebla" -#: ../fileio.c:655 msgid "E201: *ReadPre autocommands must not change current buffer" msgstr "E201: La aÅtokomandoj *ReadPre ne rajtas ÅanÄi la aktualan bufron" -#: ../fileio.c:672 msgid "Nvim: Reading from stdin...\n" msgstr "Vim: Legado el stdin...\n" #. Re-opening the original file failed! -#: ../fileio.c:909 msgid "E202: Conversion made file unreadable!" msgstr "E202: Konverto igis la dosieron nelegebla!" #. fifo or socket -#: ../fileio.c:1782 msgid "[fifo/socket]" msgstr "[rektvica memoro/kontaktoskatolo]" #. fifo -#: ../fileio.c:1788 msgid "[fifo]" msgstr "[rektvica memoro]" #. or socket -#: ../fileio.c:1794 msgid "[socket]" msgstr "[kontaktoskatolo]" #. or character special -#: ../fileio.c:1801 msgid "[character special]" msgstr "[speciala signo]" -#: ../fileio.c:1815 msgid "[CR missing]" msgstr "[CR mankas]" -#: ../fileio.c:1819 msgid "[long lines split]" msgstr "[divido de longaj linioj]" -#: ../fileio.c:1823 ../fileio.c:3512 msgid "[NOT converted]" msgstr "[NE konvertita]" -#: ../fileio.c:1826 ../fileio.c:3515 msgid "[converted]" msgstr "[konvertita]" -#: ../fileio.c:1831 #, c-format msgid "[CONVERSION ERROR in line %<PRId64>]" msgstr "[ERARO DE KONVERTO en linio %<PRId64>]" -#: ../fileio.c:1835 #, c-format msgid "[ILLEGAL BYTE in line %<PRId64>]" msgstr "[NEVALIDA BAJTO en linio %<PRId64>]" -#: ../fileio.c:1838 msgid "[READ ERRORS]" msgstr "[ERAROJ DE LEGADO]" -#: ../fileio.c:2104 msgid "Can't find temp file for conversion" msgstr "Ne eblas trovi provizoran dosieron por konverti" -#: ../fileio.c:2110 msgid "Conversion with 'charconvert' failed" msgstr "Konverto kun 'charconvert' fiaskis" -#: ../fileio.c:2113 msgid "can't read output of 'charconvert'" msgstr "ne eblas legi la eligon de 'charconvert'" -#: ../fileio.c:2437 msgid "E676: No matching autocommands for acwrite buffer" msgstr "E676: Neniu kongrua aÅtokomando por la bufro acwrite" -#: ../fileio.c:2466 msgid "E203: Autocommands deleted or unloaded buffer to be written" msgstr "E203: AÅtokomandoj forviÅis aÅ malÅargis la skribendan bufron" -#: ../fileio.c:2486 msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "E204: AÅtokomando ÅanÄis la nombron de linioj neatendite" -#: ../fileio.c:2548 ../fileio.c:2565 msgid "is not a file or writable device" msgstr "ne estas dosiero aÅ skribebla aparatdosiero" -#: ../fileio.c:2601 msgid "is read-only (add ! to override)" msgstr "estas nurlegebla (aldonu ! por transpasi)" -#: ../fileio.c:2886 msgid "E506: Can't write to backup file (add ! to override)" msgstr "E506: Ne eblas skribi restaÅrkopion (aldonu ! por transpasi)" -#: ../fileio.c:2898 msgid "E507: Close error for backup file (add ! to override)" msgstr "E507: Eraro dum fermo de restaÅrkopio (aldonu ! transpasi)" -#: ../fileio.c:2901 msgid "E508: Can't read file for backup (add ! to override)" msgstr "E508: Ne eblas legi restaÅrkopion (aldonu ! por transpasi)" -#: ../fileio.c:2923 msgid "E509: Cannot create backup file (add ! to override)" msgstr "E509: Ne eblas krei restaÅrkopion (aldonu ! por transpasi)" -#: ../fileio.c:3008 msgid "E510: Can't make backup file (add ! to override)" msgstr "E510: Ne eblas krei restaÅrkopion (aldonu ! por transpasi)" #. Can't write without a tempfile! -#: ../fileio.c:3121 msgid "E214: Can't find temp file for writing" msgstr "E214: Ne eblas trovi provizoran dosieron por skribi" -#: ../fileio.c:3134 msgid "E213: Cannot convert (add ! to write without conversion)" msgstr "E213: Ne eblas konverti (aldonu ! por skribi sen konverto)" -#: ../fileio.c:3169 msgid "E166: Can't open linked file for writing" msgstr "E166: Ne eblas malfermi ligitan dosieron por skribi" -#: ../fileio.c:3173 msgid "E212: Can't open file for writing" msgstr "E212: Ne eblas malfermi la dosieron por skribi" # AM: fsync: ne traduku (nomo de C-komando) -#: ../fileio.c:3363 msgid "E667: Fsync failed" msgstr "E667: Fsync fiaskis" -#: ../fileio.c:3398 msgid "E512: Close failed" msgstr "E512: Fermo fiaskis" -#: ../fileio.c:3436 msgid "E513: write error, conversion failed (make 'fenc' empty to override)" msgstr "E513: skriberaro, konverto fiaskis (igu 'fenc' malplena por transpasi)" -#: ../fileio.c:3441 #, c-format msgid "" "E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to " @@ -2244,56 +1773,43 @@ msgstr "" "E513: skriberaro, konverto fiaskis en linio %<PRId64> (igu 'fenc' malplena " "por transpasi)" -#: ../fileio.c:3448 msgid "E514: write error (file system full?)" msgstr "E514: skriberaro (ĉu plena dosiersistemo?)" -#: ../fileio.c:3506 msgid " CONVERSION ERROR" msgstr " ERARO DE KONVERTO" -#: ../fileio.c:3509 #, c-format msgid " in line %<PRId64>;" msgstr " en linio %<PRId64>;" -#: ../fileio.c:3519 msgid "[Device]" msgstr "[Aparatdosiero]" -#: ../fileio.c:3522 msgid "[New]" msgstr "[Nova]" -#: ../fileio.c:3535 msgid " [a]" msgstr " [a]" -#: ../fileio.c:3535 msgid " appended" msgstr " postaldonita(j)" -#: ../fileio.c:3537 msgid " [w]" msgstr " [s]" -#: ../fileio.c:3537 msgid " written" msgstr " skribita(j)" -#: ../fileio.c:3579 msgid "E205: Patchmode: can't save original file" msgstr "E205: Patchmode: ne eblas konservi originalan dosieron" -#: ../fileio.c:3602 msgid "E206: patchmode: can't touch empty original file" msgstr "E206: patchmode: ne eblas tuÅi malplenan originalan dosieron" -#: ../fileio.c:3616 msgid "E207: Can't delete backup file" msgstr "E207: Ne eblas forviÅi restaÅrkopion" -#: ../fileio.c:3672 msgid "" "\n" "WARNING: Original file may be lost or damaged\n" @@ -2301,96 +1817,75 @@ msgstr "" "\n" "AVERTO: Originala dosiero estas eble perdita aÅ difekta\n" -#: ../fileio.c:3675 msgid "don't quit the editor until the file is successfully written!" msgstr "ne eliru el la redaktilo Äis kiam la dosiero estas sukcese konservita!" -#: ../fileio.c:3795 msgid "[dos]" msgstr "[dos]" -#: ../fileio.c:3795 msgid "[dos format]" msgstr "[formato dos]" -#: ../fileio.c:3801 msgid "[mac]" msgstr "[mac]" -#: ../fileio.c:3801 msgid "[mac format]" msgstr "[formato mac]" -#: ../fileio.c:3807 msgid "[unix]" msgstr "[unikso]" -#: ../fileio.c:3807 msgid "[unix format]" msgstr "[formato unikso]" -#: ../fileio.c:3831 msgid "1 line, " msgstr "1 linio, " -#: ../fileio.c:3833 #, c-format msgid "%<PRId64> lines, " msgstr "%<PRId64> linioj, " -#: ../fileio.c:3836 msgid "1 character" msgstr "1 signo" -#: ../fileio.c:3838 #, c-format msgid "%<PRId64> characters" msgstr "%<PRId64> signoj" -#: ../fileio.c:3849 msgid "[noeol]" msgstr "[sen EOL]" -#: ../fileio.c:3849 msgid "[Incomplete last line]" msgstr "[Nekompleta lasta linio]" #. don't overwrite messages here #. must give this prompt #. don't use emsg() here, don't want to flush the buffers -#: ../fileio.c:3865 msgid "WARNING: The file has been changed since reading it!!!" msgstr "AVERTO: La dosiero estas ÅanÄita de post kiam Äi estis legita!!!" -#: ../fileio.c:3867 msgid "Do you really want to write to it" msgstr "Ĉu vi vere volas skribi al Äi" -#: ../fileio.c:4648 #, c-format msgid "E208: Error writing to \"%s\"" msgstr "E208: Eraro dum skribo de \"%s\"" -#: ../fileio.c:4655 #, c-format msgid "E209: Error closing \"%s\"" msgstr "E209: Eraro dum fermo de \"%s\"" -#: ../fileio.c:4657 #, c-format msgid "E210: Error reading \"%s\"" msgstr "E210: Eraro dum lego de \"%s\"" -#: ../fileio.c:4883 msgid "E246: FileChangedShell autocommand deleted buffer" msgstr "E246: AÅtokomando FileChangedShell forviÅis bufron" -#: ../fileio.c:4894 #, c-format msgid "E211: File \"%s\" no longer available" msgstr "E211: Dosiero \"%s\" ne plu haveblas" -#: ../fileio.c:4906 #, c-format msgid "" "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as " @@ -2398,38 +1893,30 @@ msgid "" msgstr "" "W12: Averto: Dosiero \"%s\" ÅanÄiÄis kaj la bufro estis ÅanÄita ankaÅ en Vim" -#: ../fileio.c:4907 msgid "See \":help W12\" for more info." msgstr "Vidu \":help W12\" por pliaj informoj." -#: ../fileio.c:4910 #, c-format msgid "W11: Warning: File \"%s\" has changed since editing started" msgstr "W11: Averto: La dosiero \"%s\" ÅanÄiÄis ekde redakti Äin" -#: ../fileio.c:4911 msgid "See \":help W11\" for more info." msgstr "Vidu \":help W11\" por pliaj informoj." -#: ../fileio.c:4914 #, c-format msgid "W16: Warning: Mode of file \"%s\" has changed since editing started" msgstr "W16: Averto: Permeso de dosiero \"%s\" ÅanÄiÄis ekde redakti Äin" -#: ../fileio.c:4915 msgid "See \":help W16\" for more info." msgstr "Vidu \":help W16\" por pliaj informoj." -#: ../fileio.c:4927 #, c-format msgid "W13: Warning: File \"%s\" has been created after editing started" msgstr "W13: Averto: Dosiero \"%s\" kreiÄis post la komenco de redaktado" -#: ../fileio.c:4947 msgid "Warning" msgstr "Averto" -#: ../fileio.c:4948 msgid "" "&OK\n" "&Load File" @@ -2437,48 +1924,39 @@ msgstr "" "&Bone\n" "Åœ&argi Dosieron" -#: ../fileio.c:5065 #, c-format msgid "E462: Could not prepare for reloading \"%s\"" msgstr "E462: Ne eblis prepari por reÅargi \"%s\"" -#: ../fileio.c:5078 #, c-format msgid "E321: Could not reload \"%s\"" msgstr "E321: Ne eblis reÅargi \"%s\"" -#: ../fileio.c:5601 msgid "--Deleted--" msgstr "--ForviÅita--" -#: ../fileio.c:5732 #, c-format msgid "auto-removing autocommand: %s <buffer=%d>" msgstr "aÅto-forviÅas aÅtokomandon: %s <bufro=%d>" #. the group doesn't exist -#: ../fileio.c:5772 #, c-format msgid "E367: No such group: \"%s\"" msgstr "E367: Ne ekzistas tia grupo: \"%s\"" -#: ../fileio.c:5897 #, c-format msgid "E215: Illegal character after *: %s" msgstr "E215: Nevalida signo post *: %s" -#: ../fileio.c:5905 #, c-format msgid "E216: No such event: %s" msgstr "E216: Ne estas tia evento: %s" -#: ../fileio.c:5907 #, c-format msgid "E216: No such group or event: %s" msgstr "E216: Ne ekzistas tia grupo aÅ evento: %s" #. Highlight title -#: ../fileio.c:6090 msgid "" "\n" "--- Auto-Commands ---" @@ -2486,108 +1964,85 @@ msgstr "" "\n" "--- AÅto-Komandoj ---" -#: ../fileio.c:6293 #, c-format msgid "E680: <buffer=%d>: invalid buffer number " msgstr "E680: <bufro=%d>: nevalida numero de bufro " -#: ../fileio.c:6370 msgid "E217: Can't execute autocommands for ALL events" msgstr "E217: Ne eblas plenumi aÅtokomandojn por ĈIUJ eventoj" -#: ../fileio.c:6393 msgid "No matching autocommands" msgstr "Neniu kongrua aÅtokomando" -#: ../fileio.c:6831 msgid "E218: autocommand nesting too deep" msgstr "E218: aÅtokomando tro ingita" -#: ../fileio.c:7143 #, c-format msgid "%s Auto commands for \"%s\"" msgstr "%s AÅtokomandoj por \"%s\"" -#: ../fileio.c:7149 #, c-format msgid "Executing %s" msgstr "Plenumado de %s" -#: ../fileio.c:7211 #, c-format msgid "autocommand %s" msgstr "aÅtokomando %s" -#: ../fileio.c:7795 msgid "E219: Missing {." msgstr "E219: Mankas {." -#: ../fileio.c:7797 msgid "E220: Missing }." msgstr "E220: Mankas }." -#: ../fold.c:93 msgid "E490: No fold found" msgstr "E490: Neniu faldo trovita" -#: ../fold.c:544 msgid "E350: Cannot create fold with current 'foldmethod'" msgstr "E350: Ne eblas krei faldon per la aktuala 'foldmethod'" -#: ../fold.c:546 msgid "E351: Cannot delete fold with current 'foldmethod'" msgstr "E351: Ne eblas forviÅi faldon per la aktuala 'foldmethod'" -#: ../fold.c:1784 #, c-format msgid "+--%3ld lines folded " msgstr "+--%3ld linioj falditaj " #. buffer has already been read -#: ../getchar.c:273 msgid "E222: Add to read buffer" msgstr "E222: Aldoni al lega bufro" -#: ../getchar.c:2040 msgid "E223: recursive mapping" msgstr "E223: rekursia mapo" -#: ../getchar.c:2849 #, c-format msgid "E224: global abbreviation already exists for %s" msgstr "E224: malloka mallongigo jam ekzistas por %s" -#: ../getchar.c:2852 #, c-format msgid "E225: global mapping already exists for %s" msgstr "E225: malloka mapo jam ekzistas por %s" -#: ../getchar.c:2952 #, c-format msgid "E226: abbreviation already exists for %s" msgstr "E226: mallongigo jam ekzistas por %s" -#: ../getchar.c:2955 #, c-format msgid "E227: mapping already exists for %s" msgstr "E227: mapo jam ekzistas por %s" -#: ../getchar.c:3008 msgid "No abbreviation found" msgstr "Neniu mallongigo trovita" -#: ../getchar.c:3010 msgid "No mapping found" msgstr "Neniu mapo trovita" -#: ../getchar.c:3974 msgid "E228: makemap: Illegal mode" msgstr "E228: makemap: Nevalida reÄimo" #. key value of 'cedit' option #. type of cmdline window or 0 #. result of cmdline window or 0 -#: ../globals.h:924 msgid "--No lines in buffer--" msgstr "--Neniu linio en bufro--" @@ -2595,283 +2050,217 @@ msgstr "--Neniu linio en bufro--" #. * The error messages that can be shared are included here. #. * Excluded are errors that are only used once and debugging messages. #. -#: ../globals.h:996 msgid "E470: Command aborted" msgstr "E470: komando ĉesigita" -#: ../globals.h:997 msgid "E471: Argument required" msgstr "E471: Argumento bezonata" -#: ../globals.h:998 msgid "E10: \\ should be followed by /, ? or &" msgstr "E10: \\ devus esti sekvita de /, ? aÅ &" -#: ../globals.h:1000 msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits" msgstr "" "E11: Nevalida en fenestro de komanda linio; <CR> plenumas, CTRL-C eliras" -#: ../globals.h:1002 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search" msgstr "" "E12: Nepermesebla komando el exrc/vimrc en aktuala dosierujo aÅ etikeda serĉo" -#: ../globals.h:1003 msgid "E171: Missing :endif" msgstr "E171: Mankas \":endif\"" -#: ../globals.h:1004 msgid "E600: Missing :endtry" msgstr "E600: Mankas \":endtry\"" -#: ../globals.h:1005 msgid "E170: Missing :endwhile" msgstr "E170: Mankas \":endwhile\"" -#: ../globals.h:1006 msgid "E170: Missing :endfor" msgstr "E170: Mankas \":endfor\"" -#: ../globals.h:1007 msgid "E588: :endwhile without :while" msgstr "E588: \":endwhile\" sen \":while\"" -#: ../globals.h:1008 msgid "E588: :endfor without :for" msgstr "E588: \":endfor\" sen \":for\"" -#: ../globals.h:1009 msgid "E13: File exists (add ! to override)" msgstr "E13: Dosiero ekzistas (aldonu ! por transpasi)" -#: ../globals.h:1010 msgid "E472: Command failed" msgstr "E472: La komando fiaskis" -#: ../globals.h:1011 msgid "E473: Internal error" msgstr "E473: Interna eraro" -#: ../globals.h:1012 msgid "Interrupted" msgstr "Interrompita" -#: ../globals.h:1013 msgid "E14: Invalid address" msgstr "E14: Nevalida adreso" -#: ../globals.h:1014 msgid "E474: Invalid argument" msgstr "E474: Nevalida argumento" -#: ../globals.h:1015 #, c-format msgid "E475: Invalid argument: %s" msgstr "E475: Nevalida argumento: %s" -#: ../globals.h:1016 #, c-format msgid "E15: Invalid expression: %s" msgstr "E15: Nevalida esprimo: %s" -#: ../globals.h:1017 msgid "E16: Invalid range" msgstr "E16: Nevalida amplekso" -#: ../globals.h:1018 msgid "E476: Invalid command" msgstr "E476: Nevalida komando" -#: ../globals.h:1019 #, c-format msgid "E17: \"%s\" is a directory" msgstr "E17: \"%s\" estas dosierujo" -#: ../globals.h:1020 #, fuzzy -msgid "E900: Invalid job id" -msgstr "E49: Nevalida grando de rulumo" +#~ msgid "E900: Invalid job id" +#~ msgstr "E49: Nevalida grando de rulumo" -#: ../globals.h:1021 -msgid "E901: Job table is full" -msgstr "" +#~ msgid "E901: Job table is full" +#~ msgstr "" -#: ../globals.h:1024 #, c-format msgid "E364: Library call failed for \"%s()\"" msgstr "E364: Alvoko al biblioteko fiaskis por \"%s()\"" -#: ../globals.h:1026 msgid "E19: Mark has invalid line number" msgstr "E19: Marko havas nevalidan numeron de linio" -#: ../globals.h:1027 msgid "E20: Mark not set" msgstr "E20: Marko ne estas agordita" -#: ../globals.h:1029 msgid "E21: Cannot make changes, 'modifiable' is off" msgstr "E21: Ne eblas fari ÅanÄojn, 'modifiable' estas malÅaltita" -#: ../globals.h:1030 msgid "E22: Scripts nested too deep" msgstr "E22: Tro profunde ingitaj skriptoj" -#: ../globals.h:1031 msgid "E23: No alternate file" msgstr "E23: Neniu alterna dosiero" -#: ../globals.h:1032 msgid "E24: No such abbreviation" msgstr "E24: Ne estas tia mallongigo" -#: ../globals.h:1033 msgid "E477: No ! allowed" msgstr "E477: Neniu ! permesebla" -#: ../globals.h:1035 msgid "E25: Nvim does not have a built-in GUI" msgstr "E25: Grafika interfaco ne uzeblas: MalÅaltita dum kompilado" -#: ../globals.h:1036 #, c-format msgid "E28: No such highlight group name: %s" msgstr "E28: Neniu grupo de emfazo kiel: %s" -#: ../globals.h:1037 msgid "E29: No inserted text yet" msgstr "E29: AnkoraÅ neniu enmetita teksto" -#: ../globals.h:1038 msgid "E30: No previous command line" msgstr "E30: Neniu antaÅa komanda linio" -#: ../globals.h:1039 msgid "E31: No such mapping" msgstr "E31: Neniu tiel mapo" -#: ../globals.h:1040 msgid "E479: No match" msgstr "E479: Neniu kongruo" -#: ../globals.h:1041 #, c-format msgid "E480: No match: %s" msgstr "E480: Neniu kongruo: %s" -#: ../globals.h:1042 msgid "E32: No file name" msgstr "E32: Neniu dosiernomo" -#: ../globals.h:1044 msgid "E33: No previous substitute regular expression" msgstr "E33: Neniu antaÅa regulesprimo de anstataÅigo" -#: ../globals.h:1045 msgid "E34: No previous command" msgstr "E34: Neniu antaÅa komando" -#: ../globals.h:1046 msgid "E35: No previous regular expression" msgstr "E35: Neniu antaÅa regulesprimo" -#: ../globals.h:1047 msgid "E481: No range allowed" msgstr "E481: Amplekso nepermesebla" -#: ../globals.h:1048 msgid "E36: Not enough room" msgstr "E36: Ne sufiĉe da spaco" -#: ../globals.h:1049 #, c-format msgid "E482: Can't create file %s" msgstr "E482: Ne eblas krei dosieron %s" -#: ../globals.h:1050 msgid "E483: Can't get temp file name" msgstr "E483: Ne eblas akiri provizoran dosiernomon" -#: ../globals.h:1051 #, c-format msgid "E484: Can't open file %s" msgstr "E484: Ne eblas malfermi dosieron %s" -#: ../globals.h:1052 #, c-format msgid "E485: Can't read file %s" msgstr "E485: Ne eblas legi dosieron %s" -#: ../globals.h:1054 msgid "E37: No write since last change (add ! to override)" msgstr "E37: Neniu skribo de post lasta ÅanÄo (aldonu ! por transpasi)" -#: ../globals.h:1055 #, fuzzy -msgid "E37: No write since last change" -msgstr "[Neniu skribo de post lasta ÅanÄo]\n" +#~ msgid "E37: No write since last change" +#~ msgstr "[Neniu skribo de post lasta ÅanÄo]\n" -#: ../globals.h:1056 msgid "E38: Null argument" msgstr "E38: Nula argumento" -#: ../globals.h:1057 msgid "E39: Number expected" msgstr "E39: Nombro atendita" -#: ../globals.h:1058 #, c-format msgid "E40: Can't open errorfile %s" msgstr "E40: Ne eblas malfermi eraran dosieron %s" -#: ../globals.h:1059 msgid "E41: Out of memory!" msgstr "E41: Ne plu restas memoro!" -#: ../globals.h:1060 msgid "Pattern not found" msgstr "Åœablono ne trovita" -#: ../globals.h:1061 #, c-format msgid "E486: Pattern not found: %s" msgstr "E486: Åœablono ne trovita: %s" -#: ../globals.h:1062 msgid "E487: Argument must be positive" msgstr "E487: La argumento devas esti pozitiva" -#: ../globals.h:1064 msgid "E459: Cannot go back to previous directory" msgstr "E459: Ne eblas reiri al antaÅa dosierujo" -#: ../globals.h:1066 msgid "E42: No Errors" msgstr "E42: Neniu eraro" -#: ../globals.h:1067 msgid "E776: No location list" msgstr "E776: Neniu listo de loko" -#: ../globals.h:1068 msgid "E43: Damaged match string" msgstr "E43: Difekta kongruenda ĉeno" -#: ../globals.h:1069 msgid "E44: Corrupted regexp program" msgstr "E44: Difekta programo de regulesprimo" -#: ../globals.h:1071 msgid "E45: 'readonly' option is set (add ! to override)" msgstr "E45: La opcio 'readonly' estas Åaltita '(aldonu ! por transpasi)" -#: ../globals.h:1073 #, c-format msgid "E46: Cannot change read-only variable \"%s\"" msgstr "E46: Ne eblas ÅanÄi nurlegeblan variablon \"%s\"" -#: ../globals.h:1075 #, c-format msgid "E794: Cannot set variable in the sandbox: \"%s\"" msgstr "E794: Ne eblas agordi variablon en la sabloludejo: \"%s\"" @@ -2879,372 +2268,286 @@ msgstr "E794: Ne eblas agordi variablon en la sabloludejo: \"%s\"" msgid "E713: Cannot use empty key for Dictionary" msgstr "E713: Ne eblas uzi malplenan Ålosilon de Vortaro" -#: ../globals.h:1076 msgid "E47: Error while reading errorfile" msgstr "E47: Eraro dum legado de erardosiero" -#: ../globals.h:1078 msgid "E48: Not allowed in sandbox" msgstr "E48: Nepermesebla en sabloludejo" -#: ../globals.h:1080 msgid "E523: Not allowed here" msgstr "E523: Nepermesebla tie" -#: ../globals.h:1082 msgid "E359: Screen mode setting not supported" msgstr "E359: ReÄimo de ekrano ne subtenata" -#: ../globals.h:1083 msgid "E49: Invalid scroll size" msgstr "E49: Nevalida grando de rulumo" -#: ../globals.h:1084 msgid "E91: 'shell' option is empty" msgstr "E91: La opcio 'shell' estas malplena" -#: ../globals.h:1085 msgid "E255: Couldn't read in sign data!" msgstr "E255: Ne eblis legi datumojn de simboloj!" -#: ../globals.h:1086 msgid "E72: Close error on swap file" msgstr "E72: Eraro dum malfermo de permutodosiero .swp" -#: ../globals.h:1087 msgid "E73: tag stack empty" msgstr "E73: malplena stako de etikedo" -#: ../globals.h:1088 msgid "E74: Command too complex" msgstr "E74: Komando tro kompleksa" -#: ../globals.h:1089 msgid "E75: Name too long" msgstr "E75: Nomo tro longa" -#: ../globals.h:1090 msgid "E76: Too many [" msgstr "E76: Tro da [" -#: ../globals.h:1091 msgid "E77: Too many file names" msgstr "E77: Tro da dosiernomoj" -#: ../globals.h:1092 msgid "E488: Trailing characters" msgstr "E488: Vostaj signoj" -#: ../globals.h:1093 msgid "E78: Unknown mark" msgstr "E78: Nekonata marko" -#: ../globals.h:1094 msgid "E79: Cannot expand wildcards" msgstr "E79: Ne eblas malvolvi ĵokerojn" -#: ../globals.h:1096 msgid "E591: 'winheight' cannot be smaller than 'winminheight'" msgstr "E591: 'winheight' ne rajtas esti malpli ol 'winminheight'" -#: ../globals.h:1098 msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'" msgstr "E592: 'winwidth' ne rajtas esti malpli ol 'winminwidth'" -#: ../globals.h:1099 msgid "E80: Error while writing" msgstr "E80: Eraro dum skribado" -#: ../globals.h:1100 msgid "Zero count" msgstr "Nul kvantoro" -#: ../globals.h:1101 msgid "E81: Using <SID> not in a script context" msgstr "E81: Uzo de <SID> ekster kunteksto de skripto" -#: ../globals.h:1102 #, c-format msgid "E685: Internal error: %s" msgstr "E685: Interna eraro: %s" -#: ../globals.h:1104 msgid "E363: pattern uses more memory than 'maxmempattern'" msgstr "E363: Åablono uzas pli da memoro ol 'maxmempattern'" -#: ../globals.h:1105 msgid "E749: empty buffer" msgstr "E749: malplena bufro" -#: ../globals.h:1226 #, c-format msgid "E86: Buffer %<PRId64> does not exist" msgstr "E86: La bufro %<PRId64> ne ekzistas" -#: ../globals.h:1108 msgid "E682: Invalid search pattern or delimiter" msgstr "E682: Nevalida serĉa Åablono aÅ disigilo" -#: ../globals.h:1109 msgid "E139: File is loaded in another buffer" msgstr "E139: Dosiero estas Åargita en alia bufro" -#: ../globals.h:1110 #, c-format msgid "E764: Option '%s' is not set" msgstr "E764: La opcio '%s' ne estas Åaltita" -#: ../globals.h:1111 msgid "E850: Invalid register name" msgstr "E850: Nevalida nomo de reÄistro" -#: ../globals.h:1114 msgid "search hit TOP, continuing at BOTTOM" msgstr "serĉo atingis SUPRON, daÅrigonte al SUBO" -#: ../globals.h:1115 msgid "search hit BOTTOM, continuing at TOP" msgstr "serĉo atingis SUBON, daÅrigonte al SUPRO" -#: ../hardcopy.c:240 msgid "E550: Missing colon" msgstr "E550: Mankas dupunkto" -#: ../hardcopy.c:252 msgid "E551: Illegal component" msgstr "E551: Nevalida komponento" -#: ../hardcopy.c:259 msgid "E552: digit expected" msgstr "E552: cifero atendita" -#: ../hardcopy.c:473 #, c-format msgid "Page %d" msgstr "PaÄo %d" -#: ../hardcopy.c:597 msgid "No text to be printed" msgstr "Neniu presenda teksto" -#: ../hardcopy.c:668 #, c-format msgid "Printing page %d (%d%%)" msgstr "Presas paÄon %d (%d%%)" -#: ../hardcopy.c:680 #, c-format msgid " Copy %d of %d" msgstr " Kopio %d de %d" -#: ../hardcopy.c:733 #, c-format msgid "Printed: %s" msgstr "Presis: %s" -#: ../hardcopy.c:740 msgid "Printing aborted" msgstr "Presado ĉesigita" -#: ../hardcopy.c:1365 msgid "E455: Error writing to PostScript output file" msgstr "E455: Eraro dum skribo de PostSkripta eliga dosiero" -#: ../hardcopy.c:1747 #, c-format msgid "E624: Can't open file \"%s\"" msgstr "E624: Ne eblas malfermi dosieron \"%s\"" -#: ../hardcopy.c:1756 ../hardcopy.c:2470 #, c-format msgid "E457: Can't read PostScript resource file \"%s\"" msgstr "E457: Ne eblas legi dosieron de PostSkripta rimedo \"%s\"" -#: ../hardcopy.c:1772 #, c-format msgid "E618: file \"%s\" is not a PostScript resource file" msgstr "E618: \"%s\" ne estas dosiero de PostSkripta rimedo" -#: ../hardcopy.c:1788 ../hardcopy.c:1805 ../hardcopy.c:1844 #, c-format msgid "E619: file \"%s\" is not a supported PostScript resource file" msgstr "E619: \"%s\" ne estas subtenata dosiero de PostSkripta rimedo" -#: ../hardcopy.c:1856 #, c-format msgid "E621: \"%s\" resource file has wrong version" msgstr "E621: \"%s\" dosiero de rimedo havas neÄustan version" -#: ../hardcopy.c:2225 msgid "E673: Incompatible multi-byte encoding and character set." msgstr "E673: Nekongrua plurbajta kodoprezento kaj signaro." -#: ../hardcopy.c:2238 msgid "E674: printmbcharset cannot be empty with multi-byte encoding." msgstr "" "E674: printmbcharset ne rajtas esti malplena kun plurbajta kodoprezento." -#: ../hardcopy.c:2254 msgid "E675: No default font specified for multi-byte printing." msgstr "E675: Neniu defaÅlta tiparo specifita por plurbajta presado." -#: ../hardcopy.c:2426 msgid "E324: Can't open PostScript output file" msgstr "E324: Ne eblas malfermi eligan PostSkriptan dosieron" -#: ../hardcopy.c:2458 #, c-format msgid "E456: Can't open file \"%s\"" msgstr "E456: Ne eblas malfermi dosieron \"%s\"" -#: ../hardcopy.c:2583 msgid "E456: Can't find PostScript resource file \"prolog.ps\"" msgstr "E456: Dosiero de PostSkripta rimedo \"prolog.ps\" ne troveblas" -#: ../hardcopy.c:2593 msgid "E456: Can't find PostScript resource file \"cidfont.ps\"" msgstr "E456: Dosiero de PostSkripta rimedo \"cidfont.ps\" ne troveblas" -#: ../hardcopy.c:2622 ../hardcopy.c:2639 ../hardcopy.c:2665 #, c-format msgid "E456: Can't find PostScript resource file \"%s.ps\"" msgstr "E456: Dosiero de PostSkripta rimedo \"%s.ps\" ne troveblas" -#: ../hardcopy.c:2654 #, c-format msgid "E620: Unable to convert to print encoding \"%s\"" msgstr "E620: Ne eblas konverti al la presa kodoprezento \"%s\"" -#: ../hardcopy.c:2877 msgid "Sending to printer..." msgstr "Sendas al presilo..." -#: ../hardcopy.c:2881 msgid "E365: Failed to print PostScript file" msgstr "E365: Presado de PostSkripta dosiero fiaskis" -#: ../hardcopy.c:2883 msgid "Print job sent." msgstr "Laboro de presado sendita." -#: ../if_cscope.c:85 msgid "Add a new database" msgstr "Aldoni novan datumbazon" -#: ../if_cscope.c:87 msgid "Query for a pattern" msgstr "Serĉi Åablonon" -#: ../if_cscope.c:89 msgid "Show this message" msgstr "Montri tiun mesaÄon" -#: ../if_cscope.c:91 msgid "Kill a connection" msgstr "Ĉesigi konekton" -#: ../if_cscope.c:93 msgid "Reinit all connections" msgstr "Repravalorizi ĉiujn konektojn" -#: ../if_cscope.c:95 msgid "Show connections" msgstr "Montri konektojn" -#: ../if_cscope.c:101 #, c-format msgid "E560: Usage: cs[cope] %s" msgstr "E560: Uzo: cs[cope] %s" -#: ../if_cscope.c:225 msgid "This cscope command does not support splitting the window.\n" msgstr "Tiu ĉi komando de cscope ne subtenas dividon de fenestro.\n" -#: ../if_cscope.c:266 msgid "E562: Usage: cstag <ident>" msgstr "E562: Uzo: cstag <ident>" -#: ../if_cscope.c:313 msgid "E257: cstag: tag not found" msgstr "E257: cstag: etikedo netrovita" -#: ../if_cscope.c:461 #, c-format msgid "E563: stat(%s) error: %d" msgstr "E563: Eraro de stat(%s): %d" -#: ../if_cscope.c:551 #, c-format msgid "E564: %s is not a directory or a valid cscope database" msgstr "E564: %s ne estas dosierujo aÅ valida datumbazo de cscope" -#: ../if_cscope.c:566 #, c-format msgid "Added cscope database %s" msgstr "Aldonis datumbazon de cscope %s" -#: ../if_cscope.c:616 #, c-format msgid "E262: error reading cscope connection %<PRId64>" msgstr "E262: eraro dum legado de konekto de cscope %<PRId64>" -#: ../if_cscope.c:711 msgid "E561: unknown cscope search type" msgstr "E561: nekonata tipo de serĉo de cscope" -#: ../if_cscope.c:752 ../if_cscope.c:789 msgid "E566: Could not create cscope pipes" msgstr "E566: Ne eblis krei duktojn de cscope" -#: ../if_cscope.c:767 msgid "E622: Could not fork for cscope" msgstr "E622: Ne eblis forki cscope" -#: ../if_cscope.c:849 #, fuzzy -msgid "cs_create_connection setpgid failed" -msgstr "plenumo de cs_create_connection fiaskis" +#~ msgid "cs_create_connection setpgid failed" +#~ msgstr "plenumo de cs_create_connection fiaskis" -#: ../if_cscope.c:853 ../if_cscope.c:889 msgid "cs_create_connection exec failed" msgstr "plenumo de cs_create_connection fiaskis" -#: ../if_cscope.c:863 ../if_cscope.c:902 msgid "cs_create_connection: fdopen for to_fp failed" msgstr "cs_create_connection: fdopen de to_fp fiaskis" -#: ../if_cscope.c:865 ../if_cscope.c:906 msgid "cs_create_connection: fdopen for fr_fp failed" msgstr "cs_create_connection: fdopen de fr_fp fiaskis" -#: ../if_cscope.c:890 msgid "E623: Could not spawn cscope process" msgstr "E623: Ne eblis naskigi procezon cscope" -#: ../if_cscope.c:932 msgid "E567: no cscope connections" msgstr "E567: neniu konekto al cscope" -#: ../if_cscope.c:1009 #, c-format msgid "E469: invalid cscopequickfix flag %c for %c" msgstr "E469: nevalida flago cscopequickfix %c de %c" -#: ../if_cscope.c:1058 #, c-format msgid "E259: no matches found for cscope query %s of %s" msgstr "E259: neniu kongruo trovita por serĉo per cscope %s de %s" -#: ../if_cscope.c:1142 msgid "cscope commands:\n" msgstr "komandoj de cscope:\n" -#: ../if_cscope.c:1150 #, c-format msgid "%-5s: %s%*s (Usage: %s)" msgstr "%-5s: %s%*s (Uzo: %s)" -#: ../if_cscope.c:1155 msgid "" "\n" " c: Find functions calling this function\n" @@ -3255,6 +2558,7 @@ msgid "" " i: Find files #including this file\n" " s: Find this C symbol\n" " t: Find this text string\n" +" a: Find assignments to this symbol\n" msgstr "" "\n" " c: Trovi funkciojn, kiuj alvokas tiun funkcion\n" @@ -3265,32 +2569,27 @@ msgstr "" " i: Trovi dosierojn, kiuj inkluzivas (#include) tiun dosieron\n" " s: Trovi tiun C-simbolon\n" " t: Trovi tiun ĉenon\n" +" a: Trovi valirizojn al tiu simbolo\n" -#: ../if_cscope.c:1226 msgid "E568: duplicate cscope database not added" msgstr "E568: ripetita datumbazo de cscope ne aldonita" -#: ../if_cscope.c:1335 #, c-format msgid "E261: cscope connection %s not found" msgstr "E261: konekto cscope %s netrovita" -#: ../if_cscope.c:1364 #, c-format msgid "cscope connection %s closed" msgstr "konekto cscope %s fermita" #. should not reach here -#: ../if_cscope.c:1486 msgid "E570: fatal error in cs_manage_matches" msgstr "E570: neriparebla eraro en cs_manage_matches" -#: ../if_cscope.c:1693 #, c-format msgid "Cscope tag: %s" msgstr "Etikedo de cscope: %s" -#: ../if_cscope.c:1711 msgid "" "\n" " # line" @@ -3298,87 +2597,67 @@ msgstr "" "\n" " nro linio" -#: ../if_cscope.c:1713 msgid "filename / context / line\n" msgstr "dosiernomo / kunteksto / linio\n" -#: ../if_cscope.c:1809 #, c-format msgid "E609: Cscope error: %s" msgstr "E609: Eraro de cscope: %s" -#: ../if_cscope.c:2053 msgid "All cscope databases reset" msgstr "ReÅargo de ĉiuj datumbazoj de cscope" -#: ../if_cscope.c:2123 msgid "no cscope connections\n" msgstr "neniu konekto de cscope\n" -#: ../if_cscope.c:2126 msgid " # pid database name prepend path\n" msgstr " # pid nomo de datumbazo prefiksa vojo\n" -#: ../main.c:144 msgid "Unknown option argument" msgstr "Nekonata argumento de opcio" -#: ../main.c:146 msgid "Too many edit arguments" msgstr "Tro da argumentoj de redakto" -#: ../main.c:148 msgid "Argument missing after" msgstr "Argumento mankas post" -#: ../main.c:150 msgid "Garbage after option argument" msgstr "Forĵetindaĵo post argumento de opcio" -#: ../main.c:152 msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments" msgstr "Tro da argumentoj \"+komando\", \"-c komando\" aÅ \"--cmd komando\"" -#: ../main.c:154 msgid "Invalid argument for" msgstr "Nevalida argumento por" -#: ../main.c:294 #, c-format msgid "%d files to edit\n" msgstr "%d redaktendaj dosieroj\n" -#: ../main.c:1342 msgid "Attempt to open script file again: \"" msgstr "Provas malfermi skriptan dosieron denove: \"" -#: ../main.c:1350 msgid "Cannot open for reading: \"" msgstr "Ne eblas malfermi en lega reÄimo: \"" -#: ../main.c:1393 msgid "Cannot open for script output: \"" msgstr "Ne eblas malfermi por eligo de skripto: \"" -#: ../main.c:1622 msgid "Vim: Warning: Output is not to a terminal\n" msgstr "Vim: Averto: Eligo ne estas al terminalo\n" -#: ../main.c:1624 msgid "Vim: Warning: Input is not from a terminal\n" msgstr "Vim: Averto: Enigo ne estas el terminalo\n" #. just in case.. -#: ../main.c:1891 msgid "pre-vimrc command line" msgstr "komanda linio pre-vimrc" -#: ../main.c:1964 #, c-format msgid "E282: Cannot read from \"%s\"" msgstr "E282: Ne eblas legi el \"%s\"" -#: ../main.c:2149 msgid "" "\n" "More info with: \"vim -h\"\n" @@ -3387,23 +2666,18 @@ msgstr "" "Pliaj informoj per: \"vim -h\"\n" # DP: tajpu "vim --help" por testi tiujn mesaÄojn -#: ../main.c:2178 msgid "[file ..] edit specified file(s)" msgstr "[dosiero...] redakti specifita(j)n dosiero(j)n" -#: ../main.c:2179 msgid "- read text from stdin" msgstr "- legi tekston el stdin" -#: ../main.c:2180 msgid "-t tag edit file where tag is defined" msgstr "-t etikedo redakti dosieron kie etikedo estas difinata" -#: ../main.c:2181 msgid "-q [errorfile] edit file with first error" msgstr "-q [erardosiero] redakti dosieron kun unua eraro" -#: ../main.c:2187 msgid "" "\n" "\n" @@ -3413,11 +2687,9 @@ msgstr "" "\n" " uzo:" -#: ../main.c:2189 msgid " vim [arguments] " msgstr " vim [argumentoj] " -#: ../main.c:2193 msgid "" "\n" " or:" @@ -3425,7 +2697,6 @@ msgstr "" "\n" " aÅ:" -#: ../main.c:2196 msgid "" "\n" "\n" @@ -3435,197 +2706,151 @@ msgstr "" "\n" "Argumentoj:\n" -#: ../main.c:2197 msgid "--\t\t\tOnly file names after this" msgstr "--\t\t\tNur dosiernomoj post tio" -#: ../main.c:2199 msgid "--literal\t\tDon't expand wildcards" msgstr "--literal\t\tNe malvolvi ĵokerojn" -#: ../main.c:2201 msgid "-v\t\t\tVi mode (like \"vi\")" msgstr "-v\t\t\tReÄimo Vi (kiel \"vi\")" -#: ../main.c:2202 msgid "-e\t\t\tEx mode (like \"ex\")" msgstr "-e\t\t\tReÄimo Ex (kiel \"ex\")" -#: ../main.c:2203 msgid "-E\t\t\tImproved Ex mode" msgstr "-E\t\t\tPlibonigita Ex-reÄimo" -#: ../main.c:2204 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")" msgstr "-s\t\t\tSilenta (stapla) reÄimo (nur por \"ex\")" -#: ../main.c:2205 msgid "-d\t\t\tDiff mode (like \"vimdiff\")" msgstr "-d\t\t\tKompara reÄimo (kiel \"vimdiff\")" -#: ../main.c:2206 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)" msgstr "-y\t\t\tFacila reÄimo (kiel \"evim\", senreÄima)" -#: ../main.c:2207 msgid "-R\t\t\tReadonly mode (like \"view\")" msgstr "-R\t\t\tNurlegebla reÄimo (kiel \"view\")" -#: ../main.c:2208 msgid "-Z\t\t\tRestricted mode (like \"rvim\")" msgstr "-Z\t\t\tLimigita reÄimo (kiel \"rvim\")" -#: ../main.c:2209 msgid "-m\t\t\tModifications (writing files) not allowed" msgstr "-m\t\t\tÅœanÄoj (skribo al dosieroj) nepermeseblaj" -#: ../main.c:2210 msgid "-M\t\t\tModifications in text not allowed" msgstr "-M\t\t\tÅœanÄoj al teksto nepermeseblaj" -#: ../main.c:2211 msgid "-b\t\t\tBinary mode" msgstr "-b\t\t\tDuuma reÄimo" -#: ../main.c:2212 msgid "-l\t\t\tLisp mode" msgstr "-l\t\t\tReÄimo Lisp" -#: ../main.c:2213 msgid "-C\t\t\tCompatible with Vi: 'compatible'" msgstr "-C\t\t\tKongrua kun Vi: 'compatible'" -#: ../main.c:2214 msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'" msgstr "-N\t\t\tNe tute kongrua kun Vi: 'nocompatible'" -#: ../main.c:2215 msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]" msgstr "" "-V[N][dosiernomo]\tEsti babilema [nivelo N] [konservi mesaÄojn al dosiernomo]" -#: ../main.c:2216 msgid "-D\t\t\tDebugging mode" msgstr "-D\t\t\tSencimiga reÄimo" -#: ../main.c:2217 msgid "-n\t\t\tNo swap file, use memory only" msgstr "-n\t\t\tNeniu permutodosiero .swp, uzas nur memoron" -#: ../main.c:2218 msgid "-r\t\t\tList swap files and exit" msgstr "-r\t\t\tListigi permutodosierojn .swp kaj eliri" -#: ../main.c:2219 msgid "-r (with file name)\tRecover crashed session" msgstr "-r (kun dosiernomo)\tRestaÅri kolapsintan seancon" -#: ../main.c:2220 msgid "-L\t\t\tSame as -r" msgstr "-L\t\t\tKiel -r" -#: ../main.c:2221 msgid "-A\t\t\tstart in Arabic mode" msgstr "-A\t\t\tKomenci en araba reÄimo" -#: ../main.c:2222 msgid "-H\t\t\tStart in Hebrew mode" msgstr "-H\t\t\tKomenci en hebrea reÄimo" -#: ../main.c:2223 msgid "-F\t\t\tStart in Farsi mode" msgstr "-F\t\t\tKomenci en persa reÄimo" -#: ../main.c:2224 msgid "-T <terminal>\tSet terminal type to <terminal>" msgstr "-T <terminalo>\tAgordi terminalon al <terminalo>" -#: ../main.c:2225 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc" msgstr "-u <vimrc>\t\tUzi <vimrc> anstataÅ iun ajn .vimrc" -#: ../main.c:2226 msgid "--noplugin\t\tDon't load plugin scripts" msgstr "--noplugin\t\tNe Åargi kromaĵajn skriptojn" -#: ../main.c:2227 msgid "-p[N]\t\tOpen N tab pages (default: one for each file)" msgstr "-p[N]\t\tMalfermi N langetojn (defaÅlto: po unu por ĉiu dosiero)" -#: ../main.c:2228 msgid "-o[N]\t\tOpen N windows (default: one for each file)" msgstr "-o[N]\t\tMalfermi N fenestrojn (defaÅlto: po unu por ĉiu dosiero)" -#: ../main.c:2229 msgid "-O[N]\t\tLike -o but split vertically" msgstr "-O[N]\t\tKiel -o sed dividi vertikale" -#: ../main.c:2230 msgid "+\t\t\tStart at end of file" msgstr "+\t\t\tKomenci ĉe la fino de la dosiero" -#: ../main.c:2231 msgid "+<lnum>\t\tStart at line <lnum>" msgstr "+<numL>\t\tKomenci ĉe linio <numL>" -#: ../main.c:2232 msgid "--cmd <command>\tExecute <command> before loading any vimrc file" msgstr "" "--cmd <komando>\tPlenumi <komando>-n antaÅ ol Åargi iun ajn dosieron vimrc" -#: ../main.c:2233 msgid "-c <command>\t\tExecute <command> after loading the first file" msgstr "-c <komando>\t\tPlenumi <komando>-n post kiam la unua dosiero ÅargiÄis" -#: ../main.c:2235 msgid "-S <session>\t\tSource file <session> after loading the first file" msgstr "" "-S <seanco>\t\tRuli dosieron <seanco>-n post kiam la unua dosiero ÅargiÄis" -#: ../main.c:2236 msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>" msgstr "-s <skripto>\t\tLegi komandojn en Normala reÄimo el dosiero <skripto>" -#: ../main.c:2237 msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>" msgstr "" "-w <eligaskripto>\tPostaldoni ĉiujn tajpitajn komandojn al dosiero " "<eligaskripto>" -#: ../main.c:2238 msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>" msgstr "" "-W <eligaskripto>\tSkribi ĉiujn tajpitajn komandojn al dosiero <eligaskripto>" -#: ../main.c:2240 msgid "--startuptime <file>\tWrite startup timing messages to <file>" msgstr "" "--startuptime <dosiero> Skribi mesaÄojn de komenca tempomezurado al " "<dosiero>" -#: ../main.c:2242 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo" msgstr "-i <viminfo>\t\tUzi <viminfo> anstataÅ .viminfo" -#: ../main.c:2243 msgid "-h or --help\tPrint Help (this message) and exit" msgstr "-h aÅ --help\tAfiÅi Helpon (tiun mesaÄon) kaj eliri" -#: ../main.c:2244 msgid "--version\t\tPrint version information and exit" msgstr "--version\t\tAfiÅi informon de versio kaj eliri" -#: ../mark.c:676 msgid "No marks set" msgstr "Neniu marko" -#: ../mark.c:678 #, c-format msgid "E283: No marks matching \"%s\"" msgstr "E283: Neniu marko kongruas kun \"%s\"" #. Highlight title -#: ../mark.c:687 msgid "" "\n" "mark line col file/text" @@ -3634,7 +2859,6 @@ msgstr "" "mark linio kol dosiero/teksto" #. Highlight title -#: ../mark.c:789 msgid "" "\n" " jump line col file/text" @@ -3643,7 +2867,6 @@ msgstr "" " salt linio kol dosiero/teksto" #. Highlight title -#: ../mark.c:831 msgid "" "\n" "change line col text" @@ -3651,7 +2874,6 @@ msgstr "" "\n" "ÅanÄo linio kol teksto" -#: ../mark.c:1238 msgid "" "\n" "# File marks:\n" @@ -3660,7 +2882,6 @@ msgstr "" "# Markoj de dosiero:\n" #. Write the jumplist with -' -#: ../mark.c:1271 msgid "" "\n" "# Jumplist (newest first):\n" @@ -3668,7 +2889,6 @@ msgstr "" "\n" "# Saltlisto (plej novaj unue):\n" -#: ../mark.c:1352 msgid "" "\n" "# History of marks within files (newest to oldest):\n" @@ -3676,85 +2896,66 @@ msgstr "" "\n" "# Historio de markoj en dosieroj (de plej nova al plej malnova):\n" -#: ../mark.c:1431 msgid "Missing '>'" msgstr "Mankas '>'" -#: ../memfile.c:426 msgid "E293: block was not locked" msgstr "E293: bloko ne estis Ålosita" -#: ../memfile.c:799 msgid "E294: Seek error in swap file read" msgstr "E294: Eraro de enpoziciigo dum lego de permutodosiero .swp" -#: ../memfile.c:803 msgid "E295: Read error in swap file" msgstr "E295: Eraro de lego en permutodosiero .swp" -#: ../memfile.c:849 msgid "E296: Seek error in swap file write" msgstr "E296: Eraro de enpoziciigo dum skribo de permutodosiero .swp" -#: ../memfile.c:865 msgid "E297: Write error in swap file" msgstr "E297: Skriberaro en permutodosiero .swp" -#: ../memfile.c:1036 msgid "E300: Swap file already exists (symlink attack?)" msgstr "E300: Permutodosiero .swp jam ekzistas (ĉu atako per simbola ligilo?)" -#: ../memline.c:318 msgid "E298: Didn't get block nr 0?" msgstr "E298: Ĉu ne akiris blokon n-ro 0?" -#: ../memline.c:361 msgid "E298: Didn't get block nr 1?" msgstr "E298: Ĉu ne akiris blokon n-ro 1?" -#: ../memline.c:377 msgid "E298: Didn't get block nr 2?" msgstr "E298: Ĉu ne akiris blokon n-ro 2?" #. could not (re)open the swap file, what can we do???? -#: ../memline.c:465 msgid "E301: Oops, lost the swap file!!!" msgstr "E301: Ve, perdis la permutodosieron .swp!!!" -#: ../memline.c:477 msgid "E302: Could not rename swap file" msgstr "E302: Ne eblis renomi la permutodosieron .swp" -#: ../memline.c:554 #, c-format msgid "E303: Unable to open swap file for \"%s\", recovery impossible" msgstr "" "E303: Ne eblas malfermi permutodosieron .swp de \"%s\", restaÅro neeblas" -#: ../memline.c:666 msgid "E304: ml_upd_block0(): Didn't get block 0??" msgstr "E304: ml_upd_block0(): Ne akiris blokon 0??" #. no swap files found -#: ../memline.c:830 #, c-format msgid "E305: No swap file found for %s" msgstr "E305: Neniu permutodosiero .swp trovita por %s" -#: ../memline.c:839 msgid "Enter number of swap file to use (0 to quit): " msgstr "Entajpu la uzendan numeron de permutodosiero .swp (0 por eliri): " -#: ../memline.c:879 #, c-format msgid "E306: Cannot open %s" msgstr "E306: Ne eblas malfermi %s" -#: ../memline.c:897 msgid "Unable to read block 0 from " msgstr "Ne eblas legi blokon 0 de " -#: ../memline.c:900 msgid "" "\n" "Maybe no changes were made or Vim did not update the swap file." @@ -3762,28 +2963,22 @@ msgstr "" "\n" "Eble neniu ÅanÄo estis farita aÅ Vim ne Äisdatigis la permutodosieron .swp." -#: ../memline.c:909 msgid " cannot be used with this version of Vim.\n" msgstr " ne uzeblas per tiu versio de vim.\n" -#: ../memline.c:911 msgid "Use Vim version 3.0.\n" msgstr "Uzu version 3.0 de Vim\n" -#: ../memline.c:916 #, c-format msgid "E307: %s does not look like a Vim swap file" msgstr "E307: %s ne aspektas kiel permutodosiero .swp de Vim" -#: ../memline.c:922 msgid " cannot be used on this computer.\n" msgstr " ne uzeblas per tiu komputilo.\n" -#: ../memline.c:924 msgid "The file was created on " msgstr "La dosiero estas kreita je " -#: ../memline.c:928 msgid "" ",\n" "or the file has been damaged." @@ -3791,85 +2986,66 @@ msgstr "" ",\n" "aÅ la dosiero estas difekta." -#: ../memline.c:945 msgid " has been damaged (page size is smaller than minimum value).\n" msgstr " difektiÄis (paÄa grando pli malgranda ol minimuma valoro).\n" -#: ../memline.c:974 #, c-format msgid "Using swap file \"%s\"" msgstr "Uzado de permutodosiero .swp \"%s\"" -#: ../memline.c:980 #, c-format msgid "Original file \"%s\"" msgstr "Originala dosiero \"%s\"" -#: ../memline.c:995 msgid "E308: Warning: Original file may have been changed" msgstr "E308: Averto: Originala dosiero eble ÅanÄiÄis" -#: ../memline.c:1061 #, c-format msgid "E309: Unable to read block 1 from %s" msgstr "E309: Ne eblas legi blokon 1 de %s" -#: ../memline.c:1065 msgid "???MANY LINES MISSING" msgstr "???MULTAJ LINIOJ MANKAS" -#: ../memline.c:1076 msgid "???LINE COUNT WRONG" msgstr "???NOMBRO DE LINIOJ NE ÄœUSTAS" -#: ../memline.c:1082 msgid "???EMPTY BLOCK" msgstr "???MALPLENA BLOKO" -#: ../memline.c:1103 msgid "???LINES MISSING" msgstr "???LINIOJ MANKANTAJ" -#: ../memline.c:1128 #, c-format msgid "E310: Block 1 ID wrong (%s not a .swp file?)" msgstr "" "E310: Nevalida identigilo de bloko 1 (ĉu %s ne estas permutodosiero .swp?)" -#: ../memline.c:1133 msgid "???BLOCK MISSING" msgstr "???MANKAS BLOKO" -#: ../memline.c:1147 msgid "??? from here until ???END lines may be messed up" msgstr "??? ekde tie Äis ???FINO linioj estas eble difektaj" -#: ../memline.c:1164 msgid "??? from here until ???END lines may have been inserted/deleted" msgstr "??? ekde tie Äis ???FINO linioj estas eble enmetitaj/forviÅitaj" -#: ../memline.c:1181 msgid "???END" msgstr "???FINO" -#: ../memline.c:1238 msgid "E311: Recovery Interrupted" msgstr "E311: RestaÅro interrompita" -#: ../memline.c:1243 msgid "" "E312: Errors detected while recovering; look for lines starting with ???" msgstr "E312: Eraroj dum restaÅro; rigardu liniojn komencantajn per ???" -#: ../memline.c:1245 msgid "See \":help E312\" for more information." msgstr "Vidu \":help E312\" por pliaj informoj." -#: ../memline.c:1249 msgid "Recovery completed. You should check if everything is OK." msgstr "RestaÅro finiÄis. Indus kontroli ĉu ĉio estas en ordo." -#: ../memline.c:1251 msgid "" "\n" "(You might want to write out this file under another name\n" @@ -3877,16 +3053,13 @@ msgstr "" "\n" "(Indas konservi tiun dosieron per alia nomo\n" -#: ../memline.c:1252 msgid "and run diff with the original file to check for changes)" msgstr "kaj lanĉi diff kun la originala dosiero por kontroli la ÅanÄojn)" -#: ../memline.c:1254 msgid "Recovery completed. Buffer contents equals file contents." msgstr "" "RestaÅro finiÄis. La enhavo de la bufro samas kun la enhavo de la dosiero." -#: ../memline.c:1255 msgid "" "\n" "You may want to delete the .swp file now.\n" @@ -3897,51 +3070,39 @@ msgstr "" "\n" #. use msg() to start the scrolling properly -#: ../memline.c:1327 msgid "Swap files found:" msgstr "Permutodosiero .swp trovita:" -#: ../memline.c:1446 msgid " In current directory:\n" msgstr " En la aktuala dosierujo:\n" -#: ../memline.c:1448 msgid " Using specified name:\n" msgstr " Uzado de specifita nomo:\n" -#: ../memline.c:1450 msgid " In directory " msgstr " En dosierujo " -#: ../memline.c:1465 msgid " -- none --\n" msgstr " -- nenio --\n" -#: ../memline.c:1527 msgid " owned by: " msgstr " posedata de: " -#: ../memline.c:1529 msgid " dated: " msgstr " dato: " -#: ../memline.c:1532 ../memline.c:3231 msgid " dated: " msgstr " dato: " -#: ../memline.c:1548 msgid " [from Vim version 3.0]" msgstr " [de Vim versio 3.0]" -#: ../memline.c:1550 msgid " [does not look like a Vim swap file]" msgstr " [ne aspektas kiel permutodosiero .swp de Vim]" -#: ../memline.c:1552 msgid " file name: " msgstr " dosiernomo: " -#: ../memline.c:1558 msgid "" "\n" " modified: " @@ -3949,15 +3110,12 @@ msgstr "" "\n" " modifita: " -#: ../memline.c:1559 msgid "YES" msgstr "JES" -#: ../memline.c:1559 msgid "no" msgstr "ne" -#: ../memline.c:1562 msgid "" "\n" " user name: " @@ -3965,11 +3123,9 @@ msgstr "" "\n" " uzantonomo: " -#: ../memline.c:1568 msgid " host name: " msgstr " komputila nomo: " -#: ../memline.c:1570 msgid "" "\n" " host name: " @@ -3977,7 +3133,6 @@ msgstr "" "\n" " komputila nomo: " -#: ../memline.c:1575 msgid "" "\n" " process ID: " @@ -3985,11 +3140,9 @@ msgstr "" "\n" " proceza ID: " -#: ../memline.c:1579 msgid " (still running)" msgstr " (ankoraÅ ruliÄas)" -#: ../memline.c:1586 msgid "" "\n" " [not usable on this computer]" @@ -3997,97 +3150,75 @@ msgstr "" "\n" " [neuzebla per tiu komputilo]" -#: ../memline.c:1590 msgid " [cannot be read]" msgstr " [nelegebla]" -#: ../memline.c:1593 msgid " [cannot be opened]" msgstr " [nemalfermebla]" -#: ../memline.c:1698 msgid "E313: Cannot preserve, there is no swap file" msgstr "E313: Ne eblas konservi, ne estas permutodosiero .swp" -#: ../memline.c:1747 msgid "File preserved" msgstr "Dosiero konservita" -#: ../memline.c:1749 msgid "E314: Preserve failed" msgstr "E314: Konservo fiaskis" -#: ../memline.c:1819 #, c-format msgid "E315: ml_get: invalid lnum: %<PRId64>" msgstr "E315: ml_get: nevalida lnum: %<PRId64>" -#: ../memline.c:1851 #, c-format msgid "E316: ml_get: cannot find line %<PRId64>" msgstr "E316: ml_get: ne eblas trovi linion %<PRId64>" -#: ../memline.c:2236 msgid "E317: pointer block id wrong 3" msgstr "E317: nevalida referenco de bloko id 3" -#: ../memline.c:2311 msgid "stack_idx should be 0" msgstr "stack_idx devus esti 0" -#: ../memline.c:2369 msgid "E318: Updated too many blocks?" msgstr "E318: Ĉu Äisdatigis tro da blokoj?" -#: ../memline.c:2511 msgid "E317: pointer block id wrong 4" msgstr "E317: nevalida referenco de bloko id 4" -#: ../memline.c:2536 msgid "deleted block 1?" msgstr "ĉu forviÅita bloko 1?" -#: ../memline.c:2707 #, c-format msgid "E320: Cannot find line %<PRId64>" msgstr "E320: Ne eblas trovi linion %<PRId64>" -#: ../memline.c:2916 msgid "E317: pointer block id wrong" msgstr "E317: nevalida referenco de bloko id" -#: ../memline.c:2930 msgid "pe_line_count is zero" msgstr "pe_line_count estas nul" -#: ../memline.c:2955 #, c-format msgid "E322: line number out of range: %<PRId64> past the end" msgstr "E322: numero de linio ekster limoj: %<PRId64> preter la fino" -#: ../memline.c:2959 #, c-format msgid "E323: line count wrong in block %<PRId64>" msgstr "E323: nevalida nombro de linioj en bloko %<PRId64>" -#: ../memline.c:2999 msgid "Stack size increases" msgstr "Stako pligrandiÄas" -#: ../memline.c:3038 msgid "E317: pointer block id wrong 2" msgstr "E317: nevalida referenco de bloko id 2" -#: ../memline.c:3070 #, c-format msgid "E773: Symlink loop for \"%s\"" msgstr "E773: Buklo de simbolaj ligiloj por \"%s\"" -#: ../memline.c:3221 msgid "E325: ATTENTION" msgstr "E325: ATENTO" -#: ../memline.c:3222 msgid "" "\n" "Found a swap file by the name \"" @@ -4095,15 +3226,12 @@ msgstr "" "\n" "Trovis permutodosieron .swp kun la nomo \"" -#: ../memline.c:3226 msgid "While opening file \"" msgstr "Dum malfermo de dosiero \"" -#: ../memline.c:3239 msgid " NEWER than swap file!\n" msgstr " PLI NOVA ol permutodosiero .swp!\n" -#: ../memline.c:3244 msgid "" "\n" "(1) Another program may be editing the same file. If this is the case,\n" @@ -4115,19 +3243,15 @@ msgstr "" " por ne havi du malsamajn aperojn de la sama dosiero, kiam vi faros\n" " ÅanÄojn. Eliru aÅ daÅrigu singarde.\n" -#: ../memline.c:3245 msgid " Quit, or continue with caution.\n" msgstr " Eliru, aÅ daÅrigu singarde.\n" -#: ../memline.c:3246 msgid "(2) An edit session for this file crashed.\n" msgstr "(2) Redakta seanco de tiu dosiero kolapsis.\n" -#: ../memline.c:3247 msgid " If this is the case, use \":recover\" or \"vim -r " msgstr " Se veras, uzu \":recover\" aÅ \"vim -r " -#: ../memline.c:3249 msgid "" "\"\n" " to recover the changes (see \":help recovery\").\n" @@ -4135,11 +3259,9 @@ msgstr "" "\"\n" " por restaÅri la ÅanÄojn (vidu \":help recovery\").\n" -#: ../memline.c:3250 msgid " If you did this already, delete the swap file \"" msgstr " Se vi jam faris Äin, forviÅu la permutodosieron .swp \"" -#: ../memline.c:3252 msgid "" "\"\n" " to avoid this message.\n" @@ -4147,25 +3269,20 @@ msgstr "" "\"\n" " por eviti tiun mesaÄon.\n" -#: ../memline.c:3450 ../memline.c:3452 msgid "Swap file \"" msgstr "Permutodosiero .swp \"" -#: ../memline.c:3451 ../memline.c:3455 msgid "\" already exists!" msgstr "\" jam ekzistas!" -#: ../memline.c:3457 msgid "VIM - ATTENTION" msgstr "VIM - ATENTO" -#: ../memline.c:3459 msgid "Swap file already exists!" msgstr "Permutodosiero .swp jam ekzistas!" # AM: ĉu Vim konvertos la unuliterajn respondojn de la uzulo? # DP: jes, la '&' respondoj bone funkcias (mi kontrolis) -#: ../memline.c:3464 msgid "" "&Open Read-Only\n" "&Edit anyway\n" @@ -4179,7 +3296,6 @@ msgstr "" "&Eliri\n" "Ĉe&sigi" -#: ../memline.c:3467 msgid "" "&Open Read-Only\n" "&Edit anyway\n" @@ -4203,48 +3319,38 @@ msgstr "" #. #. ".s?a" #. ".saa": tried enough, give up -#: ../memline.c:3528 msgid "E326: Too many swap files found" msgstr "E326: Tro da dosieroj trovitaj" -#: ../memory.c:227 #, c-format msgid "E342: Out of memory! (allocating %<PRIu64> bytes)" msgstr "E342: Ne plu restas memoro! (disponigo de %<PRIu64> bajtoj)" -#: ../menu.c:62 msgid "E327: Part of menu-item path is not sub-menu" msgstr "E327: Parto de vojo de menuero ne estas sub-menuo" -#: ../menu.c:63 msgid "E328: Menu only exists in another mode" msgstr "E328: Menuo nur ekzistas en alia reÄimo" -#: ../menu.c:64 #, c-format msgid "E329: No menu \"%s\"" msgstr "E329: Neniu menuo \"%s\"" #. Only a mnemonic or accelerator is not valid. -#: ../menu.c:329 msgid "E792: Empty menu name" msgstr "E792: Malplena nomo de menuo" -#: ../menu.c:340 msgid "E330: Menu path must not lead to a sub-menu" msgstr "E330: Vojo de menuo ne rajtas konduki al sub-menuo" -#: ../menu.c:365 msgid "E331: Must not add menu items directly to menu bar" msgstr "E331: Aldono de menueroj direkte al menuzono estas malpermesita" -#: ../menu.c:370 msgid "E332: Separator cannot be part of a menu path" msgstr "E332: Disigilo ne rajtas esti ero de vojo de menuo" #. Now we have found the matching menu, and we list the mappings #. Highlight title -#: ../menu.c:762 msgid "" "\n" "--- Menus ---" @@ -4252,69 +3358,54 @@ msgstr "" "\n" "--- Menuoj ---" -#: ../menu.c:1313 msgid "E333: Menu path must lead to a menu item" msgstr "E333: Vojo de menuo devas konduki al menuero" -#: ../menu.c:1330 #, c-format msgid "E334: Menu not found: %s" msgstr "E334: Menuo netrovita: %s" -#: ../menu.c:1396 #, c-format msgid "E335: Menu not defined for %s mode" msgstr "E335: Menuo ne estas difinita por reÄimo %s" -#: ../menu.c:1426 msgid "E336: Menu path must lead to a sub-menu" msgstr "E336: Vojo de menuo devas konduki al sub-menuo" -#: ../menu.c:1447 msgid "E337: Menu not found - check menu names" msgstr "E337: Menuo ne trovita - kontrolu nomojn de menuoj" -#: ../message.c:423 #, c-format msgid "Error detected while processing %s:" msgstr "Eraro okazis dum traktado de %s:" -#: ../message.c:445 #, c-format msgid "line %4ld:" msgstr "linio %4ld:" -#: ../message.c:617 #, c-format msgid "E354: Invalid register name: '%s'" msgstr "E354: Nevalida nomo de reÄistro: '%s'" -#: ../message.c:986 msgid "Interrupt: " msgstr "Interrompo: " -#: ../message.c:988 msgid "Press ENTER or type command to continue" msgstr "Premu ENEN-KLAVON aÅ tajpu komandon por daÅrigi" -#: ../message.c:1843 #, c-format msgid "%s line %<PRId64>" msgstr "%s linio %<PRId64>" -#: ../message.c:2392 msgid "-- More --" msgstr "-- Pli --" -#: ../message.c:2398 msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit " msgstr " SPACETO/d/j: ekrano/paÄo/sub linio, b/u/k: supre, q: eliri " -#: ../message.c:3021 ../message.c:3031 msgid "Question" msgstr "Demando" -#: ../message.c:3023 msgid "" "&Yes\n" "&No" @@ -4322,7 +3413,6 @@ msgstr "" "&Jes\n" "&Ne" -#: ../message.c:3033 msgid "" "&Yes\n" "&No\n" @@ -4334,7 +3424,6 @@ msgstr "" # AM: ĉu Vim konvertos unuliterajn respondojn? # DP: jes, '&' bone funkcias (mi kontrolis) -#: ../message.c:3045 msgid "" "&Yes\n" "&No\n" @@ -4348,175 +3437,136 @@ msgstr "" "&Forlasi Ĉion\n" "&Rezigni" -#: ../message.c:3058 msgid "E766: Insufficient arguments for printf()" msgstr "E766: Ne sufiĉaj argumentoj por printf()" -#: ../message.c:3119 msgid "E807: Expected Float argument for printf()" msgstr "E807: Atendis Glitpunktnombron kiel argumento de printf()" -#: ../message.c:3873 msgid "E767: Too many arguments to printf()" msgstr "E767: Tro da argumentoj al printf()" -#: ../misc1.c:2256 msgid "W10: Warning: Changing a readonly file" msgstr "W10: Averto: ÅœanÄo de nurlegebla dosiero" -#: ../misc1.c:2537 msgid "Type number and <Enter> or click with mouse (empty cancels): " msgstr "" "Tajpu nombron kaj <Enenklavon> aÅ alklaku per la muso (malpleno rezignas): " -#: ../misc1.c:2539 msgid "Type number and <Enter> (empty cancels): " msgstr "Tajpu nombron kaj <Enenklavon> (malpleno rezignas): " -#: ../misc1.c:2585 msgid "1 more line" msgstr "1 plia linio" -#: ../misc1.c:2588 msgid "1 line less" msgstr "1 malplia linio" -#: ../misc1.c:2593 #, c-format msgid "%<PRId64> more lines" msgstr "%<PRId64> pliaj linioj" -#: ../misc1.c:2596 #, c-format msgid "%<PRId64> fewer lines" msgstr "%<PRId64> malpliaj linioj" -#: ../misc1.c:2599 msgid " (Interrupted)" msgstr " (Interrompita)" -#: ../misc1.c:2635 msgid "Beep!" msgstr "Bip!" -#: ../misc2.c:738 #, c-format msgid "Calling shell to execute: \"%s\"" msgstr "Alvokas Åelon por plenumi: \"%s\"" -#: ../normal.c:183 msgid "E349: No identifier under cursor" msgstr "E349: Neniu identigilo sub la kursoro" -#: ../normal.c:1866 msgid "E774: 'operatorfunc' is empty" msgstr "E774: 'operatorfunc' estas malplena" -#: ../normal.c:2637 msgid "Warning: terminal cannot highlight" msgstr "Averto: terminalo ne povas emfazi" -#: ../normal.c:2807 msgid "E348: No string under cursor" msgstr "E348: Neniu ĉeno sub la kursoro" -#: ../normal.c:3937 msgid "E352: Cannot erase folds with current 'foldmethod'" msgstr "E352: Ne eblas forviÅi faldon per aktuala 'foldmethod'" -#: ../normal.c:5897 msgid "E664: changelist is empty" msgstr "E664: Listo de ÅanÄoj estas malplena" -#: ../normal.c:5899 msgid "E662: At start of changelist" msgstr "E662: Ĉe komenco de ÅanÄlisto" -#: ../normal.c:5901 msgid "E663: At end of changelist" msgstr "E663: Ĉe fino de ÅanÄlisto" -#: ../normal.c:7053 msgid "Type :quit<Enter> to exit Nvim" msgstr "Tajpu \":quit<Enenklavo>\" por eliri el Vim" -#: ../ops.c:248 #, c-format msgid "1 line %sed 1 time" msgstr "1 linio %sita 1 foje" -#: ../ops.c:250 #, c-format msgid "1 line %sed %d times" msgstr "1 linio %sita %d foje" -#: ../ops.c:253 #, c-format msgid "%<PRId64> lines %sed 1 time" msgstr "%<PRId64> linio %sita 1 foje" -#: ../ops.c:256 #, c-format msgid "%<PRId64> lines %sed %d times" msgstr "%<PRId64> linioj %sitaj %d foje" -#: ../ops.c:592 #, c-format msgid "%<PRId64> lines to indent... " msgstr "%<PRId64> krommarÄenendaj linioj... " -#: ../ops.c:634 msgid "1 line indented " msgstr "1 linio krommarÄenita " -#: ../ops.c:636 #, c-format msgid "%<PRId64> lines indented " msgstr "%<PRId64> linioj krommarÄenitaj " -#: ../ops.c:938 msgid "E748: No previously used register" msgstr "E748: Neniu reÄistro antaÅe uzata" #. must display the prompt -#: ../ops.c:1433 msgid "cannot yank; delete anyway" msgstr "ne eblas kopii; forviÅi tamene" -#: ../ops.c:1929 msgid "1 line changed" msgstr "1 linio ÅanÄita" -#: ../ops.c:1931 #, c-format msgid "%<PRId64> lines changed" msgstr "%<PRId64> linioj ÅanÄitaj" -#: ../ops.c:2521 msgid "block of 1 line yanked" msgstr "bloko de 1 linio kopiita" -#: ../ops.c:2523 msgid "1 line yanked" msgstr "1 linio kopiita" -#: ../ops.c:2525 #, c-format msgid "block of %<PRId64> lines yanked" msgstr "bloko de %<PRId64> linioj kopiita" -#: ../ops.c:2528 #, c-format msgid "%<PRId64> lines yanked" msgstr "%<PRId64> linioj kopiitaj" -#: ../ops.c:2710 #, c-format msgid "E353: Nothing in register %s" msgstr "E353: Nenio en reÄistro %s" #. Highlight title -#: ../ops.c:3185 msgid "" "\n" "--- Registers ---" @@ -4524,11 +3574,9 @@ msgstr "" "\n" "--- ReÄistroj ---" -#: ../ops.c:4455 msgid "Illegal register name" msgstr "Nevalida nomo de reÄistro" -#: ../ops.c:4533 msgid "" "\n" "# Registers:\n" @@ -4536,17 +3584,14 @@ msgstr "" "\n" "# ReÄistroj:\n" -#: ../ops.c:4575 #, c-format msgid "E574: Unknown register type %d" msgstr "E574: Nekonata tipo de reÄistro %d" -#: ../ops.c:5089 #, c-format msgid "%<PRId64> Cols; " msgstr "%<PRId64> Kolumnoj; " -#: ../ops.c:5097 #, c-format msgid "" "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; " @@ -4555,7 +3600,6 @@ msgstr "" "Apartigis %s%<PRId64> de %<PRId64> Linioj; %<PRId64> de %<PRId64> Vortoj; " "%<PRId64> de %<PRId64> Bajtoj" -#: ../ops.c:5105 #, c-format msgid "" "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; " @@ -4564,7 +3608,6 @@ msgstr "" "Apartigis %s%<PRId64> de %<PRId64> Linioj; %<PRId64> de %<PRId64> Vortoj; " "%<PRId64> de %<PRId64> Signoj; %<PRId64> de %<PRId64> Bajtoj" -#: ../ops.c:5123 #, c-format msgid "" "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte " @@ -4573,7 +3616,6 @@ msgstr "" "Kol %s de %s; Linio %<PRId64> de %<PRId64>; Vorto %<PRId64> de %<PRId64>; " "Bajto %<PRId64> de %<PRId64>" -#: ../ops.c:5133 #, c-format msgid "" "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char " @@ -4582,140 +3624,108 @@ msgstr "" "Kol %s de %s; Linio %<PRId64> de %<PRId64>; Vorto %<PRId64> de %<PRId64>; " "Signo %<PRId64> de %<PRId64>; Bajto %<PRId64> de %<PRId64>" -#: ../ops.c:5146 #, c-format msgid "(+%<PRId64> for BOM)" msgstr "(+%<PRId64> por BOM)" -#: ../option.c:1238 msgid "%<%f%h%m%=Page %N" msgstr "%<%f%h%m%=Folio %N" -#: ../option.c:1574 msgid "Thanks for flying Vim" msgstr "Dankon pro flugi per Vim" #. found a mismatch: skip -#: ../option.c:2698 msgid "E518: Unknown option" msgstr "E518: Nekonata opcio" -#: ../option.c:2709 msgid "E519: Option not supported" msgstr "E519: Opcio ne subtenata" -#: ../option.c:2740 msgid "E520: Not allowed in a modeline" msgstr "E520: Nepermesebla en reÄimlinio" -#: ../option.c:2815 msgid "E846: Key code not set" msgstr "E846: Klavkodo ne agordita" -#: ../option.c:2924 msgid "E521: Number required after =" msgstr "E521: Nombro bezonata post =" -#: ../option.c:3226 ../option.c:3864 msgid "E522: Not found in termcap" msgstr "E522: Netrovita en termcap" -#: ../option.c:3335 #, c-format msgid "E539: Illegal character <%s>" msgstr "E539: Nevalida signo <%s>" -#: ../option.c:2253 #, c-format msgid "For option %s" msgstr "Por opcio %s" -#: ../option.c:3862 msgid "E529: Cannot set 'term' to empty string" msgstr "E529: Ne eblas agordi 'term' al malplena ĉeno" -#: ../option.c:3885 msgid "E589: 'backupext' and 'patchmode' are equal" msgstr "E589: 'backupext' kaj 'patchmode' estas egalaj" -#: ../option.c:3964 msgid "E834: Conflicts with value of 'listchars'" msgstr "E834: Konfliktoj kun la valoro de 'listchars'" -#: ../option.c:3966 msgid "E835: Conflicts with value of 'fillchars'" msgstr "E835: Konfliktoj kun la valoro de 'fillchars'" -#: ../option.c:4163 msgid "E524: Missing colon" msgstr "E524: Mankas dupunkto" -#: ../option.c:4165 msgid "E525: Zero length string" msgstr "E525: Ĉeno de nula longo" -#: ../option.c:4220 #, c-format msgid "E526: Missing number after <%s>" msgstr "E526: Mankas nombro post <%s>" -#: ../option.c:4232 msgid "E527: Missing comma" msgstr "E527: Mankas komo" -#: ../option.c:4239 msgid "E528: Must specify a ' value" msgstr "E528: Devas specifi ' valoron" -#: ../option.c:4271 msgid "E595: contains unprintable or wide character" msgstr "E595: enhavas nepreseblan aÅ plurĉellarÄan signon" -#: ../option.c:4469 #, c-format msgid "E535: Illegal character after <%c>" msgstr "E535: Nevalida signo post <%c>" -#: ../option.c:4534 msgid "E536: comma required" msgstr "E536: komo bezonata" -#: ../option.c:4543 #, c-format msgid "E537: 'commentstring' must be empty or contain %s" msgstr "E537: 'commentstring' devas esti malplena aÅ enhavi %s" -#: ../option.c:4928 msgid "E540: Unclosed expression sequence" msgstr "E540: '}' mankas" -#: ../option.c:4932 msgid "E541: too many items" msgstr "E541: tro da elementoj" -#: ../option.c:4934 msgid "E542: unbalanced groups" msgstr "E542: misekvilibritaj grupoj" -#: ../option.c:5148 msgid "E590: A preview window already exists" msgstr "E590: AntaÅvida fenestro jam ekzistas" -#: ../option.c:5311 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'" msgstr "W17: La araba bezonas UTF-8, tajpu \":set encoding=utf-8\"" -#: ../option.c:5623 #, c-format msgid "E593: Need at least %d lines" msgstr "E593: Bezonas almenaÅ %d liniojn" -#: ../option.c:5631 #, c-format msgid "E594: Need at least %d columns" msgstr "E594: Bezonas almenaÅ %d kolumnojn" -#: ../option.c:6011 #, c-format msgid "E355: Unknown option: %s" msgstr "E355: Nekonata opcio: %s" @@ -4723,12 +3733,10 @@ msgstr "E355: Nekonata opcio: %s" #. There's another character after zeros or the string #. * is empty. In both cases, we are trying to set a #. * num option using a string. -#: ../option.c:6037 #, c-format msgid "E521: Number required: &%s = '%s'" msgstr "E521: Nombro bezonata: &%s = '%s'" -#: ../option.c:6149 msgid "" "\n" "--- Terminal codes ---" @@ -4736,7 +3744,6 @@ msgstr "" "\n" "--- Kodoj de terminalo ---" -#: ../option.c:6151 msgid "" "\n" "--- Global option values ---" @@ -4744,7 +3751,6 @@ msgstr "" "\n" "--- Mallokaj opcioj ---" -#: ../option.c:6153 msgid "" "\n" "--- Local option values ---" @@ -4752,7 +3758,6 @@ msgstr "" "\n" "--- Valoroj de lokaj opcioj ---" -#: ../option.c:6155 msgid "" "\n" "--- Options ---" @@ -4760,21 +3765,17 @@ msgstr "" "\n" "--- Opcioj ---" -#: ../option.c:6816 msgid "E356: get_varp ERROR" msgstr "E356: ERARO get_varp" -#: ../option.c:7696 #, c-format msgid "E357: 'langmap': Matching character missing for %s" msgstr "E357: 'langmap': Kongrua signo mankas por %s" -#: ../option.c:7715 #, c-format msgid "E358: 'langmap': Extra characters after semicolon: %s" msgstr "E358: 'langmap': Ekstraj signoj post punktokomo: %s" -#: ../os/shell.c:194 msgid "" "\n" "Cannot execute shell " @@ -4782,7 +3783,6 @@ msgstr "" "\n" "Ne eblas plenumi Åelon " -#: ../os/shell.c:439 msgid "" "\n" "shell returned " @@ -4790,7 +3790,6 @@ msgstr "" "\n" "Åelo liveris " -#: ../os_unix.c:465 ../os_unix.c:471 msgid "" "\n" "Could not get security context for " @@ -4798,7 +3797,6 @@ msgstr "" "\n" "Ne povis akiri kuntekston de sekureco por " -#: ../os_unix.c:479 msgid "" "\n" "Could not set security context for " @@ -4815,219 +3813,172 @@ msgid "Could not get security context %s for %s. Removing it!" msgstr "" "Ne povis akiri kuntekston de sekureco %s por %s. Gi nun estas forigata!" -#: ../os_unix.c:1558 ../os_unix.c:1647 #, c-format msgid "dlerror = \"%s\"" msgstr "dlerror = \"%s\"" -#: ../path.c:1449 #, c-format msgid "E447: Can't find file \"%s\" in path" msgstr "E447: Ne eblas trovi dosieron \"%s\" en serĉvojo" -#: ../quickfix.c:359 #, c-format msgid "E372: Too many %%%c in format string" msgstr "E372: Tro da %%%c en formata ĉeno" -#: ../quickfix.c:371 #, c-format msgid "E373: Unexpected %%%c in format string" msgstr "E373: Neatendita %%%c en formata ĉeno" -#: ../quickfix.c:420 msgid "E374: Missing ] in format string" msgstr "E374: Mankas ] en formata ĉeno" -#: ../quickfix.c:431 #, c-format msgid "E375: Unsupported %%%c in format string" msgstr "E375: Nesubtenata %%%c en formata ĉeno" -#: ../quickfix.c:448 #, c-format msgid "E376: Invalid %%%c in format string prefix" msgstr "E376: Nevalida %%%c en prefikso de formata ĉeno" -#: ../quickfix.c:454 #, c-format msgid "E377: Invalid %%%c in format string" msgstr "E377: Nevalida %%%c en formata ĉeno" #. nothing found -#: ../quickfix.c:477 msgid "E378: 'errorformat' contains no pattern" msgstr "E378: 'errorformat' enhavas neniun Åablonon" -#: ../quickfix.c:695 msgid "E379: Missing or empty directory name" msgstr "E379: Nomo de dosierujo mankas aÅ estas malplena" -#: ../quickfix.c:1305 msgid "E553: No more items" msgstr "E553: Ne plu estas eroj" -#: ../quickfix.c:1674 #, c-format msgid "(%d of %d)%s%s: " msgstr "(%d de %d)%s%s: " -#: ../quickfix.c:1676 msgid " (line deleted)" msgstr " (forviÅita linio)" -#: ../quickfix.c:1863 msgid "E380: At bottom of quickfix stack" msgstr "E380: Ĉe la subo de stako de rapidriparo" -#: ../quickfix.c:1869 msgid "E381: At top of quickfix stack" msgstr "E381: Ĉe la supro de stako de rapidriparo" -#: ../quickfix.c:1880 #, c-format msgid "error list %d of %d; %d errors" msgstr "listo de eraroj %d de %d; %d eraroj" -#: ../quickfix.c:2427 msgid "E382: Cannot write, 'buftype' option is set" msgstr "E382: Ne eblas skribi, opcio 'buftype' estas Åaltita" -#: ../quickfix.c:2812 msgid "E683: File name missing or invalid pattern" msgstr "E683: Dosiernomo mankas aÅ nevalida Åablono" -#: ../quickfix.c:2911 #, c-format msgid "Cannot open file \"%s\"" msgstr "Ne eblas malfermi dosieron \"%s\"" -#: ../quickfix.c:3429 msgid "E681: Buffer is not loaded" msgstr "E681: Bufro ne estas Åargita" -#: ../quickfix.c:3487 msgid "E777: String or List expected" msgstr "E777: Ĉeno aÅ Listo atendita" -#: ../regexp.c:359 #, c-format msgid "E369: invalid item in %s%%[]" msgstr "E369: nevalida ano en %s%%[]" -#: ../regexp.c:374 #, c-format msgid "E769: Missing ] after %s[" msgstr "E769: Mankas ] post %s[" -#: ../regexp.c:375 #, c-format msgid "E53: Unmatched %s%%(" msgstr "E53: Neekvilibra %s%%(" -#: ../regexp.c:376 #, c-format msgid "E54: Unmatched %s(" msgstr "E54: Neekvilibra %s(" -#: ../regexp.c:377 #, c-format msgid "E55: Unmatched %s)" msgstr "E55: Neekvilibra %s" -#: ../regexp.c:378 msgid "E66: \\z( not allowed here" msgstr "E66: \\z( estas permesebla tie" # DP: vidu http://www.thefreedictionary.com/et+al. -#: ../regexp.c:379 msgid "E67: \\z1 et al. not allowed here" msgstr "E67: \\z1 kaj aliaj estas nepermeseblaj tie" -#: ../regexp.c:380 #, c-format msgid "E69: Missing ] after %s%%[" msgstr "E69: Mankas ] post %s%%[" -#: ../regexp.c:381 #, c-format msgid "E70: Empty %s%%[]" msgstr "E70: Malplena %s%%[]" -#: ../regexp.c:1209 ../regexp.c:1224 msgid "E339: Pattern too long" msgstr "E339: Åœablono tro longa" -#: ../regexp.c:1371 msgid "E50: Too many \\z(" msgstr "E50: Tro da \\z(" -#: ../regexp.c:1378 #, c-format msgid "E51: Too many %s(" msgstr "E51: Tro da %s(" -#: ../regexp.c:1427 msgid "E52: Unmatched \\z(" msgstr "E52: Neekvilibra \\z(" -#: ../regexp.c:1637 #, c-format msgid "E59: invalid character after %s@" msgstr "E59: nevalida signo post %s@" -#: ../regexp.c:1672 #, c-format msgid "E60: Too many complex %s{...}s" msgstr "E60: Tro da kompleksaj %s{...}-oj" -#: ../regexp.c:1687 #, c-format msgid "E61: Nested %s*" msgstr "E61: Ingita %s*" -#: ../regexp.c:1690 #, c-format msgid "E62: Nested %s%c" msgstr "E62: Ingita %s%c" -#: ../regexp.c:1800 msgid "E63: invalid use of \\_" msgstr "E63: nevalida uzo de \\_" -#: ../regexp.c:1850 #, c-format msgid "E64: %s%c follows nothing" msgstr "E64: %s%c sekvas nenion" -#: ../regexp.c:1902 msgid "E65: Illegal back reference" msgstr "E65: Nevalida retro-referenco" -#: ../regexp.c:1943 msgid "E68: Invalid character after \\z" msgstr "E68: Nevalida signo post \\z" -#: ../regexp.c:2049 ../regexp_nfa.c:1296 #, c-format msgid "E678: Invalid character after %s%%[dxouU]" msgstr "E678: Nevalida signo post %s%%[dxouU]" -#: ../regexp.c:2107 #, c-format msgid "E71: Invalid character after %s%%" msgstr "E71: Nevalida signo post %s%%" -#: ../regexp.c:3017 #, c-format msgid "E554: Syntax error in %s{...}" msgstr "E554: Sintaksa eraro en %s{...}" -#: ../regexp.c:3805 msgid "External submatches:\n" msgstr "Eksteraj subkongruoj:\n" -#: ../regexp.c:7022 msgid "" "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be " "used " @@ -5035,65 +3986,52 @@ msgstr "" "E864: \\%#= povas nur esti sekvita de 0, 1, aÅ 2. La aÅtomata motoro de " "regulesprimo estos uzata " -#: ../regexp_nfa.c:239 msgid "E865: (NFA) Regexp end encountered prematurely" msgstr "E865: (NFA) Trovis finon de regulesprimo tro frue" -#: ../regexp_nfa.c:240 #, c-format msgid "E866: (NFA regexp) Misplaced %c" msgstr "E866: (NFA-regulesprimo) Mispoziciigita %c" -#: ../regexp_nfa.c:242 #, fuzzy, c-format -msgid "E877: (NFA regexp) Invalid character class: %<PRId64>" -msgstr "E877: (NFA-regulesprimo) Nevalida klaso de signo " +#~ msgid "E877: (NFA regexp) Invalid character class: %<PRId64>" +#~ msgstr "E877: (NFA-regulesprimo) Nevalida klaso de signo " -#: ../regexp_nfa.c:1261 #, c-format msgid "E867: (NFA) Unknown operator '\\z%c'" msgstr "E867: (NFA) Nekonata operatoro '\\z%c'" -#: ../regexp_nfa.c:1387 #, fuzzy, c-format -msgid "E867: (NFA) Unknown operator '\\%%%c'" -msgstr "E867: (NFA) Nekonata operatoro '\\z%c'" +#~ msgid "E867: (NFA) Unknown operator '\\%%%c'" +#~ msgstr "E867: (NFA) Nekonata operatoro '\\z%c'" -#: ../regexp_nfa.c:1802 #, c-format msgid "E869: (NFA) Unknown operator '\\@%c'" msgstr "E869: (NFA) Nekonata operatoro '\\@%c'" -#: ../regexp_nfa.c:1831 msgid "E870: (NFA regexp) Error reading repetition limits" msgstr "E870: (NFS-regulesprimo) Eraro dum legado de limoj de ripeto" #. Can't have a multi follow a multi. -#: ../regexp_nfa.c:1895 msgid "E871: (NFA regexp) Can't have a multi follow a multi !" msgstr "" "E871: (NFA-regulesprimo) Ne povas havi mult-selekton tuj post alia mult-" "selekto!" #. Too many `(' -#: ../regexp_nfa.c:2037 msgid "E872: (NFA regexp) Too many '('" msgstr "E872: (NFA-regulesprimo) tro da '('" -#: ../regexp_nfa.c:2042 #, fuzzy -msgid "E879: (NFA regexp) Too many \\z(" -msgstr "E872: (NFA-regulesprimo) tro da '('" +#~ msgid "E879: (NFA regexp) Too many \\z(" +#~ msgstr "E872: (NFA-regulesprimo) tro da '('" -#: ../regexp_nfa.c:2066 msgid "E873: (NFA regexp) proper termination error" msgstr "E873: (NFA-regulesprimo) propra end-eraro" -#: ../regexp_nfa.c:2599 msgid "E874: (NFA) Could not pop the stack !" msgstr "E874: (NFA) Ne povis elpreni de la staplo!" -#: ../regexp_nfa.c:3298 msgid "" "E875: (NFA regexp) (While converting from postfix to NFA), too many states " "left on stack" @@ -5101,177 +4039,136 @@ msgstr "" "E875: (NFA-regulesprimo) (dum konverto de postmeto al NFA), restas tro da " "statoj en la staplo" -#: ../regexp_nfa.c:3302 msgid "E876: (NFA regexp) Not enough space to store the whole NFA " msgstr "E876: (NFA-regulesprimo) ne sufiĉa spaco por enmomorigi la tutan NFA " -#: ../regexp_nfa.c:4571 ../regexp_nfa.c:4869 msgid "" "Could not open temporary log file for writing, displaying on stderr ... " msgstr "" "Ne povis malfermi provizoran protokolan dosieron por skribi, nun montras sur " "stderr ..." -#: ../regexp_nfa.c:4840 #, c-format msgid "(NFA) COULD NOT OPEN %s !" msgstr "(NFA) NE POVIS MALFERMI %s!" -#: ../regexp_nfa.c:6049 msgid "Could not open temporary log file for writing " msgstr "Ne povis malfermi la provizoran protokolan dosieron por skribi " -#: ../screen.c:7435 msgid " VREPLACE" msgstr " V-ANSTATAŬIGO" -#: ../screen.c:7437 msgid " REPLACE" msgstr " ANSTATAŬIGO" -#: ../screen.c:7440 msgid " REVERSE" msgstr " INVERSI" -#: ../screen.c:7441 msgid " INSERT" msgstr " ENMETO" -#: ../screen.c:7443 msgid " (insert)" msgstr " (enmeto)" -#: ../screen.c:7445 msgid " (replace)" msgstr " (anstataÅigo)" -#: ../screen.c:7447 msgid " (vreplace)" msgstr " (v-anstataÅigo)" -#: ../screen.c:7449 msgid " Hebrew" msgstr " hebrea" -#: ../screen.c:7454 msgid " Arabic" msgstr " araba" -#: ../screen.c:7456 msgid " (lang)" msgstr " (lingvo)" -#: ../screen.c:7459 msgid " (paste)" msgstr " (algluo)" -#: ../screen.c:7469 msgid " VISUAL" msgstr " VIDUMA" -#: ../screen.c:7470 msgid " VISUAL LINE" msgstr " VIDUMA LINIO" -#: ../screen.c:7471 msgid " VISUAL BLOCK" msgstr " VIDUMA BLOKO" -#: ../screen.c:7472 msgid " SELECT" msgstr " APARTIGO" -#: ../screen.c:7473 msgid " SELECT LINE" msgstr " APARTIGITA LINIO" -#: ../screen.c:7474 msgid " SELECT BLOCK" msgstr " APARTIGITA BLOKO" -#: ../screen.c:7486 ../screen.c:7541 msgid "recording" msgstr "registrado" -#: ../search.c:487 #, c-format msgid "E383: Invalid search string: %s" msgstr "E383: Nevalida serĉenda ĉeno: %s" -#: ../search.c:832 #, c-format msgid "E384: search hit TOP without match for: %s" msgstr "E384: serĉo atingis SUPRON sen trovi: %s" -#: ../search.c:835 #, c-format msgid "E385: search hit BOTTOM without match for: %s" msgstr "E385: serĉo atingis SUBON sen trovi: %s" -#: ../search.c:1200 msgid "E386: Expected '?' or '/' after ';'" msgstr "E386: Atendis '?' aÅ '/' post ';'" -#: ../search.c:4085 msgid " (includes previously listed match)" msgstr " (enhavas antaÅe listigitajn kongruojn)" #. cursor at status line -#: ../search.c:4104 msgid "--- Included files " msgstr "--- Inkluzivitaj dosieroj " -#: ../search.c:4106 msgid "not found " msgstr "netrovitaj " -#: ../search.c:4107 msgid "in path ---\n" msgstr "en serĉvojo ---\n" -#: ../search.c:4168 msgid " (Already listed)" msgstr " (Jam listigita)" -#: ../search.c:4170 msgid " NOT FOUND" msgstr " NETROVITA" -#: ../search.c:4211 #, c-format msgid "Scanning included file: %s" msgstr "Skanado de inkluzivitaj dosieroj: %s" -#: ../search.c:4216 #, c-format msgid "Searching included file %s" msgstr "Serĉado de inkluzivitaj dosieroj %s" -#: ../search.c:4405 msgid "E387: Match is on current line" msgstr "E387: Kongruo estas ĉe aktuala linio" -#: ../search.c:4517 msgid "All included files were found" msgstr "Ĉiuj inkluzivitaj dosieroj estis trovitaj" -#: ../search.c:4519 msgid "No included files" msgstr "Neniu inkluzivita dosiero" -#: ../search.c:4527 msgid "E388: Couldn't find definition" msgstr "E388: Ne eblis trovi difinon" -#: ../search.c:4529 msgid "E389: Couldn't find pattern" msgstr "E389: Ne eblis trovi Åablonon" -#: ../search.c:4668 msgid "Substitute " msgstr "AnstataÅigi " -#: ../search.c:4681 #, c-format msgid "" "\n" @@ -5282,97 +4179,76 @@ msgstr "" "# Lasta serĉa Åablono %s:\n" "~" -#: ../spell.c:951 msgid "E759: Format error in spell file" msgstr "E759: Eraro de formato en literuma dosiero" -#: ../spell.c:952 msgid "E758: Truncated spell file" msgstr "E758: Trunkita literuma dosiero" -#: ../spell.c:953 #, c-format msgid "Trailing text in %s line %d: %s" msgstr "Vosta teksto en %s linio %d: %s" -#: ../spell.c:954 #, c-format msgid "Affix name too long in %s line %d: %s" msgstr "Nomo de afikso tro longa en %s linio %d: %s" -#: ../spell.c:955 msgid "E761: Format error in affix file FOL, LOW or UPP" msgstr "E761: Eraro de formato en afiksa dosiero FOL, LOW aÅ UPP" -#: ../spell.c:957 msgid "E762: Character in FOL, LOW or UPP is out of range" msgstr "E762: Signo en FOL, LOW aÅ UPP estas ekster limoj" -#: ../spell.c:958 msgid "Compressing word tree..." msgstr "Densigas arbon de vortoj..." -#: ../spell.c:1951 msgid "E756: Spell checking is not enabled" msgstr "E756: Literumilo ne estas Åaltita" -#: ../spell.c:2249 #, c-format msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\"" msgstr "Averto: Ne eblas trovi vortliston \"%s.%s.spl\" aÅ \"%s.ascii.spl\"" -#: ../spell.c:2473 #, c-format msgid "Reading spell file \"%s\"" msgstr "Legado de literuma dosiero \"%s\"" -#: ../spell.c:2496 msgid "E757: This does not look like a spell file" msgstr "E757: Tio ne Åajnas esti literuma dosiero" -#: ../spell.c:2501 msgid "E771: Old spell file, needs to be updated" msgstr "E771: Malnova literuma dosiero, Äisdatigo bezonata" -#: ../spell.c:2504 msgid "E772: Spell file is for newer version of Vim" msgstr "E772: Literuma dosiero estas por pli nova versio de Vim" -#: ../spell.c:2602 msgid "E770: Unsupported section in spell file" msgstr "E770: Nesubtenata sekcio en literuma dosiero" -#: ../spell.c:3762 #, c-format msgid "Warning: region %s not supported" msgstr "Averto: regiono %s ne subtenata" -#: ../spell.c:4550 #, c-format msgid "Reading affix file %s ..." msgstr "Legado de afiksa dosiero %s ..." -#: ../spell.c:4589 ../spell.c:5635 ../spell.c:6140 #, c-format msgid "Conversion failure for word in %s line %d: %s" msgstr "Malsukceso dum konverto de vorto en %s linio %d: %s" -#: ../spell.c:4630 ../spell.c:6170 #, c-format msgid "Conversion in %s not supported: from %s to %s" msgstr "Konverto en %s nesubtenata: de %s al %s" -#: ../spell.c:4642 #, c-format msgid "Invalid value for FLAG in %s line %d: %s" msgstr "Nevalida valoro de FLAG en %s linio %d: %s" -#: ../spell.c:4655 #, c-format msgid "FLAG after using flags in %s line %d: %s" msgstr "FLAG post flagoj en %s linio %d: %s" -#: ../spell.c:4723 #, c-format msgid "" "Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line " @@ -5381,7 +4257,6 @@ msgstr "" "Difino de COMPOUNDFORBIDFLAG post ano PFX povas doni neÄustajn rezultojn en " "%s linio %d" -#: ../spell.c:4731 #, c-format msgid "" "Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line " @@ -5390,42 +4265,34 @@ msgstr "" "Difino de COMPOUNDPERMITFLAG post ano PFX povas doni neÄustajn rezultojn en " "%s linio %d" -#: ../spell.c:4747 #, c-format msgid "Wrong COMPOUNDRULES value in %s line %d: %s" msgstr "Nevalida valoro de COMPOUNDRULES en %s linio %d: %s" -#: ../spell.c:4771 #, c-format msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s" msgstr "Nevalida valoro de COMPOUNDWORDMAX en %s linio %d: %s" -#: ../spell.c:4777 #, c-format msgid "Wrong COMPOUNDMIN value in %s line %d: %s" msgstr "Nevalida valoro de COMPOUNDMIN en %s linio %d: %s" -#: ../spell.c:4783 #, c-format msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s" msgstr "Nevalida valoro de COMPOUNDSYLMAX en %s linio %d: %s" -#: ../spell.c:4795 #, c-format msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s" msgstr "Nevalida valoro de CHECKCOMPOUNDPATTERN en %s linio %d: %s" -#: ../spell.c:4847 #, c-format msgid "Different combining flag in continued affix block in %s line %d: %s" msgstr "Malsama flago de kombino en daÅra bloko de afikso en %s linio %d: %s" -#: ../spell.c:4850 #, c-format msgid "Duplicate affix in %s line %d: %s" msgstr "Ripetita afikso en %s linio %d: %s" -#: ../spell.c:4871 #, c-format msgid "" "Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s " @@ -5434,308 +4301,245 @@ msgstr "" "Afikso ankaÅ uzata por BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST en " "%s linio %d: %s" -#: ../spell.c:4893 #, c-format msgid "Expected Y or N in %s line %d: %s" msgstr "Y aÅ N atendita en %s linio %d: %s" -#: ../spell.c:4968 #, c-format msgid "Broken condition in %s line %d: %s" msgstr "Nevalida kondiĉo en %s linio %d: %s" -#: ../spell.c:5091 #, c-format msgid "Expected REP(SAL) count in %s line %d" msgstr "Neatendita nombro REP(SAL) en %s linio %d" -#: ../spell.c:5120 #, c-format msgid "Expected MAP count in %s line %d" msgstr "Neatendita nombro de MAPen %s linio %d" -#: ../spell.c:5132 #, c-format msgid "Duplicate character in MAP in %s line %d" msgstr "Ripetita signo en MAP en %s linio %d" -#: ../spell.c:5176 #, c-format msgid "Unrecognized or duplicate item in %s line %d: %s" msgstr "Neagnoskita aÅ ripetita ano en %s linio %d: %s" -#: ../spell.c:5197 #, c-format msgid "Missing FOL/LOW/UPP line in %s" msgstr "Mankas linio FOL/LOW/UPP en %s" -#: ../spell.c:5220 msgid "COMPOUNDSYLMAX used without SYLLABLE" msgstr "COMPOUNDSYLMAX uzita sen SYLLABLE" -#: ../spell.c:5236 msgid "Too many postponed prefixes" msgstr "Tro da prokrastitaj prefiksoj" -#: ../spell.c:5238 msgid "Too many compound flags" msgstr "Tro da kunmetitaj flagoj" -#: ../spell.c:5240 msgid "Too many postponed prefixes and/or compound flags" msgstr "Tro da prokrastitaj prefiksoj kaj/aÅ kunmetitaj flagoj" -#: ../spell.c:5250 #, c-format msgid "Missing SOFO%s line in %s" msgstr "Mankas SOFO%s-aj linioj en %s" -#: ../spell.c:5253 #, c-format msgid "Both SAL and SOFO lines in %s" msgstr "AmbaÅ SAL kaj SOFO linioj en %s" -#: ../spell.c:5331 #, c-format msgid "Flag is not a number in %s line %d: %s" msgstr "Flago ne estas nombro en %s linio %d: %s" -#: ../spell.c:5334 #, c-format msgid "Illegal flag in %s line %d: %s" msgstr "Nevalida flago en %s linio %d: %s" -#: ../spell.c:5493 ../spell.c:5501 #, c-format msgid "%s value differs from what is used in another .aff file" msgstr "Valoro de %s malsamas ol tiu en alia dosiero .aff" -#: ../spell.c:5602 #, c-format msgid "Reading dictionary file %s ..." msgstr "Legado de vortardosiero %s ..." -#: ../spell.c:5611 #, c-format msgid "E760: No word count in %s" msgstr "E760: Ne estas nombro de vortoj en %s" -#: ../spell.c:5669 #, c-format msgid "line %6d, word %6d - %s" msgstr "linio %6d, vorto %6d - %s" -#: ../spell.c:5691 #, c-format msgid "Duplicate word in %s line %d: %s" msgstr "Ripetita vorto en %s linio %d: %s" -#: ../spell.c:5694 #, c-format msgid "First duplicate word in %s line %d: %s" msgstr "Unua ripetita vorto en %s linio %d: %s" -#: ../spell.c:5746 #, c-format msgid "%d duplicate word(s) in %s" msgstr "%d ripetita(j) vorto(j) en %s" -#: ../spell.c:5748 #, c-format msgid "Ignored %d word(s) with non-ASCII characters in %s" msgstr "%d ignorita(j) vorto(j) kun neaskiaj signoj en %s" -#: ../spell.c:6115 #, c-format msgid "Reading word file %s ..." msgstr "Legado de dosiero de vortoj %s ..." -#: ../spell.c:6155 #, c-format msgid "Duplicate /encoding= line ignored in %s line %d: %s" msgstr "Ripetita linio /encoding= ignorita en %s linio %d: %s" -#: ../spell.c:6159 #, c-format msgid "/encoding= line after word ignored in %s line %d: %s" msgstr "Linio /encoding= post vorto ignorita en %s linio %d: %s" -#: ../spell.c:6180 #, c-format msgid "Duplicate /regions= line ignored in %s line %d: %s" msgstr "Ripetita linio /regions= ignorita en %s linio %d: %s" -#: ../spell.c:6185 #, c-format msgid "Too many regions in %s line %d: %s" msgstr "Tro da regionoj en %s linio %d: %s" -#: ../spell.c:6198 #, c-format msgid "/ line ignored in %s line %d: %s" msgstr "Linio / ignorita en %s linio %d: %s" -#: ../spell.c:6224 #, c-format msgid "Invalid region nr in %s line %d: %s" msgstr "Nevalida regiono nr en %s linio %d: %s" -#: ../spell.c:6230 #, c-format msgid "Unrecognized flags in %s line %d: %s" msgstr "Nekonata flago en %s linio %d: %s" -#: ../spell.c:6257 #, c-format msgid "Ignored %d words with non-ASCII characters" msgstr "Ignoris %d vorto(j)n kun neaskiaj signoj" -#: ../spell.c:6656 #, c-format msgid "Compressed %d of %d nodes; %d (%d%%) remaining" msgstr "Densigis %d de %d nodoj; %d (%d%%) restantaj" -#: ../spell.c:7340 msgid "Reading back spell file..." msgstr "Relegas la dosieron de literumo..." #. Go through the trie of good words, soundfold each word and add it to #. the soundfold trie. -#: ../spell.c:7357 msgid "Performing soundfolding..." msgstr "Fonetika analizado..." -#: ../spell.c:7368 #, c-format msgid "Number of words after soundfolding: %<PRId64>" msgstr "Nombro de vortoj post fonetika analizado: %<PRId64>" -#: ../spell.c:7476 #, c-format msgid "Total number of words: %d" msgstr "Totala nombro de vortoj: %d" -#: ../spell.c:7655 #, c-format msgid "Writing suggestion file %s ..." msgstr "Skribado de dosiero de sugesto %s ..." -#: ../spell.c:7707 ../spell.c:7927 #, c-format msgid "Estimated runtime memory use: %d bytes" msgstr "Evaluo de memoro uzata: %d bajtoj" -#: ../spell.c:7820 msgid "E751: Output file name must not have region name" msgstr "E751: Nomo de eliga dosiero ne devas havi nomon de regiono" -#: ../spell.c:7822 msgid "E754: Only up to 8 regions supported" msgstr "E754: Nur 8 regionoj subtenataj" -#: ../spell.c:7846 #, c-format msgid "E755: Invalid region in %s" msgstr "E755: Nevalida regiono en %s" -#: ../spell.c:7907 msgid "Warning: both compounding and NOBREAK specified" msgstr "Averto: ambaÅ NOBREAK kaj NOBREAK specifitaj" -#: ../spell.c:7920 #, c-format msgid "Writing spell file %s ..." msgstr "Skribado de literuma dosiero %s ..." -#: ../spell.c:7925 msgid "Done!" msgstr "Farita!" -#: ../spell.c:8034 #, c-format msgid "E765: 'spellfile' does not have %<PRId64> entries" msgstr "E765: 'spellfile' ne havas %<PRId64> rikordojn" -#: ../spell.c:8074 #, fuzzy, c-format -msgid "Word '%.*s' removed from %s" -msgstr "Vorto fortirita el %s" +#~ msgid "Word '%.*s' removed from %s" +#~ msgstr "Vorto fortirita el %s" -#: ../spell.c:8117 #, fuzzy, c-format -msgid "Word '%.*s' added to %s" -msgstr "Vorto aldonita al %s" +#~ msgid "Word '%.*s' added to %s" +#~ msgstr "Vorto aldonita al %s" -#: ../spell.c:8381 msgid "E763: Word characters differ between spell files" msgstr "E763: Signoj de vorto malsamas tra literumaj dosieroj" -#: ../spell.c:8684 msgid "Sorry, no suggestions" msgstr "BedaÅrinde ne estas sugestoj" -#: ../spell.c:8687 #, c-format msgid "Sorry, only %<PRId64> suggestions" msgstr "BedaÅrinde estas nur %<PRId64> sugestoj" #. for when 'cmdheight' > 1 #. avoid more prompt -#: ../spell.c:8704 #, c-format msgid "Change \"%.*s\" to:" msgstr "AnstataÅigi \"%.*s\" per:" -#: ../spell.c:8737 #, c-format msgid " < \"%.*s\"" msgstr " < \"%.*s\"" -#: ../spell.c:8882 msgid "E752: No previous spell replacement" msgstr "E752: Neniu antaÅa literuma anstataÅigo" -#: ../spell.c:8925 #, c-format msgid "E753: Not found: %s" msgstr "E753: Netrovita: %s" -#: ../spell.c:9276 #, c-format msgid "E778: This does not look like a .sug file: %s" msgstr "E778: Tio ne Åajnas esti dosiero .sug: %s" -#: ../spell.c:9282 #, c-format msgid "E779: Old .sug file, needs to be updated: %s" msgstr "E779: Malnova dosiero .sug, bezonas Äisdatigon: %s" -#: ../spell.c:9286 #, c-format msgid "E780: .sug file is for newer version of Vim: %s" msgstr "E780: Dosiero .sug estas por pli nova versio de Vim: %s" -#: ../spell.c:9295 #, c-format msgid "E781: .sug file doesn't match .spl file: %s" msgstr "E781: Dosiero .sug ne kongruas kun dosiero .spl: %s" -#: ../spell.c:9305 #, c-format msgid "E782: error while reading .sug file: %s" msgstr "E782: eraro dum legado de dosiero .sug: %s" #. This should have been checked when generating the .spl #. file. -#: ../spell.c:11575 msgid "E783: duplicate char in MAP entry" msgstr "E783: ripetita signo en rikordo MAP" -#: ../syntax.c:266 msgid "No Syntax items defined for this buffer" msgstr "Neniu sintaksa elemento difinita por tiu bufro" -#: ../syntax.c:3083 ../syntax.c:3104 ../syntax.c:3127 #, c-format msgid "E390: Illegal argument: %s" msgstr "E390: Nevalida argumento: %s" @@ -5743,28 +4547,22 @@ msgstr "E390: Nevalida argumento: %s" msgid "syntax iskeyword " msgstr "sintakso iskeyword " -#: ../syntax.c:3299 #, c-format msgid "E391: No such syntax cluster: %s" msgstr "E391: Nenia sintaksa fasko: %s" -#: ../syntax.c:3433 msgid "syncing on C-style comments" msgstr "sinkronigo per C-stilaj komentoj" -#: ../syntax.c:3439 msgid "no syncing" msgstr "neniu sinkronigo" -#: ../syntax.c:3441 msgid "syncing starts " msgstr "sinkronigo ekas " -#: ../syntax.c:3443 ../syntax.c:3506 msgid " lines before top line" msgstr " linioj antaÅ supra linio" -#: ../syntax.c:3448 msgid "" "\n" "--- Syntax sync items ---" @@ -5772,7 +4570,6 @@ msgstr "" "\n" "--- Eroj de sintaksa sinkronigo ---" -#: ../syntax.c:3452 msgid "" "\n" "syncing on items" @@ -5780,7 +4577,6 @@ msgstr "" "\n" "sinkronigo per eroj" -#: ../syntax.c:3457 msgid "" "\n" "--- Syntax items ---" @@ -5788,53 +4584,41 @@ msgstr "" "\n" "--- Sintakseroj ---" -#: ../syntax.c:3475 #, c-format msgid "E392: No such syntax cluster: %s" msgstr "E392: Nenia sintaksa fasko: %s" -#: ../syntax.c:3497 msgid "minimal " msgstr "minimuma " -#: ../syntax.c:3503 msgid "maximal " msgstr "maksimuma " -#: ../syntax.c:3513 msgid "; match " msgstr "; kongruo " -#: ../syntax.c:3515 msgid " line breaks" msgstr " liniavancoj" -#: ../syntax.c:4076 msgid "E395: contains argument not accepted here" msgstr "E395: La argumento \"contains\" ne akcepteblas tie" -#: ../syntax.c:4096 msgid "E844: invalid cchar value" msgstr "E844: nevalida valoro de cchar" -#: ../syntax.c:4107 msgid "E393: group[t]here not accepted here" msgstr "E393: La argumento \"group[t]here\" ne akcepteblas tie" -#: ../syntax.c:4126 #, c-format msgid "E394: Didn't find region item for %s" msgstr "E394: Ne trovis regionan elementon por %s" -#: ../syntax.c:4188 msgid "E397: Filename required" msgstr "E397: Dosiernomo bezonata" -#: ../syntax.c:4221 msgid "E847: Too many syntax includes" msgstr "E847: Tro da sintaksaj inkluzivoj" -#: ../syntax.c:4303 #, c-format msgid "E789: Missing ']': %s" msgstr "E789: Mankas ']': %s" @@ -5843,221 +4627,174 @@ msgstr "E789: Mankas ']': %s" msgid "E890: trailing char after ']': %s]%s" msgstr "E890: vosta signo post ']': %s]%s" -#: ../syntax.c:4531 #, c-format msgid "E398: Missing '=': %s" msgstr "E398: Mankas '=': %s" -#: ../syntax.c:4666 #, c-format msgid "E399: Not enough arguments: syntax region %s" msgstr "E399: Ne sufiĉaj argumentoj: sintaksa regiono %s" -#: ../syntax.c:4870 msgid "E848: Too many syntax clusters" msgstr "E848: Tro da sintaksaj grupoj" -#: ../syntax.c:4954 msgid "E400: No cluster specified" msgstr "E400: Neniu fasko specifita" #. end delimiter not found -#: ../syntax.c:4986 #, c-format msgid "E401: Pattern delimiter not found: %s" msgstr "E401: Disigilo de Åablono netrovita: %s" -#: ../syntax.c:5049 #, c-format msgid "E402: Garbage after pattern: %s" msgstr "E402: Forĵetindaĵo post Åablono: %s" -#: ../syntax.c:5120 msgid "E403: syntax sync: line continuations pattern specified twice" msgstr "E403: sintaksa sinkronigo: Åablono de linia daÅrigo specifita dufoje" -#: ../syntax.c:5169 #, c-format msgid "E404: Illegal arguments: %s" msgstr "E404: Nevalidaj argumentoj: %s" -#: ../syntax.c:5217 #, c-format msgid "E405: Missing equal sign: %s" msgstr "E405: Mankas egalsigno: %s" -#: ../syntax.c:5222 #, c-format msgid "E406: Empty argument: %s" msgstr "E406: Malplena argumento: %s" -#: ../syntax.c:5240 #, c-format msgid "E407: %s not allowed here" msgstr "E407: %s ne estas permesebla tie" -#: ../syntax.c:5246 #, c-format msgid "E408: %s must be first in contains list" msgstr "E408: %s devas esti la unua ano de la listo \"contains\"" -#: ../syntax.c:5304 #, c-format msgid "E409: Unknown group name: %s" msgstr "E409: Nekonata nomo de grupo: %s" -#: ../syntax.c:5512 #, c-format msgid "E410: Invalid :syntax subcommand: %s" msgstr "E410: Nevalida \":syntax\" subkomando: %s" -#: ../syntax.c:5854 -msgid "" -" TOTAL COUNT MATCH SLOWEST AVERAGE NAME PATTERN" -msgstr "" +#~ msgid "" +#~ " TOTAL COUNT MATCH SLOWEST AVERAGE NAME PATTERN" +#~ msgstr "" -#: ../syntax.c:6146 msgid "E679: recursive loop loading syncolor.vim" msgstr "E679: rekursia buklo dum Åargo de syncolor.vim" -#: ../syntax.c:6256 #, c-format msgid "E411: highlight group not found: %s" msgstr "E411: emfaza grupo netrovita: %s" -#: ../syntax.c:6278 #, c-format msgid "E412: Not enough arguments: \":highlight link %s\"" msgstr "E412: Ne sufiĉaj argumentoj: \":highlight link %s\"" -#: ../syntax.c:6284 #, c-format msgid "E413: Too many arguments: \":highlight link %s\"" msgstr "E413: Tro argumentoj: \":highlight link %s\"" -#: ../syntax.c:6302 msgid "E414: group has settings, highlight link ignored" msgstr "E414: grupo havas agordojn, ligilo de emfazo ignorita" -#: ../syntax.c:6367 #, c-format msgid "E415: unexpected equal sign: %s" msgstr "E415: neatendita egalsigno: %s" -#: ../syntax.c:6395 #, c-format msgid "E416: missing equal sign: %s" msgstr "E416: mankas egalsigno: %s" -#: ../syntax.c:6418 #, c-format msgid "E417: missing argument: %s" msgstr "E417: mankas argumento: %s" -#: ../syntax.c:6446 #, c-format msgid "E418: Illegal value: %s" msgstr "E418: Nevalida valoro: %s" -#: ../syntax.c:6496 msgid "E419: FG color unknown" msgstr "E419: Nekonata malfona koloro" -#: ../syntax.c:6504 msgid "E420: BG color unknown" msgstr "E420: Nekonata fona koloro" -#: ../syntax.c:6564 #, c-format msgid "E421: Color name or number not recognized: %s" msgstr "E421: Kolora nomo aÅ nombro nerekonita: %s" -#: ../syntax.c:6714 #, c-format msgid "E422: terminal code too long: %s" msgstr "E422: kodo de terminalo estas tro longa: %s" -#: ../syntax.c:6753 #, c-format msgid "E423: Illegal argument: %s" msgstr "E423: Nevalida argumento: %s" -#: ../syntax.c:6925 msgid "E424: Too many different highlighting attributes in use" msgstr "E424: Tro da malsamaj atributoj de emfazo uzataj" -#: ../syntax.c:7427 msgid "E669: Unprintable character in group name" msgstr "E669: Nepresebla signo en nomo de grupo" -#: ../syntax.c:7434 msgid "W18: Invalid character in group name" msgstr "W18: Nevalida signo en nomo de grupo" -#: ../syntax.c:7448 msgid "E849: Too many highlight and syntax groups" msgstr "E849: Tro da emfazaj kaj sintaksaj grupoj" -#: ../tag.c:104 msgid "E555: at bottom of tag stack" msgstr "E555: ĉe subo de stako de etikedoj" -#: ../tag.c:105 msgid "E556: at top of tag stack" msgstr "E556: ĉe supro de stako de etikedoj" -#: ../tag.c:380 msgid "E425: Cannot go before first matching tag" msgstr "E425: Ne eblas iri antaÅ la unuan kongruan etikedon" -#: ../tag.c:504 #, c-format msgid "E426: tag not found: %s" msgstr "E426: etikedo netrovita: %s" # DP: "pri" estas "priority" -#: ../tag.c:528 msgid " # pri kind tag" msgstr "nro pri tipo etikedo" -#: ../tag.c:531 msgid "file\n" msgstr "dosiero\n" -#: ../tag.c:829 msgid "E427: There is only one matching tag" msgstr "E427: Estas nur unu kongrua etikedo" -#: ../tag.c:831 msgid "E428: Cannot go beyond last matching tag" msgstr "E428: Ne eblas iri preter lastan kongruan etikedon" -#: ../tag.c:850 #, c-format msgid "File \"%s\" does not exist" msgstr "La dosiero \"%s\" ne ekzistas" #. Give an indication of the number of matching tags -#: ../tag.c:859 #, c-format msgid "tag %d of %d%s" msgstr "etikedo %d de %d%s" -#: ../tag.c:862 msgid " or more" msgstr " aÅ pli" -#: ../tag.c:864 msgid " Using tag with different case!" msgstr " Uzo de etikedo kun malsama uskleco!" -#: ../tag.c:909 #, c-format msgid "E429: File \"%s\" does not exist" msgstr "E429: Dosiero \"%s\" ne ekzistas" #. Highlight title -#: ../tag.c:960 msgid "" "\n" " # TO tag FROM line in file/text" @@ -6065,79 +4802,62 @@ msgstr "" "\n" "nro AL etikedo DE linio en dosiero/teksto" -#: ../tag.c:1303 #, c-format msgid "Searching tags file %s" msgstr "Serĉado de dosiero de etikedoj %s" -#: ../tag.c:1545 msgid "Ignoring long line in tags file" msgstr "Ignoro de longa linio en etikeda dosiero" -#: ../tag.c:1915 #, c-format msgid "E431: Format error in tags file \"%s\"" msgstr "E431: Eraro de formato en etikeda dosiero \"%s\"" -#: ../tag.c:1917 #, c-format msgid "Before byte %<PRId64>" msgstr "AntaÅ bajto %<PRId64>" -#: ../tag.c:1929 #, c-format msgid "E432: Tags file not sorted: %s" msgstr "E432: Etikeda dosiero ne estas ordigita: %s" #. never opened any tags file -#: ../tag.c:1960 msgid "E433: No tags file" msgstr "E433: Neniu etikeda dosiero" -#: ../tag.c:2536 msgid "E434: Can't find tag pattern" msgstr "E434: Ne eblas trovi Åablonon de etikedo" -#: ../tag.c:2544 msgid "E435: Couldn't find tag, just guessing!" msgstr "E435: Ne eblis trovi etikedon, nur divenas!" -#: ../tag.c:2797 #, c-format msgid "Duplicate field name: %s" msgstr "Ripetita kamponomo: %s" -#: ../term.c:1442 msgid "' not known. Available builtin terminals are:" msgstr "' nekonata. Haveblaj terminaloj estas:" -#: ../term.c:1463 msgid "defaulting to '" msgstr "defaÅlto al '" -#: ../term.c:1731 msgid "E557: Cannot open termcap file" msgstr "E557: Ne eblas malfermi la dosieron termcap" -#: ../term.c:1735 msgid "E558: Terminal entry not found in terminfo" msgstr "E558: Ne trovis rikordon de terminalo terminfo" -#: ../term.c:1737 msgid "E559: Terminal entry not found in termcap" msgstr "E559: Ne trovis rikordon de terminalo en termcap" -#: ../term.c:1878 #, c-format msgid "E436: No \"%s\" entry in termcap" msgstr "E436: Neniu rikordo \"%s\" en termcap" -#: ../term.c:2249 msgid "E437: terminal capability \"cm\" required" msgstr "E437: kapablo de terminalo \"cm\" bezonata" #. Highlight title -#: ../term.c:4376 msgid "" "\n" "--- Terminal keys ---" @@ -6145,169 +4865,132 @@ msgstr "" "\n" "--- Klavoj de terminalo ---" -#: ../ui.c:481 msgid "Vim: Error reading input, exiting...\n" msgstr "Vim: Eraro dum legado de eniro, elironta...\n" #. This happens when the FileChangedRO autocommand changes the #. * file in a way it becomes shorter. -#: ../undo.c:379 #, fuzzy -msgid "E881: Line count changed unexpectedly" -msgstr "E834: Nombro de linioj ÅanÄiÄis neatendite" +#~ msgid "E881: Line count changed unexpectedly" +#~ msgstr "E834: Nombro de linioj ÅanÄiÄis neatendite" -#: ../undo.c:627 #, c-format msgid "E828: Cannot open undo file for writing: %s" msgstr "E828: Ne eblas malfermi la malfaran dosieron por skribi: %s" -#: ../undo.c:717 #, c-format msgid "E825: Corrupted undo file (%s): %s" msgstr "E825: Difektita malfara dosiero (%s): %s" -#: ../undo.c:1039 msgid "Cannot write undo file in any directory in 'undodir'" msgstr "Ne eblis skribi malfaran dosieron en iu dosiero ajn de 'undodir'" -#: ../undo.c:1074 #, c-format msgid "Will not overwrite with undo file, cannot read: %s" msgstr "Ne superskribos malfaran dosieron, ne eblis legi: %s" -#: ../undo.c:1092 #, c-format msgid "Will not overwrite, this is not an undo file: %s" msgstr "Ne superskribos, tio ne estas malfara dosiero: %s" -#: ../undo.c:1108 msgid "Skipping undo file write, nothing to undo" msgstr "Preterpasas skribon de malfara dosiero, nenio por malfari" -#: ../undo.c:1121 #, c-format msgid "Writing undo file: %s" msgstr "Skribas malfaran dosieron: %s" -#: ../undo.c:1213 #, c-format msgid "E829: write error in undo file: %s" msgstr "E829: Skriberaro en malfara dosiero: %s" -#: ../undo.c:1280 #, c-format msgid "Not reading undo file, owner differs: %s" msgstr "Ne legas malfaran dosieron, posedanto malsamas: %s" -#: ../undo.c:1292 #, c-format msgid "Reading undo file: %s" msgstr "Legado de malfara dosiero: %s" -#: ../undo.c:1299 #, c-format msgid "E822: Cannot open undo file for reading: %s" msgstr "E822: Ne eblas malfermi malfaran dosieron por legi: %s" -#: ../undo.c:1308 #, c-format msgid "E823: Not an undo file: %s" msgstr "E823: Ne estas malfara dosiero: %s" -#: ../undo.c:1313 #, c-format msgid "E824: Incompatible undo file: %s" msgstr "E824: Malkongrua malfara dosiero: %s" -#: ../undo.c:1328 msgid "File contents changed, cannot use undo info" msgstr "Enhavo de dosiero ÅanÄiÄis, ne eblas uzi malfarajn informojn" -#: ../undo.c:1497 #, c-format msgid "Finished reading undo file %s" msgstr "Finis legi malfaran dosieron %s" -#: ../undo.c:1586 ../undo.c:1812 msgid "Already at oldest change" msgstr "Jam al la plej malnova ÅanÄo" -#: ../undo.c:1597 ../undo.c:1814 msgid "Already at newest change" msgstr "Jam al la plej nova ÅanÄo" -#: ../undo.c:1806 #, c-format msgid "E830: Undo number %<PRId64> not found" msgstr "E830: Malfara numero %<PRId64> netrovita" -#: ../undo.c:1979 msgid "E438: u_undo: line numbers wrong" msgstr "E438: u_undo: nevalidaj numeroj de linioj" -#: ../undo.c:2183 msgid "more line" msgstr "plia linio" -#: ../undo.c:2185 msgid "more lines" msgstr "pliaj linioj" -#: ../undo.c:2187 msgid "line less" msgstr "malpli linio" -#: ../undo.c:2189 msgid "fewer lines" msgstr "malpli linioj" -#: ../undo.c:2193 msgid "change" msgstr "ÅanÄo" -#: ../undo.c:2195 msgid "changes" msgstr "ÅanÄoj" -#: ../undo.c:2225 #, c-format msgid "%<PRId64> %s; %s #%<PRId64> %s" msgstr "%<PRId64> %s; %s #%<PRId64> %s" -#: ../undo.c:2228 msgid "before" msgstr "antaÅ" -#: ../undo.c:2228 msgid "after" msgstr "post" -#: ../undo.c:2325 msgid "Nothing to undo" msgstr "Nenio por malfari" -#: ../undo.c:2330 msgid "number changes when saved" msgstr "numero ÅanÄoj tempo konservita" -#: ../undo.c:2360 #, c-format msgid "%<PRId64> seconds ago" msgstr "antaÅ %<PRId64> sekundoj" -#: ../undo.c:2372 msgid "E790: undojoin is not allowed after undo" msgstr "E790: undojoin estas nepermesebla post malfaro" -#: ../undo.c:2466 msgid "E439: undo list corrupt" msgstr "E439: listo de malfaro estas difekta" -#: ../undo.c:2495 msgid "E440: undo line missing" msgstr "E440: linio de malfaro mankas" -#: ../version.c:600 msgid "" "\n" "Included patches: " @@ -6315,7 +4998,6 @@ msgstr "" "\n" "Flikaĵoj inkluzivitaj: " -#: ../version.c:627 msgid "" "\n" "Extra patches: " @@ -6323,11 +5005,9 @@ msgstr "" "\n" "Ekstraj flikaĵoj: " -#: ../version.c:639 ../version.c:864 msgid "Modified by " msgstr "Modifita de " -#: ../version.c:646 msgid "" "\n" "Compiled " @@ -6335,11 +5015,9 @@ msgstr "" "\n" "Kompilita " -#: ../version.c:649 msgid "by " msgstr "de " -#: ../version.c:660 msgid "" "\n" "Huge version " @@ -6347,169 +5025,130 @@ msgstr "" "\n" "Grandega versio " -#: ../version.c:661 msgid "without GUI." msgstr "sen grafika interfaco." -#: ../version.c:662 msgid " Features included (+) or not (-):\n" msgstr " Ebloj inkluzivitaj (+) aÅ ne (-):\n" -#: ../version.c:667 msgid " system vimrc file: \"" msgstr " sistema dosiero vimrc: \"" -#: ../version.c:672 msgid " user vimrc file: \"" msgstr " dosiero vimrc de uzanto: \"" -#: ../version.c:677 msgid " 2nd user vimrc file: \"" msgstr " 2-a dosiero vimrc de uzanto: \"" -#: ../version.c:682 msgid " 3rd user vimrc file: \"" msgstr " 3-a dosiero vimrc de uzanto: \"" -#: ../version.c:687 msgid " user exrc file: \"" msgstr " dosiero exrc de uzanto: \"" -#: ../version.c:692 msgid " 2nd user exrc file: \"" msgstr " 2-a dosiero exrc de uzanto: \"" -#: ../version.c:699 msgid " fall-back for $VIM: \"" msgstr " defaÅlto de $VIM: \"" -#: ../version.c:705 msgid " f-b for $VIMRUNTIME: \"" msgstr " defaÅlto de VIMRUNTIME: \"" -#: ../version.c:709 msgid "Compilation: " msgstr "Kompilado: " -#: ../version.c:712 msgid "Linking: " msgstr "Ligado: " -#: ../version.c:717 msgid " DEBUG BUILD" msgstr " SENCIMIGA MUNTO" -#: ../version.c:767 msgid "VIM - Vi IMproved" msgstr "VIM - Vi plibonigita" -#: ../version.c:769 msgid "version " msgstr "versio " # DP: vidu http://www.thefreedictionary.com/et+al. -#: ../version.c:770 msgid "by Bram Moolenaar et al." msgstr "de Bram Moolenaar kaj aliuloj" -#: ../version.c:774 msgid "Vim is open source and freely distributable" msgstr "Vim estas libera programo kaj disdoneblas libere" -#: ../version.c:776 msgid "Help poor children in Uganda!" msgstr "Helpu malriĉajn infanojn en Ugando!" # DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon -#: ../version.c:777 msgid "type :help iccf<Enter> for information " msgstr "tajpu :help iccf<Enenklavo> por pliaj informoj " # DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon -#: ../version.c:779 msgid "type :q<Enter> to exit " msgstr "tajpu :q<Enenklavo> por eliri " # DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon -#: ../version.c:780 msgid "type :help<Enter> or <F1> for on-line help" msgstr "tajpu :help<Enenklavo> aÅ <F1> por aliri la helpon " # DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon -#: ../version.c:781 msgid "type :help version7<Enter> for version info" msgstr "tajpu :help version7<Enenklavo> por informo de versio" -#: ../version.c:784 msgid "Running in Vi compatible mode" msgstr "RuliÄas en reÄimo kongrua kun Vi" # DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon -#: ../version.c:785 msgid "type :set nocp<Enter> for Vim defaults" msgstr "tajpu :set nocp<Enenklavo> por Vim defaÅltoj " # DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon -#: ../version.c:786 msgid "type :help cp-default<Enter> for info on this" msgstr "tajpu :help cp-default<Enenklavo> por pliaj informoj " -#: ../version.c:827 msgid "Sponsor Vim development!" msgstr "Subtenu la programadon de Vim!" -#: ../version.c:828 msgid "Become a registered Vim user!" msgstr "IÄu registrita uzanto de Vim!" # DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon -#: ../version.c:831 msgid "type :help sponsor<Enter> for information " msgstr "tajpu :help sponsor<Enenklavo> por pliaj informoj " # DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon -#: ../version.c:832 msgid "type :help register<Enter> for information " msgstr "tajpu :help register<Enenklavo> por pliaj informoj " # DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon -#: ../version.c:834 msgid "menu Help->Sponsor/Register for information " msgstr "menuo Helpo->Subteni/Registri por pliaj informoj " -#: ../window.c:119 msgid "Already only one window" msgstr "Jam nur unu fenestro" -#: ../window.c:224 msgid "E441: There is no preview window" msgstr "E441: Ne estas antaÅvida fenestro" -#: ../window.c:559 msgid "E442: Can't split topleft and botright at the same time" msgstr "E442: Ne eblas dividi supralivan kaj subdekstran samtempe" -#: ../window.c:1228 msgid "E443: Cannot rotate when another window is split" msgstr "E443: Ne eblas rotacii kiam alia fenestro estas dividita" -#: ../window.c:1803 msgid "E444: Cannot close last window" msgstr "E444: Ne eblas fermi la lastan fenestron" -#: ../window.c:1810 msgid "E813: Cannot close autocmd window" msgstr "E813: Ne eblas fermi la fenestron de aÅtokomandoj" -#: ../window.c:1814 msgid "E814: Cannot close window, only autocmd window would remain" msgstr "E814: Ne eblas fermi fenestron, nur la fenestro de aÅtokomandoj restus" -#: ../window.c:2717 msgid "E445: Other window contains changes" msgstr "E445: La alia fenestro enhavas ÅanÄojn" -#: ../window.c:4805 msgid "E446: No file name under cursor" msgstr "E446: Neniu dosiernomo sub la kursoro" diff --git a/src/nvim/po/fr.po b/src/nvim/po/fr.po index bf0610de02..61920697d0 100644 --- a/src/nvim/po/fr.po +++ b/src/nvim/po/fr.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: Vim(Français)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-07-30 17:54+0200\n" -"PO-Revision-Date: 2015-07-30 18:00+0200\n" +"POT-Creation-Date: 2016-07-02 16:21+0200\n" +"PO-Revision-Date: 2016-07-02 17:06+0200\n" "Last-Translator: Dominique Pellé <dominique.pelle@gmail.com>\n" "Language-Team: \n" "Language: fr\n" @@ -24,106 +24,84 @@ msgstr "" "Content-Type: text/plain; charset=ISO_8859-15\n" "Content-Transfer-Encoding: 8bit\n" -#: ../api/private/helpers.c:201 #, fuzzy -msgid "Unable to get option value" -msgstr "impossible d'obtenir la valeur d'une option" +#~ msgid "Unable to get option value" +#~ msgstr "impossible d'obtenir la valeur d'une option" -#: ../api/private/helpers.c:204 #, fuzzy -msgid "internal error: unknown option type" -msgstr "erreur interne : pas d'élément de liste vim" +#~ msgid "internal error: unknown option type" +#~ msgstr "erreur interne : pas d'élément de liste vim" # DB - TODO : Trouver une traduction valable et attestée pour "location". -#: ../buffer.c:92 msgid "[Location List]" msgstr "[Liste des emplacements]" -#: ../buffer.c:93 msgid "[Quickfix List]" msgstr "[Liste Quickfix]" -#: ../buffer.c:94 msgid "E855: Autocommands caused command to abort" msgstr "E855: Des autocommandes ont causé la terminaison de la commande" # AB - Il faut respecter l'esprit plus que la lettre. -#: ../buffer.c:135 msgid "E82: Cannot allocate any buffer, exiting..." msgstr "E82: Aucun tampon ne peut être alloué, Vim doit s'arrêter" # AB - La situation est probablement plus grave que la version anglaise ne le # laisse entendre (voir l'aide en ligne). La version française est plus # explicite. -#: ../buffer.c:138 msgid "E83: Cannot allocate buffer, using other one..." msgstr "" "E83: L'allocation du tampon a échoué : arrêtez Vim, libérez de la mémoire" -#: ../buffer.c:763 msgid "E515: No buffers were unloaded" msgstr "E515: Aucun tampon n'a été déchargé" -#: ../buffer.c:765 msgid "E516: No buffers were deleted" msgstr "E516: Aucun tampon n'a été effacé" -#: ../buffer.c:767 msgid "E517: No buffers were wiped out" msgstr "E517: Aucun tampon n'a été détruit" -#: ../buffer.c:772 msgid "1 buffer unloaded" msgstr "1 tampon a été déchargé" -#: ../buffer.c:774 #, c-format msgid "%d buffers unloaded" msgstr "%d tampons ont été déchargés" -#: ../buffer.c:777 msgid "1 buffer deleted" msgstr "1 tampon a été effacé" -#: ../buffer.c:779 #, c-format msgid "%d buffers deleted" msgstr "%d tampons ont été effacés" -#: ../buffer.c:782 msgid "1 buffer wiped out" msgstr "1 tampon a été détruit" -#: ../buffer.c:784 #, c-format msgid "%d buffers wiped out" msgstr "%d tampons ont été détruits" -#: ../buffer.c:806 msgid "E90: Cannot unload last buffer" msgstr "E90: Impossible de décharger le dernier tampon" # AB - La version française est meilleure que la version anglaise. -#: ../buffer.c:874 msgid "E84: No modified buffer found" msgstr "E84: Aucun tampon n'est modifié" #. back where we started, didn't find anything. -#: ../buffer.c:903 msgid "E85: There is no listed buffer" msgstr "E85: Aucun tampon n'est listé" # AB - Je ne suis pas sûr que l'on puisse obtenir ce message. -#: ../buffer.c:915 msgid "E87: Cannot go beyond last buffer" msgstr "E87: Impossible d'aller après le dernier tampon" # AB - Je ne suis pas sûr que l'on puisse obtenir ce message. -#: ../buffer.c:917 msgid "E88: Cannot go before first buffer" msgstr "E88: Impossible d'aller avant le premier tampon" -#: ../buffer.c:945 #, c-format msgid "" "E89: No write since last change for buffer %<PRId64> (add ! to override)" @@ -131,77 +109,62 @@ msgstr "" "E89: Le tampon %<PRId64> n'a pas été enregistré (ajoutez ! pour passer outre)" #. wrap around (may cause duplicates) -#: ../buffer.c:1423 msgid "W14: Warning: List of file names overflow" msgstr "W14: Alerte : La liste des noms de fichier déborde" # AB - Vu le code source, la version française est meilleure que la # version anglaise. Ce message est similaire au message E86. -#: ../buffer.c:1555 ../quickfix.c:3361 #, c-format msgid "E92: Buffer %<PRId64> not found" msgstr "E92: Le tampon %<PRId64> n'existe pas" # AB - Il faut respecter l'esprit plus que la lettre. -#: ../buffer.c:1798 #, c-format msgid "E93: More than one match for %s" msgstr "E93: Plusieurs tampons correspondent à %s" -#: ../buffer.c:1800 #, c-format msgid "E94: No matching buffer for %s" msgstr "E94: Aucun tampon ne correspond à %s" -#: ../buffer.c:2161 #, c-format msgid "line %<PRId64>" msgstr "ligne %<PRId64>" -#: ../buffer.c:2233 msgid "E95: Buffer with this name already exists" msgstr "E95: Un tampon porte déjà ce nom" -#: ../buffer.c:2498 msgid " [Modified]" msgstr "[Modifié]" # AB - "[Inédité]" est plus correct, mais sonne faux. -#: ../buffer.c:2501 msgid "[Not edited]" msgstr "[Non édité]" -#: ../buffer.c:2504 msgid "[New file]" msgstr "[Nouveau fichier]" -#: ../buffer.c:2505 msgid "[Read errors]" msgstr "[Erreurs de lecture]" -#: ../buffer.c:2506 ../buffer.c:3217 ../fileio.c:1807 ../screen.c:4895 msgid "[RO]" msgstr "[RO]" # AB - La version courte, "[RO]", devrait-elle être traduite par "[LS]" ? # Il faudrait faire un sondage auprès des utilisateurs francophones. -#: ../buffer.c:2507 ../fileio.c:1807 msgid "[readonly]" msgstr "[lecture-seule]" -#: ../buffer.c:2524 #, c-format msgid "1 line --%d%%--" msgstr "1 ligne --%d%%--" -#: ../buffer.c:2526 #, c-format msgid "%<PRId64> lines --%d%%--" msgstr "%<PRId64> lignes --%d%%--" # AB - Faut-il remplacer "sur" par "de" ? # DB - Mon avis : oui. -#: ../buffer.c:2530 #, c-format msgid "line %<PRId64> of %<PRId64> --%d%%-- col " msgstr "ligne %<PRId64> sur %<PRId64> --%d%%-- col " @@ -209,16 +172,13 @@ msgstr "ligne %<PRId64> sur %<PRId64> --%d%%-- col " # DB - Je trouvais [Aucun fichier] (VO : [No file]) plus naturel # lors du lancement de Vim en mode graphique (ce message # apparaît notamment dans le titre de la fenêtre). -#: ../buffer.c:2632 ../buffer.c:4292 ../memline.c:1554 msgid "[No Name]" msgstr "[Aucun nom]" #. must be a help buffer -#: ../buffer.c:2667 msgid "help" msgstr "aide" -#: ../buffer.c:3225 ../screen.c:4883 msgid "[Help]" msgstr "[Aide]" @@ -226,24 +186,19 @@ msgstr "[Aide]" # traduction littérale et brève, mais qui risque fort d'être mal comprise. # J'ai finalement choisi d'utiliser une abréviation, mais cela ne me # satisfait pas. -#: ../buffer.c:3254 ../screen.c:4887 msgid "[Preview]" msgstr "[Prévisu]" -#: ../buffer.c:3528 msgid "All" msgstr "Tout" -#: ../buffer.c:3528 msgid "Bot" msgstr "Bas" # AB - Attention, on passe de trois à quatre lettres. -#: ../buffer.c:3531 msgid "Top" msgstr "Haut" -#: ../buffer.c:4244 msgid "" "\n" "# Buffer list:\n" @@ -251,11 +206,9 @@ msgstr "" "\n" "# Liste des tampons :\n" -#: ../buffer.c:4289 msgid "[Scratch]" msgstr "[Brouillon]" -#: ../buffer.c:4529 msgid "" "\n" "--- Signs ---" @@ -263,29 +216,23 @@ msgstr "" "\n" "--- Symboles ---" -#: ../buffer.c:4538 #, c-format msgid "Signs for %s:" msgstr "Symboles dans %s :" -#: ../buffer.c:4543 #, c-format msgid " line=%<PRId64> id=%d name=%s" msgstr " ligne=%<PRId64> id=%d nom=%s" -#: ../cursor_shape.c:68 msgid "E545: Missing colon" msgstr "E545: ':' manquant" -#: ../cursor_shape.c:70 ../cursor_shape.c:94 msgid "E546: Illegal mode" msgstr "E546: Mode non autorisé" -#: ../cursor_shape.c:134 msgid "E548: digit expected" msgstr "E548: chiffre attendu" -#: ../cursor_shape.c:138 msgid "E549: Illegal percentage" msgstr "E549: Pourcentage non autorisé" @@ -293,145 +240,115 @@ msgstr "E549: Pourcentage non autorisé" # Vim fait en pratique appel au programme "diff" pour evaluer les # différences entre fichiers, "to diff" a été traduit par "utiliser diff" # et d'autres expressions appropriées. -#: ../diff.c:146 #, c-format msgid "E96: Can not diff more than %<PRId64> buffers" msgstr "E96: Impossible d'utiliser diff sur plus de %<PRId64> tampons" -#: ../diff.c:753 msgid "E810: Cannot read or write temp files" msgstr "E810: Impossible de lire ou écrire des fichiers temporaires" # AB - La version française est meilleure que la version anglaise. -#: ../diff.c:755 msgid "E97: Cannot create diffs" msgstr "E97: diff ne fonctionne pas" -#: ../diff.c:966 msgid "E816: Cannot read patch output" msgstr "E816: Le fichier intermédiaire produit par patch n'a pu être lu" -#: ../diff.c:1220 msgid "E98: Cannot read diff output" msgstr "E98: Le fichier intermédiaire produit par diff n'a pu être lu" -#: ../diff.c:2081 msgid "E99: Current buffer is not in diff mode" msgstr "E99: Le tampon courant n'est pas en mode diff" -#: ../diff.c:2100 msgid "E793: No other buffer in diff mode is modifiable" msgstr "E793: Aucun autre tampon en mode diff n'est modifiable" -#: ../diff.c:2102 msgid "E100: No other buffer in diff mode" msgstr "E100: Aucun autre tampon n'est en mode diff" # AB - La version française est meilleure que la version anglaise, mais elle # peut être améliorée. -#: ../diff.c:2112 msgid "E101: More than two buffers in diff mode, don't know which one to use" msgstr "E101: Plus de deux tampons sont en mode diff, soyez plus précis" -#: ../diff.c:2141 #, c-format msgid "E102: Can't find buffer \"%s\"" msgstr "E102: Le tampon %s est introuvable" -#: ../diff.c:2152 #, c-format msgid "E103: Buffer \"%s\" is not in diff mode" msgstr "E103: Le tampon %s n'est pas en mode diff" -#: ../diff.c:2193 msgid "E787: Buffer changed unexpectedly" msgstr "E787: Le tampon a été modifié inopinément" # AB - Je cherche une traduction plus concise pour "escape". -#: ../digraph.c:1598 msgid "E104: Escape not allowed in digraph" msgstr "E104: Un digraphe ne peut contenir le caractère d'échappement" # AB - La version française est trop verbeuse. -#: ../digraph.c:1760 msgid "E544: Keymap file not found" msgstr "E544: Le fichier descripteur de clavier est introuvable" # AB - La version française est meilleure que la version anglaise. -#: ../digraph.c:1785 msgid "E105: Using :loadkeymap not in a sourced file" msgstr "E105: :loadkeymap ne peut être utilisé que dans un script Vim" -#: ../digraph.c:1821 msgid "E791: Empty keymap entry" msgstr "E791: Entrée du descripteur de clavier (keymap) vide" # AB - Remplacer "complétion" par "complètement" ? Voir l'éthymologie # d'"accrétion". -#: ../edit.c:82 msgid " Keyword completion (^N^P)" msgstr " Complètement de mot-clé (^N^P)" # DB - todo : Faut-il une majuscule à "mode" ? #. ctrl_x_mode == 0, ^P/^N compl. -#: ../edit.c:83 msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)" msgstr " mode ^X (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)" -#: ../edit.c:85 msgid " Whole line completion (^L^N^P)" msgstr " Complètement de ligne entière (^L^N^P)" -#: ../edit.c:86 msgid " File name completion (^F^N^P)" msgstr " Complètement de nom de fichier (^F^N^P)" -#: ../edit.c:87 msgid " Tag completion (^]^N^P)" msgstr " Complètement de marqueur (^]^N^P)" # AB - J'ai dû avoir une bonne raison de faire une version française aussi # différente de la version anglaise. Il me faut la retrouver. # DB - TODO -#: ../edit.c:88 msgid " Path pattern completion (^N^P)" msgstr " Complètement global de mot-clé (^N^P)" -#: ../edit.c:89 msgid " Definition completion (^D^N^P)" msgstr " Complètement de définition (^D^N^P)" # AB - Trouver une meilleure formulation que "selon le". # DB : proposition : "avec" -#: ../edit.c:91 msgid " Dictionary completion (^K^N^P)" msgstr " Complètement avec le dictionnaire (^K^N^P)" # AB - Trouver une meilleure formulation que "selon le". -#: ../edit.c:92 msgid " Thesaurus completion (^T^N^P)" msgstr " Complètement avec le thésaurus (^T^N^P)" # AB - La version française est meilleure que la version anglaise. # DB : Suggestion. -#: ../edit.c:93 msgid " Command-line completion (^V^N^P)" msgstr " Complètement de ligne de commande (^V^N^P)" -#: ../edit.c:94 msgid " User defined completion (^U^N^P)" msgstr " Complètement défini par l'utilisateur (^U^N^P)" # DB : On doit pouvoir trouver nettement mieux que ça. -#: ../edit.c:95 msgid " Omni completion (^O^N^P)" msgstr " Complètement selon le type de fichier (Omni) (^O^N^P)" -#: ../edit.c:96 msgid " Spelling suggestion (s^N^P)" msgstr " Suggestion d'orthographe (s^N^P)" -#: ../edit.c:97 msgid " Keyword Local completion (^N^P)" msgstr " Complètement local de mot-clé (^N/^P)" @@ -439,45 +356,35 @@ msgstr " Complètement local de mot-clé (^N/^P)" # Il faut éviter de le faire trop long. Je pense que la version française # est suffisamment compréhensible dans le contexte dans lequel elle est # affichée. -#: ../edit.c:100 msgid "Hit end of paragraph" msgstr "Fin du paragraphe" -#: ../edit.c:101 msgid "E839: Completion function changed window" msgstr "E839: La fonction de complètement a changé la fenêtre" -#: ../edit.c:102 msgid "E840: Completion function deleted text" msgstr "E840: La fonction de complètement a effacé du texte" -#: ../edit.c:1847 msgid "'dictionary' option is empty" msgstr "L'option 'dictionary' est vide" -#: ../edit.c:1848 msgid "'thesaurus' option is empty" msgstr "L'option 'thesaurus' est vide" -#: ../edit.c:2655 #, c-format msgid "Scanning dictionary: %s" msgstr "Examen du dictionnaire : %s" -#: ../edit.c:3079 msgid " (insert) Scroll (^E/^Y)" msgstr " (insertion) Défilement (^E/^Y)" -#: ../edit.c:3081 msgid " (replace) Scroll (^E/^Y)" msgstr " (remplacement) Défilement (^E/^Y)" -#: ../edit.c:3587 #, c-format msgid "Scanning: %s" msgstr "Examen : %s" -#: ../edit.c:3614 msgid "Scanning tags." msgstr "Examen des marqueurs." @@ -485,7 +392,6 @@ msgstr "Examen des marqueurs." # opération de complétion est répétée (typiquement avec CTRL-X CTRL-N). # Que ce soit en anglais ou en français, il y a un problème de majuscules. # Bien qu'insatisfaisante, cette traduction semble optimale. -#: ../edit.c:4519 msgid " Adding" msgstr " Ajout" @@ -493,236 +399,189 @@ msgstr " Ajout" #. * be called before line = ml_get(), or when this address is no #. * longer needed. -- Acevedo. #. -#: ../edit.c:4562 msgid "-- Searching..." msgstr "-- Recherche en cours..." # AB - Ce texte s'ajoute à la fin d'un des messages de complétion ci-dessus. # AB - Faut-il utiliser "origine" ou "originel" au lieu d'"original" ? # DB : Suggestion. -#: ../edit.c:4618 msgid "Back at original" msgstr "Retour au point de départ" # AB - Ce texte s'ajoute à la fin d'un des messages de complétion ci-dessus. -#: ../edit.c:4621 msgid "Word from other line" msgstr "Mot d'une autre ligne" # AB - Ce texte s'ajoute à la fin d'un des messages de complétion ci-dessus. -#: ../edit.c:4624 msgid "The only match" msgstr "La seule correspondance" # AB - Ce texte s'ajoute à la fin d'un des messages de complétion ci-dessus. # AB - Faut-il remplacer "sur" par "de" ? # DB : Pour moi, non. -#: ../edit.c:4680 #, c-format msgid "match %d of %d" msgstr "Correspondance %d sur %d" # AB - Ce texte s'ajoute à la fin d'un des messages de complétion ci-dessus. # DB - todo : la VO n'a pas de majuscule. -#: ../edit.c:4684 #, c-format msgid "match %d" msgstr "Correspondance %d" -#: ../eval.c:137 msgid "E18: Unexpected characters in :let" msgstr "E18: Caractères inattendus avant '='" -#: ../eval.c:138 #, c-format msgid "E684: list index out of range: %<PRId64>" msgstr "E684: index de Liste hors limites : %<PRId64> au-delà de la fin" -#: ../eval.c:139 #, c-format msgid "E121: Undefined variable: %s" msgstr "E121: Variable non définie : %s" -#: ../eval.c:140 msgid "E111: Missing ']'" msgstr "E111: ']' manquant" -#: ../eval.c:141 #, c-format msgid "E686: Argument of %s must be a List" msgstr "E686: L'argument de %s doit être une Liste" -#: ../eval.c:143 #, c-format msgid "E712: Argument of %s must be a List or Dictionary" msgstr "E712: L'argument de %s doit être une Liste ou un Dictionnaire" -#: ../eval.c:144 msgid "E713: Cannot use empty key for Dictionary" msgstr "E713: Impossible d'utiliser une clé vide dans un Dictionnaire" -#: ../eval.c:145 msgid "E714: List required" msgstr "E714: Liste requise" -#: ../eval.c:146 msgid "E715: Dictionary required" msgstr "E715: Dictionnaire requis" +msgid "E928: String required" +msgstr "E928: Chaine requis" + # DB : Suggestion -#: ../eval.c:147 #, c-format msgid "E118: Too many arguments for function: %s" msgstr "E118: La fonction %s a reçu trop d'arguments" -#: ../eval.c:148 #, c-format msgid "E716: Key not present in Dictionary: %s" msgstr "E716: La clé %s n'existe pas dans le Dictionnaire" -#: ../eval.c:150 #, c-format msgid "E122: Function %s already exists, add ! to replace it" msgstr "E122: La fonction %s existe déjà (ajoutez ! pour la remplacer)" -#: ../eval.c:151 msgid "E717: Dictionary entry already exists" msgstr "E717: Une entrée du Dictionnaire porte déjà ce nom" -#: ../eval.c:152 msgid "E718: Funcref required" msgstr "E718: Référence de fonction (Funcref) requise" -#: ../eval.c:153 msgid "E719: Cannot use [:] with a Dictionary" msgstr "E719: Utilisation de [:] impossible avec un Dictionnaire" -#: ../eval.c:154 #, c-format msgid "E734: Wrong variable type for %s=" msgstr "E734: Type de variable erroné avec %s=" -#: ../eval.c:155 #, c-format msgid "E130: Unknown function: %s" msgstr "E130: Fonction inconnue : %s" -#: ../eval.c:156 #, c-format msgid "E461: Illegal variable name: %s" msgstr "E461: Nom de variable invalide : %s" -#: ../eval.c:157 msgid "E806: using Float as a String" msgstr "E806: Utilisation d'un Flottant comme une Chaîne" # DB - todo : trouver mieux que "destinations". -#: ../eval.c:1830 msgid "E687: Less targets than List items" msgstr "E687: Moins de destinations que d'éléments dans la Liste" # DB - todo : trouver mieux que "destinations". -#: ../eval.c:1834 msgid "E688: More targets than List items" msgstr "E688: Plus de destinations que d'éléments dans la Liste" -#: ../eval.c:1906 msgid "Double ; in list of variables" msgstr "Double ; dans une liste de variables" -#: ../eval.c:2078 #, c-format msgid "E738: Can't list variables for %s" msgstr "E738: Impossible de lister les variables de %s" -#: ../eval.c:2391 msgid "E689: Can only index a List or Dictionary" msgstr "E689: Seul une Liste ou un Dictionnaire peut être indexé" -#: ../eval.c:2396 msgid "E708: [:] must come last" msgstr "E708: [:] ne peut être spécifié qu'en dernier" -#: ../eval.c:2439 msgid "E709: [:] requires a List value" msgstr "E709: [:] n?cessite une Liste" -#: ../eval.c:2674 msgid "E710: List value has more items than target" msgstr "E710: La Liste a plus d'éléments que la destination" -#: ../eval.c:2678 msgid "E711: List value has not enough items" msgstr "E711: La Liste n'a pas assez d'éléments" -#: ../eval.c:2867 msgid "E690: Missing \"in\" after :for" msgstr "E690: \"in\" manquant après :for" -#: ../eval.c:3063 #, c-format msgid "E107: Missing parentheses: %s" msgstr "E107: Parenthèses manquantes : %s" -#: ../eval.c:3263 #, c-format msgid "E108: No such variable: \"%s\"" msgstr "E108: Variable inexistante : %s" -#: ../eval.c:3333 msgid "E743: variable nested too deep for (un)lock" msgstr "E743: variable trop imbriquée pour la (dé)verrouiller" # AB - Je suis partagé entre la concision d'une traduction assez littérale et # la lourdeur d'une traduction plus correcte. -#: ../eval.c:3630 msgid "E109: Missing ':' after '?'" msgstr "E109: Il manque ':' après '?'" -#: ../eval.c:3893 msgid "E691: Can only compare List with List" msgstr "E691: Une Liste ne peut être comparée qu'avec une Liste" -#: ../eval.c:3895 msgid "E692: Invalid operation for Lists" msgstr "E692: Opération invalide avec les Listes" -#: ../eval.c:3915 msgid "E735: Can only compare Dictionary with Dictionary" msgstr "E735: Un Dictionnaire ne peut être comparé qu'avec un Dictionnaire" -#: ../eval.c:3917 msgid "E736: Invalid operation for Dictionary" msgstr "E736: Opération invalide avec les Dictionnaires" # DB - todo : Traduction valable (et courte) pour Funcref ? -#: ../eval.c:3932 msgid "E693: Can only compare Funcref with Funcref" msgstr "E693: Une Funcref ne peut être comparée qu'à une Funcref" -#: ../eval.c:3934 msgid "E694: Invalid operation for Funcrefs" msgstr "E694: Opération invalide avec les Funcrefs" -#: ../eval.c:4277 msgid "E804: Cannot use '%' with Float" msgstr "E804: Impossible d'utiliser '%' avec un Flottant" -#: ../eval.c:4478 msgid "E110: Missing ')'" msgstr "E110: ')' manquant" -#: ../eval.c:4609 msgid "E695: Cannot index a Funcref" msgstr "E695: Impossible d'indexer une Funcref" # AB - La version française est meilleure que la version anglaise. -#: ../eval.c:4839 #, c-format msgid "E112: Option name missing: %s" msgstr "E112: Il manque un nom d'option après %s" -#: ../eval.c:4855 #, c-format msgid "E113: Unknown option: %s" msgstr "E113: Option inconnue : %s" @@ -730,270 +589,215 @@ msgstr "E113: Option inconnue : %s" # AB - La version française est meilleure que la version anglaise, qui est # erronée, d'ailleurs : il s'agit d'une "double quote" et non d'une # "quote". -#: ../eval.c:4904 #, c-format msgid "E114: Missing quote: %s" msgstr "E114: Il manque \" à la fin de %s" # AB - La version française est meilleure que la version anglaise. -#: ../eval.c:5020 #, c-format msgid "E115: Missing quote: %s" msgstr "E115: Il manque ' à la fin de %s" -#: ../eval.c:5084 #, c-format msgid "E696: Missing comma in List: %s" msgstr "E696: Il manque une virgule dans la Liste %s" -#: ../eval.c:5091 #, c-format msgid "E697: Missing end of List ']': %s" msgstr "E697: Il manque ']' à la fin de la Liste %s" -#: ../eval.c:5750 msgid "Not enough memory to set references, garbage collection aborted!" msgstr "" "Pas assez de mémoire pour les références, arrêt du ramassage de miètes !" -#: ../eval.c:6475 #, c-format msgid "E720: Missing colon in Dictionary: %s" msgstr "E720: Il manque ':' dans le Dictionnaire %s" -#: ../eval.c:6499 #, c-format msgid "E721: Duplicate key in Dictionary: \"%s\"" msgstr "E721: Clé \"%s\" dupliquée dans le Dictionnaire" -#: ../eval.c:6517 #, c-format msgid "E722: Missing comma in Dictionary: %s" msgstr "E722: Il manque une virgule dans le Dictionnaire %s" -#: ../eval.c:6524 #, c-format msgid "E723: Missing end of Dictionary '}': %s" msgstr "E723: Il manque '}' à la fin du Dictionnaire %s" -#: ../eval.c:6555 msgid "E724: variable nested too deep for displaying" msgstr "E724: variable trop imbriquée pour être affichée" -#: ../eval.c:7188 #, c-format msgid "E740: Too many arguments for function %s" msgstr "E740: Trop d'arguments pour la fonction %s" -#: ../eval.c:7190 #, c-format msgid "E116: Invalid arguments for function %s" msgstr "E116: Arguments invalides pour la fonction %s" -#: ../eval.c:7377 #, c-format msgid "E117: Unknown function: %s" msgstr "E117: Fonction inconnue : %s" -#: ../eval.c:7383 #, c-format msgid "E119: Not enough arguments for function: %s" msgstr "E119: La fonction %s n'a pas reçu assez d'arguments" -#: ../eval.c:7387 #, c-format msgid "E120: Using <SID> not in a script context: %s" msgstr "E120: <SID> utilisé en dehors d'un script : %s" -#: ../eval.c:7391 #, c-format msgid "E725: Calling dict function without Dictionary: %s" msgstr "E725: Appel d'une fonction « dict » sans Dictionnaire : %s" -#: ../eval.c:7453 msgid "E808: Number or Float required" msgstr "E808: Nombre ou Flottant requis" -#: ../eval.c:7503 msgid "add() argument" msgstr "argument de add()" -#: ../eval.c:7907 msgid "E699: Too many arguments" msgstr "E699: Trop d'arguments" -#: ../eval.c:8073 msgid "E785: complete() can only be used in Insert mode" msgstr "E785: complete() n'est utilisable que dans le mode Insertion" # AB - Texte par défaut du bouton de la boîte de dialogue affichée par la # fonction confirm(). -#: ../eval.c:8156 msgid "&Ok" msgstr "&Ok" -#: ../eval.c:8692 msgid "extend() argument" msgstr "argument de extend()" -#: ../eval.c:9345 #, c-format msgid "E737: Key already exists: %s" msgstr "E737: un mappage existe déjà pour %s" -#: ../eval.c:8915 msgid "map() argument" msgstr "argument de map()" -#: ../eval.c:8916 msgid "filter() argument" msgstr "argument de filter()" -#: ../eval.c:9229 #, c-format msgid "+-%s%3ld lines: " msgstr "+-%s%3ld lignes : " -#: ../eval.c:9291 #, c-format msgid "E700: Unknown function: %s" msgstr "E700: Fonction inconnue : %s" # AB - La version française est meilleure que la version anglaise. -#: ../eval.c:10729 msgid "called inputrestore() more often than inputsave()" msgstr "inputrestore() a été appelé plus de fois qu'inputsave()" -#: ../eval.c:10771 msgid "insert() argument" msgstr "argument de insert()" -#: ../eval.c:10841 msgid "E786: Range not allowed" msgstr "E786: Les plages ne sont pas autorisées" -#: ../eval.c:11140 msgid "E701: Invalid type for len()" msgstr "E701: Type invalide avec len()" -#: ../eval.c:11980 msgid "E726: Stride is zero" msgstr "E726: Le pas est nul" -#: ../eval.c:11982 msgid "E727: Start past end" msgstr "E727: Début au-delà de la fin" -#: ../eval.c:12024 ../eval.c:15297 msgid "<empty>" msgstr "<vide>" -#: ../eval.c:12282 msgid "remove() argument" msgstr "argument de remove()" -#: ../eval.c:12466 msgid "E655: Too many symbolic links (cycle?)" msgstr "E655: Trop de liens symboliques (cycle ?)" -#: ../eval.c:12593 msgid "reverse() argument" msgstr "argument de reverse()" -#: ../eval.c:13721 +#, c-format +msgid "E927: Invalid action: '%s'" +msgstr "E927: Action invalide : « %s »" + msgid "sort() argument" msgstr "argument de sort()" -#: ../eval.c:13721 #, fuzzy -msgid "uniq() argument" -msgstr "argument de add()" +#~ msgid "uniq() argument" +#~ msgstr "argument de add()" -#: ../eval.c:13776 msgid "E702: Sort compare function failed" msgstr "E702: La fonction de comparaison de sort() a échoué" -#: ../eval.c:13806 #, fuzzy -msgid "E882: Uniq compare function failed" -msgstr "E702: La fonction de comparaison de sort() a échoué" +#~ msgid "E882: Uniq compare function failed" +#~ msgstr "E702: La fonction de comparaison de sort() a échoué" -#: ../eval.c:14085 msgid "(Invalid)" msgstr "(Invalide)" -#: ../eval.c:14590 msgid "E677: Error writing temp file" msgstr "E677: Erreur lors de l'écriture du fichier temporaire" -#: ../eval.c:16159 msgid "E805: Using a Float as a Number" msgstr "E805: Utilisation d'un Flottant comme un Nombre" -#: ../eval.c:16162 msgid "E703: Using a Funcref as a Number" msgstr "E703: Utilisation d'une Funcref comme un Nombre" -#: ../eval.c:16170 msgid "E745: Using a List as a Number" msgstr "E745: Utilisation d'une Liste comme un Nombre" -#: ../eval.c:16173 msgid "E728: Using a Dictionary as a Number" msgstr "E728: Utilisation d'un Dictionnaire comme un Nombre" -#: ../eval.c:16259 msgid "E729: using Funcref as a String" msgstr "E729: Utilisation d'une Funcref comme une Chaîne" -#: ../eval.c:16262 msgid "E730: using List as a String" msgstr "E730: Utilisation d'une Liste comme une Chaîne" -#: ../eval.c:16265 msgid "E731: using Dictionary as a String" msgstr "E731: Utilisation d'un Dictionnaire comme une Chaîne" # DB : On doit pouvoir trouver nettement mieux que ça. -#: ../eval.c:16619 #, c-format msgid "E706: Variable type mismatch for: %s" msgstr "E706: Type de variable incohérent pour %s" -#: ../eval.c:16705 #, c-format msgid "E795: Cannot delete variable %s" msgstr "E795: Impossible de supprimer la variable %s" -#: ../eval.c:16724 #, c-format msgid "E704: Funcref variable name must start with a capital: %s" msgstr "E704: Le nom d'une Funcref doit commencer par une majuscule : %s" -#: ../eval.c:16732 #, c-format msgid "E705: Variable name conflicts with existing function: %s" msgstr "E705: Le nom d'une variable entre en conflit avec la fonction %s" -#: ../eval.c:16763 #, c-format msgid "E741: Value is locked: %s" msgstr "E741: La valeur de %s est verrouillée" -#: ../eval.c:16764 ../eval.c:16769 ../message.c:1839 msgid "Unknown" msgstr "Inconnu" -#: ../eval.c:16768 #, c-format msgid "E742: Cannot change value of %s" msgstr "E742: Impossible de modifier la valeur de %s" -#: ../eval.c:16838 msgid "E698: variable nested too deep for making a copy" msgstr "E698: variable trop imbriquée pour en faire une copie" -#: ../eval.c:17249 #, c-format msgid "E123: Undefined function: %s" msgstr "E123: Fonction non définie : %s" @@ -1001,112 +805,92 @@ msgstr "E123: Fonction non définie : %s" # AB - La version française est plus consistante que la version anglaise. # AB - Je suis partagé entre la concision d'une traduction assez littérale et # la lourdeur d'une traduction plus correcte. -#: ../eval.c:17260 #, c-format msgid "E124: Missing '(': %s" msgstr "E124: Il manque '(' après %s" -#: ../eval.c:17293 msgid "E862: Cannot use g: here" msgstr "E862: Impossible d'utiliser g: ici" -#: ../eval.c:17312 #, c-format msgid "E125: Illegal argument: %s" msgstr "E125: Argument invalide : %s" -#: ../eval.c:17323 #, c-format msgid "E853: Duplicate argument name: %s" msgstr "E853: Nom d'argument dupliqué : %s" -#: ../eval.c:17416 msgid "E126: Missing :endfunction" msgstr "E126: Il manque :endfunction" -#: ../eval.c:17537 #, c-format msgid "E707: Function name conflicts with variable: %s" msgstr "E707: Le nom de fonction entre en conflit avec la variable : %s" -#: ../eval.c:17549 #, c-format msgid "E127: Cannot redefine function %s: It is in use" msgstr "E127: Impossible de redéfinir fonction %s : déjà utilisée" # DB - Le contenu du "c-format" est le nom de la fonction. -#: ../eval.c:17604 #, c-format msgid "E746: Function name does not match script file name: %s" msgstr "E746: Le nom de la fonction %s ne correspond pas le nom du script" -#: ../eval.c:17716 msgid "E129: Function name required" msgstr "E129: Nom de fonction requis" -#: ../eval.c:17824 #, fuzzy, c-format -msgid "E128: Function name must start with a capital or \"s:\": %s" -msgstr "E128: La fonction %s ne commence pas par une majuscule ou contient ':'" +#~ msgid "E128: Function name must start with a capital or \"s:\": %s" +#~ msgstr "E128: La fonction %s ne commence pas par une majuscule ou contient ':'" -#: ../eval.c:17833 #, fuzzy, c-format -msgid "E884: Function name cannot contain a colon: %s" -msgstr "E128: La fonction %s ne commence pas par une majuscule ou contient ':'" +#~ msgid "E884: Function name cannot contain a colon: %s" +#~ msgstr "E128: La fonction %s ne commence pas par une majuscule ou contient ':'" # AB - Il est difficile de créer une version française qui fasse moins de 80 # caractères de long, nom de la fonction compris : "It is in use" est une # expression très dense. Traductions possibles : "elle est utilisée", # "elle s'exécute" ou "elle est occupée". -#: ../eval.c:18336 #, c-format msgid "E131: Cannot delete function %s: It is in use" msgstr "E131: Impossible d'effacer %s : cette fonction est utilisée" # AB - Vérifier dans la littérature technique s'il n'existe pas une meilleure # traduction pour "function call depth". -#: ../eval.c:18441 msgid "E132: Function call depth is higher than 'maxfuncdepth'" msgstr "" "E132: La profondeur d'appel de fonction est supérieure à 'maxfuncdepth'" # AB - Ce texte fait partie d'un message de débogage. -#: ../eval.c:18568 #, c-format msgid "calling %s" msgstr "appel de %s" # AB - Vérifier. -#: ../eval.c:18651 #, c-format msgid "%s aborted" msgstr "%s annulée" # AB - Ce texte fait partie d'un message de débogage. -#: ../eval.c:18653 #, c-format msgid "%s returning #%<PRId64>" msgstr "%s a retourné #%<PRId64>" # AB - Ce texte fait partie d'un message de débogage. -#: ../eval.c:18670 #, c-format msgid "%s returning %s" msgstr "%s a retourné \"%s\"" # AB - Ce texte fait partie d'un message de débogage. -#: ../eval.c:18691 ../ex_cmds2.c:2695 #, c-format msgid "continuing in %s" msgstr "de retour dans %s" -#: ../eval.c:18795 msgid "E133: :return not inside a function" msgstr "E133: :return en dehors d'une fonction" # AB - La version française est capitalisée pour être en accord avec les autres # commentaires enregistrés dans le fichier viminfo. -#: ../eval.c:19159 msgid "" "\n" "# global variables:\n" @@ -1115,7 +899,6 @@ msgstr "" "# Variables globales:\n" # DB - Plus précis ("la dernière fois") ? -#: ../eval.c:19254 msgid "" "\n" "\tLast set from " @@ -1123,41 +906,33 @@ msgstr "" "\n" "\tModifié la dernière fois dans " -#: ../eval.c:19272 msgid "No old files" msgstr "Aucun vieux fichier" -#: ../ex_cmds.c:122 #, c-format msgid "<%s>%s%s %d, Hex %02x, Octal %03o" msgstr "<%s>%s%s %d, Hexa %02x, Octal %03o" -#: ../ex_cmds.c:145 #, c-format msgid "> %d, Hex %04x, Octal %o" msgstr "> %d, Hexa %04x, Octal %o" -#: ../ex_cmds.c:146 #, c-format msgid "> %d, Hex %08x, Octal %o" msgstr "> %d, Hexa %08x, Octal %o" # AB - La version anglaise est très mauvaise, ce qui m'oblige a inventer une # version française. -#: ../ex_cmds.c:684 msgid "E134: Move lines into themselves" msgstr "E134: La destination est dans la plage d'origine" -#: ../ex_cmds.c:747 msgid "1 line moved" msgstr "1 ligne déplacée" -#: ../ex_cmds.c:749 #, c-format msgid "%<PRId64> lines moved" msgstr "%<PRId64> lignes déplacées" -#: ../ex_cmds.c:1175 #, c-format msgid "%<PRId64> lines filtered" msgstr "%<PRId64> lignes filtrées" @@ -1167,27 +942,23 @@ msgstr "%<PRId64> lignes filtrées" # au filtrage (FilterReadPre, FilterReadPost, FilterWritePre et # FilterWritePost) que "*Filter*" que l'on confond avec une tentative de # mise en valeur. -#: ../ex_cmds.c:1194 msgid "E135: *Filter* Autocommands must not change current buffer" msgstr "" "E135: Les autocommandes Filter* ne doivent pas changer le tampon courant" # AB - Il faut respecter l'esprit plus que la lettre. Dans le cas présent, # nettement plus. -#: ../ex_cmds.c:1244 msgid "[No write since last change]\n" msgstr "[Attention : tout n'est pas enregistré]\n" # AB - Le numéro et le message d'erreur (%s ci-dessous) et le "numéro" de ligne # sont des chaînes de caractères dont le contenu est à la discrétion de # l'appelant de la fonction viminfo_error(). -#: ../ex_cmds.c:1424 #, c-format msgid "%sviminfo: %s in line: " msgstr "%sviminfo : %s à la ligne " # AB - La version française est meilleure que la version anglaise. -#: ../ex_cmds.c:1431 msgid "E136: viminfo: Too many errors, skipping rest of file" msgstr "" "E136: Il y a trop d'erreurs ; interruption de la lecture du fichier viminfo" @@ -1195,30 +966,25 @@ msgstr "" # AB - Ce texte fait partie d'un message de débogage. # DB - ... dont les valeurs possibles sont les messages # qui suivent. -#: ../ex_cmds.c:1458 #, c-format msgid "Reading viminfo file \"%s\"%s%s%s" msgstr "Lecture du fichier viminfo \"%s\"%s%s%s" # AB - Ce texte fait partie d'un message de débogage. # DB - Voir ci-dessus. -#: ../ex_cmds.c:1460 msgid " info" msgstr " info" # AB - Ce texte fait partie d'un message de débogage. # DB - Voir ci-dessus. -#: ../ex_cmds.c:1461 msgid " marks" msgstr " marques" -#: ../ex_cmds.c:1462 msgid " oldfiles" msgstr " vieux fichiers" # AB - Ce texte fait partie d'un message de débogage. # DB - Voir ci-dessus. -#: ../ex_cmds.c:1463 msgid " FAILED" msgstr " ÉCHEC" @@ -1227,7 +993,6 @@ msgstr " ÉCHEC" # AB - Le mot "viminfo" a été retiré pour que le message ne dépasse pas 80 # caractères dans le cas courant où %s = /home/12345678/.viminfo #. avoid a wait_return for this message, it's annoying -#: ../ex_cmds.c:1541 #, c-format msgid "E137: Viminfo file is not writable: %s" msgstr "E137: L'écriture dans le fichier %s est interdite" @@ -1235,25 +1000,21 @@ msgstr "E137: L'écriture dans le fichier %s est interdite" # AB - Le point d'exclamation est superflu. # AB - Le mot "viminfo" a été retiré pour que le message ne dépasse pas 80 # caractères dans le cas courant où %s = /home/12345678/.viminfo -#: ../ex_cmds.c:1626 #, c-format msgid "E138: Can't write viminfo file %s!" msgstr "E138: Impossible d'écrire le fichier %s" # AB - Ce texte est un message de débogage. -#: ../ex_cmds.c:1635 #, c-format msgid "Writing viminfo file \"%s\"" msgstr "Écriture du fichier viminfo \"%s\"" #. Write the info: -#: ../ex_cmds.c:1720 #, c-format msgid "# This viminfo file was generated by Vim %s.\n" msgstr "# Ce fichier viminfo a été généré par Vim %s.\n" # AB - Les deux versions, bien que différentes, se valent. -#: ../ex_cmds.c:1722 msgid "" "# You may edit it if you're careful!\n" "\n" @@ -1261,58 +1022,48 @@ msgstr "" "# Vous pouvez l'éditer, mais soyez prudent.\n" "\n" -#: ../ex_cmds.c:1723 msgid "# Value of 'encoding' when this file was written\n" msgstr "# 'encoding' dans lequel ce fichier a été écrit\n" # AB - Ce texte est passé en argument à la fonction viminfo_error(). # AB - "illégal" est un terme trop fort à mon goût. -#: ../ex_cmds.c:1800 msgid "Illegal starting char" msgstr "Caractère initial non valide" # AB - Ceci est un contenu de boîte de dialogue (éventuellement en mode texte). # AB - La version française est meilleure que la version anglaise. -#: ../ex_cmds.c:2162 msgid "Write partial file?" msgstr "Perdre une partie du fichier ?" # AB - La version française est nettement meilleure que la version anglaise. -#: ../ex_cmds.c:2166 msgid "E140: Use ! to write partial buffer" msgstr "" "E140: Une partie du fichier serait perdue (ajoutez ! pour passer outre)" -#: ../ex_cmds.c:2281 #, c-format msgid "Overwrite existing file \"%s\"?" msgstr "Écraser le fichier %s existant ?" -#: ../ex_cmds.c:2317 #, c-format msgid "Swap file \"%s\" exists, overwrite anyway?" msgstr "Le fichier d'échange \"%s\" existe déjà, l'écraser ?" # DB - Un peu long à mon avis. -#: ../ex_cmds.c:2326 #, c-format msgid "E768: Swap file exists: %s (:silent! overrides)" msgstr "E768: Le fichier d'échange %s existe déjà (:silent! pour passer outre)" -#: ../ex_cmds.c:2381 #, c-format msgid "E141: No file name for buffer %<PRId64>" msgstr "E141: Pas de nom de fichier pour le tampon %<PRId64>" # AB - Il faut respecter l'esprit plus que la lettre. -#: ../ex_cmds.c:2412 msgid "E142: File not written: Writing is disabled by 'write' option" msgstr "" "E142: L'option 'nowrite' est activée et empêche toute écriture du fichier" # AB - Ceci est un contenu de boîte de dialogue (éventuellement en mode texte). # AB - "activée pour" n'est pas une formulation très heureuse. -#: ../ex_cmds.c:2434 #, c-format msgid "" "'readonly' option is set for \"%s\".\n" @@ -1321,7 +1072,6 @@ msgstr "" "L'option 'readonly' est activée pour \"%s\".\n" "Voulez-vous tout de même enregistrer ?" -#: ../ex_cmds.c:2439 #, c-format msgid "" "File permissions of \"%s\" are read-only.\n" @@ -1332,7 +1082,6 @@ msgstr "" "Il peut être possible de l'écrire tout de même.\n" "Tenter ?" -#: ../ex_cmds.c:2451 #, c-format msgid "E505: \"%s\" is read-only (add ! to override)" msgstr "E505: \"%s\" est en lecture seule (ajoutez ! pour passer outre)" @@ -1342,84 +1091,68 @@ msgstr "E505: \"%s\" est en lecture seule (ajoutez ! pour passer outre)" # devrait n'être affiché qu'après une tentative d'ouverture de fichier, # la version actuelle devrait donc suffire. # DB - Suggestion : "nouveau tampon" ? -#: ../ex_cmds.c:3120 #, c-format msgid "E143: Autocommands unexpectedly deleted new buffer %s" msgstr "E143: Une autocommande a effacé le nouveau tampon %s" -#: ../ex_cmds.c:3313 msgid "E144: non-numeric argument to :z" msgstr "E144: L'argument de :z n'est pas numérique" # AB - La version française fera peut-être mieux passer l'amère pilule. # La consultation de l'aide donnera l'explication complète à ceux qui # ne comprendraient pas à quoi ce message est dû. -#: ../ex_cmds.c:3404 msgid "E145: Shell commands not allowed in rvim" msgstr "E145: Les commandes externes sont indisponibles dans rvim" -#: ../ex_cmds.c:3498 msgid "E146: Regular expressions can't be delimited by letters" msgstr "" "E146: Les expressions régulières ne peuvent pas être délimitées par des " "lettres" -#: ../ex_cmds.c:3964 #, c-format msgid "replace with %s (y/n/a/q/l/^E/^Y)?" msgstr "remplacer par %s (y/n/a/q/l/^E/^Y)?" -#: ../ex_cmds.c:4379 msgid "(Interrupted) " msgstr "(Interrompu) " -#: ../ex_cmds.c:4384 msgid "1 match" msgstr "1 correspondance" -#: ../ex_cmds.c:4384 msgid "1 substitution" msgstr "1 substitution" -#: ../ex_cmds.c:4387 #, c-format msgid "%<PRId64> matches" msgstr "%<PRId64> correspondances" -#: ../ex_cmds.c:4388 #, c-format msgid "%<PRId64> substitutions" msgstr "%<PRId64> substitutions" -#: ../ex_cmds.c:4392 msgid " on 1 line" msgstr " sur 1 ligne" -#: ../ex_cmds.c:4395 #, c-format msgid " on %<PRId64> lines" msgstr " sur %<PRId64> lignes" # AB - Il faut respecter l'esprit plus que la lettre. # AB - Ce message devrait contenir une référence à :vglobal. -#: ../ex_cmds.c:4438 msgid "E147: Cannot do :global recursive" msgstr "E147: :global ne peut pas exécuter :global" # AB - Ce message devrait contenir une référence à :vglobal. -#: ../ex_cmds.c:4467 msgid "E148: Regular expression missing from global" msgstr "E148: :global doit être suivi par une expression régulière" # AB - Ce message est utilisé lorsque :vglobal ne trouve rien. Lorsque :global # ne trouve rien, c'est "Pattern not found: %s" / "Motif introuvable: %s" # qui est utilisé. -#: ../ex_cmds.c:4508 #, c-format msgid "Pattern found in every line: %s" msgstr "Motif trouvé dans toutes les lignes : %s" -#: ../ex_cmds.c:4510 #, c-format msgid "Pattern not found: %s" msgstr "Motif introuvable: %s" @@ -1430,7 +1163,6 @@ msgstr "Motif introuvable: %s" # à internationalisation. J'attends que les deux autres messages soient # traduisibles pour traduire celui-ci. # DB - TODO : Qu'en est-il à présent ? -#: ../ex_cmds.c:4587 msgid "" "\n" "# Last Substitute String:\n" @@ -1441,43 +1173,35 @@ msgstr "" "$" # This message should *so* be E42! -#: ../ex_cmds.c:4679 msgid "E478: Don't panic!" msgstr "E478: Pas de panique !" -#: ../ex_cmds.c:4717 #, c-format msgid "E661: Sorry, no '%s' help for %s" msgstr "E661: Désolé, aucune aide en langue '%s' pour %s" -#: ../ex_cmds.c:4719 #, c-format msgid "E149: Sorry, no help for %s" msgstr "E149: Désolé, aucune aide pour %s" -#: ../ex_cmds.c:4751 #, c-format msgid "Sorry, help file \"%s\" not found" msgstr "Désolé, le fichier d'aide \"%s\" est introuvable" -#: ../ex_cmds.c:5323 #, c-format msgid "E150: Not a directory: %s" msgstr "E150: %s n'est pas un répertoire" # AB - La version anglaise est plus précise, mais trop technique. -#: ../ex_cmds.c:5446 #, c-format msgid "E152: Cannot open %s for writing" msgstr "E152: Impossible d'écrire %s" # AB - La version anglaise est plus précise, mais trop technique. -#: ../ex_cmds.c:5471 #, c-format msgid "E153: Unable to open %s for reading" msgstr "E153: Impossible de lire %s" -#: ../ex_cmds.c:5500 #, c-format msgid "E670: Mix of help file encodings within a language: %s" msgstr "E670: Encodages différents dans les fichiers d'aide en langue %s" @@ -1487,315 +1211,250 @@ msgstr "E670: Encodages différents dans les fichiers d'aide en langue %s" # traduction de 40 caractères ou moins. Ce qui est loin d'être le cas # présent. # DB - Suggestion. -#: ../ex_cmds.c:5565 #, c-format msgid "E154: Duplicate tag \"%s\" in file %s/%s" msgstr "E154: Marqueur \"%s\" dupliqué dans le fichier %s/%s" # AB - Il faut respecter l'esprit plus que la lettre. -#: ../ex_cmds.c:5687 #, c-format msgid "E160: Unknown sign command: %s" msgstr "E160: Commande inconnue : :sign %s" # AB - La version française est meilleure que la version anglaise. -#: ../ex_cmds.c:5704 msgid "E156: Missing sign name" msgstr "E156: Il manque le nom du symbole" -#: ../ex_cmds.c:5746 msgid "E612: Too many signs defined" msgstr "E612: Trop de symboles sont définis" # AB - Cette traduction ne me satisfait pas. # DB - Suggestion. -#: ../ex_cmds.c:5813 #, c-format msgid "E239: Invalid sign text: %s" msgstr "E239: Le texte du symbole est invalide : %s" -#: ../ex_cmds.c:5844 ../ex_cmds.c:6035 #, c-format msgid "E155: Unknown sign: %s" msgstr "E155: Symbole inconnu : %s" # AB - La version française est meilleure que la version anglaise. -#: ../ex_cmds.c:5877 msgid "E159: Missing sign number" msgstr "E159: Il manque l'ID du symbole" # AB - Vu le code source, la version française est meilleure que la # version anglaise. Ce message est similaire au message E102. -#: ../ex_cmds.c:5971 #, c-format msgid "E158: Invalid buffer name: %s" msgstr "E158: Le tampon %s est introuvable" # AB - Vu le code source, la version française est meilleure que la # version anglaise. -#: ../ex_cmds.c:6008 #, c-format msgid "E157: Invalid sign ID: %<PRId64>" msgstr "E157: Le symbole %<PRId64> est introuvable" -#: ../ex_cmds.c:6066 msgid " (not supported)" msgstr " (non supporté)" -#: ../ex_cmds.c:6169 msgid "[Deleted]" msgstr "[Effacé]" # AB - La version française de la première phrase ne me satisfait pas. # DB - Suggestion. -#: ../ex_cmds2.c:139 msgid "Entering Debug mode. Type \"cont\" to continue." msgstr "Mode débogage activé. Tapez \"cont\" pour continuer." -#: ../ex_cmds2.c:143 ../ex_docmd.c:759 #, c-format msgid "line %<PRId64>: %s" msgstr "ligne %<PRId64> : %s" -#: ../ex_cmds2.c:145 #, c-format msgid "cmd: %s" msgstr "cmde : %s" -#: ../ex_cmds2.c:322 #, c-format msgid "Breakpoint in \"%s%s\" line %<PRId64>" msgstr "Point d'arrêt dans %s%s ligne %<PRId64>" -#: ../ex_cmds2.c:581 #, c-format msgid "E161: Breakpoint not found: %s" msgstr "E161: Le point d'arrêt %s est introuvable" -#: ../ex_cmds2.c:611 msgid "No breakpoints defined" msgstr "Aucun point d'arrêt n'est défini" # AB - Le deuxième %s est remplacé par "func" ou "file" sans que l'on puisse # traduire ces mots. -#: ../ex_cmds2.c:617 #, c-format msgid "%3d %s %s line %<PRId64>" msgstr "%3d %s %s ligne %<PRId64>" -#: ../ex_cmds2.c:942 msgid "E750: First use \":profile start {fname}\"" msgstr "E750: Utilisez d'abord \":profile start {nomfichier}\"" # AB - "changes to" est redondant et a été omis de la version française. -#: ../ex_cmds2.c:1269 #, c-format msgid "Save changes to \"%s\"?" msgstr "Enregistrer \"%s\" ?" # AB - Si les parenthèses posent problème, il faudra remettre les guillemets # ci-dessus. -#: ../ex_cmds2.c:1271 ../ex_docmd.c:8851 msgid "Untitled" msgstr "(sans titre)" # AB - Il faut respecter l'esprit plus que la lettre. # AB - Ce message est similaire au message E89. -#: ../ex_cmds2.c:1421 #, c-format msgid "E162: No write since last change for buffer \"%s\"" msgstr "E162: Le tampon %s n'a pas été enregistré" -#: ../ex_cmds2.c:1480 msgid "Warning: Entered other buffer unexpectedly (check autocommands)" -msgstr "Alerte : Entrée inattendue dans un autre tampon (vérifier autocmdes)" +msgstr "Alerte : Entrée inattendue dans un autre tampon (vérifier autocommandes)" -#: ../ex_cmds2.c:1826 msgid "E163: There is only one file to edit" msgstr "E163: Il n'y a qu'un seul fichier à éditer" -#: ../ex_cmds2.c:1828 msgid "E164: Cannot go before first file" msgstr "E164: Impossible d'aller avant le premier fichier" -#: ../ex_cmds2.c:1830 msgid "E165: Cannot go beyond last file" msgstr "E165: Impossible d'aller au-delà du dernier fichier" -#: ../ex_cmds2.c:2175 #, c-format msgid "E666: compiler not supported: %s" msgstr "E666: Compilateur %s non supporté" -#: ../ex_cmds2.c:2257 #, c-format msgid "Searching for \"%s\" in \"%s\"" msgstr "Recherche de \"%s\" dans \"%s\"" -#: ../ex_cmds2.c:2284 #, c-format msgid "Searching for \"%s\"" msgstr "Recherche de \"%s\"" -#: ../ex_cmds2.c:2307 #, c-format msgid "not found in '%s': \"%s\"" msgstr "introuvable dans '%s' : \"%s\"" -#: ../ex_cmds2.c:2472 #, c-format msgid "Cannot source a directory: \"%s\"" msgstr "Impossible de sourcer un répertoire : \"%s\"" -#: ../ex_cmds2.c:2518 #, c-format msgid "could not source \"%s\"" msgstr "impossible de sourcer \"%s\"" -#: ../ex_cmds2.c:2520 #, c-format msgid "line %<PRId64>: could not source \"%s\"" msgstr "ligne %<PRId64> : impossible de sourcer \"%s\"" -#: ../ex_cmds2.c:2535 #, c-format msgid "sourcing \"%s\"" msgstr "sourcement \"%s\"" -#: ../ex_cmds2.c:2537 #, c-format msgid "line %<PRId64>: sourcing \"%s\"" msgstr "ligne %<PRId64> : sourcement de \"%s\"" -#: ../ex_cmds2.c:2693 #, c-format msgid "finished sourcing %s" msgstr "fin du sourcement de %s" -#: ../ex_cmds2.c:2765 msgid "modeline" msgstr "ligne de mode" -#: ../ex_cmds2.c:2767 msgid "--cmd argument" msgstr "argument --cmd" -#: ../ex_cmds2.c:2769 msgid "-c argument" msgstr "argument -c" -#: ../ex_cmds2.c:2771 msgid "environment variable" msgstr "variable d'environnement" -#: ../ex_cmds2.c:2773 msgid "error handler" msgstr "gestionnaire d'erreur" -#: ../ex_cmds2.c:3020 msgid "W15: Warning: Wrong line separator, ^M may be missing" msgstr "W15: Alerte : Séparateur de ligne erroné, ^M possiblement manquant" -#: ../ex_cmds2.c:3139 msgid "E167: :scriptencoding used outside of a sourced file" msgstr "E167: :scriptencoding utilisé en dehors d'un fichier sourcé" -#: ../ex_cmds2.c:3166 msgid "E168: :finish used outside of a sourced file" msgstr "E168: :finish utilisé en dehors d'un fichier sourcé" # DB - Le premier %s est, au choix : "time ", "ctype " ou "messages ", # sans qu'il soit possible de les traduire. -#: ../ex_cmds2.c:3389 #, c-format msgid "Current %slanguage: \"%s\"" msgstr "Langue courante pour %s : \"%s\"" -#: ../ex_cmds2.c:3404 #, c-format msgid "E197: Cannot set language to \"%s\"" msgstr "E197: Impossible de choisir la langue \"%s\"" #. don't redisplay the window #. don't wait for return -#: ../ex_docmd.c:387 msgid "Entering Ex mode. Type \"visual\" to go to Normal mode." msgstr "Mode Ex activé. Tapez \"visual\" pour passer en mode Normal." -#: ../ex_docmd.c:428 msgid "E501: At end-of-file" msgstr "E501: À la fin du fichier" -#: ../ex_docmd.c:513 msgid "E169: Command too recursive" msgstr "E169: Commande trop récursive" -#: ../ex_docmd.c:1006 #, c-format msgid "E605: Exception not caught: %s" msgstr "E605: Exception non interceptée : %s" -#: ../ex_docmd.c:1085 msgid "End of sourced file" msgstr "Fin du fichier sourcé" -#: ../ex_docmd.c:1086 msgid "End of function" msgstr "Fin de la fonction" -#: ../ex_docmd.c:1628 msgid "E464: Ambiguous use of user-defined command" msgstr "E464: Utilisation ambiguë d'une commande définie par l'utilisateur" -#: ../ex_docmd.c:1638 msgid "E492: Not an editor command" msgstr "E492: Commande inconnue" -#: ../ex_docmd.c:1729 msgid "E493: Backwards range given" msgstr "E493: La plage spécifiée est inversée" -#: ../ex_docmd.c:1733 msgid "Backwards range given, OK to swap" msgstr "La plage spécifiée est inversée, OK pour l'inverser" #. append #. typed wrong -#: ../ex_docmd.c:1787 msgid "E494: Use w or w>>" msgstr "E494: Utilisez w ou w>>" -#: ../ex_docmd.c:3454 msgid "E319: The command is not available in this version" msgstr "E319: Désolé, cette commande n'est pas disponible dans cette version" -#: ../ex_docmd.c:3752 msgid "E172: Only one file name allowed" msgstr "E172: Un seul nom de fichier autorisé" -#: ../ex_docmd.c:4238 msgid "1 more file to edit. Quit anyway?" msgstr "Encore 1 fichier à éditer. Quitter tout de même ?" -#: ../ex_docmd.c:4242 #, c-format msgid "%d more files to edit. Quit anyway?" msgstr "Encore %d fichiers à éditer. Quitter tout de même ?" -#: ../ex_docmd.c:4248 msgid "E173: 1 more file to edit" msgstr "E173: encore 1 fichier à éditer" -#: ../ex_docmd.c:4250 #, c-format msgid "E173: %<PRId64> more files to edit" msgstr "E173: encore %<PRId64> fichiers à éditer" -#: ../ex_docmd.c:4320 msgid "E174: Command already exists: add ! to replace it" msgstr "E174: La commande existe déjà : ajoutez ! pour la redéfinir" -#: ../ex_docmd.c:4432 msgid "" "\n" " Name Args Address Complete Definition" @@ -1803,356 +1462,277 @@ msgstr "" "\n" " Nom Args Adresse Complet. Définition" -#: ../ex_docmd.c:4516 msgid "No user-defined commands found" msgstr "Aucune commande définie par l'utilisateur trouvée" -#: ../ex_docmd.c:4538 msgid "E175: No attribute specified" msgstr "E175: Pas d'attribut spécifié" -#: ../ex_docmd.c:4583 msgid "E176: Invalid number of arguments" msgstr "E176: Nombre d'arguments invalide" -#: ../ex_docmd.c:4594 msgid "E177: Count cannot be specified twice" msgstr "E177: Le quantificateur ne peut être spécifié deux fois" -#: ../ex_docmd.c:4603 msgid "E178: Invalid default value for count" msgstr "E178: La valeur par défaut du quantificateur est invalide" -#: ../ex_docmd.c:4625 msgid "E179: argument required for -complete" msgstr "E179: argument requis avec -complete" -#: ../ex_docmd.c:4933 msgid "E179: argument required for -addr" msgstr "E179: argument requis avec -addr" -#: ../ex_docmd.c:4635 #, c-format msgid "E181: Invalid attribute: %s" msgstr "E181: Attribut invalide : %s" -#: ../ex_docmd.c:4678 msgid "E182: Invalid command name" msgstr "E182: Nom de commande invalide" -#: ../ex_docmd.c:4691 msgid "E183: User defined commands must start with an uppercase letter" msgstr "E183: Les commandes utilisateur doivent commencer par une majuscule" -#: ../ex_docmd.c:4696 msgid "E841: Reserved name, cannot be used for user defined command" msgstr "" "E841: Nom réservé, ne peux pas être utilisé pour une commande utilisateur" -#: ../ex_docmd.c:4751 #, c-format msgid "E184: No such user-defined command: %s" msgstr "E184: Aucune commande %s définie par l'utilisateur" -#: ../ex_docmd.c:5516 #, c-format msgid "E180: Invalid address type value: %s" msgstr "E180: Valeur de type d'adresse invalide : %s" -#: ../ex_docmd.c:5219 #, c-format msgid "E180: Invalid complete value: %s" msgstr "E180: Valeur invalide pour \"-complete=\" : %s" -#: ../ex_docmd.c:5225 msgid "E468: Completion argument only allowed for custom completion" msgstr "E468: Seul le complètement personnalisé accepte un argument" -#: ../ex_docmd.c:5231 msgid "E467: Custom completion requires a function argument" msgstr "E467: Le complètement personnalisé requiert une fonction en argument" -#: ../ex_docmd.c:5257 #, c-format msgid "E185: Cannot find color scheme '%s'" msgstr "E185: Impossible de trouver le jeu de couleurs '%s'" -#: ../ex_docmd.c:5263 msgid "Greetings, Vim user!" msgstr "Bienvenue, utilisateur de Vim !" -#: ../ex_docmd.c:5431 msgid "E784: Cannot close last tab page" msgstr "E784: Impossible de fermer le dernier onglet" -#: ../ex_docmd.c:5462 msgid "Already only one tab page" msgstr "Il ne reste déjà plus qu'un seul onglet" -#: ../ex_docmd.c:6004 #, c-format msgid "Tab page %d" msgstr "Onglet %d" -#: ../ex_docmd.c:6295 msgid "No swap file" msgstr "Pas de fichier d'échange" -#: ../ex_docmd.c:6478 msgid "E747: Cannot change directory, buffer is modified (add ! to override)" msgstr "" "E747: Tampon modifié : impossible de changer de répertoire (ajoutez ! pour " "passer outre)" -#: ../ex_docmd.c:6485 msgid "E186: No previous directory" msgstr "E186: Pas de répertoire précédent" -#: ../ex_docmd.c:6530 msgid "E187: Unknown" msgstr "E187: Inconnu" -#: ../ex_docmd.c:6610 msgid "E465: :winsize requires two number arguments" msgstr "E465: :winsize requiert deux arguments numériques" # DB : Suggestion, sans doute perfectible. -#: ../ex_docmd.c:6655 msgid "E188: Obtaining window position not implemented for this platform" msgstr "" "E188: Récupérer la position de la fenêtre non implémenté dans cette version" -#: ../ex_docmd.c:6662 msgid "E466: :winpos requires two number arguments" msgstr "E466: :winpos requiert deux arguments numériques" -#: ../ex_docmd.c:7241 #, c-format msgid "E739: Cannot create directory: %s" msgstr "E739: Impossible de créer le répertoire \"%s\"" -#: ../ex_docmd.c:7268 #, c-format msgid "E189: \"%s\" exists (add ! to override)" msgstr "E189: \"%s\" existe (ajoutez ! pour passer outre)" -#: ../ex_docmd.c:7273 #, c-format msgid "E190: Cannot open \"%s\" for writing" msgstr "E190: Impossible d'ouvrir \"%s\" pour y écrire" #. set mark -#: ../ex_docmd.c:7294 msgid "E191: Argument must be a letter or forward/backward quote" msgstr "E191: L'argument doit être une lettre ou une (contre-)apostrophe" -#: ../ex_docmd.c:7333 msgid "E192: Recursive use of :normal too deep" msgstr "E192: Appel récursif de :normal trop important" -#: ../ex_docmd.c:7807 msgid "E194: No alternate file name to substitute for '#'" msgstr "E194: Aucun nom de fichier alternatif à substituer à '#'" -#: ../ex_docmd.c:7841 msgid "E495: no autocommand file name to substitute for \"<afile>\"" msgstr "E495: Aucun nom de ficher d'autocommande à substituer à \"<afile>\"" -#: ../ex_docmd.c:7850 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\"" msgstr "E496: Aucun numéro de tampon d'autocommande à substituer à \"<abuf>\"" -#: ../ex_docmd.c:7861 msgid "E497: no autocommand match name to substitute for \"<amatch>\"" msgstr "E497: Aucune correspondance d'autocommande à substituer à \"<amatch>\"" -#: ../ex_docmd.c:7870 msgid "E498: no :source file name to substitute for \"<sfile>\"" msgstr "E498: Aucun nom de fichier :source à substituer à \"<sfile>\"" -#: ../ex_docmd.c:7876 msgid "E842: no line number to use for \"<slnum>\"" msgstr "E842: aucun numéro de ligne à utiliser pour \"<slnum>\"" -#: ../ex_docmd.c:7903 #, c-format msgid "E499: Empty file name for '%' or '#', only works with \":p:h\"" msgstr "E499: Nom de fichier vide pour '%' ou '#', ne marche qu'avec \":p:h\"" -#: ../ex_docmd.c:7905 msgid "E500: Evaluates to an empty string" msgstr "E500: Évalué en une chaîne vide" -#: ../ex_docmd.c:8838 msgid "E195: Cannot open viminfo file for reading" msgstr "E195: Impossible d'ouvrir le viminfo en lecture" -#: ../ex_eval.c:464 msgid "E608: Cannot :throw exceptions with 'Vim' prefix" msgstr "E608: Impossible d'émettre des exceptions avec 'Vim' comme préfixe" #. always scroll up, don't overwrite -#: ../ex_eval.c:496 #, c-format msgid "Exception thrown: %s" msgstr "Exception émise : %s" -#: ../ex_eval.c:545 #, c-format msgid "Exception finished: %s" msgstr "Exception terminée : %s" -#: ../ex_eval.c:546 #, c-format msgid "Exception discarded: %s" msgstr "Exception éliminée : %s" -#: ../ex_eval.c:588 ../ex_eval.c:634 #, c-format msgid "%s, line %<PRId64>" msgstr "%s, ligne %<PRId64>" #. always scroll up, don't overwrite -#: ../ex_eval.c:608 #, c-format msgid "Exception caught: %s" msgstr "Exception interceptée : %s" # DB - Le c-format est féminin, singulier ou pluriel (cf. 3 messages plus bas). -#: ../ex_eval.c:676 #, c-format msgid "%s made pending" msgstr "%s mise(s) en attente" -#: ../ex_eval.c:679 #, c-format msgid "%s resumed" msgstr "%s ré-émise(s)" -#: ../ex_eval.c:683 #, c-format msgid "%s discarded" msgstr "%s éliminée(s)" -#: ../ex_eval.c:708 msgid "Exception" msgstr "Exception" -#: ../ex_eval.c:713 msgid "Error and interrupt" msgstr "Erreur et interruption" -#: ../ex_eval.c:715 msgid "Error" msgstr "Erreur" #. if (pending & CSTP_INTERRUPT) -#: ../ex_eval.c:717 msgid "Interrupt" msgstr "Interruption" -#: ../ex_eval.c:795 msgid "E579: :if nesting too deep" msgstr "E579: Imbrication de :if trop importante" -#: ../ex_eval.c:830 msgid "E580: :endif without :if" msgstr "E580: :endif sans :if" -#: ../ex_eval.c:873 msgid "E581: :else without :if" msgstr "E581: :else sans :if" -#: ../ex_eval.c:876 msgid "E582: :elseif without :if" msgstr "E582: :elseif sans :if" -#: ../ex_eval.c:880 msgid "E583: multiple :else" msgstr "E583: Il ne peut y avoir qu'un seul :else" -#: ../ex_eval.c:883 msgid "E584: :elseif after :else" msgstr "E584: :elseif après :else" -#: ../ex_eval.c:941 msgid "E585: :while/:for nesting too deep" msgstr "E585: Imbrication de :while ou :for trop importante" -#: ../ex_eval.c:1028 msgid "E586: :continue without :while or :for" msgstr "E586: :continue sans :while ou :for" -#: ../ex_eval.c:1061 msgid "E587: :break without :while or :for" msgstr "E587: :break sans :while ou :for" -#: ../ex_eval.c:1102 msgid "E732: Using :endfor with :while" msgstr "E732: Utilisation de :endfor avec :while" -#: ../ex_eval.c:1104 msgid "E733: Using :endwhile with :for" msgstr "E733: Utilisation de :endwhile avec :for" -#: ../ex_eval.c:1247 msgid "E601: :try nesting too deep" msgstr "E601: Imbrication de :try trop importante" -#: ../ex_eval.c:1317 msgid "E603: :catch without :try" msgstr "E603: :catch sans :try" #. Give up for a ":catch" after ":finally" and ignore it. #. * Just parse. -#: ../ex_eval.c:1332 msgid "E604: :catch after :finally" msgstr "E604: :catch après :finally" -#: ../ex_eval.c:1451 msgid "E606: :finally without :try" msgstr "E606: :finally sans :try" #. Give up for a multiple ":finally" and ignore it. -#: ../ex_eval.c:1467 msgid "E607: multiple :finally" msgstr "E607: Il ne peut y avoir qu'un seul :finally" -#: ../ex_eval.c:1571 msgid "E602: :endtry without :try" msgstr "E602: :endtry sans :try" -#: ../ex_eval.c:2026 msgid "E193: :endfunction not inside a function" msgstr "E193: :endfunction en dehors d'une fonction" -#: ../ex_getln.c:1643 msgid "E788: Not allowed to edit another buffer now" msgstr "E788: L'édition d'un autre tampon n'est plus permise" -#: ../ex_getln.c:1656 msgid "E811: Not allowed to change buffer information now" msgstr "" "E811: Changement des informations du tampon n'est pas permise maintenant" # DB - TODO : Pas compris le message ni comment le déclencher malgré une visite # dans le code. -#: ../ex_getln.c:3178 msgid "tagname" msgstr "nom du marqueur" # DB - TODO : Idem précédent. -#: ../ex_getln.c:3181 msgid " kind file\n" msgstr " type de fichier\n" -#: ../ex_getln.c:4799 msgid "'history' option is zero" msgstr "l'option 'history' vaut zéro" # DB - Messages et les suivants : fichier .viminfo. # Pas de majuscule nécessaire pour les messages d'après. -#: ../ex_getln.c:5046 #, c-format msgid "" "\n" @@ -2161,35 +1741,30 @@ msgstr "" "\n" "# Historique %s (chronologie décroissante) :\n" -#: ../ex_getln.c:5047 msgid "Command Line" msgstr "ligne de commande" -#: ../ex_getln.c:5048 msgid "Search String" msgstr "chaîne de recherche" -#: ../ex_getln.c:5049 msgid "Expression" msgstr "expression" -#: ../ex_getln.c:5050 msgid "Input Line" msgstr "ligne de saisie" -#: ../ex_getln.c:5117 +msgid "Debug Line" +msgstr "Ligne de débogage" + msgid "E198: cmd_pchar beyond the command length" msgstr "E198: cmd_pchar au-delà de la longueur de la commande" -#: ../ex_getln.c:5279 msgid "E199: Active window or buffer deleted" msgstr "E199: Fenêtre ou tampon actif effacé" -#: ../file_search.c:203 msgid "E854: path too long for completion" msgstr "E854: chemin trop long pour complètement" -#: ../file_search.c:446 #, c-format msgid "" "E343: Invalid path: '**[number]' must be at the end of the path or be " @@ -2198,216 +1773,168 @@ msgstr "" "E343: Chemin invalide : '**[nombre]' doit être à la fin du chemin ou être " "suivi de '%s'." -#: ../file_search.c:1505 #, c-format msgid "E344: Can't find directory \"%s\" in cdpath" msgstr "E344: Répertoire \"%s\" introuvable dans 'cdpath'" -#: ../file_search.c:1508 #, c-format msgid "E345: Can't find file \"%s\" in path" msgstr "E345: Fichier \"%s\" introuvable dans 'path'" -#: ../file_search.c:1512 #, c-format msgid "E346: No more directory \"%s\" found in cdpath" msgstr "E346: Plus de répertoire \"%s\" dans 'cdpath'" -#: ../file_search.c:1515 #, c-format msgid "E347: No more file \"%s\" found in path" msgstr "E347: Plus de fichier \"%s\" dans 'path'" -#: ../fileio.c:137 msgid "E812: Autocommands changed buffer or buffer name" msgstr "E812: Des autocommandes ont changé le tampon ou le nom du tampon" -#: ../fileio.c:368 msgid "Illegal file name" msgstr "Nom de fichier invalide" -#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578 msgid "is a directory" msgstr "est un répertoire" -#: ../fileio.c:397 msgid "is not a file" msgstr "n'est pas un fichier" -#: ../fileio.c:508 ../fileio.c:3522 msgid "[New File]" msgstr "[Nouveau fichier]" -#: ../fileio.c:511 msgid "[New DIRECTORY]" msgstr "[Nouveau RÉPERTOIRE]" -#: ../fileio.c:529 ../fileio.c:532 msgid "[File too big]" msgstr "[Fichier trop volumineux]" -#: ../fileio.c:534 msgid "[Permission Denied]" msgstr "[Permission refusée]" -#: ../fileio.c:653 msgid "E200: *ReadPre autocommands made the file unreadable" msgstr "E200: Les autocommandes *ReadPre ont rendu le fichier illisible" -#: ../fileio.c:655 msgid "E201: *ReadPre autocommands must not change current buffer" msgstr "" "E201: Autocommandes *ReadPre ne doivent pas modifier le contenu du tampon " "courant" -#: ../fileio.c:672 msgid "Nvim: Reading from stdin...\n" msgstr "Vim : Lecture de stdin...\n" #. Re-opening the original file failed! -#: ../fileio.c:909 msgid "E202: Conversion made file unreadable!" msgstr "E202: La conversion a rendu le fichier illisible !" #. fifo or socket -#: ../fileio.c:1782 msgid "[fifo/socket]" msgstr "[fifo/socket]" #. fifo -#: ../fileio.c:1788 msgid "[fifo]" msgstr "[fifo]" #. or socket -#: ../fileio.c:1794 msgid "[socket]" msgstr "[socket]" #. or character special -#: ../fileio.c:1801 msgid "[character special]" msgstr "[caractère spécial]" -#: ../fileio.c:1815 msgid "[CR missing]" msgstr "[CR manquant]" -#: ../fileio.c:1819 msgid "[long lines split]" msgstr "[lignes longues coupées]" -#: ../fileio.c:1823 ../fileio.c:3512 msgid "[NOT converted]" msgstr "[NON converti]" -#: ../fileio.c:1826 ../fileio.c:3515 msgid "[converted]" msgstr "[converti]" -#: ../fileio.c:1831 #, c-format msgid "[CONVERSION ERROR in line %<PRId64>]" msgstr "[ERREUR DE CONVERSION à la ligne %<PRId64>]" -#: ../fileio.c:1835 #, c-format msgid "[ILLEGAL BYTE in line %<PRId64>]" msgstr "[OCTET INVALIDE à la ligne %<PRId64>]" -#: ../fileio.c:1838 msgid "[READ ERRORS]" msgstr "[ERREURS DE LECTURE]" -#: ../fileio.c:2104 msgid "Can't find temp file for conversion" msgstr "Impossible de générer un fichier temporaire pour la conversion" -#: ../fileio.c:2110 msgid "Conversion with 'charconvert' failed" msgstr "La conversion avec 'charconvert' a échoué" # DB : Pas de majuscule ? -#: ../fileio.c:2113 msgid "can't read output of 'charconvert'" msgstr "Impossible de lire la sortie de 'charconvert'" -#: ../fileio.c:2437 msgid "E676: No matching autocommands for acwrite buffer" msgstr "E676: Pas d'autocommande correspondante pour le tampon acwrite" -#: ../fileio.c:2466 msgid "E203: Autocommands deleted or unloaded buffer to be written" msgstr "E203: Des autocommandes ont effacé ou déchargé le tampon à écrire" -#: ../fileio.c:2486 msgid "E204: Autocommand changed number of lines in unexpected way" msgstr "" "E204: L'autocommande a modifié le nombre de lignes de manière inattendue" -#: ../fileio.c:2548 ../fileio.c:2565 msgid "is not a file or writable device" msgstr "n'est pas un fichier ou un périphérique inscriptible" -#: ../fileio.c:2601 msgid "is read-only (add ! to override)" msgstr "est en lecture seule (ajoutez ! pour passer outre)" -#: ../fileio.c:2886 msgid "E506: Can't write to backup file (add ! to override)" msgstr "E506: Impossible d'écrire la copie de secours (! pour passer outre)" -#: ../fileio.c:2898 msgid "E507: Close error for backup file (add ! to override)" msgstr "E507: Erreur de fermeture de la copie de secours (! pour passer outre)" -#: ../fileio.c:2901 msgid "E508: Can't read file for backup (add ! to override)" msgstr "" "E508: Impossible de lire le fichier pour la copie de secours (ajoutez ! pour " "passer outre)" -#: ../fileio.c:2923 msgid "E509: Cannot create backup file (add ! to override)" msgstr "" "E509: Impossible de créer la copie de secours (ajoutez ! pour passer outre)" -#: ../fileio.c:3008 msgid "E510: Can't make backup file (add ! to override)" msgstr "" "E510: Impossible de générer la copie de secours (ajoutez ! pour passer outre)" #. Can't write without a tempfile! -#: ../fileio.c:3121 msgid "E214: Can't find temp file for writing" msgstr "E214: Impossible de générer un fichier temporaire pour y écrire" -#: ../fileio.c:3134 msgid "E213: Cannot convert (add ! to write without conversion)" msgstr "E213: Impossible de convertir (ajoutez ! pour écrire sans convertir)" -#: ../fileio.c:3169 msgid "E166: Can't open linked file for writing" msgstr "E166: Impossible d'ouvrir le lien pour y écrire" -#: ../fileio.c:3173 msgid "E212: Can't open file for writing" msgstr "E212: Impossible d'ouvrir le fichier pour y écrire" -#: ../fileio.c:3363 msgid "E667: Fsync failed" msgstr "E667: Fsynch a échoué" -#: ../fileio.c:3398 msgid "E512: Close failed" msgstr "E512: Erreur de fermeture de fichier" -#: ../fileio.c:3436 msgid "E513: write error, conversion failed (make 'fenc' empty to override)" msgstr "" "E513: Erreur d'écriture, échec de conversion (videz 'fenc' pour passer outre)" -#: ../fileio.c:3441 #, c-format msgid "" "E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to " @@ -2416,56 +1943,43 @@ msgstr "" "E513: Erreur d'écriture, échec de conversion à la ligne %<PRId64> (videz " "'fenc' pour passer outre)" -#: ../fileio.c:3448 msgid "E514: write error (file system full?)" msgstr "E514: erreur d'écriture (système de fichiers plein ?)" -#: ../fileio.c:3506 msgid " CONVERSION ERROR" msgstr " ERREUR DE CONVERSION" -#: ../fileio.c:3509 #, c-format msgid " in line %<PRId64>;" msgstr " à la ligne %<PRId64>" -#: ../fileio.c:3519 msgid "[Device]" msgstr "[Périph.]" -#: ../fileio.c:3522 msgid "[New]" msgstr "[Nouveau]" -#: ../fileio.c:3535 msgid " [a]" msgstr " [a]" -#: ../fileio.c:3535 msgid " appended" msgstr " ajouté(s)" -#: ../fileio.c:3537 msgid " [w]" msgstr " [e]" -#: ../fileio.c:3537 msgid " written" msgstr " écrit(s)" -#: ../fileio.c:3579 msgid "E205: Patchmode: can't save original file" msgstr "E205: Patchmode : impossible d'enregistrer le fichier original" -#: ../fileio.c:3602 msgid "E206: patchmode: can't touch empty original file" msgstr "E206: patchmode : impossible de créer le fichier original vide" -#: ../fileio.c:3616 msgid "E207: Can't delete backup file" msgstr "E207: Impossible d'effacer la copie de secours" -#: ../fileio.c:3672 msgid "" "\n" "WARNING: Original file may be lost or damaged\n" @@ -2474,99 +1988,78 @@ msgstr "" "ALERTE: Le fichier original est peut-être perdu ou endommagé\n" # DB - todo : un peu long... -#: ../fileio.c:3675 msgid "don't quit the editor until the file is successfully written!" msgstr "" "ne quittez pas l'éditeur tant que le fichier n'est pas correctement " "enregistré !" -#: ../fileio.c:3795 msgid "[dos]" msgstr "[dos]" -#: ../fileio.c:3795 msgid "[dos format]" msgstr "[format dos]" -#: ../fileio.c:3801 msgid "[mac]" msgstr "[mac]" -#: ../fileio.c:3801 msgid "[mac format]" msgstr "[format mac]" -#: ../fileio.c:3807 msgid "[unix]" msgstr "[unix]" -#: ../fileio.c:3807 msgid "[unix format]" msgstr "[format unix]" -#: ../fileio.c:3831 msgid "1 line, " msgstr "1 ligne, " -#: ../fileio.c:3833 #, c-format msgid "%<PRId64> lines, " msgstr "%<PRId64> lignes, " -#: ../fileio.c:3836 msgid "1 character" msgstr "1 caractère" -#: ../fileio.c:3838 #, c-format msgid "%<PRId64> characters" msgstr "%<PRId64> caractères" -#: ../fileio.c:3849 msgid "[noeol]" msgstr "[noeol]" -#: ../fileio.c:3849 msgid "[Incomplete last line]" msgstr "[Dernière ligne incomplète]" #. don't overwrite messages here #. must give this prompt #. don't use emsg() here, don't want to flush the buffers -#: ../fileio.c:3865 msgid "WARNING: The file has been changed since reading it!!!" msgstr "ALERTE : Le fichier a été modifié depuis que Vim l'a lu !" -#: ../fileio.c:3867 msgid "Do you really want to write to it" msgstr "Voulez-vous vraiment écrire dedans" -#: ../fileio.c:4648 #, c-format msgid "E208: Error writing to \"%s\"" msgstr "E208: Erreur lors de l'écriture dans \"%s\"" -#: ../fileio.c:4655 #, c-format msgid "E209: Error closing \"%s\"" msgstr "E209: Erreur lors de la fermeture de \"%s\"" -#: ../fileio.c:4657 #, c-format msgid "E210: Error reading \"%s\"" msgstr "E210: Erreur lors de la lecture de \"%s\"" -#: ../fileio.c:4883 msgid "E246: FileChangedShell autocommand deleted buffer" msgstr "E246: L'autocommande FileChangedShell a effacé le tampon" -#: ../fileio.c:4894 #, c-format msgid "E211: File \"%s\" no longer available" msgstr "E211: Le fichier \"%s\" n'est plus disponible" # DB - todo : Suggestion. Bof bof, à améliorer. -#: ../fileio.c:4906 #, c-format msgid "" "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as " @@ -2574,40 +2067,32 @@ msgid "" msgstr "" "W12: Alerte : Le fichier \"%s\" a été modifié, ainsi que le tampon dans Vim" -#: ../fileio.c:4907 msgid "See \":help W12\" for more info." msgstr "Consultez \":help W12\" pour plus d'information." -#: ../fileio.c:4910 #, c-format msgid "W11: Warning: File \"%s\" has changed since editing started" msgstr "W11: Alerte : Le fichier \"%s\" a changé depuis le début de l'édition" -#: ../fileio.c:4911 msgid "See \":help W11\" for more info." msgstr "Consultez \":help W11\" pour plus d'information." -#: ../fileio.c:4914 #, c-format msgid "W16: Warning: Mode of file \"%s\" has changed since editing started" msgstr "" "W16: Alerte : Les permissions de \"%s\" ont changé depuis le début de " "l'édition" -#: ../fileio.c:4915 msgid "See \":help W16\" for more info." msgstr "Consultez \":help W16\" pour plus d'information." -#: ../fileio.c:4927 #, c-format msgid "W13: Warning: File \"%s\" has been created after editing started" msgstr "W13: Alerte : Le fichier \"%s\" a été créé après le début de l'édition" -#: ../fileio.c:4947 msgid "Warning" msgstr "Alerte" -#: ../fileio.c:4948 msgid "" "&OK\n" "&Load File" @@ -2615,48 +2100,39 @@ msgstr "" "&Ok\n" "&Charger le fichier" -#: ../fileio.c:5065 #, c-format msgid "E462: Could not prepare for reloading \"%s\"" msgstr "E462: Impossible de préparer le rechargement de \"%s\"" -#: ../fileio.c:5078 #, c-format msgid "E321: Could not reload \"%s\"" msgstr "E321: Impossible de recharger \"%s\"" -#: ../fileio.c:5601 msgid "--Deleted--" msgstr "--Effacé--" -#: ../fileio.c:5732 #, c-format msgid "auto-removing autocommand: %s <buffer=%d>" msgstr "Autocommandes marquées pour auto-suppression : %s <tampon=%d>" #. the group doesn't exist -#: ../fileio.c:5772 #, c-format msgid "E367: No such group: \"%s\"" msgstr "E367: Aucun groupe \"%s\"" -#: ../fileio.c:5897 #, c-format msgid "E215: Illegal character after *: %s" msgstr "E215: Caractère non valide après * : %s" -#: ../fileio.c:5905 #, c-format msgid "E216: No such event: %s" msgstr "E216: Aucun événement %s" -#: ../fileio.c:5907 #, c-format msgid "E216: No such group or event: %s" msgstr "E216: Aucun événement ou groupe %s" #. Highlight title -#: ../fileio.c:6090 msgid "" "\n" "--- Auto-Commands ---" @@ -2664,102 +2140,80 @@ msgstr "" "\n" "--- Auto-commandes ---" -#: ../fileio.c:6293 #, c-format msgid "E680: <buffer=%d>: invalid buffer number " msgstr "E680: <buffer=%d> : numéro de tampon invalide" -#: ../fileio.c:6370 msgid "E217: Can't execute autocommands for ALL events" msgstr "" "E217: Impossible d'exécuter les autocommandes pour TOUS les événements (ALL)" -#: ../fileio.c:6393 msgid "No matching autocommands" msgstr "Aucune autocommande correspondante" -#: ../fileio.c:6831 msgid "E218: autocommand nesting too deep" msgstr "E218: autocommandes trop imbriquées" -#: ../fileio.c:7143 #, c-format msgid "%s Auto commands for \"%s\"" msgstr "Autocommandes %s pour \"%s\"" -#: ../fileio.c:7149 #, c-format msgid "Executing %s" msgstr "Exécution de %s" -#: ../fileio.c:7211 #, c-format msgid "autocommand %s" msgstr "autocommande %s" -#: ../fileio.c:7795 msgid "E219: Missing {." msgstr "E219: { manquant." -#: ../fileio.c:7797 msgid "E220: Missing }." msgstr "E220: } manquant." -#: ../fold.c:93 msgid "E490: No fold found" msgstr "E490: Aucun repli trouvé" -#: ../fold.c:544 msgid "E350: Cannot create fold with current 'foldmethod'" msgstr "E350: Impossible de créer un repli avec la 'foldmethod'e actuelle" -#: ../fold.c:546 msgid "E351: Cannot delete fold with current 'foldmethod'" msgstr "E351: Impossible de supprimer un repli avec la 'foldmethod'e actuelle" -#: ../fold.c:1784 #, c-format msgid "+--%3ld lines folded " msgstr "+--%3ld lignes repliées " #. buffer has already been read -#: ../getchar.c:273 msgid "E222: Add to read buffer" msgstr "E222: Ajout au tampon de lecture" -#: ../getchar.c:2040 msgid "E223: recursive mapping" msgstr "E223: mappage récursif" -#: ../getchar.c:2849 #, c-format msgid "E224: global abbreviation already exists for %s" msgstr "E224: une abréviation globale existe déjà pour %s" -#: ../getchar.c:2852 #, c-format msgid "E225: global mapping already exists for %s" msgstr "E225: un mappage global existe déjà pour %s" -#: ../getchar.c:2952 #, c-format msgid "E226: abbreviation already exists for %s" msgstr "E226: une abréviation existe déjà pour %s" -#: ../getchar.c:2955 #, c-format msgid "E227: mapping already exists for %s" msgstr "E227: un mappage existe déjà pour %s" -#: ../getchar.c:3008 msgid "No abbreviation found" msgstr "Aucune abréviation trouvée" -#: ../getchar.c:3010 msgid "No mapping found" msgstr "Aucun mappage trouvé" -#: ../getchar.c:3974 msgid "E228: makemap: Illegal mode" msgstr "E228: makemap : mode invalide" @@ -2768,7 +2222,6 @@ msgstr "E228: makemap : mode invalide" #. key value of 'cedit' option #. type of cmdline window or 0 #. result of cmdline window or 0 -#: ../globals.h:924 msgid "--No lines in buffer--" msgstr "--Le tampon est vide--" @@ -2776,662 +2229,510 @@ msgstr "--Le tampon est vide--" #. * The error messages that can be shared are included here. #. * Excluded are errors that are only used once and debugging messages. #. -#: ../globals.h:996 msgid "E470: Command aborted" msgstr "E470: Commande annulée" -#: ../globals.h:997 msgid "E471: Argument required" msgstr "E471: Argument requis" -#: ../globals.h:998 msgid "E10: \\ should be followed by /, ? or &" msgstr "E10: \\ devrait être suivi de /, ? ou &" -#: ../globals.h:1000 msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits" msgstr "" "E11: Invalide dans la fenêtre ligne-de-commande ; <CR> exécute, CTRL-C quitte" -#: ../globals.h:1002 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search" msgstr "" "E12: commande non autorisée depuis un exrc/vimrc dans répertoire courant ou " "une recherche de marqueur" -#: ../globals.h:1003 msgid "E171: Missing :endif" msgstr "E171: :endif manquant" -#: ../globals.h:1004 msgid "E600: Missing :endtry" msgstr "E600: :endtry manquant" -#: ../globals.h:1005 msgid "E170: Missing :endwhile" msgstr "E170: :endwhile manquant" -#: ../globals.h:1006 msgid "E170: Missing :endfor" msgstr "E170: :endfor manquant" -#: ../globals.h:1007 msgid "E588: :endwhile without :while" msgstr "E588: :endwhile sans :while" -#: ../globals.h:1008 msgid "E588: :endfor without :for" msgstr "E588: :endfor sans :for" -#: ../globals.h:1009 msgid "E13: File exists (add ! to override)" msgstr "E13: Le fichier existe déjà (ajoutez ! pour passer outre)" -#: ../globals.h:1010 msgid "E472: Command failed" msgstr "E472: La commande a échoué" -#: ../globals.h:1011 msgid "E473: Internal error" msgstr "E473: Erreur interne" -#: ../globals.h:1012 msgid "Interrupted" msgstr "Interrompu" -#: ../globals.h:1013 msgid "E14: Invalid address" msgstr "E14: Adresse invalide" -#: ../globals.h:1014 msgid "E474: Invalid argument" msgstr "E474: Argument invalide" -#: ../globals.h:1015 #, c-format msgid "E475: Invalid argument: %s" msgstr "E475: Argument invalide : %s" -#: ../globals.h:1016 #, c-format msgid "E15: Invalid expression: %s" msgstr "E15: Expression invalide : %s" -#: ../globals.h:1017 msgid "E16: Invalid range" msgstr "E16: Plage invalide" -#: ../globals.h:1018 msgid "E476: Invalid command" msgstr "E476: Commande invalide" -#: ../globals.h:1019 #, c-format msgid "E17: \"%s\" is a directory" msgstr "E17: \"%s\" est un répertoire" -#: ../globals.h:1020 #, fuzzy -msgid "E900: Invalid job id" -msgstr "E49: Valeur de défilement invalide" +#~ msgid "E900: Invalid job id" +#~ msgstr "E49: Valeur de défilement invalide" -#: ../globals.h:1021 -msgid "E901: Job table is full" -msgstr "" +#~ msgid "E901: Job table is full" +#~ msgstr "" -#: ../globals.h:1024 #, c-format msgid "E364: Library call failed for \"%s()\"" msgstr "E364: L'appel à la bibliothèque a échoué pour \"%s()\"" -#: ../globals.h:1026 msgid "E19: Mark has invalid line number" msgstr "E19: La marque a un numéro de ligne invalide" -#: ../globals.h:1027 msgid "E20: Mark not set" msgstr "E20: Marque non positionnée" -#: ../globals.h:1029 msgid "E21: Cannot make changes, 'modifiable' is off" msgstr "E21: Impossible de modifier, 'modifiable' est désactivé" -#: ../globals.h:1030 msgid "E22: Scripts nested too deep" msgstr "E22: Trop de récursion dans les scripts" -#: ../globals.h:1031 msgid "E23: No alternate file" msgstr "E23: Pas de fichier alternatif" -#: ../globals.h:1032 msgid "E24: No such abbreviation" msgstr "E24: Cette abréviation n'existe pas" -#: ../globals.h:1033 msgid "E477: No ! allowed" msgstr "E477: Le ! n'est pas autorisé" -#: ../globals.h:1035 msgid "E25: Nvim does not have a built-in GUI" msgstr "E25: L'interface graphique n'a pas été compilée dans cette version" -#: ../globals.h:1036 #, c-format msgid "E28: No such highlight group name: %s" msgstr "E28: Aucun nom de groupe de surbrillance %s" -#: ../globals.h:1037 msgid "E29: No inserted text yet" msgstr "E29: Pas encore de texte inséré" -#: ../globals.h:1038 msgid "E30: No previous command line" msgstr "E30: Aucune ligne de commande précédente" -#: ../globals.h:1039 msgid "E31: No such mapping" msgstr "E31: Mappage inexistant" -#: ../globals.h:1040 msgid "E479: No match" msgstr "E479: Aucune correspondance" -#: ../globals.h:1041 #, c-format msgid "E480: No match: %s" msgstr "E480: Aucune correspondance : %s" -#: ../globals.h:1042 msgid "E32: No file name" msgstr "E32: Aucun nom de fichier" -#: ../globals.h:1044 msgid "E33: No previous substitute regular expression" msgstr "E33: Aucune expression régulière de substitution précédente" -#: ../globals.h:1045 msgid "E34: No previous command" msgstr "E34: Aucune commande précédente" -#: ../globals.h:1046 msgid "E35: No previous regular expression" msgstr "E35: Aucune expression régulière précédente" -#: ../globals.h:1047 msgid "E481: No range allowed" msgstr "E481: Les plages ne sont pas autorisées" -#: ../globals.h:1048 msgid "E36: Not enough room" msgstr "E36: Pas assez de place" -#: ../globals.h:1049 #, c-format msgid "E482: Can't create file %s" msgstr "E482: Impossible de créer le fichier %s" -#: ../globals.h:1050 msgid "E483: Can't get temp file name" msgstr "E483: Impossible d'obtenir un nom de fichier temporaire" -#: ../globals.h:1051 #, c-format msgid "E484: Can't open file %s" msgstr "E484: Impossible d'ouvrir le fichier \"%s\"" -#: ../globals.h:1052 #, c-format msgid "E485: Can't read file %s" msgstr "E485: Impossible de lire le fichier %s" -#: ../globals.h:1054 msgid "E37: No write since last change (add ! to override)" msgstr "E37: Modifications non enregistrées (ajoutez ! pour passer outre)" # AB - Il faut respecter l'esprit plus que la lettre. Dans le cas présent, # nettement plus. -#: ../globals.h:1055 #, fuzzy -msgid "E37: No write since last change" -msgstr "[Attention : tout n'est pas enregistré]\n" +#~ msgid "E37: No write since last change" +#~ msgstr "[Attention : tout n'est pas enregistré]\n" -#: ../globals.h:1056 msgid "E38: Null argument" msgstr "E38: Argument null" -#: ../globals.h:1057 msgid "E39: Number expected" msgstr "E39: Nombre attendu" -#: ../globals.h:1058 #, c-format msgid "E40: Can't open errorfile %s" msgstr "E40: Impossible d'ouvrir le fichier d'erreurs %s" -#: ../globals.h:1059 msgid "E41: Out of memory!" msgstr "E41: Mémoire épuisée" -#: ../globals.h:1060 msgid "Pattern not found" msgstr "Motif introuvable" -#: ../globals.h:1061 #, c-format msgid "E486: Pattern not found: %s" msgstr "E486: Motif introuvable : %s" -#: ../globals.h:1062 msgid "E487: Argument must be positive" msgstr "E487: L'argument doit être positif" -#: ../globals.h:1064 msgid "E459: Cannot go back to previous directory" msgstr "E459: Impossible de retourner au répertoire précédent" -#: ../globals.h:1066 msgid "E42: No Errors" msgstr "E42: Aucune erreur" # DB - TODO : trouver une traduction valable et attestée pour "location". -#: ../globals.h:1067 msgid "E776: No location list" msgstr "E776: Aucune liste d'emplacements" -#: ../globals.h:1068 msgid "E43: Damaged match string" msgstr "E43: La chaîne de recherche est endommagée" -#: ../globals.h:1069 msgid "E44: Corrupted regexp program" msgstr "E44: L'automate de regexp est corrompu" -#: ../globals.h:1071 msgid "E45: 'readonly' option is set (add ! to override)" msgstr "E45: L'option 'readonly' est activée (ajoutez ! pour passer outre)" -#: ../globals.h:1073 #, c-format msgid "E46: Cannot change read-only variable \"%s\"" msgstr "E46: La variable \"%s\" est en lecture seule" -#: ../globals.h:1075 #, c-format msgid "E794: Cannot set variable in the sandbox: \"%s\"" msgstr "" "E794: Impossible de modifier une variable depuis le bac à sable : \"%s\"" -#: ../globals.h:1076 msgid "E47: Error while reading errorfile" msgstr "E47: Erreur lors de la lecture du fichier d'erreurs" -#: ../globals.h:1078 msgid "E48: Not allowed in sandbox" msgstr "E48: Opération interdite dans le bac à sable" -#: ../globals.h:1080 msgid "E523: Not allowed here" msgstr "E523: Interdit à cet endroit" -#: ../globals.h:1082 msgid "E359: Screen mode setting not supported" msgstr "E359: Choix du mode d'écran non supporté" -#: ../globals.h:1083 msgid "E49: Invalid scroll size" msgstr "E49: Valeur de défilement invalide" -#: ../globals.h:1084 msgid "E91: 'shell' option is empty" msgstr "E91: L'option 'shell' est vide" -#: ../globals.h:1085 msgid "E255: Couldn't read in sign data!" msgstr "E255: Impossible de lire les données du symbole !" -#: ../globals.h:1086 msgid "E72: Close error on swap file" msgstr "E72: Erreur lors de la fermeture du fichier d'échange" -#: ../globals.h:1087 msgid "E73: tag stack empty" msgstr "E73: La pile des marqueurs est vide" -#: ../globals.h:1088 msgid "E74: Command too complex" msgstr "E74: Commande trop complexe" -#: ../globals.h:1089 msgid "E75: Name too long" msgstr "E75: Nom trop long" -#: ../globals.h:1090 msgid "E76: Too many [" msgstr "E76: Trop de [" -#: ../globals.h:1091 msgid "E77: Too many file names" msgstr "E77: Trop de noms de fichiers" -#: ../globals.h:1092 msgid "E488: Trailing characters" msgstr "E488: Caractères surnuméraires" -#: ../globals.h:1093 msgid "E78: Unknown mark" msgstr "E78: Marque inconnue" -#: ../globals.h:1094 msgid "E79: Cannot expand wildcards" msgstr "E79: Impossible de développer les métacaractères" -#: ../globals.h:1096 msgid "E591: 'winheight' cannot be smaller than 'winminheight'" msgstr "E591: 'winheight' ne peut pas être plus petit que 'winminheight'" -#: ../globals.h:1098 msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'" msgstr "E592: 'winwidth' ne peut pas être plus petit que 'winminwidth'" -#: ../globals.h:1099 msgid "E80: Error while writing" msgstr "E80: Erreur lors de l'écriture" -#: ../globals.h:1100 msgid "Zero count" msgstr "Le quantificateur est nul" -#: ../globals.h:1101 msgid "E81: Using <SID> not in a script context" msgstr "E81: <SID> utilisé en dehors d'un script" -#: ../globals.h:1102 #, c-format msgid "E685: Internal error: %s" msgstr "E685: Erreur interne : %s" -#: ../globals.h:1104 msgid "E363: pattern uses more memory than 'maxmempattern'" msgstr "E363: le motif utilise plus de mémoire que 'maxmempattern'" -#: ../globals.h:1105 msgid "E749: empty buffer" msgstr "E749: tampon vide" -#: ../buffer.c:1587 #, c-format msgid "E86: Buffer %<PRId64> does not exist" msgstr "E86: Le tampon %<PRId64> n'existe pas" -#: ../globals.h:1108 msgid "E682: Invalid search pattern or delimiter" msgstr "E682: Délimiteur ou motif de recherche invalide" -#: ../globals.h:1109 msgid "E139: File is loaded in another buffer" msgstr "E139: Le fichier est chargé dans un autre tampon" -#: ../globals.h:1110 #, c-format msgid "E764: Option '%s' is not set" msgstr "E764: L'option '%s' n'est pas activée" -#: ../globals.h:1111 msgid "E850: Invalid register name" msgstr "E850: Nom de registre invalide" -#: ../globals.h:1114 msgid "search hit TOP, continuing at BOTTOM" msgstr "La recherche a atteint le HAUT, et continue en BAS" -#: ../globals.h:1115 msgid "search hit BOTTOM, continuing at TOP" msgstr "La recherche a atteint le BAS, et continue en HAUT" -#: ../hardcopy.c:240 msgid "E550: Missing colon" msgstr "E550: ':' manquant" # DB - Il s'agit ici d'un problème lors du parsing d'une option dont le contenu # est une liste d'éléments séparés par des virgules. -#: ../hardcopy.c:252 msgid "E551: Illegal component" msgstr "E551: élément invalide" -#: ../hardcopy.c:259 msgid "E552: digit expected" msgstr "E552: chiffre attendu" -#: ../hardcopy.c:473 #, c-format msgid "Page %d" msgstr "Page %d" -#: ../hardcopy.c:597 msgid "No text to be printed" msgstr "Aucun texte à imprimer" -#: ../hardcopy.c:668 #, c-format msgid "Printing page %d (%d%%)" msgstr "Impression de la page %d (%d%%)" -#: ../hardcopy.c:680 #, c-format msgid " Copy %d of %d" msgstr " Copie %d sur %d" -#: ../hardcopy.c:733 #, c-format msgid "Printed: %s" msgstr "Imprimé : %s" -#: ../hardcopy.c:740 msgid "Printing aborted" msgstr "Impression interrompue" -#: ../hardcopy.c:1365 msgid "E455: Error writing to PostScript output file" msgstr "E455: Erreur lors de l'écriture du fichier PostScript" -#: ../hardcopy.c:1747 #, c-format msgid "E624: Can't open file \"%s\"" msgstr "E624: Impossible d'ouvrir le fichier \"%s\"" -#: ../hardcopy.c:1756 ../hardcopy.c:2470 #, c-format msgid "E457: Can't read PostScript resource file \"%s\"" msgstr "E457: Impossible de lire le fichier de ressource PostScript \"%s\"" -#: ../hardcopy.c:1772 #, c-format msgid "E618: file \"%s\" is not a PostScript resource file" msgstr "E618: \"%s\" n'est pas un fichier de ressource PostScript" -#: ../hardcopy.c:1788 ../hardcopy.c:1805 ../hardcopy.c:1844 #, c-format msgid "E619: file \"%s\" is not a supported PostScript resource file" msgstr "E619: \"%s\" n'est pas un fichier de ressource PostScript supporté" -#: ../hardcopy.c:1856 #, c-format msgid "E621: \"%s\" resource file has wrong version" msgstr "E621: La version du fichier de ressource \"%s\" est erronée" -#: ../hardcopy.c:2225 msgid "E673: Incompatible multi-byte encoding and character set." msgstr "E673: Jeu de caractères et encodage multi-octets incompatibles" -#: ../hardcopy.c:2238 msgid "E674: printmbcharset cannot be empty with multi-byte encoding." msgstr "" "E674: 'printmbcharset' ne peut pas être vide avec un encodage multi-octets" -#: ../hardcopy.c:2254 msgid "E675: No default font specified for multi-byte printing." msgstr "E675: Aucune police par défaut pour l'impression multi-octets" -#: ../hardcopy.c:2426 msgid "E324: Can't open PostScript output file" msgstr "E324: Impossible d'ouvrir le fichier PostScript de sortie" -#: ../hardcopy.c:2458 #, c-format msgid "E456: Can't open file \"%s\"" msgstr "E456: Impossible d'ouvrir le fichier \"%s\"" -#: ../hardcopy.c:2583 msgid "E456: Can't find PostScript resource file \"prolog.ps\"" msgstr "E456: Le fichier de ressource PostScript \"prolog.ps\" est introuvable" -#: ../hardcopy.c:2593 msgid "E456: Can't find PostScript resource file \"cidfont.ps\"" msgstr "" "E456: Le fichier de ressource PostScript \"cidfont.ps\" est introuvable" -#: ../hardcopy.c:2622 ../hardcopy.c:2639 ../hardcopy.c:2665 #, c-format msgid "E456: Can't find PostScript resource file \"%s.ps\"" msgstr "E456: Le fichier de ressource PostScript \"%s.ps\" est introuvable" -#: ../hardcopy.c:2654 #, c-format msgid "E620: Unable to convert to print encoding \"%s\"" msgstr "E620: La conversion pour imprimer dans l'encodage \"%s\" a échoué" -#: ../hardcopy.c:2877 msgid "Sending to printer..." msgstr "Envoi à l'imprimante..." -#: ../hardcopy.c:2881 msgid "E365: Failed to print PostScript file" msgstr "E365: L'impression du fichier PostScript a échoué" -#: ../hardcopy.c:2883 msgid "Print job sent." msgstr "Tâche d'impression envoyée." -#: ../if_cscope.c:85 msgid "Add a new database" msgstr "Ajouter une base de données" -#: ../if_cscope.c:87 msgid "Query for a pattern" msgstr "Rechercher un motif" -#: ../if_cscope.c:89 msgid "Show this message" msgstr "Afficher ce message" -#: ../if_cscope.c:91 msgid "Kill a connection" msgstr "Fermer une connexion" -#: ../if_cscope.c:93 msgid "Reinit all connections" msgstr "Réinitialiser toutes les connexions" -#: ../if_cscope.c:95 msgid "Show connections" msgstr "Afficher les connexions" -#: ../if_cscope.c:101 #, c-format msgid "E560: Usage: cs[cope] %s" msgstr "E560: Utilisation : cs[cope] %s" -#: ../if_cscope.c:225 msgid "This cscope command does not support splitting the window.\n" msgstr "Cette commande cscope ne supporte pas le partage de la fenêtre.\n" -#: ../if_cscope.c:266 msgid "E562: Usage: cstag <ident>" msgstr "E562: Utilisation : cstag <ident>" -#: ../if_cscope.c:313 msgid "E257: cstag: tag not found" msgstr "E257: cstag : marqueur introuvable" -#: ../if_cscope.c:461 #, c-format msgid "E563: stat(%s) error: %d" msgstr "E563: Erreur stat(%s) : %d" -#: ../if_cscope.c:551 #, c-format msgid "E564: %s is not a directory or a valid cscope database" msgstr "E564: %s n'est pas un répertoire ou une base de données cscope valide" -#: ../if_cscope.c:566 #, c-format msgid "Added cscope database %s" msgstr "Base de données cscope %s ajoutée" -#: ../if_cscope.c:616 #, c-format msgid "E262: error reading cscope connection %<PRId64>" msgstr "E262: erreur lors de la lecture de la connexion cscope %<PRId64>" -#: ../if_cscope.c:711 msgid "E561: unknown cscope search type" msgstr "E561: type de recherche cscope inconnu" -#: ../if_cscope.c:752 ../if_cscope.c:789 msgid "E566: Could not create cscope pipes" msgstr "E566: Impossible de créer les tuyaux (pipes) cscope" -#: ../if_cscope.c:767 msgid "E622: Could not fork for cscope" msgstr "E622: Impossible de forker pour cscope" -#: ../if_cscope.c:849 #, fuzzy -msgid "cs_create_connection setpgid failed" -msgstr "exec de cs_create_connection a échoué" +#~ msgid "cs_create_connection setpgid failed" +#~ msgstr "exec de cs_create_connection a échoué" -#: ../if_cscope.c:853 ../if_cscope.c:889 msgid "cs_create_connection exec failed" msgstr "exec de cs_create_connection a échoué" -#: ../if_cscope.c:863 ../if_cscope.c:902 msgid "cs_create_connection: fdopen for to_fp failed" msgstr "cs_create_connection : fdopen pour to_fp a échoué" -#: ../if_cscope.c:865 ../if_cscope.c:906 msgid "cs_create_connection: fdopen for fr_fp failed" msgstr "cs_create_connection : fdopen pour fr_fp a échoué" -#: ../if_cscope.c:890 msgid "E623: Could not spawn cscope process" msgstr "E623: Impossible d'engendrer le processus cscope" -#: ../if_cscope.c:932 msgid "E567: no cscope connections" msgstr "E567: Aucune connexion cscope" -#: ../if_cscope.c:1009 #, c-format msgid "E469: invalid cscopequickfix flag %c for %c" msgstr "E469: Drapeau cscopequickfix %c invalide pour %c" # DB - todo -#: ../if_cscope.c:1058 #, c-format msgid "E259: no matches found for cscope query %s of %s" msgstr "E259: aucune correspondance trouvée pour la requête cscope %s de %s" -#: ../if_cscope.c:1142 msgid "cscope commands:\n" msgstr "commandes cscope :\n" -#: ../if_cscope.c:1150 #, c-format msgid "%-5s: %s%*s (Usage: %s)" msgstr "%-5s: %s%*s (Utilisation : %s)" -#: ../if_cscope.c:1155 msgid "" "\n" " c: Find functions calling this function\n" @@ -3442,6 +2743,7 @@ msgid "" " i: Find files #including this file\n" " s: Find this C symbol\n" " t: Find this text string\n" +" a: Find assignments to this symbol\n" msgstr "" "\n" " c: Trouver les fonctions appelant cette fonction\n" @@ -3452,32 +2754,27 @@ msgstr "" " i: Trouver les fichiers qui #incluent ce fichier\n" " s: Trouver ce symbole C\n" " t: Trouver cette chaîne\n" +" a: Trouver les assignements à ce symbole\n" -#: ../if_cscope.c:1226 msgid "E568: duplicate cscope database not added" msgstr "E568: base de données cscope redondante non ajoutée" -#: ../if_cscope.c:1335 #, c-format msgid "E261: cscope connection %s not found" msgstr "E261: Connexion cscope %s introuvable" -#: ../if_cscope.c:1364 #, c-format msgid "cscope connection %s closed" msgstr "connexion cscope %s fermée" #. should not reach here -#: ../if_cscope.c:1486 msgid "E570: fatal error in cs_manage_matches" msgstr "E570: erreur fatale dans cs_manage_matches" -#: ../if_cscope.c:1693 #, c-format msgid "Cscope tag: %s" msgstr "Marqueur cscope : %s" -#: ../if_cscope.c:1711 msgid "" "\n" " # line" @@ -3486,87 +2783,67 @@ msgstr "" " # ligne" # DB - todo : Faut-il respecter l'alignement ici ? -#: ../if_cscope.c:1713 msgid "filename / context / line\n" msgstr "nom / contexte/ ligne\n" -#: ../if_cscope.c:1809 #, c-format msgid "E609: Cscope error: %s" msgstr "E609: Erreur cscope : %s" -#: ../if_cscope.c:2053 msgid "All cscope databases reset" msgstr "Toutes les bases de données cscope ont été réinitialisées" -#: ../if_cscope.c:2123 msgid "no cscope connections\n" msgstr "aucune connexion cscope\n" -#: ../if_cscope.c:2126 msgid " # pid database name prepend path\n" msgstr " # pid nom de la base de données chemin\n" -#: ../main.c:144 msgid "Unknown option argument" msgstr "Option inconnue" -#: ../main.c:146 msgid "Too many edit arguments" msgstr "Trop d'arguments d'édition" -#: ../main.c:148 msgid "Argument missing after" msgstr "Argument manquant après" -#: ../main.c:150 msgid "Garbage after option argument" msgstr "arguments en trop après l'option" -#: ../main.c:152 msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments" msgstr "Trop d'arguments \"+command\", \"-c command\" ou \"--cmd command\"" -#: ../main.c:154 msgid "Invalid argument for" msgstr "Argument invalide pour" -#: ../main.c:294 #, c-format msgid "%d files to edit\n" msgstr "%d fichiers à éditer\n" -#: ../main.c:1342 msgid "Attempt to open script file again: \"" msgstr "Nouvelle tentative pour ouvrir le script : \"" -#: ../main.c:1350 msgid "Cannot open for reading: \"" msgstr "Impossible d'ouvrir en lecture : \"" -#: ../main.c:1393 msgid "Cannot open for script output: \"" msgstr "Impossible d'ouvrir pour la sortie script : \"" -#: ../main.c:1622 msgid "Vim: Warning: Output is not to a terminal\n" msgstr "Vim : Alerte : La sortie ne s'effectue pas sur un terminal\n" -#: ../main.c:1624 msgid "Vim: Warning: Input is not from a terminal\n" msgstr "Vim : Alerte : L'entrée ne se fait pas sur un terminal\n" #. just in case.. -#: ../main.c:1891 msgid "pre-vimrc command line" msgstr "ligne de commande pre-vimrc" -#: ../main.c:1964 #, c-format msgid "E282: Cannot read from \"%s\"" msgstr "E282: Impossible de lire \"%s\"" -#: ../main.c:2149 msgid "" "\n" "More info with: \"vim -h\"\n" @@ -3574,23 +2851,18 @@ msgstr "" "\n" "Plus d'info avec : \"vim -h\"\n" -#: ../main.c:2178 msgid "[file ..] edit specified file(s)" msgstr "[fichier ...] ouvrir le ou les fichiers spécifiés" -#: ../main.c:2179 msgid "- read text from stdin" msgstr "- lire le texte à partir de stdin" -#: ../main.c:2180 msgid "-t tag edit file where tag is defined" msgstr "-t marqueur ouvrir le fichier qui contient le marqueur" -#: ../main.c:2181 msgid "-q [errorfile] edit file with first error" msgstr "-q [fichErr] ouvrir à l'endroit de la première erreur" -#: ../main.c:2187 msgid "" "\n" "\n" @@ -3600,11 +2872,9 @@ msgstr "" "\n" "utilisation :" -#: ../main.c:2189 msgid " vim [arguments] " msgstr " vim [args] " -#: ../main.c:2193 msgid "" "\n" " or:" @@ -3612,7 +2882,6 @@ msgstr "" "\n" " ou :" -#: ../main.c:2196 msgid "" "\n" "\n" @@ -3622,192 +2891,146 @@ msgstr "" "\n" "Arguments :\n" -#: ../main.c:2197 msgid "--\t\t\tOnly file names after this" msgstr "--\t\tSeuls des noms de fichier sont spécifiés après ceci" -#: ../main.c:2199 msgid "--literal\t\tDon't expand wildcards" msgstr "--literal\tNe pas développer les métacaractères" -#: ../main.c:2201 msgid "-v\t\t\tVi mode (like \"vi\")" msgstr "-v\t\tMode Vi (comme \"vi\")" -#: ../main.c:2202 msgid "-e\t\t\tEx mode (like \"ex\")" msgstr "-e\t\tMode Ex (comme \"ex\")" -#: ../main.c:2203 msgid "-E\t\t\tImproved Ex mode" msgstr "-E\t\t\tMode Ex amélioré" -#: ../main.c:2204 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")" msgstr "-s\t\tMode silencieux (batch) (seulement pour \"ex\")" -#: ../main.c:2205 msgid "-d\t\t\tDiff mode (like \"vimdiff\")" msgstr "-d\t\tMode diff (comme \"vimdiff\")" -#: ../main.c:2206 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)" msgstr "-y\t\tMode facile (comme \"evim\", vim sans modes)" -#: ../main.c:2207 msgid "-R\t\t\tReadonly mode (like \"view\")" msgstr "-R\t\tMode lecture seule (comme \"view\")" -#: ../main.c:2208 msgid "-Z\t\t\tRestricted mode (like \"rvim\")" msgstr "-Z\t\tMode restreint (comme \"rvim\")" -#: ../main.c:2209 msgid "-m\t\t\tModifications (writing files) not allowed" msgstr "-m\t\tInterdire l'enregistrement des fichiers" -#: ../main.c:2210 msgid "-M\t\t\tModifications in text not allowed" msgstr "-M\t\tInterdire toute modification de texte" -#: ../main.c:2211 msgid "-b\t\t\tBinary mode" msgstr "-b\t\tMode binaire" -#: ../main.c:2212 msgid "-l\t\t\tLisp mode" msgstr "-l\t\tMode lisp" -#: ../main.c:2213 msgid "-C\t\t\tCompatible with Vi: 'compatible'" msgstr "-C\t\tCompatible avec Vi : 'compatible'" -#: ../main.c:2214 msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'" msgstr "-N\t\tPas totalement compatible avec Vi : 'nocompatible'" -#: ../main.c:2215 msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]" msgstr "-V[N][<fichier>]\tMode verbeux [niveau N] [dans <fichier>]" -#: ../main.c:2216 msgid "-D\t\t\tDebugging mode" msgstr "-D\t\tMode débogage" -#: ../main.c:2217 msgid "-n\t\t\tNo swap file, use memory only" msgstr "-n\t\tNe pas utiliser de fichier d'échange, seulement la mémoire" -#: ../main.c:2218 msgid "-r\t\t\tList swap files and exit" msgstr "-r\t\tLister les fichiers d'échange et quitter" -#: ../main.c:2219 msgid "-r (with file name)\tRecover crashed session" msgstr "-r <fichier>\tRécupérer une session plantée" -#: ../main.c:2220 msgid "-L\t\t\tSame as -r" msgstr "-L\t\tComme -r" -#: ../main.c:2221 msgid "-A\t\t\tstart in Arabic mode" msgstr "-A\t\tDémarrer en mode arabe" -#: ../main.c:2222 msgid "-H\t\t\tStart in Hebrew mode" msgstr "-H\t\tDémarrer en mode hébreu" -#: ../main.c:2223 msgid "-F\t\t\tStart in Farsi mode" msgstr "-F\t\tDémarrer en mode farsi" -#: ../main.c:2224 msgid "-T <terminal>\tSet terminal type to <terminal>" msgstr "-T <term>\tRégler le type du terminal sur <terminal>" -#: ../main.c:2225 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc" msgstr "-u <vimrc>\tUtiliser <vimrc> au lieu du vimrc habituel" -#: ../main.c:2226 msgid "--noplugin\t\tDon't load plugin scripts" msgstr "--noplugin\tNe charger aucun greffon" -#: ../main.c:2227 msgid "-p[N]\t\tOpen N tab pages (default: one for each file)" msgstr "-p[N]\tOuvrir N onglets (défaut : un pour chaque fichier)" -#: ../main.c:2228 msgid "-o[N]\t\tOpen N windows (default: one for each file)" msgstr "-o[N]\tOuvrir N fenêtres (défaut : une pour chaque fichier)" -#: ../main.c:2229 msgid "-O[N]\t\tLike -o but split vertically" msgstr "-O[N]\tComme -o, mais partager verticalement" -#: ../main.c:2230 msgid "+\t\t\tStart at end of file" msgstr "+\t\tOuvrir à la fin du fichier" -#: ../main.c:2231 msgid "+<lnum>\t\tStart at line <lnum>" msgstr "+<numL>\tOuvrir le fichier à la ligne <numL>" -#: ../main.c:2232 msgid "--cmd <command>\tExecute <command> before loading any vimrc file" msgstr "--cmd <cmde>\tExécuter <commande> avant de charger les fichiers vimrc" -#: ../main.c:2233 msgid "-c <command>\t\tExecute <command> after loading the first file" msgstr "-c <cmde>\tExécuter <commande> une fois le 1er fichier chargé" -#: ../main.c:2235 msgid "-S <session>\t\tSource file <session> after loading the first file" msgstr "" "-S <session>\tSourcer le fichier <session> une fois le 1er fichier chargé" -#: ../main.c:2236 msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>" msgstr "-s <src>\tLire les commandes du mode Normal à partir du fichier <src>" -#: ../main.c:2237 msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>" msgstr "-w <dest>\tAjouter toutes les commandes tapées dans le fichier <dest>" -#: ../main.c:2238 msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>" msgstr "-W <dest>\tÉcrire toutes les commandes tapées dans le fichier <dest>" -#: ../main.c:2240 msgid "--startuptime <file>\tWrite startup timing messages to <file>" msgstr "" "--startuptime <fich>\tÉcrire les messages d'horodatage au démarrage dans " "<fich>" -#: ../main.c:2242 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo" msgstr "-i <viminfo>\t\tUtiliser <viminfo> au lieu du viminfo habituel" -#: ../main.c:2243 msgid "-h or --help\tPrint Help (this message) and exit" msgstr "-h ou --help\t\tAfficher l'aide (ce message) puis quitter" -#: ../main.c:2244 msgid "--version\t\tPrint version information and exit" msgstr "--version\t\tAfficher les informations de version et quitter" -#: ../mark.c:676 msgid "No marks set" msgstr "Aucune marque positionnée" -#: ../mark.c:678 #, c-format msgid "E283: No marks matching \"%s\"" msgstr "E283: Aucune marque ne correspond à \"%s\"" #. Highlight title -#: ../mark.c:687 msgid "" "\n" "mark line col file/text" @@ -3816,7 +3039,6 @@ msgstr "" "marq ligne col fichier/texte" #. Highlight title -#: ../mark.c:789 msgid "" "\n" " jump line col file/text" @@ -3825,7 +3047,6 @@ msgstr "" " saut ligne col fichier/texte" #. Highlight title -#: ../mark.c:831 msgid "" "\n" "change line col text" @@ -3833,7 +3054,6 @@ msgstr "" "\n" "modif ligne col fichier/texte" -#: ../mark.c:1238 msgid "" "\n" "# File marks:\n" @@ -3842,7 +3062,6 @@ msgstr "" "# Marques dans le fichier :\n" #. Write the jumplist with -' -#: ../mark.c:1271 msgid "" "\n" "# Jumplist (newest first):\n" @@ -3850,7 +3069,6 @@ msgstr "" "\n" "# Liste de sauts (le plus récent en premier) :\n" -#: ../mark.c:1352 msgid "" "\n" "# History of marks within files (newest to oldest):\n" @@ -3858,84 +3076,65 @@ msgstr "" "\n" "# Historique des marques dans les fichiers (les plus récentes en premier) :\n" -#: ../mark.c:1431 msgid "Missing '>'" msgstr "'>' manquant" -#: ../memfile.c:426 msgid "E293: block was not locked" msgstr "E293: le bloc n'était pas verrouillé" -#: ../memfile.c:799 msgid "E294: Seek error in swap file read" msgstr "E294: Erreur de positionnement lors de la lecture du fichier d'échange" -#: ../memfile.c:803 msgid "E295: Read error in swap file" msgstr "E295: Erreur de lecture dans le fichier d'échange" -#: ../memfile.c:849 msgid "E296: Seek error in swap file write" msgstr "E296: Erreur de positionnement lors de l'écriture du fichier d'échange" -#: ../memfile.c:865 msgid "E297: Write error in swap file" msgstr "E297: Erreur d'écriture dans le fichier d'échange" -#: ../memfile.c:1036 msgid "E300: Swap file already exists (symlink attack?)" msgstr "E300: Le fichier d'échange existe déjà (attaque par symlink ?)" -#: ../memline.c:318 msgid "E298: Didn't get block nr 0?" msgstr "E298: Bloc n°0 non récupéré ?" -#: ../memline.c:361 msgid "E298: Didn't get block nr 1?" msgstr "E298: Bloc n°1 non récupéré ?" -#: ../memline.c:377 msgid "E298: Didn't get block nr 2?" msgstr "E298: Bloc n°2 non récupéré ?" #. could not (re)open the swap file, what can we do???? -#: ../memline.c:465 msgid "E301: Oops, lost the swap file!!!" msgstr "E301: Oups, le fichier d'échange a disparu !" -#: ../memline.c:477 msgid "E302: Could not rename swap file" msgstr "E302: Impossible de renommer le fichier d'échange" -#: ../memline.c:554 #, c-format msgid "E303: Unable to open swap file for \"%s\", recovery impossible" msgstr "E303: Impossible d'ouvrir fichier .swp pour \"%s\", récup. impossible" -#: ../memline.c:666 msgid "E304: ml_upd_block0(): Didn't get block 0??" msgstr "E304: ml_upd_block0() : bloc 0 non récupéré ?!" #. no swap files found -#: ../memline.c:830 #, c-format msgid "E305: No swap file found for %s" msgstr "E305: Aucun fichier d'échange trouvé pour %s" -#: ../memline.c:839 msgid "Enter number of swap file to use (0 to quit): " msgstr "Entrez le numéro du fichier d'échange à utiliser (0 pour quitter) : " -#: ../memline.c:879 #, c-format msgid "E306: Cannot open %s" msgstr "E306: Impossible d'ouvrir %s" -#: ../memline.c:897 msgid "Unable to read block 0 from " msgstr "Impossible de lire le bloc 0 de " -#: ../memline.c:900 msgid "" "\n" "Maybe no changes were made or Vim did not update the swap file." @@ -3944,28 +3143,22 @@ msgstr "" "Il est possible qu'aucune modification n'a été faite ou que Vim n'a pas mis " "à jour le fichier d'échange." -#: ../memline.c:909 msgid " cannot be used with this version of Vim.\n" msgstr " ne peut pas être utilisé avec cette version de Vim.\n" -#: ../memline.c:911 msgid "Use Vim version 3.0.\n" msgstr "Utilisez Vim version 3.0.\n" -#: ../memline.c:916 #, c-format msgid "E307: %s does not look like a Vim swap file" msgstr "E307: %s ne semble pas être un fichier d'échange de Vim" -#: ../memline.c:922 msgid " cannot be used on this computer.\n" msgstr " ne peut pas être utilisé sur cet ordinateur.\n" -#: ../memline.c:924 msgid "The file was created on " msgstr "Le fichier a été créé le " -#: ../memline.c:928 msgid "" ",\n" "or the file has been damaged." @@ -3973,86 +3166,67 @@ msgstr "" ",\n" "ou le fichier a été endommagé." -#: ../memline.c:945 msgid " has been damaged (page size is smaller than minimum value).\n" msgstr " a été endommagé (taille de page inférieure à la valeur minimale).\n" -#: ../memline.c:974 #, c-format msgid "Using swap file \"%s\"" msgstr "Utilisation du fichier d'échange \"%s\"" -#: ../memline.c:980 #, c-format msgid "Original file \"%s\"" msgstr "Fichier original \"%s\"" -#: ../memline.c:995 msgid "E308: Warning: Original file may have been changed" msgstr "E308: Alerte : Le fichier original a pu être modifié" -#: ../memline.c:1061 #, c-format msgid "E309: Unable to read block 1 from %s" msgstr "E309: Impossible de lire le bloc 1 de %s" -#: ../memline.c:1065 msgid "???MANY LINES MISSING" msgstr "???DE NOMBREUSES LIGNES MANQUENT" -#: ../memline.c:1076 msgid "???LINE COUNT WRONG" msgstr "???NOMBRE DE LIGNES ERRONÉ" -#: ../memline.c:1082 msgid "???EMPTY BLOCK" msgstr "???BLOC VIDE" -#: ../memline.c:1103 msgid "???LINES MISSING" msgstr "???LIGNES MANQUANTES" -#: ../memline.c:1128 #, c-format msgid "E310: Block 1 ID wrong (%s not a .swp file?)" msgstr "E310: ID du bloc 1 erroné (%s n'est pas un fichier d'échange ?)" -#: ../memline.c:1133 msgid "???BLOCK MISSING" msgstr "???BLOC MANQUANT" -#: ../memline.c:1147 msgid "??? from here until ???END lines may be messed up" msgstr "??? d'ici jusqu'à ???FIN des lignes peuvent être corrompues" -#: ../memline.c:1164 msgid "??? from here until ???END lines may have been inserted/deleted" msgstr "??? d'ici jusqu'à ???FIN des lignes ont pu être insérées/effacées" -#: ../memline.c:1181 msgid "???END" msgstr "???FIN" -#: ../memline.c:1238 msgid "E311: Recovery Interrupted" msgstr "E311: Récupération interrompue" -#: ../memline.c:1243 msgid "" "E312: Errors detected while recovering; look for lines starting with ???" msgstr "" "E312: Erreurs lors de la récupération ; examinez les lignes commençant " "par ???" -#: ../memline.c:1245 msgid "See \":help E312\" for more information." msgstr "Consultez \":help E312\" pour plus d'information." -#: ../memline.c:1249 msgid "Recovery completed. You should check if everything is OK." msgstr "Récupération achevée. Vérifiez que tout est correct." -#: ../memline.c:1251 msgid "" "\n" "(You might want to write out this file under another name\n" @@ -4060,17 +3234,14 @@ msgstr "" "\n" "(Vous voudrez peut-être enregistrer ce fichier sous un autre nom\n" -#: ../memline.c:1252 msgid "and run diff with the original file to check for changes)" msgstr "et lancer diff avec le fichier original pour repérer les changements)" -#: ../memline.c:1254 msgid "Recovery completed. Buffer contents equals file contents." msgstr "" "Récupération achevée. Le contenu du tampon est identique au contenu du " "fichier." -#: ../memline.c:1255 msgid "" "\n" "You may want to delete the .swp file now.\n" @@ -4081,51 +3252,39 @@ msgstr "" "\n" #. use msg() to start the scrolling properly -#: ../memline.c:1327 msgid "Swap files found:" msgstr "Fichiers d'échange trouvés :" -#: ../memline.c:1446 msgid " In current directory:\n" msgstr " Dans le répertoire courant :\n" -#: ../memline.c:1448 msgid " Using specified name:\n" msgstr "Utilisant le nom indiqué :\n" -#: ../memline.c:1450 msgid " In directory " msgstr " Dans le répertoire " -#: ../memline.c:1465 msgid " -- none --\n" msgstr " -- aucun --\n" -#: ../memline.c:1527 msgid " owned by: " msgstr " propriété de : " -#: ../memline.c:1529 msgid " dated: " msgstr " daté : " -#: ../memline.c:1532 ../memline.c:3231 msgid " dated: " msgstr " daté : " -#: ../memline.c:1548 msgid " [from Vim version 3.0]" msgstr " [de Vim version 3.0]" -#: ../memline.c:1550 msgid " [does not look like a Vim swap file]" msgstr " [ne semble pas être un fichier d'échange Vim]" -#: ../memline.c:1552 msgid " file name: " msgstr " nom de fichier : " -#: ../memline.c:1558 msgid "" "\n" " modified: " @@ -4133,15 +3292,12 @@ msgstr "" "\n" " modifié : " -#: ../memline.c:1559 msgid "YES" msgstr "OUI" -#: ../memline.c:1559 msgid "no" msgstr "non" -#: ../memline.c:1562 msgid "" "\n" " user name: " @@ -4149,11 +3305,9 @@ msgstr "" "\n" " nom d'utilisateur : " -#: ../memline.c:1568 msgid " host name: " msgstr " nom d'hôte : " -#: ../memline.c:1570 msgid "" "\n" " host name: " @@ -4161,7 +3315,6 @@ msgstr "" "\n" " nom d'hôte : " -#: ../memline.c:1575 msgid "" "\n" " process ID: " @@ -4169,11 +3322,9 @@ msgstr "" "\n" " processus n° : " -#: ../memline.c:1579 msgid " (still running)" msgstr " (en cours d'exécution)" -#: ../memline.c:1586 msgid "" "\n" " [not usable on this computer]" @@ -4181,97 +3332,75 @@ msgstr "" "\n" " [inutilisable sur cet ordinateur]" -#: ../memline.c:1590 msgid " [cannot be read]" msgstr " [ne peut être lu]" -#: ../memline.c:1593 msgid " [cannot be opened]" msgstr " [ne peut être ouvert]" -#: ../memline.c:1698 msgid "E313: Cannot preserve, there is no swap file" msgstr "E313: Préservation impossible, il n'y a pas de fichier d'échange" -#: ../memline.c:1747 msgid "File preserved" msgstr "Fichier préservé" -#: ../memline.c:1749 msgid "E314: Preserve failed" msgstr "E314: Échec de la préservation" -#: ../memline.c:1819 #, c-format msgid "E315: ml_get: invalid lnum: %<PRId64>" msgstr "E315: ml_get : numéro de ligne invalide : %<PRId64>" -#: ../memline.c:1851 #, c-format msgid "E316: ml_get: cannot find line %<PRId64>" msgstr "E316: ml_get : ligne %<PRId64> introuvable" -#: ../memline.c:2236 msgid "E317: pointer block id wrong 3" msgstr "E317: mauvais id de pointeur de bloc 3" -#: ../memline.c:2311 msgid "stack_idx should be 0" msgstr "stack_idx devrait être 0" -#: ../memline.c:2369 msgid "E318: Updated too many blocks?" msgstr "E318: Trop de blocs mis à jour ?" -#: ../memline.c:2511 msgid "E317: pointer block id wrong 4" msgstr "E317: mauvais id de pointeur de bloc 4" -#: ../memline.c:2536 msgid "deleted block 1?" msgstr "bloc 1 effacé ?" -#: ../memline.c:2707 #, c-format msgid "E320: Cannot find line %<PRId64>" msgstr "E320: Ligne %<PRId64> introuvable" -#: ../memline.c:2916 msgid "E317: pointer block id wrong" msgstr "E317: mauvais id de pointeur de bloc" -#: ../memline.c:2930 msgid "pe_line_count is zero" msgstr "pe_line_count vaut zéro" -#: ../memline.c:2955 #, c-format msgid "E322: line number out of range: %<PRId64> past the end" msgstr "E322: numéro de ligne hors limites : %<PRId64> au-delà de la fin" -#: ../memline.c:2959 #, c-format msgid "E323: line count wrong in block %<PRId64>" msgstr "E323: nombre de lignes erroné dans le bloc %<PRId64>" -#: ../memline.c:2999 msgid "Stack size increases" msgstr "La taille de la pile s'accroît" -#: ../memline.c:3038 msgid "E317: pointer block id wrong 2" msgstr "E317: mauvais id de pointeur de block 2" -#: ../memline.c:3070 #, c-format msgid "E773: Symlink loop for \"%s\"" msgstr "E773: cycle de liens symboliques avec \"%s\"" -#: ../memline.c:3221 msgid "E325: ATTENTION" msgstr "E325: ATTENTION" -#: ../memline.c:3222 msgid "" "\n" "Found a swap file by the name \"" @@ -4279,15 +3408,12 @@ msgstr "" "\n" "Trouvé un fichier d'échange nommé \"" -#: ../memline.c:3226 msgid "While opening file \"" msgstr "Lors de l'ouverture du fichier \"" -#: ../memline.c:3239 msgid " NEWER than swap file!\n" msgstr " PLUS RÉCENT que le fichier d'échange !\n" -#: ../memline.c:3244 msgid "" "\n" "(1) Another program may be editing the same file. If this is the case,\n" @@ -4299,19 +3425,15 @@ msgstr "" " Si c'est le cas, faites attention à ne pas vous retrouver avec\n" " deux versions différentes du même fichier en faisant des modifications." -#: ../memline.c:3245 msgid " Quit, or continue with caution.\n" msgstr " Quittez, ou continuez prudemment.\n" -#: ../memline.c:3246 msgid "(2) An edit session for this file crashed.\n" msgstr "(2) Une session d'édition de ce fichier a planté.\n" -#: ../memline.c:3247 msgid " If this is the case, use \":recover\" or \"vim -r " msgstr " Si c'est le cas, utilisez \":recover\" ou \"vim -r " -#: ../memline.c:3249 msgid "" "\"\n" " to recover the changes (see \":help recovery\").\n" @@ -4319,11 +3441,9 @@ msgstr "" "\"\n" " pour récupérer le fichier (consultez \":help recovery\").\n" -#: ../memline.c:3250 msgid " If you did this already, delete the swap file \"" msgstr " Si vous l'avez déjà fait, effacez le fichier d'échange \"" -#: ../memline.c:3252 msgid "" "\"\n" " to avoid this message.\n" @@ -4331,23 +3451,18 @@ msgstr "" "\"\n" " pour éviter ce message.\n" -#: ../memline.c:3450 ../memline.c:3452 msgid "Swap file \"" msgstr "Le fichier d'échange \"" -#: ../memline.c:3451 ../memline.c:3455 msgid "\" already exists!" msgstr "\" existe déjà !" -#: ../memline.c:3457 msgid "VIM - ATTENTION" msgstr "VIM - ATTENTION" -#: ../memline.c:3459 msgid "Swap file already exists!" msgstr "Un fichier d'échange existe déjà !" -#: ../memline.c:3464 msgid "" "&Open Read-Only\n" "&Edit anyway\n" @@ -4361,7 +3476,6 @@ msgstr "" "&Quitter\n" "&Abandonner" -#: ../memline.c:3467 msgid "" "&Open Read-Only\n" "&Edit anyway\n" @@ -4385,50 +3499,40 @@ msgstr "" #. #. ".s?a" #. ".saa": tried enough, give up -#: ../memline.c:3528 msgid "E326: Too many swap files found" msgstr "E326: Trop de fichiers d'échange trouvés" -#: ../memory.c:227 #, c-format msgid "E342: Out of memory! (allocating %<PRIu64> bytes)" msgstr "E342: Mémoire épuisée ! (allocation de %<PRIu64> octets)" -#: ../menu.c:62 msgid "E327: Part of menu-item path is not sub-menu" msgstr "E327: Une partie du chemin de l'élément de menu n'est pas un sous-menu" # DB - todo : J'hésite avec # msgstr "E328: Le menu n'existe pas dans ce mode" -#: ../menu.c:63 msgid "E328: Menu only exists in another mode" msgstr "E328: Le menu n'existe que dans un autre mode" -#: ../menu.c:64 #, c-format msgid "E329: No menu \"%s\"" msgstr "E329: Aucun menu \"%s\"" #. Only a mnemonic or accelerator is not valid. -#: ../menu.c:329 msgid "E792: Empty menu name" msgstr "E792: Nom de menu vide" -#: ../menu.c:340 msgid "E330: Menu path must not lead to a sub-menu" msgstr "E330: Le chemin de menu ne doit pas conduire à un sous-menu" -#: ../menu.c:365 msgid "E331: Must not add menu items directly to menu bar" msgstr "E331: Ajout d'éléments de menu directement dans barre de menu interdit" -#: ../menu.c:370 msgid "E332: Separator cannot be part of a menu path" msgstr "E332: Un séparateur ne peut faire partie d'un chemin de menu" #. Now we have found the matching menu, and we list the mappings #. Highlight title -#: ../menu.c:762 msgid "" "\n" "--- Menus ---" @@ -4436,71 +3540,56 @@ msgstr "" "\n" "--- Menus ---" -#: ../menu.c:1313 msgid "E333: Menu path must lead to a menu item" msgstr "E333: Le chemin du menu doit conduire à un élément de menu" -#: ../menu.c:1330 #, c-format msgid "E334: Menu not found: %s" msgstr "E334: Menu introuvable : %s" -#: ../menu.c:1396 #, c-format msgid "E335: Menu not defined for %s mode" msgstr "E335: Le menu n'est pas défini pour le mode %s" -#: ../menu.c:1426 msgid "E336: Menu path must lead to a sub-menu" msgstr "E336: Le chemin du menu doit conduire à un sous-menu" -#: ../menu.c:1447 msgid "E337: Menu not found - check menu names" msgstr "E337: Menu introuvable - vérifiez les noms des menus" -#: ../message.c:423 #, c-format msgid "Error detected while processing %s:" msgstr "Erreur détectée en traitant %s :" -#: ../message.c:445 #, c-format msgid "line %4ld:" msgstr "ligne %4ld :" -#: ../message.c:617 #, c-format msgid "E354: Invalid register name: '%s'" msgstr "E354: Nom de registre invalide : '%s'" # DB - todo : mettre à jour ? -#: ../message.c:986 msgid "Interrupt: " msgstr "Interruption : " -#: ../message.c:988 msgid "Press ENTER or type command to continue" msgstr "Appuyez sur ENTRÉE ou tapez une commande pour continuer" -#: ../message.c:1843 #, c-format msgid "%s line %<PRId64>" msgstr "%s, ligne %<PRId64>" -#: ../message.c:2392 msgid "-- More --" msgstr "-- Plus --" -#: ../message.c:2398 msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit " msgstr "" "ESPACE/d/j : écran/page/ligne vers le bas, b/u/k : vers le haut, q : quitter" -#: ../message.c:3021 ../message.c:3031 msgid "Question" msgstr "Question" -#: ../message.c:3023 msgid "" "&Yes\n" "&No" @@ -4508,7 +3597,6 @@ msgstr "" "&Oui\n" "&Non" -#: ../message.c:3033 msgid "" "&Yes\n" "&No\n" @@ -4518,7 +3606,6 @@ msgstr "" "&Non\n" "&Annuler" -#: ../message.c:3045 msgid "" "&Yes\n" "&No\n" @@ -4532,176 +3619,137 @@ msgstr "" "Tout aban&donner\n" "&Annuler" -#: ../message.c:3058 msgid "E766: Insufficient arguments for printf()" msgstr "E766: Pas assez d'arguments pour printf()" -#: ../message.c:3119 msgid "E807: Expected Float argument for printf()" msgstr "E807: printf() attend un argument de type Flottant" -#: ../message.c:3873 msgid "E767: Too many arguments to printf()" msgstr "E767: Trop d'arguments pour printf()" -#: ../misc1.c:2256 msgid "W10: Warning: Changing a readonly file" msgstr "W10: Alerte : Modification d'un fichier en lecture seule" -#: ../misc1.c:2537 msgid "Type number and <Enter> or click with mouse (empty cancels): " msgstr "Tapez un nombre et <Entrée> ou cliquez avec la souris (rien annule) :" -#: ../misc1.c:2539 msgid "Type number and <Enter> (empty cancels): " msgstr "Tapez un nombre et <Entrée> (rien annule) :" -#: ../misc1.c:2585 msgid "1 more line" msgstr "1 ligne en plus" -#: ../misc1.c:2588 msgid "1 line less" msgstr "1 ligne en moins" -#: ../misc1.c:2593 #, c-format msgid "%<PRId64> more lines" msgstr "%<PRId64> lignes en plus" -#: ../misc1.c:2596 #, c-format msgid "%<PRId64> fewer lines" msgstr "%<PRId64> lignes en moins" -#: ../misc1.c:2599 msgid " (Interrupted)" msgstr " (Interrompu)" -#: ../misc1.c:2635 msgid "Beep!" msgstr "Bip !" -#: ../misc2.c:738 #, c-format msgid "Calling shell to execute: \"%s\"" msgstr "Appel du shell pour exécuter : \"%s\"" -#: ../normal.c:183 msgid "E349: No identifier under cursor" msgstr "E349: Aucun identifiant sous le curseur" -#: ../normal.c:1866 msgid "E774: 'operatorfunc' is empty" msgstr "E774: 'operatorfunc' est vide" # DB : Il est ici question du mode Visuel. -#: ../normal.c:2637 msgid "Warning: terminal cannot highlight" msgstr "Alerte : le terminal ne peut pas surligner" -#: ../normal.c:2807 msgid "E348: No string under cursor" msgstr "E348: Aucune chaîne sous le curseur" -#: ../normal.c:3937 msgid "E352: Cannot erase folds with current 'foldmethod'" msgstr "E352: Impossible d'effacer des replis avec la 'foldmethod'e actuelle" -#: ../normal.c:5897 msgid "E664: changelist is empty" msgstr "E664: La liste des modifications (changelist) est vide" -#: ../normal.c:5899 msgid "E662: At start of changelist" msgstr "E662: Au début de la liste des modifications" -#: ../normal.c:5901 msgid "E663: At end of changelist" msgstr "E663: À la fin de la liste des modifications" -#: ../normal.c:7053 msgid "Type :quit<Enter> to exit Nvim" msgstr "tapez :q<Entrée> pour quitter Vim" -#: ../ops.c:248 #, c-format msgid "1 line %sed 1 time" msgstr "1 ligne %sée 1 fois" -#: ../ops.c:250 #, c-format msgid "1 line %sed %d times" msgstr "1 ligne %sée %d fois" -#: ../ops.c:253 #, c-format msgid "%<PRId64> lines %sed 1 time" msgstr "%<PRId64> lignes %sées 1 fois" -#: ../ops.c:256 #, c-format msgid "%<PRId64> lines %sed %d times" msgstr "%<PRId64> lignes %sées %d fois" -#: ../ops.c:592 #, c-format msgid "%<PRId64> lines to indent... " msgstr "%<PRId64> lignes à indenter... " -#: ../ops.c:634 msgid "1 line indented " msgstr "1 ligne indentée " -#: ../ops.c:636 #, c-format msgid "%<PRId64> lines indented " msgstr "%<PRId64> lignes indentées " -#: ../ops.c:938 msgid "E748: No previously used register" msgstr "E748: Aucun registre n'a été précédemment utilisé" # DB - Question O/N. #. must display the prompt -#: ../ops.c:1433 msgid "cannot yank; delete anyway" msgstr "impossible de réaliser une copie ; effacer tout de même" -#: ../ops.c:1929 msgid "1 line changed" msgstr "1 ligne modifiée" -#: ../ops.c:1931 #, c-format msgid "%<PRId64> lines changed" msgstr "%<PRId64> lignes modifiées" -#: ../ops.c:2521 msgid "block of 1 line yanked" msgstr "bloc de 1 ligne copié" -#: ../ops.c:2523 msgid "1 line yanked" msgstr "1 ligne copiée" -#: ../ops.c:2525 #, c-format msgid "block of %<PRId64> lines yanked" msgstr "bloc de %<PRId64> lignes copié" -#: ../ops.c:2528 #, c-format msgid "%<PRId64> lines yanked" msgstr "%<PRId64> lignes copiées" -#: ../ops.c:2710 #, c-format msgid "E353: Nothing in register %s" msgstr "E353: Le registre %s est vide" #. Highlight title -#: ../ops.c:3185 msgid "" "\n" "--- Registers ---" @@ -4709,11 +3757,9 @@ msgstr "" "\n" "--- Registres ---" -#: ../ops.c:4455 msgid "Illegal register name" msgstr "Nom de registre invalide" -#: ../ops.c:4533 msgid "" "\n" "# Registers:\n" @@ -4721,17 +3767,14 @@ msgstr "" "\n" "# Registres :\n" -#: ../ops.c:4575 #, c-format msgid "E574: Unknown register type %d" msgstr "E574: Type de registre %d inconnu" -#: ../ops.c:5089 #, c-format msgid "%<PRId64> Cols; " msgstr "%<PRId64> Colonnes ; " -#: ../ops.c:5097 #, c-format msgid "" "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; " @@ -4740,7 +3783,6 @@ msgstr "" "%s%<PRId64> sur %<PRId64> Lignes ; %<PRId64> sur %<PRId64> Mots ; %<PRId64> " "sur %<PRId64> Octets sélectionnés" -#: ../ops.c:5105 #, c-format msgid "" "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; " @@ -4749,7 +3791,6 @@ msgstr "" "%s%<PRId64> sur %<PRId64> Lignes ; %<PRId64> sur %<PRId64> Mots ; %<PRId64> " "sur %<PRId64> Caractères ; %<PRId64> sur %<PRId64> octets sélectionnés" -#: ../ops.c:5123 #, c-format msgid "" "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte " @@ -4758,7 +3799,6 @@ msgstr "" "Colonne %s sur %s ; Ligne %<PRId64> sur %<PRId64> ; Mot %<PRId64> sur " "%<PRId64> ; Octet %<PRId64> sur %<PRId64>" -#: ../ops.c:5133 #, c-format msgid "" "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char " @@ -4767,105 +3807,81 @@ msgstr "" "Colonne %s sur %s ; Ligne %<PRId64> sur %<PRId64> ; Mot %<PRId64> sur " "%<PRId64> ; Caractère %<PRId64> sur %<PRId64> ; Octet %<PRId64> sur %<PRId64>" -#: ../ops.c:5146 #, c-format msgid "(+%<PRId64> for BOM)" msgstr "(+%<PRId64> pour le BOM)" -#: ../option.c:1238 msgid "%<%f%h%m%=Page %N" msgstr "%<%f%h%m%=Page %N" -#: ../option.c:1574 msgid "Thanks for flying Vim" msgstr "Merci d'avoir choisi Vim" #. found a mismatch: skip -#: ../option.c:2698 msgid "E518: Unknown option" msgstr "E518: Option inconnue" -#: ../option.c:2709 msgid "E519: Option not supported" msgstr "E519: Option non supportée" -#: ../option.c:2740 msgid "E520: Not allowed in a modeline" msgstr "E520: Non autorisé dans une ligne de mode" -#: ../option.c:2815 msgid "E846: Key code not set" msgstr "E846: Le code de touche n'est pas configuré" -#: ../option.c:2924 msgid "E521: Number required after =" msgstr "E521: Nombre requis après =" -#: ../option.c:3226 ../option.c:3864 msgid "E522: Not found in termcap" msgstr "E522: Introuvable dans termcap" -#: ../option.c:3335 #, c-format msgid "E539: Illegal character <%s>" msgstr "E539: Caractère <%s> invalide" -#: ../option.c:2253 #, c-format msgid "For option %s" msgstr "Pour l'option %s" -#: ../option.c:3862 msgid "E529: Cannot set 'term' to empty string" msgstr "E529: 'term' ne doit pas être une chaîne vide" -#: ../option.c:3885 msgid "E589: 'backupext' and 'patchmode' are equal" msgstr "E589: 'backupext' et 'patchmode' sont égaux" -#: ../option.c:3964 msgid "E834: Conflicts with value of 'listchars'" msgstr "E834: Conflits avec la valeur de 'listchars'" -#: ../option.c:3966 msgid "E835: Conflicts with value of 'fillchars'" msgstr "E835: Conflits avec la valeur de 'fillchars'" -#: ../option.c:4163 msgid "E524: Missing colon" msgstr "E524: ':' manquant" -#: ../option.c:4165 msgid "E525: Zero length string" msgstr "E525: Chaîne de longueur nulle" -#: ../option.c:4220 #, c-format msgid "E526: Missing number after <%s>" msgstr "E526: Nombre manquant après <%s>" -#: ../option.c:4232 msgid "E527: Missing comma" msgstr "E527: Virgule manquante" -#: ../option.c:4239 msgid "E528: Must specify a ' value" msgstr "E528: Une valeur ' doit être spécifiée" -#: ../option.c:4271 msgid "E595: contains unprintable or wide character" msgstr "E595: contient des caractères à largeur double non-imprimables" -#: ../option.c:4469 #, c-format msgid "E535: Illegal character after <%c>" msgstr "E535: Caractère invalide après <%c>" -#: ../option.c:4534 msgid "E536: comma required" msgstr "E536: virgule requise" -#: ../option.c:4543 #, c-format msgid "E537: 'commentstring' must be empty or contain %s" msgstr "E537: 'commentstring' doit être vide ou contenir %s" @@ -4873,37 +3889,29 @@ msgstr "E537: 'commentstring' doit être vide ou contenir %s" # DB - Le code est sans ambiguïté sur le caractère manquant. # À défaut d'une traduction valable, au moins comprend-on # ce qui se passe. -#: ../option.c:4928 msgid "E540: Unclosed expression sequence" msgstr "E540: '}' manquant" -#: ../option.c:4932 msgid "E541: too many items" msgstr "E541: trop d'éléments" -#: ../option.c:4934 msgid "E542: unbalanced groups" msgstr "E542: parenthèses non équilibrées" -#: ../option.c:5148 msgid "E590: A preview window already exists" msgstr "E590: Il existe déjà une fenêtre de prévisualisation" -#: ../option.c:5311 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'" msgstr "W17: L'arabe requiert l'UTF-8, tapez ':set encoding=utf-8'" -#: ../option.c:5623 #, c-format msgid "E593: Need at least %d lines" msgstr "E593: Au moins %d lignes sont nécessaires" -#: ../option.c:5631 #, c-format msgid "E594: Need at least %d columns" msgstr "E594: Au moins %d colonnes sont nécessaires" -#: ../option.c:6011 #, c-format msgid "E355: Unknown option: %s" msgstr "E355: Option inconnue : %s" @@ -4911,12 +3919,10 @@ msgstr "E355: Option inconnue : %s" #. There's another character after zeros or the string #. * is empty. In both cases, we are trying to set a #. * num option using a string. -#: ../option.c:6037 #, c-format msgid "E521: Number required: &%s = '%s'" msgstr "E521: Nombre requis : &%s = '%s'" -#: ../option.c:6149 msgid "" "\n" "--- Terminal codes ---" @@ -4924,7 +3930,6 @@ msgstr "" "\n" "--- Codes de terminal ---" -#: ../option.c:6151 msgid "" "\n" "--- Global option values ---" @@ -4932,7 +3937,6 @@ msgstr "" "\n" "--- Valeur des options globales ---" -#: ../option.c:6153 msgid "" "\n" "--- Local option values ---" @@ -4940,7 +3944,6 @@ msgstr "" "\n" "--- Valeur des options locales ---" -#: ../option.c:6155 msgid "" "\n" "--- Options ---" @@ -4948,21 +3951,17 @@ msgstr "" "\n" "--- Options ---" -#: ../option.c:6816 msgid "E356: get_varp ERROR" msgstr "E356: ERREUR get_varp" -#: ../option.c:7696 #, c-format msgid "E357: 'langmap': Matching character missing for %s" msgstr "E357: 'langmap' : Aucun caractère correspondant pour %s" -#: ../option.c:7715 #, c-format msgid "E358: 'langmap': Extra characters after semicolon: %s" msgstr "E358: 'langmap' : Caractères surnuméraires après point-virgule : %s" -#: ../os/shell.c:194 msgid "" "\n" "Cannot execute shell " @@ -4970,7 +3969,6 @@ msgstr "" "\n" "Impossible d'exécuter le shell " -#: ../os/shell.c:439 msgid "" "\n" "shell returned " @@ -4978,7 +3976,6 @@ msgstr "" "\n" "le shell a retourné " -#: ../os_unix.c:465 ../os_unix.c:471 msgid "" "\n" "Could not get security context for " @@ -4986,7 +3983,6 @@ msgstr "" "\n" "Impossible d'obtenir le contexte de sécurité pour " -#: ../os_unix.c:479 msgid "" "\n" "Could not set security context for " @@ -4994,218 +3990,171 @@ msgstr "" "\n" "Impossible de modifier le contexte de sécurité pour " -#: ../os_unix.c:1558 ../os_unix.c:1647 #, c-format msgid "dlerror = \"%s\"" msgstr "dlerror = \"%s\"" -#: ../path.c:1449 #, c-format msgid "E447: Can't find file \"%s\" in path" msgstr "E447: Le fichier \"%s\" est introuvable dans 'path'" -#: ../quickfix.c:359 #, c-format msgid "E372: Too many %%%c in format string" msgstr "E372: Trop de %%%c dans la chaîne de format" -#: ../quickfix.c:371 #, c-format msgid "E373: Unexpected %%%c in format string" msgstr "E373: %%%c inattendu dans la chaîne de format" -#: ../quickfix.c:420 msgid "E374: Missing ] in format string" msgstr "E374: ] manquant dans la chaîne de format" -#: ../quickfix.c:431 #, c-format msgid "E375: Unsupported %%%c in format string" msgstr "E375: %%%c non supporté dans la chaîne de format" -#: ../quickfix.c:448 #, c-format msgid "E376: Invalid %%%c in format string prefix" msgstr "E376: %%%c invalide dans le préfixe de la chaîne de format" -#: ../quickfix.c:454 #, c-format msgid "E377: Invalid %%%c in format string" msgstr "E377: %%%c invalide dans la chaîne de format" #. nothing found -#: ../quickfix.c:477 msgid "E378: 'errorformat' contains no pattern" msgstr "E378: 'errorformat' ne contient aucun motif" -#: ../quickfix.c:695 msgid "E379: Missing or empty directory name" msgstr "E379: Nom de répertoire vide ou absent" -#: ../quickfix.c:1305 msgid "E553: No more items" msgstr "E553: Plus d'éléments" -#: ../quickfix.c:1674 #, c-format msgid "(%d of %d)%s%s: " msgstr "(%d sur %d)%s%s : " -#: ../quickfix.c:1676 msgid " (line deleted)" msgstr " (ligne effacée)" -#: ../quickfix.c:1863 msgid "E380: At bottom of quickfix stack" msgstr "E380: En bas de la pile quickfix" -#: ../quickfix.c:1869 msgid "E381: At top of quickfix stack" msgstr "E381: Au sommet de la pile quickfix" -#: ../quickfix.c:1880 #, c-format msgid "error list %d of %d; %d errors" msgstr "liste d'erreurs %d sur %d ; %d erreurs" -#: ../quickfix.c:2427 msgid "E382: Cannot write, 'buftype' option is set" msgstr "E382: Écriture impossible, l'option 'buftype' est activée" -#: ../quickfix.c:2812 msgid "E683: File name missing or invalid pattern" msgstr "E683: Nom de fichier manquant ou motif invalide" -#: ../quickfix.c:2911 #, c-format msgid "Cannot open file \"%s\"" msgstr "Impossible d'ouvrir le fichier \"%s\"" -#: ../quickfix.c:3429 msgid "E681: Buffer is not loaded" msgstr "E681: le tampon n'est pas chargé" -#: ../quickfix.c:3487 msgid "E777: String or List expected" msgstr "E777: Chaîne ou Liste attendue" -#: ../regexp.c:359 #, c-format msgid "E369: invalid item in %s%%[]" msgstr "E369: élément invalide dans %s%%[]" -#: ../regexp.c:374 #, c-format msgid "E769: Missing ] after %s[" msgstr "E769: ']' manquant après %s[" -#: ../regexp.c:375 #, c-format msgid "E53: Unmatched %s%%(" msgstr "E53: Pas de correspondance pour %s%%(" -#: ../regexp.c:376 #, c-format msgid "E54: Unmatched %s(" msgstr "E54: %s( ouvrante non fermée" -#: ../regexp.c:377 #, c-format msgid "E55: Unmatched %s)" msgstr "E55: %s) fermante non ouverte" -#: ../regexp.c:378 msgid "E66: \\z( not allowed here" msgstr "E66: \\z( n'est pas autorisé ici" -#: ../regexp.c:379 msgid "E67: \\z1 et al. not allowed here" msgstr "E67: \\z1 et co. ne sont pas autorisés ici" -#: ../regexp.c:380 #, c-format msgid "E69: Missing ] after %s%%[" msgstr "E69: ']' manquant après %s%%[" -#: ../regexp.c:381 #, c-format msgid "E70: Empty %s%%[]" msgstr "E70: %s%%[] vide" -#: ../regexp.c:1209 ../regexp.c:1224 msgid "E339: Pattern too long" msgstr "E339: Motif trop long" -#: ../regexp.c:1371 msgid "E50: Too many \\z(" msgstr "E50: Trop de \\z(" -#: ../regexp.c:1378 #, c-format msgid "E51: Too many %s(" msgstr "E51: Trop de %s(" -#: ../regexp.c:1427 msgid "E52: Unmatched \\z(" msgstr "E52: Pas de correspondance pour \\z(" -#: ../regexp.c:1637 #, c-format msgid "E59: invalid character after %s@" msgstr "E59: caractère invalide après %s@" -#: ../regexp.c:1672 #, c-format msgid "E60: Too many complex %s{...}s" msgstr "E60: Trop de %s{...}s complexes" -#: ../regexp.c:1687 #, c-format msgid "E61: Nested %s*" msgstr "E61: %s* imbriqués" -#: ../regexp.c:1690 #, c-format msgid "E62: Nested %s%c" msgstr "E62: %s%c imbriqués" -#: ../regexp.c:1800 msgid "E63: invalid use of \\_" msgstr "E63: utilisation invalide de \\_" -#: ../regexp.c:1850 #, c-format msgid "E64: %s%c follows nothing" msgstr "E64: %s%c ne suit aucun atome" -#: ../regexp.c:1902 msgid "E65: Illegal back reference" msgstr "E65: post-référence invalide" -#: ../regexp.c:1943 msgid "E68: Invalid character after \\z" msgstr "E68: Caractère invalide après \\z" -#: ../regexp.c:2049 ../regexp_nfa.c:1296 #, c-format msgid "E678: Invalid character after %s%%[dxouU]" msgstr "E678: Caractère invalide après %s%%[dxouU]" -#: ../regexp.c:2107 #, c-format msgid "E71: Invalid character after %s%%" msgstr "E71: Caractère invalide après %s%%" -#: ../regexp.c:3017 #, c-format msgid "E554: Syntax error in %s{...}" msgstr "E554: Erreur de syntaxe dans %s{...}" -#: ../regexp.c:3805 msgid "External submatches:\n" msgstr "Sous-correspondances externes :\n" -#: ../regexp.c:7022 msgid "" "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be " "used " @@ -5213,63 +4162,50 @@ msgstr "" "E864: \\%#= peut être suivi uniquement de 0, 1 ou 2. Le moteur automatique " "sera utilisé " -#: ../regexp_nfa.c:239 msgid "E865: (NFA) Regexp end encountered prematurely" msgstr "E865: (NFA) Fin de regexp rencontrée prématurément" -#: ../regexp_nfa.c:240 #, c-format msgid "E866: (NFA regexp) Misplaced %c" msgstr "E866: (regexp NFA) %c au mauvais endroit" -#: ../regexp_nfa.c:242 #, fuzzy, c-format -msgid "E877: (NFA regexp) Invalid character class: %<PRId64>" -msgstr "E877: (regexp NFA) Classe de caractère invalide " +#~ msgid "E877: (NFA regexp) Invalid character class: %<PRId64>" +#~ msgstr "E877: (regexp NFA) Classe de caractère invalide " -#: ../regexp_nfa.c:1261 #, c-format msgid "E867: (NFA) Unknown operator '\\z%c'" msgstr "E867: (NFA) Opérateur inconnu '\\z%c'" -#: ../regexp_nfa.c:1387 #, fuzzy, c-format -msgid "E867: (NFA) Unknown operator '\\%%%c'" -msgstr "E867: (NFA) Opérateur inconnu '\\z%c'" +#~ msgid "E867: (NFA) Unknown operator '\\%%%c'" +#~ msgstr "E867: (NFA) Opérateur inconnu '\\z%c'" -#: ../regexp_nfa.c:1802 #, c-format msgid "E869: (NFA) Unknown operator '\\@%c'" msgstr "E869: (NFA) Opérateur inconnu '\\@%c'" -#: ../regexp_nfa.c:1831 msgid "E870: (NFA regexp) Error reading repetition limits" msgstr "E870: (regexp NFA) Erreur à la lecture des limites de répétition" #. Can't have a multi follow a multi. -#: ../regexp_nfa.c:1895 msgid "E871: (NFA regexp) Can't have a multi follow a multi !" msgstr "E871: (regexp NFA) Un multi ne peut pas suivre un multi !" #. Too many `(' -#: ../regexp_nfa.c:2037 msgid "E872: (NFA regexp) Too many '('" msgstr "E872: (regexp NFA) Trop de '('" -#: ../regexp_nfa.c:2042 #, fuzzy -msgid "E879: (NFA regexp) Too many \\z(" -msgstr "E872: (regexp NFA) Trop de '('" +#~ msgid "E879: (NFA regexp) Too many \\z(" +#~ msgstr "E872: (regexp NFA) Trop de '('" -#: ../regexp_nfa.c:2066 msgid "E873: (NFA regexp) proper termination error" msgstr "E873: (NFA regexp) erreur de terminaison" -#: ../regexp_nfa.c:2599 msgid "E874: (NFA) Could not pop the stack !" msgstr "E874: (NFA) Impossible de dépiler !" -#: ../regexp_nfa.c:3298 msgid "" "E875: (NFA regexp) (While converting from postfix to NFA), too many states " "left on stack" @@ -5277,178 +4213,137 @@ msgstr "" "E875: (regexp NFA) (lors de la conversion de postfix à NFA), il reste trop " "d'états sur la pile" -#: ../regexp_nfa.c:3302 msgid "E876: (NFA regexp) Not enough space to store the whole NFA " msgstr "E876: (regexp NFA) Pas assez de mémoire pour stocker le NFA" -#: ../regexp_nfa.c:4571 ../regexp_nfa.c:4869 msgid "" "Could not open temporary log file for writing, displaying on stderr ... " msgstr "" "Impossible d'ouvrir le fichier de log temporaire en écriture, affichage sur " "stderr ... " -#: ../regexp_nfa.c:4840 #, c-format msgid "(NFA) COULD NOT OPEN %s !" msgstr "(NFA) IMPOSSIBLE D'OUVRIR %s !" -#: ../regexp_nfa.c:6049 msgid "Could not open temporary log file for writing " msgstr "Impossible d'ouvrir le fichier de log en écriture" -#: ../screen.c:7435 msgid " VREPLACE" msgstr " VREMPLACEMENT" -#: ../screen.c:7437 msgid " REPLACE" msgstr " REMPLACEMENT" # DB - todo -#: ../screen.c:7440 msgid " REVERSE" msgstr " REVERSE" -#: ../screen.c:7441 msgid " INSERT" msgstr " INSERTION" -#: ../screen.c:7443 msgid " (insert)" msgstr " (insertion)" -#: ../screen.c:7445 msgid " (replace)" msgstr " (remplacement)" -#: ../screen.c:7447 msgid " (vreplace)" msgstr " (vremplacement)" -#: ../screen.c:7449 msgid " Hebrew" msgstr " hébreu" -#: ../screen.c:7454 msgid " Arabic" msgstr " arabe" -#: ../screen.c:7456 msgid " (lang)" msgstr " (langue)" -#: ../screen.c:7459 msgid " (paste)" msgstr " (collage)" -#: ../screen.c:7469 msgid " VISUAL" msgstr " VISUEL" -#: ../screen.c:7470 msgid " VISUAL LINE" msgstr " VISUEL LIGNE" -#: ../screen.c:7471 msgid " VISUAL BLOCK" msgstr " VISUEL BLOC" -#: ../screen.c:7472 msgid " SELECT" msgstr " SÉLECTION" -#: ../screen.c:7473 msgid " SELECT LINE" msgstr " SÉLECTION LIGNE" -#: ../screen.c:7474 msgid " SELECT BLOCK" msgstr " SÉLECTION BLOC" -#: ../screen.c:7486 ../screen.c:7541 msgid "recording" msgstr "Enregistrement" -#: ../search.c:487 #, c-format msgid "E383: Invalid search string: %s" msgstr "E383: Chaîne de recherche invalide : %s" -#: ../search.c:832 #, c-format msgid "E384: search hit TOP without match for: %s" msgstr "E384: la recherche a atteint le HAUT sans trouver : %s" -#: ../search.c:835 #, c-format msgid "E385: search hit BOTTOM without match for: %s" msgstr "E385: la recherche a atteint le BAS sans trouver : %s" -#: ../search.c:1200 msgid "E386: Expected '?' or '/' after ';'" msgstr "E386: '?' ou '/' attendu après ';'" -#: ../search.c:4085 msgid " (includes previously listed match)" msgstr " (inclut des correspondances listées précédemment)" #. cursor at status line -#: ../search.c:4104 msgid "--- Included files " msgstr "--- Fichiers inclus " -#: ../search.c:4106 msgid "not found " msgstr "introuvables " -#: ../search.c:4107 msgid "in path ---\n" msgstr "dans le chemin ---\n" -#: ../search.c:4168 msgid " (Already listed)" msgstr " (Déjà listé)" -#: ../search.c:4170 msgid " NOT FOUND" msgstr " INTROUVABLE" -#: ../search.c:4211 #, c-format msgid "Scanning included file: %s" msgstr "Examen des fichiers inclus : %s" -#: ../search.c:4216 #, c-format msgid "Searching included file %s" msgstr "Recherche du fichier inclus %s" -#: ../search.c:4405 msgid "E387: Match is on current line" msgstr "E387: La correspondance est sur la ligne courante" -#: ../search.c:4517 msgid "All included files were found" msgstr "Tous les fichiers inclus ont été trouvés" -#: ../search.c:4519 msgid "No included files" msgstr "Aucun fichier inclus" -#: ../search.c:4527 msgid "E388: Couldn't find definition" msgstr "E388: Impossible de trouver la définition" -#: ../search.c:4529 msgid "E389: Couldn't find pattern" msgstr "E389: Impossible de trouver le motif" -#: ../search.c:4668 msgid "Substitute " msgstr "Substitue " -#: ../search.c:4681 #, c-format msgid "" "\n" @@ -5459,97 +4354,76 @@ msgstr "" "# Dernier motif de recherche %s :\n" "~" -#: ../spell.c:951 msgid "E759: Format error in spell file" msgstr "E759: Erreur de format du fichier orthographique" -#: ../spell.c:952 msgid "E758: Truncated spell file" msgstr "E758: Fichier orthographique tronqué" -#: ../spell.c:953 #, c-format msgid "Trailing text in %s line %d: %s" msgstr "Texte en trop dans %s ligne %d : %s" -#: ../spell.c:954 #, c-format msgid "Affix name too long in %s line %d: %s" msgstr "Nom d'affixe trop long dans %s ligne %d : %s" -#: ../spell.c:955 msgid "E761: Format error in affix file FOL, LOW or UPP" msgstr "E761: Erreur de format dans le fichier d'affixe FOL, LOW et UPP" -#: ../spell.c:957 msgid "E762: Character in FOL, LOW or UPP is out of range" msgstr "E762: Un caractère dans FOL, LOW ou UPP est hors-limites" -#: ../spell.c:958 msgid "Compressing word tree..." msgstr "Compression de l'arbre des mots" -#: ../spell.c:1951 msgid "E756: Spell checking is not enabled" msgstr "E756: La vérification orthographique n'est pas activée" -#: ../spell.c:2249 #, c-format msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\"" msgstr "Alerte : Liste de mots \"%s.%s.spl\" ou \"%s.ascii.spl\" introuvable" -#: ../spell.c:2473 #, c-format msgid "Reading spell file \"%s\"" msgstr "Lecture du fichier orthographique \"%s\"" -#: ../spell.c:2496 msgid "E757: This does not look like a spell file" msgstr "E757: Le fichier ne ressemble pas à un fichier orthographique" -#: ../spell.c:2501 msgid "E771: Old spell file, needs to be updated" msgstr "E771: Fichier orthographique obsolète, sa mise à jour est nécessaire" -#: ../spell.c:2504 msgid "E772: Spell file is for newer version of Vim" msgstr "E772: Le fichier est prévu pour une version de Vim plus récente" -#: ../spell.c:2602 msgid "E770: Unsupported section in spell file" msgstr "E770: Section non supportée dans le fichier orthographique" -#: ../spell.c:3762 #, c-format msgid "Warning: region %s not supported" msgstr "Alerte : région %s non supportée" -#: ../spell.c:4550 #, c-format msgid "Reading affix file %s ..." msgstr "Lecture du fichier d'affixes %s..." -#: ../spell.c:4589 ../spell.c:5635 ../spell.c:6140 #, c-format msgid "Conversion failure for word in %s line %d: %s" msgstr "Échec de conversion du mot dans %s ligne %d : %s" -#: ../spell.c:4630 ../spell.c:6170 #, c-format msgid "Conversion in %s not supported: from %s to %s" msgstr "La conversion dans %s non supportée : de %s vers %s" -#: ../spell.c:4642 #, c-format msgid "Invalid value for FLAG in %s line %d: %s" msgstr "Valeur de FLAG invalide dans %s ligne %d : %s" -#: ../spell.c:4655 #, c-format msgid "FLAG after using flags in %s line %d: %s" msgstr "FLAG trouvé après des drapeaux dans %s ligne %d : %s" -#: ../spell.c:4723 #, c-format msgid "" "Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line " @@ -5558,7 +4432,6 @@ msgstr "" "Définir COMPOUNDFORBIDFLAG après des PFX peut donner des résultats erronés " "dans %s ligne %d" -#: ../spell.c:4731 #, c-format msgid "" "Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line " @@ -5567,45 +4440,37 @@ msgstr "" "Définir COMPOUNDPERMITFLAG après des PFX peut donner des résultats erronés " "dans %s ligne %d" -#: ../spell.c:4747 #, c-format msgid "Wrong COMPOUNDRULES value in %s line %d: %s" msgstr "Valeur de COMPOUNDRULES erronée dans %s ligne %d : %s" -#: ../spell.c:4771 #, c-format msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s" msgstr "Valeur de COMPOUNDWORDMAX erronée dans %s ligne %d : %s" -#: ../spell.c:4777 #, c-format msgid "Wrong COMPOUNDMIN value in %s line %d: %s" msgstr "Valeur de COMPOUNDMIN erronée dans %s ligne %d : %s" -#: ../spell.c:4783 #, c-format msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s" msgstr "Valeur de COMPOUNDSYLMAX erronée dans %s ligne %d : %s" -#: ../spell.c:4795 #, c-format msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s" msgstr "Valeur de CHECKCOMPOUNDPATTERN erronée dans %s ligne %d : %s" # DB - TODO -#: ../spell.c:4847 #, c-format msgid "Different combining flag in continued affix block in %s line %d: %s" msgstr "" "Drapeaux de composition différents dans un bloc d'affixes continu dans %s " "ligne %d : %s" -#: ../spell.c:4850 #, c-format msgid "Duplicate affix in %s line %d: %s" msgstr "Affixe dupliqué dans %s ligne %d : %s" -#: ../spell.c:4871 #, c-format msgid "" "Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s " @@ -5614,339 +4479,270 @@ msgstr "" "Affixe aussi utilisée pour BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/" "NOSUGGEST dans %s ligne %d : %s" -#: ../spell.c:4893 #, c-format msgid "Expected Y or N in %s line %d: %s" msgstr "Y ou N attendu dans %s ligne %d : %s" # DB - todo (regexp impossible à compiler...) -#: ../spell.c:4968 #, c-format msgid "Broken condition in %s line %d: %s" msgstr "Condition non valide dans %s ligne %d : %s" -#: ../spell.c:5091 #, c-format msgid "Expected REP(SAL) count in %s line %d" msgstr "Nombre de REP(SAL) attendu dans %s ligne %d" -#: ../spell.c:5120 #, c-format msgid "Expected MAP count in %s line %d" msgstr "Nombre de MAP attendu dans %s ligne %d" -#: ../spell.c:5132 #, c-format msgid "Duplicate character in MAP in %s line %d" msgstr "Caractère dupliqué dans MAP dans %s ligne %d" -#: ../spell.c:5176 #, c-format msgid "Unrecognized or duplicate item in %s line %d: %s" msgstr "Élément non reconnu ou dupliqué dans %s ligne %d : %s" -#: ../spell.c:5197 #, c-format msgid "Missing FOL/LOW/UPP line in %s" msgstr "Ligne FOL/LOW/UPP manquante dans %s" -#: ../spell.c:5220 msgid "COMPOUNDSYLMAX used without SYLLABLE" msgstr "Utilisation de COMPOUNDSYLMAX sans SYLLABLE" -#: ../spell.c:5236 msgid "Too many postponed prefixes" msgstr "Trop de préfixes reportés (PFXPOSTPONE)" -#: ../spell.c:5238 msgid "Too many compound flags" msgstr "Trop de drapeaux de composition" -#: ../spell.c:5240 msgid "Too many postponed prefixes and/or compound flags" msgstr "Trop de préfixes reportés et/ou de drapeaux de composition" -#: ../spell.c:5250 #, c-format msgid "Missing SOFO%s line in %s" msgstr "Ligne SOFO%s manquante dans %s" -#: ../spell.c:5253 #, c-format msgid "Both SAL and SOFO lines in %s" msgstr "Lignes SAL et lignes SOFO présentes dans %s" -#: ../spell.c:5331 #, c-format msgid "Flag is not a number in %s line %d: %s" msgstr "Le drapeau n'est pas un nombre dans %s ligne %d : %s" -#: ../spell.c:5334 #, c-format msgid "Illegal flag in %s line %d: %s" msgstr "Drapeau non autorisé dans %s ligne %d : %s" -#: ../spell.c:5493 ../spell.c:5501 #, c-format msgid "%s value differs from what is used in another .aff file" msgstr "La valeur de %s est différente de celle d'un autre fichier .aff" -#: ../spell.c:5602 #, c-format msgid "Reading dictionary file %s ..." msgstr "Lecture du fichier orthographique %s..." -#: ../spell.c:5611 #, c-format msgid "E760: No word count in %s" msgstr "E760: Nombre de mots non indiqué dans %s" -#: ../spell.c:5669 #, c-format msgid "line %6d, word %6d - %s" msgstr "ligne %6d, mot %6d - %s" -#: ../spell.c:5691 #, c-format msgid "Duplicate word in %s line %d: %s" msgstr "Mot dupliqué dans %s ligne %d : %s" -#: ../spell.c:5694 #, c-format msgid "First duplicate word in %s line %d: %s" msgstr "Premier mot dupliqué dans %s ligne %d : %s" -#: ../spell.c:5746 #, c-format msgid "%d duplicate word(s) in %s" msgstr "%d mot(s) dupliqué(s) dans %s" -#: ../spell.c:5748 #, c-format msgid "Ignored %d word(s) with non-ASCII characters in %s" msgstr "%d mot(s) ignoré(s) avec des caractères non-ASCII dans %s" -#: ../spell.c:6115 #, c-format msgid "Reading word file %s ..." msgstr "Lecture de la liste de mots %s..." -#: ../spell.c:6155 #, c-format msgid "Duplicate /encoding= line ignored in %s line %d: %s" msgstr "Ligne /encoding= en double ignorée dans %s ligne %d : %s" -#: ../spell.c:6159 #, c-format msgid "/encoding= line after word ignored in %s line %d: %s" msgstr "Ligne /encoding= après des mots ignorée dans %s ligne %d : %s" -#: ../spell.c:6180 #, c-format msgid "Duplicate /regions= line ignored in %s line %d: %s" msgstr "Ligne /regions= en double ignorée dans %s ligne %d : %s" -#: ../spell.c:6185 #, c-format msgid "Too many regions in %s line %d: %s" msgstr "Trop de régions dans %s ligne %d : %s" -#: ../spell.c:6198 #, c-format msgid "/ line ignored in %s line %d: %s" msgstr "Ligne / ignorée dans %s ligne %d : %s" -#: ../spell.c:6224 #, c-format msgid "Invalid region nr in %s line %d: %s" msgstr "Numéro de région invalide dans %s ligne %d : %s" -#: ../spell.c:6230 #, c-format msgid "Unrecognized flags in %s line %d: %s" msgstr "Drapeaux non reconnus dans %s ligne %d : %s" -#: ../spell.c:6257 #, c-format msgid "Ignored %d words with non-ASCII characters" msgstr "%d mot(s) ignoré(s) avec des caractères non-ASCII" -#: ../spell.c:6656 #, c-format msgid "Compressed %d of %d nodes; %d (%d%%) remaining" msgstr "%d noeuds compressés sur %d ; %d (%d%%) restants " -#: ../spell.c:7340 msgid "Reading back spell file..." msgstr "Relecture du fichier orthographique" #. Go through the trie of good words, soundfold each word and add it to #. the soundfold trie. -#: ../spell.c:7357 msgid "Performing soundfolding..." msgstr "Analyse phonétique en cours..." -#: ../spell.c:7368 #, c-format msgid "Number of words after soundfolding: %<PRId64>" msgstr "Nombre de mots après l'analyse phonétique : %<PRId64>" -#: ../spell.c:7476 #, c-format msgid "Total number of words: %d" msgstr "Nombre total de mots : %d" -#: ../spell.c:7655 #, c-format msgid "Writing suggestion file %s ..." msgstr "Écriture du fichier de suggestions %s..." -#: ../spell.c:7707 ../spell.c:7927 #, c-format msgid "Estimated runtime memory use: %d bytes" msgstr "Estimation de mémoire consommée : %d octets" -#: ../spell.c:7820 msgid "E751: Output file name must not have region name" msgstr "E751: Le nom du fichier ne doit pas contenir de nom de région" -#: ../spell.c:7822 msgid "E754: Only up to 8 regions supported" msgstr "E754: 8 régions au maximum sont supportées" -#: ../spell.c:7846 #, c-format msgid "E755: Invalid region in %s" msgstr "E755: Région invalide dans %s" -#: ../spell.c:7907 msgid "Warning: both compounding and NOBREAK specified" msgstr "Alerte : la composition et NOBREAK sont tous les deux spécifiés" -#: ../spell.c:7920 #, c-format msgid "Writing spell file %s ..." msgstr "Écriture du fichier orthographique %s..." -#: ../spell.c:7925 msgid "Done!" msgstr "Terminé !" # DB - todo : perfectible. -#: ../spell.c:8034 #, c-format msgid "E765: 'spellfile' does not have %<PRId64> entries" msgstr "E765: 'spellfile' n'a pas %<PRId64> entrées" -#: ../spell.c:8074 #, fuzzy, c-format -msgid "Word '%.*s' removed from %s" -msgstr "Mot retiré de %s" +#~ msgid "Word '%.*s' removed from %s" +#~ msgstr "Mot retiré de %s" -#: ../spell.c:8117 #, fuzzy, c-format -msgid "Word '%.*s' added to %s" -msgstr "Mot ajouté dans %s" +#~ msgid "Word '%.*s' added to %s" +#~ msgstr "Mot ajouté dans %s" -#: ../spell.c:8381 msgid "E763: Word characters differ between spell files" msgstr "" "E763: Les caractères de mots diffèrent entre les fichiers orthographiques" -#: ../spell.c:8684 msgid "Sorry, no suggestions" msgstr "Désolé, aucune suggestion" -#: ../spell.c:8687 #, c-format msgid "Sorry, only %<PRId64> suggestions" msgstr "Désolé, seulement %<PRId64> suggestions" #. for when 'cmdheight' > 1 #. avoid more prompt -#: ../spell.c:8704 #, c-format msgid "Change \"%.*s\" to:" msgstr "Remplacer \"%.*s\" par :" # DB - todo : l'intérêt de traduire ce message m'échappe. -#: ../spell.c:8737 #, c-format msgid " < \"%.*s\"" msgstr " < \"%.*s\"" -#: ../spell.c:8882 msgid "E752: No previous spell replacement" msgstr "E752: Pas de suggestion orthographique précédente" -#: ../spell.c:8925 #, c-format msgid "E753: Not found: %s" msgstr "E753: Introuvable : %s" -#: ../spell.c:9276 #, c-format msgid "E778: This does not look like a .sug file: %s" msgstr "E778: %s ne semble pas être un fichier .sug" -#: ../spell.c:9282 #, c-format msgid "E779: Old .sug file, needs to be updated: %s" msgstr "E779: Fichier de suggestions obsolète, mise à jour nécessaire : %s" -#: ../spell.c:9286 #, c-format msgid "E780: .sug file is for newer version of Vim: %s" msgstr "E780: Fichier .sug prévu pour une version de Vim plus récente : %s" -#: ../spell.c:9295 #, c-format msgid "E781: .sug file doesn't match .spl file: %s" msgstr "E781: Le fichier .sug ne correspond pas au fichier .spl : %s" -#: ../spell.c:9305 #, c-format msgid "E782: error while reading .sug file: %s" msgstr "E782: Erreur lors de la lecture de fichier de suggestions : %s" #. This should have been checked when generating the .spl #. file. -#: ../spell.c:11575 msgid "E783: duplicate char in MAP entry" msgstr "E783: caractères dupliqué dans l'entrée MAP" -#: ../syntax.c:266 msgid "No Syntax items defined for this buffer" msgstr "Aucun élément de syntaxe défini pour ce tampon" -#: ../syntax.c:3083 ../syntax.c:3104 ../syntax.c:3127 #, c-format msgid "E390: Illegal argument: %s" msgstr "E390: Argument invalide : %s" -#: ../syntax.c:3299 #, c-format msgid "E391: No such syntax cluster: %s" msgstr "E391: Aucune grappe de syntaxe %s" -#: ../syntax.c:3433 msgid "syncing on C-style comments" msgstr "synchronisation sur les commentaires de type C" -#: ../syntax.c:3439 msgid "no syncing" msgstr "Aucune synchronisation" # DB - Les deux messages qui suivent vont ensemble. -#: ../syntax.c:3441 msgid "syncing starts " msgstr "La synchronisation débute " -#: ../syntax.c:3443 ../syntax.c:3506 msgid " lines before top line" msgstr " lignes avant la ligne du haut" -#: ../syntax.c:3448 msgid "" "\n" "--- Syntax sync items ---" @@ -5954,7 +4750,6 @@ msgstr "" "\n" "--- Éléments de synchronisation syntaxique ---" -#: ../syntax.c:3452 msgid "" "\n" "syncing on items" @@ -5962,7 +4757,6 @@ msgstr "" "\n" "synchronisation sur éléments" -#: ../syntax.c:3457 msgid "" "\n" "--- Syntax items ---" @@ -5970,275 +4764,216 @@ msgstr "" "\n" "--- Éléments de syntaxe ---" -#: ../syntax.c:3475 #, c-format msgid "E392: No such syntax cluster: %s" msgstr "E392: Aucune grappe de syntaxe %s" -#: ../syntax.c:3497 msgid "minimal " msgstr "minimum " -#: ../syntax.c:3503 msgid "maximal " msgstr "maximum " # DB - todo -#: ../syntax.c:3513 msgid "; match " msgstr "; correspond avec " # DB - todo -#: ../syntax.c:3515 msgid " line breaks" msgstr " coupures de ligne" -#: ../syntax.c:4076 msgid "E395: contains argument not accepted here" msgstr "E395: L'argument « contains » n'est pas accepté ici" -#: ../syntax.c:4096 msgid "E844: invalid cchar value" msgstr "E844: valeur de cchar invalide" -#: ../syntax.c:4107 msgid "E393: group[t]here not accepted here" msgstr "E393: L'argument « group[t]here » n'est pas accepté ici" -#: ../syntax.c:4126 #, c-format msgid "E394: Didn't find region item for %s" msgstr "E394: Aucun élément de type région trouvé pour %s" -#: ../syntax.c:4188 msgid "E397: Filename required" msgstr "E397: Nom de fichier requis" -#: ../syntax.c:4221 msgid "E847: Too many syntax includes" msgstr "E847: Trop d'inclusions de syntaxe" -#: ../syntax.c:4303 #, c-format msgid "E789: Missing ']': %s" msgstr "E789: ']' manquant : %s" -#: ../syntax.c:4531 #, c-format msgid "E398: Missing '=': %s" msgstr "E398: '=' manquant : %s" -#: ../syntax.c:4666 #, c-format msgid "E399: Not enough arguments: syntax region %s" msgstr "E399: Pas assez d'arguments : syntax region %s" -#: ../syntax.c:4870 msgid "E848: Too many syntax clusters" msgstr "E848: Trop de grappes de syntaxe" -#: ../syntax.c:4954 msgid "E400: No cluster specified" msgstr "E400: Aucune grappe spécifiée" #. end delimiter not found -#: ../syntax.c:4986 #, c-format msgid "E401: Pattern delimiter not found: %s" msgstr "E401: Délimiteur de motif introuvable : %s" -#: ../syntax.c:5049 #, c-format msgid "E402: Garbage after pattern: %s" msgstr "E402: caractères en trop après le motif : %s" -#: ../syntax.c:5120 msgid "E403: syntax sync: line continuations pattern specified twice" msgstr "" "E403: synchro syntax : motif de continuation de ligne présent deux fois" -#: ../syntax.c:5169 #, c-format msgid "E404: Illegal arguments: %s" msgstr "E404: Arguments invalides : %s" -#: ../syntax.c:5217 #, c-format msgid "E405: Missing equal sign: %s" msgstr "E405: '=' manquant : %s" -#: ../syntax.c:5222 #, c-format msgid "E406: Empty argument: %s" msgstr "E406: Argument vide : %s" -#: ../syntax.c:5240 #, c-format msgid "E407: %s not allowed here" msgstr "E407: %s n'est pas autorisé ici" -#: ../syntax.c:5246 #, c-format msgid "E408: %s must be first in contains list" msgstr "E408: %s doit être le premier élément d'une liste « contains »" -#: ../syntax.c:5304 #, c-format msgid "E409: Unknown group name: %s" msgstr "E409: Nom de groupe inconnu : %s" -#: ../syntax.c:5512 #, c-format msgid "E410: Invalid :syntax subcommand: %s" msgstr "E410: Sous-commande de :syntax invalide : %s" -#: ../syntax.c:5854 -msgid "" -" TOTAL COUNT MATCH SLOWEST AVERAGE NAME PATTERN" -msgstr "" +#~ msgid "" +#~ " TOTAL COUNT MATCH SLOWEST AVERAGE NAME PATTERN" +#~ msgstr "" -#: ../syntax.c:6146 msgid "E679: recursive loop loading syncolor.vim" msgstr "E679: boucle récursive lors du chargement de syncolor.vim" -#: ../syntax.c:6256 #, c-format msgid "E411: highlight group not found: %s" msgstr "E411: groupe de surbrillance introuvable : %s" -#: ../syntax.c:6278 #, c-format msgid "E412: Not enough arguments: \":highlight link %s\"" msgstr "E412: Trop peu d'arguments : \":highlight link %s\"" -#: ../syntax.c:6284 #, c-format msgid "E413: Too many arguments: \":highlight link %s\"" msgstr "E413: Trop d'arguments : \":highlight link %s\"" -#: ../syntax.c:6302 msgid "E414: group has settings, highlight link ignored" msgstr "E414: le groupe a déjà des attributs, lien de surbrillance ignoré" -#: ../syntax.c:6367 #, c-format msgid "E415: unexpected equal sign: %s" msgstr "E415: signe égal inattendu : %s" -#: ../syntax.c:6395 #, c-format msgid "E416: missing equal sign: %s" msgstr "E416: '=' manquant : %s" -#: ../syntax.c:6418 #, c-format msgid "E417: missing argument: %s" msgstr "E417: argument manquant : %s" -#: ../syntax.c:6446 #, c-format msgid "E418: Illegal value: %s" msgstr "E418: Valeur invalide : %s" -#: ../syntax.c:6496 msgid "E419: FG color unknown" msgstr "E419: Couleur de premier plan inconnue" -#: ../syntax.c:6504 msgid "E420: BG color unknown" msgstr "E420: Couleur d'arrière-plan inconnue" -#: ../syntax.c:6564 #, c-format msgid "E421: Color name or number not recognized: %s" msgstr "E421: Nom ou numéro de couleur non reconnu : %s" -#: ../syntax.c:6714 #, c-format msgid "E422: terminal code too long: %s" msgstr "E422: le code de terminal est trop long : %s" -#: ../syntax.c:6753 #, c-format msgid "E423: Illegal argument: %s" msgstr "E423: Argument invalide : %s" -#: ../syntax.c:6925 msgid "E424: Too many different highlighting attributes in use" msgstr "" "E424: Trop d'attributs de surbrillance différents en cours d'utilisation" -#: ../syntax.c:7427 msgid "E669: Unprintable character in group name" msgstr "E669: Caractère non-imprimable dans un nom de groupe" -#: ../syntax.c:7434 msgid "W18: Invalid character in group name" msgstr "W18: Caractère invalide dans un nom de groupe" -#: ../syntax.c:7448 msgid "E849: Too many highlight and syntax groups" msgstr "E849: Trop de groupes de surbrillance et de syntaxe" -#: ../tag.c:104 msgid "E555: at bottom of tag stack" msgstr "E555: En bas de la pile de marqueurs" -#: ../tag.c:105 msgid "E556: at top of tag stack" msgstr "E556: Au sommet de la pile de marqueurs" -#: ../tag.c:380 msgid "E425: Cannot go before first matching tag" msgstr "E425: Impossible d'aller avant le premier marqueur correspondant" -#: ../tag.c:504 #, c-format msgid "E426: tag not found: %s" msgstr "E426: Marqueur introuvable : %s" -#: ../tag.c:528 msgid " # pri kind tag" msgstr " # pri type marqueur" -#: ../tag.c:531 msgid "file\n" msgstr "fichier\n" -#: ../tag.c:829 msgid "E427: There is only one matching tag" msgstr "E427: Il n'y a qu'un marqueur correspondant" -#: ../tag.c:831 msgid "E428: Cannot go beyond last matching tag" msgstr "E428: Impossible d'aller au-delà du dernier marqueur correspondant" -#: ../tag.c:850 #, c-format msgid "File \"%s\" does not exist" msgstr "Le fichier \"%s\" n'existe pas" #. Give an indication of the number of matching tags -#: ../tag.c:859 #, c-format msgid "tag %d of %d%s" msgstr "marqueur %d sur %d%s" -#: ../tag.c:862 msgid " or more" msgstr " ou plus" -#: ../tag.c:864 msgid " Using tag with different case!" msgstr " Utilisation d'un marqueur avec une casse différente !" -#: ../tag.c:909 #, c-format msgid "E429: File \"%s\" does not exist" msgstr "E429: Le fichier \"%s\" n'existe pas" #. Highlight title -#: ../tag.c:960 msgid "" "\n" " # TO tag FROM line in file/text" @@ -6246,80 +4981,63 @@ msgstr "" "\n" " # VERS marqueur DE ligne dans le fichier/texte" -#: ../tag.c:1303 #, c-format msgid "Searching tags file %s" msgstr "Examen du fichier de marqueurs %s" -#: ../tag.c:1545 msgid "Ignoring long line in tags file" msgstr "Ignore longue ligne dans le fichier de marqueurs" -#: ../tag.c:1915 #, c-format msgid "E431: Format error in tags file \"%s\"" msgstr "E431: Erreur de format dans le fichier de marqueurs \"%s\"" -#: ../tag.c:1917 #, c-format msgid "Before byte %<PRId64>" msgstr "Avant l'octet %<PRId64>" -#: ../tag.c:1929 #, c-format msgid "E432: Tags file not sorted: %s" msgstr "E432: Le fichier de marqueurs %s n'est pas ordonné" #. never opened any tags file -#: ../tag.c:1960 msgid "E433: No tags file" msgstr "E433: Aucun fichier de marqueurs" -#: ../tag.c:2536 msgid "E434: Can't find tag pattern" msgstr "E434: Le motif de marqueur est introuvable" -#: ../tag.c:2544 msgid "E435: Couldn't find tag, just guessing!" msgstr "E435: Marqueur introuvable, tentative pour deviner !" -#: ../tag.c:2797 #, c-format msgid "Duplicate field name: %s" msgstr "Nom de champ dupliqué : %s" -#: ../term.c:1442 msgid "' not known. Available builtin terminals are:" msgstr "' inconnu. Les terminaux intégrés sont :" -#: ../term.c:1463 msgid "defaulting to '" msgstr "utilisation par défaut de '" -#: ../term.c:1731 msgid "E557: Cannot open termcap file" msgstr "E557: Impossible d'ouvrir le fichier termcap" -#: ../term.c:1735 msgid "E558: Terminal entry not found in terminfo" msgstr "E558: La description du terminal est introuvable dans terminfo" -#: ../term.c:1737 msgid "E559: Terminal entry not found in termcap" msgstr "E559: La description du terminal est introuvable dans termcap" -#: ../term.c:1878 #, c-format msgid "E436: No \"%s\" entry in termcap" msgstr "E436: Aucune entrée \"%s\" dans termcap" # DB - todo : Comment améliorer ? -#: ../term.c:2249 msgid "E437: terminal capability \"cm\" required" msgstr "E437: capacité de terminal \"cm\" requise" #. Highlight title -#: ../term.c:4376 msgid "" "\n" "--- Terminal keys ---" @@ -6327,174 +5045,137 @@ msgstr "" "\n" "--- Touches du terminal ---" -#: ../ui.c:481 msgid "Vim: Error reading input, exiting...\n" msgstr "Vim : Erreur lors de la lecture de l'entrée, sortie...\n" #. This happens when the FileChangedRO autocommand changes the #. * file in a way it becomes shorter. -#: ../undo.c:379 #, fuzzy -msgid "E881: Line count changed unexpectedly" -msgstr "E834: Le nombre de lignes a été changé inopinément" +#~ msgid "E881: Line count changed unexpectedly" +#~ msgstr "E834: Le nombre de lignes a été changé inopinément" -#: ../undo.c:627 #, c-format msgid "E828: Cannot open undo file for writing: %s" msgstr "E828: Impossible d'ouvrir le fichier d'annulations en écriture : %s" -#: ../undo.c:717 #, c-format msgid "E825: Corrupted undo file (%s): %s" msgstr "E825: Fichier d'annulations corrompu (%s) : %s" -#: ../undo.c:1039 msgid "Cannot write undo file in any directory in 'undodir'" msgstr "" "Impossible d'écrire le fichier d'annulations dans n'importe quel répertoire " "de 'undodir'" -#: ../undo.c:1074 #, c-format msgid "Will not overwrite with undo file, cannot read: %s" msgstr "Le fichier d'annulations ne sera pas écrasé, impossible de lire : %s" -#: ../undo.c:1092 #, c-format msgid "Will not overwrite, this is not an undo file: %s" msgstr "Fichier ne sera pas écrasé, ce n'est pas un fichier d'annulations : %s" -#: ../undo.c:1108 msgid "Skipping undo file write, nothing to undo" msgstr "Le fichier d'annulations n'est pas écrit, rien à annuler" -#: ../undo.c:1121 #, c-format msgid "Writing undo file: %s" msgstr "Écriture du fichier d'annulations : %s" -#: ../undo.c:1213 #, c-format msgid "E829: write error in undo file: %s" msgstr "E829: Erreur d'écriture dans le fichier d'annulations : %s" -#: ../undo.c:1280 #, c-format msgid "Not reading undo file, owner differs: %s" msgstr "Le fichier d'annulations n'est pas lu, propriétaire différent : %s" -#: ../undo.c:1292 #, c-format msgid "Reading undo file: %s" msgstr "Lecture du fichier d'annulations : %s..." -#: ../undo.c:1299 #, c-format msgid "E822: Cannot open undo file for reading: %s" msgstr "E822: Impossible d'ouvrir le fichier d'annulations en lecture : %s" -#: ../undo.c:1308 #, c-format msgid "E823: Not an undo file: %s" msgstr "E823: Ce n'est pas un fichier d'annulations : %s" -#: ../undo.c:1313 #, c-format msgid "E824: Incompatible undo file: %s" msgstr "E824: Fichier d'annulations incompatible : %s" -#: ../undo.c:1328 msgid "File contents changed, cannot use undo info" msgstr "" "Le contenu du fichier a changé, impossible d'utiliser les informations " "d'annulation" -#: ../undo.c:1497 #, c-format msgid "Finished reading undo file %s" msgstr "Fin de lecture du fichier d'annulations %s" -#: ../undo.c:1586 ../undo.c:1812 msgid "Already at oldest change" msgstr "Déjà à la modification la plus ancienne" -#: ../undo.c:1597 ../undo.c:1814 msgid "Already at newest change" msgstr "Déjà à la modification la plus récente" -#: ../undo.c:1806 #, c-format msgid "E830: Undo number %<PRId64> not found" msgstr "E830: Annulation n° %<PRId64> introuvable" -#: ../undo.c:1979 msgid "E438: u_undo: line numbers wrong" msgstr "E438: u_undo : numéros de ligne erronés" -#: ../undo.c:2183 msgid "more line" msgstr "ligne en plus" -#: ../undo.c:2185 msgid "more lines" msgstr "lignes en plus" -#: ../undo.c:2187 msgid "line less" msgstr "ligne en moins" -#: ../undo.c:2189 msgid "fewer lines" msgstr "lignes en moins" -#: ../undo.c:2193 msgid "change" msgstr "modification" -#: ../undo.c:2195 msgid "changes" msgstr "modifications" -#: ../undo.c:2225 #, c-format msgid "%<PRId64> %s; %s #%<PRId64> %s" msgstr "%<PRId64> %s ; %s #%<PRId64> ; %s" -#: ../undo.c:2228 msgid "before" msgstr "avant" -#: ../undo.c:2228 msgid "after" msgstr "après" -#: ../undo.c:2325 msgid "Nothing to undo" msgstr "Rien à annuler" # DB - Les deux premières colonnes sont alignées à droite. -#: ../undo.c:2330 msgid "number changes when saved" msgstr "numéro modif. instant enregistré" -#: ../undo.c:2360 #, c-format msgid "%<PRId64> seconds ago" msgstr "il y a %<PRId64> secondes" -#: ../undo.c:2372 msgid "E790: undojoin is not allowed after undo" msgstr "E790: undojoin n'est pas autorisé après une annulation" -#: ../undo.c:2466 msgid "E439: undo list corrupt" msgstr "E439: la liste d'annulation est corrompue" -#: ../undo.c:2495 msgid "E440: undo line missing" msgstr "E440: ligne d'annulation manquante" -#: ../version.c:600 msgid "" "\n" "Included patches: " @@ -6502,7 +5183,6 @@ msgstr "" "\n" "Rustines incluses : " -#: ../version.c:627 msgid "" "\n" "Extra patches: " @@ -6510,11 +5190,9 @@ msgstr "" "\n" "Rustines extra : " -#: ../version.c:639 ../version.c:864 msgid "Modified by " msgstr "Modifié par " -#: ../version.c:646 msgid "" "\n" "Compiled " @@ -6522,11 +5200,9 @@ msgstr "" "\n" "Compilé " -#: ../version.c:649 msgid "by " msgstr "par " -#: ../version.c:660 msgid "" "\n" "Huge version " @@ -6534,164 +5210,125 @@ msgstr "" "\n" "Énorme version " -#: ../version.c:661 msgid "without GUI." msgstr "sans interface graphique." -#: ../version.c:662 msgid " Features included (+) or not (-):\n" msgstr " Fonctionnalités incluses (+) ou non (-) :\n" -#: ../version.c:667 msgid " system vimrc file: \"" msgstr " fichier vimrc système : \"" -#: ../version.c:672 msgid " user vimrc file: \"" msgstr " fichier vimrc utilisateur : \"" -#: ../version.c:677 msgid " 2nd user vimrc file: \"" msgstr " 2me fichier vimrc utilisateur : \"" -#: ../version.c:682 msgid " 3rd user vimrc file: \"" msgstr " 3me fichier vimrc utilisateur : \"" -#: ../version.c:687 msgid " user exrc file: \"" msgstr " fichier exrc utilisateur : \"" -#: ../version.c:692 msgid " 2nd user exrc file: \"" msgstr " 2me fichier exrc utilisateur : \"" -#: ../version.c:699 msgid " fall-back for $VIM: \"" msgstr " $VIM par défaut : \"" -#: ../version.c:705 msgid " f-b for $VIMRUNTIME: \"" msgstr " $VIMRUNTIME par défaut : \"" -#: ../version.c:709 msgid "Compilation: " msgstr "Compilation : " -#: ../version.c:712 msgid "Linking: " msgstr "Édition de liens : " -#: ../version.c:717 msgid " DEBUG BUILD" msgstr " VERSION DE DÉBOGAGE" -#: ../version.c:767 msgid "VIM - Vi IMproved" msgstr "VIM - Vi Amélioré" -#: ../version.c:769 msgid "version " msgstr "version " -#: ../version.c:770 msgid "by Bram Moolenaar et al." msgstr "par Bram Moolenaar et al." -#: ../version.c:774 msgid "Vim is open source and freely distributable" msgstr "Vim est un logiciel libre" -#: ../version.c:776 msgid "Help poor children in Uganda!" msgstr "Aidez les enfants pauvres d'Ouganda !" -#: ../version.c:777 msgid "type :help iccf<Enter> for information " msgstr "tapez :help iccf<Entrée> pour plus d'informations " -#: ../version.c:779 msgid "type :q<Enter> to exit " msgstr "tapez :q<Entrée> pour sortir du programme " -#: ../version.c:780 msgid "type :help<Enter> or <F1> for on-line help" msgstr "tapez :help<Entrée> ou <F1> pour accéder à l'aide en ligne " -#: ../version.c:781 msgid "type :help version7<Enter> for version info" msgstr "tapez :help version7<Entrée> pour lire les notes de mise à jour" # DB - Pour les trois messages qui suivent : # :set cp # :intro -#: ../version.c:784 msgid "Running in Vi compatible mode" msgstr "Compatibilité avec Vi activée" -#: ../version.c:785 msgid "type :set nocp<Enter> for Vim defaults" msgstr "tapez :set nocp<Entrée> pour la désactiver" -#: ../version.c:786 msgid "type :help cp-default<Enter> for info on this" msgstr "tapez :help cp-default<Entrée> pour plus d'info" -#: ../version.c:827 msgid "Sponsor Vim development!" msgstr "Sponsorisez le développement de Vim !" -#: ../version.c:828 msgid "Become a registered Vim user!" msgstr "Devenez un utilisateur de Vim enregistré !" -#: ../version.c:831 msgid "type :help sponsor<Enter> for information " msgstr "tapez :help sponsor<Entrée> pour plus d'informations " -#: ../version.c:832 msgid "type :help register<Enter> for information " msgstr "tapez :help register<Entrée> pour plus d'informations " -#: ../version.c:834 msgid "menu Help->Sponsor/Register for information " msgstr "menu Aide->Sponsor/Enregistrement pour plus d'info" -#: ../window.c:119 msgid "Already only one window" msgstr "Il n'y a déjà plus qu'une fenêtre" -#: ../window.c:224 msgid "E441: There is no preview window" msgstr "E441: Il n'y a pas de fenêtre de prévisualisation" -#: ../window.c:559 msgid "E442: Can't split topleft and botright at the same time" msgstr "E442: Impossible de partager topleft et botright en même temps" -#: ../window.c:1228 msgid "E443: Cannot rotate when another window is split" msgstr "E443: Rotation impossible quand une autre fenêtre est partagée" -#: ../window.c:1803 msgid "E444: Cannot close last window" msgstr "E444: Impossible de fermer la dernière fenêtre" -#: ../window.c:1810 msgid "E813: Cannot close autocmd window" msgstr "E813: Impossible de fermer la fenêtre des autocommandes" -#: ../window.c:1814 msgid "E814: Cannot close window, only autocmd window would remain" msgstr "" "E814: Impossible de fermer la fenêtre, seule la fenêtre des autocommandes " "resterait" -#: ../window.c:2717 msgid "E445: Other window contains changes" msgstr "E445: Les modifications de l'autre fenêtre n'ont pas été enregistrées" -#: ../window.c:4805 msgid "E446: No file name under cursor" msgstr "E446: Aucun nom de fichier sous le curseur" diff --git a/src/nvim/po/it.po b/src/nvim/po/it.po index 6c62262675..b8b119ade6 100644 --- a/src/nvim/po/it.po +++ b/src/nvim/po/it.po @@ -2541,7 +2541,7 @@ msgstr "E490: Non trovo alcuna piegatura" #: ../fold.c:544 msgid "E350: Cannot create fold with current 'foldmethod'" -msgstr "E350: Non posso create piegatura con il 'foldmethod' in uso" +msgstr "E350: Non posso creare piegatura con il 'foldmethod' in uso" #: ../fold.c:546 msgid "E351: Cannot delete fold with current 'foldmethod'" diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index 19287ecffb..cebff5e8b7 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -2126,7 +2126,7 @@ static void qf_msg(qf_info_T *qi, int which, char *lead) memset(buf + len, ' ', 34 - len); buf[34] = NUL; } - vim_strcat(buf, (char_u *)title, IOSIZE); + xstrlcat((char *)buf, title, IOSIZE); } trunc_string(buf, buf, (int)Columns - 1, IOSIZE); msg(buf); diff --git a/src/nvim/shada.c b/src/nvim/shada.c index 8cf5976e8b..197b029591 100644 --- a/src/nvim/shada.c +++ b/src/nvim/shada.c @@ -1986,7 +1986,7 @@ static ShaDaWriteResult shada_pack_encoded_entry(msgpack_packer *const packer, entry.data.data.reg.contents = xmemdup(entry.data.data.reg.contents, (entry.data.data.reg.contents_size - * sizeof(entry.data.data.reg.contents))); + * sizeof(entry.data.data.reg.contents[0]))); for (size_t i = 0; i < entry.data.data.reg.contents_size; i++) { if (i >= first_non_ascii) { entry.data.data.reg.contents[i] = get_converted_string( diff --git a/src/nvim/strings.c b/src/nvim/strings.c index c1800a0639..b38d4f8a58 100644 --- a/src/nvim/strings.c +++ b/src/nvim/strings.c @@ -51,15 +51,14 @@ char_u *vim_strsave(const char_u *string) return (char_u *)xstrdup((char *)string); } -/* - * Copy up to "len" bytes of "string" into newly allocated memory and - * terminate with a NUL. - * The allocated memory always has size "len + 1", also when "string" is - * shorter. - */ +/// Copy up to `len` bytes of `string` into newly allocated memory and +/// terminate with a NUL. The allocated memory always has size `len + 1`, even +/// when `string` is shorter. char_u *vim_strnsave(const char_u *string, size_t len) FUNC_ATTR_NONNULL_RET FUNC_ATTR_MALLOC FUNC_ATTR_NONNULL_ALL { + // strncpy is intentional: some parts of Vim use `string` shorter than `len` + // and expect the remainder to be zeroed out. return (char_u *)strncpy(xmallocz(len), (char *)string, len); } @@ -344,24 +343,6 @@ void del_trailing_spaces(char_u *ptr) *q = NUL; } -/* - * Like strcat(), but make sure the result fits in "tosize" bytes and is - * always NUL terminated. - */ -void vim_strcat(char_u *restrict to, const char_u *restrict from, - size_t tosize) - FUNC_ATTR_NONNULL_ALL -{ - size_t tolen = STRLEN(to); - size_t fromlen = STRLEN(from); - - if (tolen + fromlen + 1 > tosize) { - memcpy(to + tolen, from, tosize - tolen - 1); - to[tosize - 1] = NUL; - } else - STRCPY(to + tolen, from); -} - #if (!defined(HAVE_STRCASECMP) && !defined(HAVE_STRICMP)) /* * Compare two strings, ignoring case, using current locale. diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index aded08faee..37e5542dad 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -3377,7 +3377,7 @@ static void syn_cmd_onoff(exarg_T *eap, char *name) eap->nextcmd = check_nextcmd(eap->arg); if (!eap->skip) { char buf[100]; - strncpy(buf, "so ", 4); + memcpy(buf, "so ", 4); vim_snprintf(buf + 3, sizeof(buf) - 3, SYNTAX_FNAME, name); do_cmdline_cmd(buf); } @@ -6902,8 +6902,8 @@ static int highlight_list_arg(int id, int didh, int type, int iarg, char_u *sarg for (i = 0; hl_attr_table[i] != 0; ++i) { if (iarg & hl_attr_table[i]) { if (buf[0] != NUL) - vim_strcat(buf, (char_u *)",", 100); - vim_strcat(buf, (char_u *)hl_name_table[i], 100); + xstrlcat((char *)buf, ",", 100); + xstrlcat((char *)buf, hl_name_table[i], 100); iarg &= ~hl_attr_table[i]; /* don't want "inverse" */ } } diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c index 342c68818d..ed82e23be2 100644 --- a/src/nvim/tui/tui.c +++ b/src/nvim/tui/tui.c @@ -844,7 +844,16 @@ static void fix_terminfo(TUIData *data) } if (STARTS_WITH(term, "xterm") || STARTS_WITH(term, "rxvt")) { - unibi_set_if_empty(ut, unibi_cursor_normal, "\x1b[?25h"); + const char *normal = unibi_get_str(ut, unibi_cursor_normal); + if (!normal) { + unibi_set_str(ut, unibi_cursor_normal, "\x1b[?25h"); + } else if (STARTS_WITH(normal, "\x1b[?12l")) { + // terminfo typically includes DECRST 12 as part of setting up the normal + // cursor, which interferes with the user's control via + // NVIM_TUI_ENABLE_CURSOR_SHAPE. When DECRST 12 is present, skip over + // it, but honor the rest of the TI setting. + unibi_set_str(ut, unibi_cursor_normal, normal + strlen("\x1b[?12l")); + } unibi_set_if_empty(ut, unibi_cursor_invisible, "\x1b[?25l"); unibi_set_if_empty(ut, unibi_flash_screen, "\x1b[?5h$<100/>\x1b[?5l"); unibi_set_if_empty(ut, unibi_exit_attribute_mode, "\x1b(B\x1b[m"); diff --git a/src/nvim/undo.c b/src/nvim/undo.c index f693f20f2d..4b267a1627 100644 --- a/src/nvim/undo.c +++ b/src/nvim/undo.c @@ -1710,7 +1710,8 @@ bool u_undo_and_forget(int count) if (curbuf->b_u_curhead) { to_forget->uh_alt_next.ptr = NULL; curbuf->b_u_curhead->uh_alt_prev.ptr = to_forget->uh_alt_prev.ptr; - curbuf->b_u_seq_cur = curbuf->b_u_curhead->uh_seq-1; + curbuf->b_u_seq_cur = curbuf->b_u_curhead->uh_next.ptr ? + curbuf->b_u_curhead->uh_next.ptr->uh_seq : 0; } else if (curbuf->b_u_newhead) { curbuf->b_u_seq_cur = curbuf->b_u_newhead->uh_seq; } @@ -2321,7 +2322,8 @@ static void u_undoredo(int undo) if (undo) /* We are below the previous undo. However, to make ":earlier 1s" * work we compute this as being just above the just undone change. */ - --curbuf->b_u_seq_cur; + curbuf->b_u_seq_cur = curhead->uh_next.ptr ? + curhead->uh_next.ptr->uh_seq : 0; /* Remember where we are for ":earlier 1f" and ":later 1f". */ if (curhead->uh_save_nr != 0) { diff --git a/src/nvim/version.c b/src/nvim/version.c index 9cf509ca23..a12621d06f 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -1537,7 +1537,7 @@ static int included_patches[] = { // 907 NA // 906 NA // 905 NA - // 904 NA + 904, 903, // 902 NA 901, diff --git a/src/nvim/vim.h b/src/nvim/vim.h index 8271abda8d..458d23fcad 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -269,6 +269,7 @@ enum { #define STRCAT(d, s) strcat((char *)(d), (char *)(s)) #define STRNCAT(d, s, n) strncat((char *)(d), (char *)(s), (size_t)(n)) +#define STRLCAT(d, s, n) xstrlcat((char *)(d), (char *)(s), (size_t)(n)) # define vim_strpbrk(s, cs) (char_u *)strpbrk((char *)(s), (char *)(cs)) diff --git a/src/nvim/window.c b/src/nvim/window.c index 89228e1b0f..801969a594 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -129,9 +129,10 @@ newwindow: vim_snprintf(cbuf, sizeof(cbuf) - 5, "%" PRId64, (int64_t)Prenum); else cbuf[0] = NUL; - if (nchar == 'v' || nchar == Ctrl_V) - strcat(cbuf, "v"); - strcat(cbuf, "new"); + if (nchar == 'v' || nchar == Ctrl_V) { + xstrlcat(cbuf, "v", sizeof(cbuf)); + } + xstrlcat(cbuf, "new", sizeof(cbuf)); do_cmdline_cmd(cbuf); break; diff --git a/test/functional/clipboard/clipboard_provider_spec.lua b/test/functional/clipboard/clipboard_provider_spec.lua index 6424b39e13..2b26697b97 100644 --- a/test/functional/clipboard/clipboard_provider_spec.lua +++ b/test/functional/clipboard/clipboard_provider_spec.lua @@ -5,8 +5,6 @@ local Screen = require('test.functional.ui.screen') local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert local execute, expect, eq, eval = helpers.execute, helpers.expect, helpers.eq, helpers.eval -if helpers.pending_win32(pending) then return end - local function basic_register_test(noblock) insert("some words") @@ -440,6 +438,8 @@ describe('clipboard usage', function() end) it('handles middleclick correctly', function() + execute('set mouse=a') + local screen = Screen.new(30, 5) screen:attach() insert([[ diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua index 7de1d0f2c6..880cb6546c 100644 --- a/test/functional/helpers.lua +++ b/test/functional/helpers.lua @@ -195,7 +195,7 @@ local function dedent(str) indent = line_indent end end - if #indent == 0 then + if indent == nil or #indent == 0 then -- no minimum common indent return str end diff --git a/test/functional/normal/undo_spec.lua b/test/functional/normal/undo_spec.lua new file mode 100644 index 0000000000..55429f2e1e --- /dev/null +++ b/test/functional/normal/undo_spec.lua @@ -0,0 +1,61 @@ +local helpers = require('test.functional.helpers')(after_each) + +local clear = helpers.clear +local execute = helpers.execute +local expect = helpers.expect +local feed = helpers.feed +local insert = helpers.insert + +describe('u CTRL-R g- g+', function() + before_each(clear) + + local function create_history(num_steps) + if num_steps == 0 then return end + insert('1') + if num_steps == 1 then return end + feed('o2<esc>') + feed('o3<esc>') + feed('u') + if num_steps == 2 then return end + feed('o4<esc>') + if num_steps == 3 then return end + feed('u') + end + + local function undo_and_redo(hist_pos, undo, redo, expect_str) + execute('enew!') + create_history(hist_pos) + local cur_contents = helpers.curbuf_contents() + feed(undo) + expect(expect_str) + feed(redo) + expect(cur_contents) + end + + -- TODO Look for message saying 'Already at oldest change' + it('does nothing when no changes have happened', function() + undo_and_redo(0, 'u', '<C-r>', '') + undo_and_redo(0, 'g-', 'g+', '') + end) + it('undoes a change when at a leaf', function() + undo_and_redo(1, 'u', '<C-r>', '') + undo_and_redo(1, 'g-', 'g+', '') + end) + it('undoes a change when in a non-leaf', function() + undo_and_redo(2, 'u', '<C-r>', '1') + undo_and_redo(2, 'g-', 'g+', '1') + end) + it('undoes properly around a branch point', function() + undo_and_redo(3, 'u', '<C-r>', [[ + 1 + 2]]) + undo_and_redo(3, 'g-', 'g+', [[ + 1 + 2 + 3]]) + end) + it('can find the previous sequence after undoing to a branch', function() + undo_and_redo(4, 'u', '<C-r>', '1') + undo_and_redo(4, 'g-', 'g+', '1') + end) +end) diff --git a/test/functional/terminal/ex_terminal_spec.lua b/test/functional/terminal/ex_terminal_spec.lua index 4247be0417..7c391db18c 100644 --- a/test/functional/terminal/ex_terminal_spec.lua +++ b/test/functional/terminal/ex_terminal_spec.lua @@ -112,4 +112,40 @@ describe(':terminal (with fake shell)', function() eq(2, eval("1+1")) -- Still alive? end) + it('works with findfile()', function() + execute('terminal') + eq('term://', string.match(eval('bufname("%")'), "^term://")) + eq('scripts/shadacat.py', eval('findfile("scripts/shadacat.py", ".")')) + end) + + it('works with :find', function() + terminal_with_fake_shell() + wait() + screen:expect([[ + ready $ | + [Process exited 0] | + | + -- TERMINAL -- | + ]]) + eq('term://', string.match(eval('bufname("%")'), "^term://")) + helpers.feed([[<C-\><C-N>]]) + execute([[find */shadacat.py]]) + eq('scripts/shadacat.py', eval('bufname("%")')) + end) + + it('works with gf', function() + terminal_with_fake_shell([[echo "scripts/shadacat.py"]]) + wait() + screen:expect([[ + ready $ echo "scripts/shadacat.py" | + | + [Process exited 0] | + -- TERMINAL -- | + ]]) + helpers.feed([[<C-\><C-N>]]) + eq('term://', string.match(eval('bufname("%")'), "^term://")) + helpers.feed([[ggf"lgf]]) + eq('scripts/shadacat.py', eval('bufname("%")')) + end) + end) diff --git a/test/functional/ui/inccommand_spec.lua b/test/functional/ui/inccommand_spec.lua index 41ebfd2334..6da22b6a3a 100644 --- a/test/functional/ui/inccommand_spec.lua +++ b/test/functional/ui/inccommand_spec.lua @@ -352,6 +352,14 @@ describe(":substitute, 'inccommand' preserves undo", function() feed("2u") feed(substring .. "<esc>") + expect([[ + 1]]) + feed("g-") + expect([[ + ]]) + feed("g+") + expect([[ + 1]]) feed("<c-r>") expect([[ 1 @@ -374,9 +382,7 @@ describe(":substitute, 'inccommand' preserves undo", function() 2]]) end - -- TODO(vim): This does not work, even in Vim. - -- Waiting for fix (perhaps from upstream). - pending("at a non-leaf of the undo tree", function() + it("at a non-leaf of the undo tree", function() for _, case in pairs(cases) do for _, str in pairs(substrings) do for _, redoable in pairs({true}) do diff --git a/test/functional/ui/output_spec.lua b/test/functional/ui/output_spec.lua index 47b2516188..33086a61b1 100644 --- a/test/functional/ui/output_spec.lua +++ b/test/functional/ui/output_spec.lua @@ -41,6 +41,11 @@ describe("shell command :!", function() end) it("throttles shell-command output greater than ~10KB", function() + if os.getenv("TRAVIS") and session.os_name() == "osx" then + pending("[Unreliable on Travis macOS.]", function() end) + return + end + screen.timeout = 20000 -- Avoid false failure on slow systems. child_session.feed_data( ":!for i in $(seq 2 3000); do echo XXXXXXXXXX $i; done\n") diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua index bb82f11a58..54f43387dc 100644 --- a/test/functional/ui/screen.lua +++ b/test/functional/ui/screen.lua @@ -613,7 +613,7 @@ function Screen:_pprint_attrs(attrs) return table.concat(items, ", ") end -function backward_find_meaningful(tbl, from) -- luacheck: ignore +local function backward_find_meaningful(tbl, from) -- luacheck: no unused for i = from or #tbl, 1, -1 do if tbl[i] ~= ' ' then return i + 1 diff --git a/test/unit/memory_spec.lua b/test/unit/memory_spec.lua new file mode 100644 index 0000000000..73a32724ef --- /dev/null +++ b/test/unit/memory_spec.lua @@ -0,0 +1,51 @@ +local helpers = require("test.unit.helpers") + +local cimport = helpers.cimport +local cstr = helpers.cstr +local eq = helpers.eq +local ffi = helpers.ffi +local to_cstr = helpers.to_cstr + +local cimp = cimport('stdlib.h', './src/nvim/memory.h') + +describe('xstrlcat()', function() + local function test_xstrlcat(dst, src, dsize) + assert.is_true(dsize >= 1 + string.len(dst)) -- sanity check for tests + local dst_cstr = cstr(dsize, dst) + local src_cstr = to_cstr(src) + eq(string.len(dst .. src), cimp.xstrlcat(dst_cstr, src_cstr, dsize)) + return ffi.string(dst_cstr) + end + + local function test_xstrlcat_overlap(dst, src_idx, dsize) + assert.is_true(dsize >= 1 + string.len(dst)) -- sanity check for tests + local dst_cstr = cstr(dsize, dst) + local src_cstr = dst_cstr + src_idx -- pointer into `dst` (overlaps) + eq(string.len(dst) + string.len(dst) - src_idx, + cimp.xstrlcat(dst_cstr, src_cstr, dsize)) + return ffi.string(dst_cstr) + end + + it('concatenates strings', function() + eq('ab', test_xstrlcat('a', 'b', 3)) + eq('ab', test_xstrlcat('a', 'b', 4096)) + eq('ABC×™×”Zdefgi×™×”Z', test_xstrlcat('ABC×™×”Z', 'defgi×™×”Z', 4096)) + eq('b', test_xstrlcat('', 'b', 4096)) + eq('a', test_xstrlcat('a', '', 4096)) + end) + + it('concatenates overlapping strings', function() + eq('abcabc', test_xstrlcat_overlap('abc', 0, 7)) + eq('abca', test_xstrlcat_overlap('abc', 0, 5)) + eq('abcb', test_xstrlcat_overlap('abc', 1, 5)) + eq('abcc', test_xstrlcat_overlap('abc', 2, 10)) + eq('abcabc', test_xstrlcat_overlap('abc', 0, 2343)) + end) + + it('truncates if `dsize` is too small', function() + eq('a', test_xstrlcat('a', 'b', 2)) + eq('', test_xstrlcat('', 'b', 1)) + eq('ABC×™×”Zd', test_xstrlcat('ABC×™×”Z', 'defgi×™×”Z', 10)) + end) + +end) diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index f7e2a9510b..f0bc41fef6 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -120,6 +120,9 @@ set(LUV_SHA256 86a199403856018cd8e5529c8527450c83664a3d36f52d5253cbe909ea6c5a06) set(GPERF_URL http://ftp.gnu.org/pub/gnu/gperf/gperf-3.0.4.tar.gz) set(GPERF_SHA256 767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63e) +set(WIN32YANK_URL https://github.com/equalsraf/win32yank/releases/download/v0.0.2/win32yank.zip) +set(WIN32YANK_SHA256 78869bf68565607cda1b6a3d549e2487d59d6f0f16f9b003e123c0086f90309d) + if(USE_BUNDLED_UNIBILIUM) include(BuildUnibilium) endif() @@ -164,6 +167,13 @@ if(USE_BUNDLED_GPERF) include(BuildGperf) endif() +include(GetBinaryDeps) + +if(WIN32) + GetBinaryDep(TARGET win32yank + INSTALL_COMMAND ${CMAKE_COMMAND} -E copy win32yank.exe ${DEPS_INSTALL_DIR}/bin) +endif() + add_custom_target(clean-shared-libraries COMMAND ${CMAKE_COMMAND} -DREMOVE_FILE_GLOB=${DEPS_INSTALL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}*${CMAKE_SHARED_LIBRARY_SUFFIX}* diff --git a/third-party/cmake/GetBinaryDeps.cmake b/third-party/cmake/GetBinaryDeps.cmake new file mode 100644 index 0000000000..cdc8ac051e --- /dev/null +++ b/third-party/cmake/GetBinaryDeps.cmake @@ -0,0 +1,46 @@ +# Download and install binary dependencies for windows +include(CMakeParseArguments) + +# This is similar to the build recipes, but instead downloads a third party +# binary and installs it under the the DEPS_PREFIX. The INSTALL_COMMAND is +# executed in the folder where downloaded files are extracted and the +# ${DEPS_INSTALL_DIR} holds the path to the third-party install root. +function(GetBinaryDep) + cmake_parse_arguments(_gettool + "BUILD_IN_SOURCE" + "TARGET" + "INSTALL_COMMAND" + ${ARGN}) + + if(NOT _gettool_TARGET OR NOT _gettool_INSTALL_COMMAND) + message(FATAL_ERROR "Must pass INSTALL_COMMAND and TARGET") + endif() + + string(TOUPPER "${_gettool_TARGET}_URL" URL_VARNAME) + string(TOUPPER "${_gettool_TARGET}_SHA256" HASH_VARNAME) + set(URL ${${URL_VARNAME}}) + set(HASH ${${HASH_VARNAME}}) + if(NOT URL OR NOT HASH ) + message(FATAL_ERROR "${URL_VARNAME} and ${HASH_VARNAME} must be set") + endif() + + ExternalProject_Add(${_gettool_TARGET} + PREFIX ${DEPS_BUILD_DIR} + URL ${URL} + DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR} + DOWNLOAD_COMMAND ${CMAKE_COMMAND} + -DPREFIX=${DEPS_BUILD_DIR} + -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR} + -DURL=${URL} + -DEXPECTED_SHA256=${HASH} + -DTARGET=${_gettool_TARGET} + -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR} + -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake + CONFIGURE_COMMAND "" + BUILD_IN_SOURCE 1 + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/bin + COMMAND "${_gettool_INSTALL_COMMAND}") + list(APPEND THIRD_PARTY_DEPS ${__gettool_TARGET}) +endfunction() |
