Mercurial > vim
changeset 9407:619a98a67f67
commit https://github.com/vim/vim/commit/e18dbe865d190e74fb5d43ac8bc6ac22507d0223
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jul 2 21:42:23 2016 +0200
Updated runtime files.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 02 Jul 2016 21:45:06 +0200 |
| parents | 4aa80bcc9a00 |
| children | 6814811b90d5 |
| files | runtime/doc/eval.txt runtime/doc/indent.txt runtime/doc/options.txt runtime/doc/quickfix.txt runtime/doc/tags runtime/doc/todo.txt runtime/filetype.vim runtime/ftplugin/python.vim runtime/indent/sh.vim runtime/indent/vim.vim runtime/syntax/tex.vim runtime/tutor/tutor.eo runtime/tutor/tutor.eo.utf-8 runtime/tutor/tutor.fr runtime/tutor/tutor.fr.utf-8 src/po/eo.po src/po/fr.po |
| diffstat | 17 files changed, 234 insertions(+), 150 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.4. Last change: 2016 Jul 01 +*eval.txt* For Vim version 7.4. Last change: 2016 Jul 02 VIM REFERENCE MANUAL by Bram Moolenaar @@ -796,13 +796,16 @@ equal" and "is" can be used. This compa 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. Whether arguments or a Dictionary -are bound (with a partial) is ignored. This is so that when a function is -made a member of a Dictionary it is still considered to be the same function. -To compare partials to see if they bind the same argument and Dictionary -values use string(): > - echo string(Partial1) == string(Partial2) +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
--- a/runtime/doc/indent.txt +++ b/runtime/doc/indent.txt @@ -813,7 +813,7 @@ PHP indenting can be altered in several 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
--- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.4. Last change: 2016 Jun 19 +*options.txt* For Vim version 7.4. Last change: 2016 Jul 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1427,8 +1427,8 @@ A jump table for the options with a shor 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|.
--- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -1,4 +1,4 @@ -*quickfix.txt* For Vim version 7.4. Last change: 2016 Jul 01 +*quickfix.txt* For Vim version 7.4. Last change: 2016 Jul 02 VIM REFERENCE MANUAL by Bram Moolenaar @@ -35,11 +35,13 @@ positions in files. For example, |:vimg use the positions in a script with the |getqflist()| function. Thus you can do a lot more than the edit/compile/fix cycle! -If you are using Manx's Aztec C compiler on the Amiga look here for how to use -it with Vim: |quickfix-manx|. If you are using another compiler you should -save the error messages in 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 +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* @@ -49,8 +51,8 @@ have a separate location list. A locati 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
--- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -1260,6 +1260,7 @@ +mzscheme various.txt /*+mzscheme* +mzscheme/dyn various.txt /*+mzscheme\/dyn* +netbeans_intg various.txt /*+netbeans_intg* ++num64 various.txt /*+num64* +ole various.txt /*+ole* +packages various.txt /*+packages* +path_extra various.txt /*+path_extra*
--- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.4. Last change: 2016 Jun 25 +*todo.txt* For Vim version 7.4. Last change: 2016 Jul 02 VIM REFERENCE MANUAL by Bram Moolenaar @@ -34,8 +34,6 @@ not be repeated below, unless there is e *known-bugs* -------------------- Known bugs and current work ----------------------- -:clist! +10 list next 10 errors - Further implement 'barline' in viminfo: - Use timestamp for more items: locations, marks. @@ -43,6 +41,7 @@ Problem with setqflist([]): grep 4 times clear the next list, not the current one. Ramel Eshed, Jun 8. +channel: +- Should write_buf_line() change NL to NUL characters? - GUI cursor blinking interrupted when the job output goes to a buffer that is in a window. (Ramel Eshed, 2016 Jun 9) - GUI cursor blinking interrupted when there is a status line. (Ramel Eshed, @@ -64,8 +63,7 @@ Later Quickfix improvements for background building and grepping: Patch from Yegappan, 2016 Jun 17. Need to reset values when starting a new list. -- Move 'efm' parsing to a separate function. If 'efm' is the same as last - time re-use the fmt_first list. +- If 'efm' is the same as last time re-use the fmt_first list. - Do not clear "dir_stack", "directory" and "file_stack", "currfile" when using ":addexpr". Move multiline, multiignore, multiscan outside of the function. @@ -126,19 +124,34 @@ Regexp problems: - Search for /\%d0\+ causes error E363 in a file with consecutive NUL characters. (Christian Brabandt, 2016 Jun 7) -Patch to fix problem with GUI termcode. (Kazunobu Kuriyama, 2016 Jun 15) - json_encode(): should convert to utf-8. (Nikolai Pavlov, 2016 Jan 23) What if there is an invalid character? Should json_encode()/json_decode() restrict recursiveness? Or avoid recursiveness. +Patch to support 64 bit ints for Number. (Ken Takata, 2016 Jan 21) +Update 2016 Apr 24. +Update 2016 Jun 14, includes some tests. + +Patch to support expression argument to sort() instead of a function name. +Yasuhiro Matsumoto, 2013 May 31. +Or should we add a more general mechanism, like a lambda() function? +Patch by Yasuhiro Matsumoto, 2014 Sep 16, update 2016 Apr 17. +Correction for test, Ken Takata, 2016 May 27. +Merged patch: Ken Takata, 2016 Jun 15. + Once .exe with updated installer is available: Add remark to download page about /S and /D options (Ken Takata, 2016 Apr 13) Cursor positioned in the wrong place when editing src/testdir/test_viml.vim. +Javascript indent wrong after /* in single quoted string: + var SRC = 'src/*.js'; + function log(tag) { + a = b; + } + Use ADDR_OTHER instead of ADDR_LINES for many more commands. Add tests for using number larger than number of lines in buffer. @@ -150,13 +163,6 @@ 5) 'completeopt' noinsert breaks redo register (Shougo, 2016 Jun 18, #874) Patch to fix this: #875 -Patch to support expression argument to sort() instead of a function name. -Yasuhiro Matsumoto, 2013 May 31. -Or should we add a more general mechanism, like a lambda() function? -Patch by Yasuhiro Matsumoto, 2014 Sep 16, update 2016 Apr 17. -Correction for test, Ken Takata, 2016 May 27. -Merged patch: Ken Takata, 2016 Jun 15. - Problem with whitespace in errorformat. (Gerd Wachsmuth, 2016 May 15, #807) ":caddexpr" should keep state, so that directory changes can be respected. @@ -165,7 +171,7 @@ Don't clear dir_stack and file_stack whe adding iterms. And keep them in qf_list_T. Patch to add filtering of the quickfix list. (Yegappan Lakshmanan, 2016 Mar -13, last version) Update May 22, #830. +13, last version) Update June 26, #830. When 'autochdir' is set, writing new file does not change the current dir. (Dan Church, issue #777) @@ -182,6 +188,12 @@ Should already never use utf-8 chars to Cannot delete a file with square brackets with delete(). (#696) +No autocommand for when changing directory. Patch from allen haim, 2016 Jun +27, #888 + +Should make ":@r" handle line continuation. (Cesar Romani, 2016 Jun 26) +Also for ":@.". + Patch to add TabNew, TabNewEntered and TabClosed autocommand events. (Felipe Morales, 2015 Feb 1) @@ -211,6 +223,9 @@ the last change in any buffer? Can we u Patch for Python: #622. (Roland Puntaier, 2016 Feb 2) What does it change? +When generating the Unicode tables with runtime/tools/unicode.vim the +emoji_width table has only one entry. + It's possible to add ",," to 'wildignore', an empty entry. Causes problems. Reject the value? #710. @@ -219,18 +234,6 @@ 2013 Jul 30) Update from Ken Takata, 20 Update mentioned by Christian, 2016 Apr 25. Update from Ken Takata, 2016 Apr 26. -Win32: patch to use 64 bit stat() if possible. (Ken Takata, 2014 May 12) -More tests May 14. Update May 29. Update Aug 10. -Now part of large file patches. (Ken Takata, 2016 Feb 1) -Win64: Seek error in swap file for a very big file (3 Gbyte). Check storing -pointer in long and seek offset in 64 bit var. -Patches from Ken Takata might help (2014 Apr 17) -Update 2016 Mar 28. Can include all parts into one dist patch. - -Patch to support 64 bit ints for Number. (Ken Takata, 2016 Jan 21) -Update 2016 Apr 24. -Update 2016 Jun 14, includes some tests. - Patch to improve cscope. (Adrian Kocis, #843) Patch for groovy multi-line comment highlighting. (Justin M. Keyes, 2016 May @@ -584,7 +587,7 @@ Patch for ordered dict. (Ozaki Kiichi, 2 Patch to make closed folds line up. (Charles Campbell, 2014 Sep 12) Remark from Roland Eggner: does it cause crashes? (2014 Dec 12) Updated patch by Roland Eggner, Dec 16 -Updated patch from Charles, 2016 Jan 4. +Updated patch from Charles, 2016 Jul 2 Patch to open folds for 'incsearch'. (Christian Brabandt, 2015 Jan 6) @@ -1161,7 +1164,7 @@ Build problem with small features on Mac "0g@$" puts '] on last byte of multi-byte. (ZyX, 2011 Jan 22) -Patch to addd TextDeletePost and TextYankPost events. (Philippe Vaucher, 2011 +Patch to add TextDeletePost and TextYankPost events. (Philippe Vaucher, 2011 May 24) Update May 26. Patch for :tabrecently. (Hirokazu Yoshida, 2012 Jan 30)
--- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2016 Apr 29 +" Last Change: 2016 Jun 26 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -1019,7 +1019,7 @@ au BufNewFile,BufRead *.jgr setf jgrap 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
--- 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#Complet 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.
--- 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
--- 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
--- a/runtime/syntax/tex.vim +++ b/runtime/syntax/tex.vim @@ -92,7 +92,6 @@ if !exists("g:tex_subscripts") else let s:tex_subscripts= g:tex_subscripts endif -echomsg "s:tex_subscripts=".s:tex_subscripts " Determine whether or not to use "*.sty" mode {{{1 " The user may override the normal determination by setting
--- a/runtime/tutor/tutor.eo +++ b/runtime/tutor/tutor.eo @@ -160,7 +160,7 @@ RIMARKO: Trairante la instruilon, ne pro 4. Konservu la dosieron kun þanøoj kaj eliru el Vim per: :wq <Enenklavo> - 5. Se vi eliris la instruilon vimtutor en paþo 1, restartigu la intruilon + 5. Se vi eliris el la instruilo vimtutor en paþo 1, restartigu la instruilon vimtutor kaj moviøu suben al la sekvanta resumo. 6. Post kiam vi legis la suprajn paþojn, kaj komprenis ilin: faru ilin. @@ -229,7 +229,7 @@ Nun daýrigu al la leciono 2. 3. Movu la kursoron æe la fino de la øusta linio (POST la unua . ). - 4. Tajpu d$ por forivþi øis la fino de la linio. + 4. Tajpu d$ por foriviþi øis la fino de la linio. ---> Iu tajpis la finon de æi tiu linio dufoje. fino de æi tiu linio dufoje. @@ -670,7 +670,7 @@ RIMARKO: Se vi volus eliri el Vim kaj restartigi øin denove per vim TESTO, 3. Premu la : signon. Æe la fino de la ekrano :'<,'> aperos. 4. Tajpu w TESTO , kie TESTO estas dosiernomo, kiu ankoraý ne ekzistas. - Kontrolu, ke vi vidas :'<,'>w TESTO antaý premi <Enenklavo>. + Kontrolu, ke vi vidas :'<,'>w TESTO antaý ol premi <Enenklavo>. 5. Vim konservos la apartigitajn liniojn al la dosiero TESTO. Uzu :dir aý :!ls por vidigi øin. Ne forviþu øin. Ni uzos øin en la sekvanta @@ -688,7 +688,7 @@ RIMARKO: Premo de v komencas Viduman a ** Por enmeti la enhavon de dosiero, tajpu :r DOSIERNOMON ** - 1. Movu la kursoron ¼us super æi tiu linio. + 1. Movu la kursoron tuj super æi tiu linio. RIMARKO: Post plenumo de paþo 2, vi vidos tekston el la leciono 5.3. Tiam moviøu SUBEN por vidi tiun lecionon denove. @@ -741,7 +741,7 @@ RIMARKO: Vi nun povas legi la eliron de 2. Tajpu la minusklan literon o por malfermi linion SUB la kursoro kaj eniri la Enmetan reøimon. - 3. Nun tajpu tekston kaj premu <ESK> por eliri la Enmetan reøimon. + 3. Nun tajpu tekston kaj premu <ESK> por eliri el la Enmeta reøimo. ---> Post tajpo de o la kursoro moviøas al la malfermata linio en Enmeta reøimo. @@ -765,7 +765,7 @@ RIMARKO: Vi nun povas legi la eliron de 3. Tajpu a (minuskle) por aldoni tekston POST la kursoro. 4. Kompletigu la vorton same kiel la linio sub øi. Premu <ESK> por - eliri la Enmetan reøimon. + eliri el la Enmeta reøimo. 5. Uzu e por moviøi al la sekvanta nekompleta vorto kaj ripetu paþojn 3 kaj 4. @@ -789,7 +789,7 @@ RIMARKO: Æiu a, i kaj A iras al la sama Enmeta reøimo, la nura malsamo 2. Nun premu R kaj tajpu la nombron sub øi en la dua linio, por ke øi anstataýigu la xxx . - 3. Premu <ESK> por foriri la Anstataýigan reøimon. Rimarku, ke la cetera + 3. Premu <ESK> por foriri el la Anstataýiga reøimo. Rimarku, ke la cetera parto de la linio restas neþanøata. 4. Ripetu la paþojn por anstataýigi la restantajn xxx. @@ -810,7 +810,7 @@ RIMARKO: Anstataýiga reøimo estas same kiel Enmeta reøimo, sed æiu signo 1. Iru al la linio markita per ---> sube kaj poziciu la kursoron post "a)". - 2. Komencu la Viduman reøimon per v kaj movu la kursoron ¼us antaý "unua". + 2. Komencu la Viduman reøimon per v kaj movu la kursoron tuj antaý "unua". 3. Tajpu y por kopii la emfazitan tekston. @@ -986,6 +986,6 @@ RIMARKO: Kompletigo funkcias por multaj Esperantigita fare de Dominique Pellé, 2008-04-01 Retpoþto: dominique.pelle@gmail.com - Lasta þanøo: 2011-11-27 + Lasta þanøo: 2016-07-02 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- a/runtime/tutor/tutor.eo.utf-8 +++ b/runtime/tutor/tutor.eo.utf-8 @@ -160,7 +160,7 @@ RIMARKO: Trairante la instruilon, ne pro 4. Konservu la dosieron kun ÅanÄoj kaj eliru el Vim per: :wq <Enenklavo> - 5. Se vi eliris la instruilon vimtutor en paÅo 1, restartigu la intruilon + 5. Se vi eliris el la instruilo vimtutor en paÅo 1, restartigu la instruilon vimtutor kaj moviÄu suben al la sekvanta resumo. 6. Post kiam vi legis la suprajn paÅojn, kaj komprenis ilin: faru ilin. @@ -229,7 +229,7 @@ Nun daÅrigu al la leciono 2. 3. Movu la kursoron ĉe la fino de la Äusta linio (POST la unua . ). - 4. Tajpu d$ por forivÅi Äis la fino de la linio. + 4. Tajpu d$ por foriviÅi Äis la fino de la linio. ---> Iu tajpis la finon de ĉi tiu linio dufoje. fino de ĉi tiu linio dufoje. @@ -670,7 +670,7 @@ RIMARKO: Se vi volus eliri el Vim kaj restartigi Äin denove per vim TESTO, 3. Premu la : signon. Ĉe la fino de la ekrano :'<,'> aperos. 4. Tajpu w TESTO , kie TESTO estas dosiernomo, kiu ankoraÅ ne ekzistas. - Kontrolu, ke vi vidas :'<,'>w TESTO antaÅ premi <Enenklavo>. + Kontrolu, ke vi vidas :'<,'>w TESTO antaÅ ol premi <Enenklavo>. 5. Vim konservos la apartigitajn liniojn al la dosiero TESTO. Uzu :dir aÅ :!ls por vidigi Äin. Ne forviÅu Äin. Ni uzos Äin en la sekvanta @@ -688,7 +688,7 @@ RIMARKO: Premo de v komencas Viduman a ** Por enmeti la enhavon de dosiero, tajpu :r DOSIERNOMON ** - 1. Movu la kursoron ĵus super ĉi tiu linio. + 1. Movu la kursoron tuj super ĉi tiu linio. RIMARKO: Post plenumo de paÅo 2, vi vidos tekston el la leciono 5.3. Tiam moviÄu SUBEN por vidi tiun lecionon denove. @@ -741,7 +741,7 @@ RIMARKO: Vi nun povas legi la eliron de 2. Tajpu la minusklan literon o por malfermi linion SUB la kursoro kaj eniri la Enmetan reÄimon. - 3. Nun tajpu tekston kaj premu <ESK> por eliri la Enmetan reÄimon. + 3. Nun tajpu tekston kaj premu <ESK> por eliri el la Enmeta reÄimo. ---> Post tajpo de o la kursoro moviÄas al la malfermata linio en Enmeta reÄimo. @@ -765,7 +765,7 @@ RIMARKO: Vi nun povas legi la eliron de 3. Tajpu a (minuskle) por aldoni tekston POST la kursoro. 4. Kompletigu la vorton same kiel la linio sub Äi. Premu <ESK> por - eliri la Enmetan reÄimon. + eliri el la Enmeta reÄimo. 5. Uzu e por moviÄi al la sekvanta nekompleta vorto kaj ripetu paÅojn 3 kaj 4. @@ -789,7 +789,7 @@ RIMARKO: Ĉiu a, i kaj A iras al la sama Enmeta reÄimo, la nura malsamo 2. Nun premu R kaj tajpu la nombron sub Äi en la dua linio, por ke Äi anstataÅigu la xxx . - 3. Premu <ESK> por foriri la AnstataÅigan reÄimon. Rimarku, ke la cetera + 3. Premu <ESK> por foriri el la AnstataÅiga reÄimo. Rimarku, ke la cetera parto de la linio restas neÅanÄata. 4. Ripetu la paÅojn por anstataÅigi la restantajn xxx. @@ -810,7 +810,7 @@ RIMARKO: AnstataÅiga reÄimo estas same kiel Enmeta reÄimo, sed ĉiu signo 1. Iru al la linio markita per ---> sube kaj poziciu la kursoron post "a)". - 2. Komencu la Viduman reÄimon per v kaj movu la kursoron ĵus antaÅ "unua". + 2. Komencu la Viduman reÄimon per v kaj movu la kursoron tuj antaÅ "unua". 3. Tajpu y por kopii la emfazitan tekston. @@ -986,6 +986,6 @@ RIMARKO: Kompletigo funkcias por multaj Esperantigita fare de Dominique Pellé, 2008-04-01 RetpoÅto: dominique.pelle@gmail.com - Lasta ÅanÄo: 2011-11-27 + Lasta ÅanÄo: 2016-07-02 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- a/runtime/tutor/tutor.fr +++ b/runtime/tutor/tutor.fr @@ -190,7 +190,7 @@ NOTE : En avançant dans ce cours, n'essayez pas de mémoriser, apprenez par 5. Pour insérer ou ajouter du texte tapez : i tapez le texte à insérer avant le curseur <Échap> - A tapez le texte à ajouter après le curseur <Échap> + A tapez le texte à ajouter en fin de ligne <Échap> NOTE : Appuyer <Échap> vous place en mode Normal ou annule une commande partiellement tapée dont vous ne voulez plus. @@ -1034,5 +1034,5 @@ NOTE : Le complètement fonctionne pour de nombreuses commandes. Essayez Dernières mises à jour par Dominique Pellé. E-mail : dominique.pelle@gmail.com - Last Change : 2014 Aug 18 + Last Change : 2016 Jul 02 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- a/runtime/tutor/tutor.fr.utf-8 +++ b/runtime/tutor/tutor.fr.utf-8 @@ -190,7 +190,7 @@ NOTE : En avançant dans ce cours, n'essayez pas de mémoriser, apprenez par 5. Pour insérer ou ajouter du texte tapez : i tapez le texte à insérer avant le curseur <Échap> - A tapez le texte à ajouter après le curseur <Échap> + A tapez le texte à ajouter en fin de ligne <Échap> NOTE : Appuyer <Échap> vous place en mode Normal ou annule une commande partiellement tapée dont vous ne voulez plus. @@ -1034,5 +1034,5 @@ NOTE : Le complètement fonctionne pour de nombreuses commandes. Essayez Dernières mises à jour par Dominique Pellé. E-mail : dominique.pelle@gmail.com - Last Change : 2014 Aug 18 + Last Change : 2016 Jul 02 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- a/src/po/eo.po +++ b/src/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" @@ -441,6 +441,9 @@ msgstr "E714: Listo bezonata" msgid "E715: Dictionary required" msgstr "E715: Vortaro bezonata" +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" @@ -719,6 +722,10 @@ msgstr "argumento de reverse()" msgid "E258: Unable to send to client" msgstr "E258: Ne eblas sendi al kliento" +#, c-format +msgid "E927: Invalid action: '%s'" +msgstr "E927: Nevalida ago: '%s'" + msgid "sort() argument" msgstr "argumento de sort()" @@ -970,6 +977,10 @@ msgid "E137: Viminfo file is not writabl msgstr "E137: Dosiero viminfo ne skribeblas: %s" #, c-format +msgid "E929: Too many viminfo temp files, like %s!" +msgstr "E929: Tro da provizoraj dosieroj viminfo, kiel %s!" + +#, c-format msgid "E138: Can't write viminfo file %s!" msgstr "E138: Ne eblas skribi dosieron viminfo %s!" @@ -1719,6 +1730,9 @@ msgstr "Esprimo" msgid "Input Line" msgstr "Eniga linio" +msgid "Debug Line" +msgstr "Sencimiga linio" + msgid "E198: cmd_pchar beyond the command length" msgstr "E198: cmd_pchar preter la longo de komando" @@ -1964,11 +1978,6 @@ msgstr "1 signo" msgid "%lld characters" msgstr "%lld signoj" -#. Explicit typecast avoids warning on Mac OS X 10.6 -#, c-format -msgid "%ld characters" -msgstr "%ld signoj" - msgid "[noeol]" msgstr "[sen EOL]" @@ -2641,6 +2650,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" @@ -2651,6 +2661,7 @@ 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" #, c-format msgid "E625: cannot open cscope database: %s" @@ -2956,6 +2967,9 @@ msgstr "Ne eblas malfermi por eligo de s msgid "Vim: Error: Failure to start gvim from NetBeans\n" msgstr "Vim: Eraro: malsukcesis lanĉi gvim el NetBeans\n" +msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n" +msgstr "Vim: Eraro: Tiu versio de Vim ne ruliÄas en terminalo Cygwin\n" + msgid "Vim: Warning: Output is not to a terminal\n" msgstr "Vim: Averto: Eligo ne estas al terminalo\n" @@ -4269,28 +4283,28 @@ msgid "%ld Cols; " msgstr "%ld Kolumnoj; " #, c-format -msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes" -msgstr "Apartigis %s%ld de %ld Linioj; %ld de %ld Vortoj; %ld de %ld Bajtoj" +msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes" +msgstr "Apartigis %s%ld de %ld Linioj; %lld de %lld Vortoj; %lld de %lld Bajtoj" #, c-format msgid "" -"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld " -"Bytes" -msgstr "" -"Apartigis %s%ld de %ld Linioj; %ld de %ld Vortoj; %ld de %ld Signoj; %ld de " -"%ld Bajtoj" - -#, c-format -msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld" -msgstr "Kol %s de %s; Linio %ld de %ld; Vorto %ld de %ld; Bajto %ld de %ld" +"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of " +"%lld Bytes" +msgstr "" +"Apartigis %s%ld de %ld Linioj; %lld de %lld Vortoj; %lld de %lld Signoj; %lld de " +"%lld Bajtoj" + +#, c-format +msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld" +msgstr "Kol %s de %s; Linio %ld de %ld; Vorto %lld de %lld; Bajto %lld de %lld" #, c-format msgid "" -"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of " -"%ld" -msgstr "" -"Kol %s de %s; Linio %ld de %ld; Vorto %ld de %ld; Signo %ld de %ld; Bajto " -"%ld de %ld" +"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte " +"%lld of %lld" +msgstr "" +"Kol %s de %s; Linio %ld de %ld; Vorto %lld de %lld; Signo %lld de %lld; Bajto " +"%lld de %lld" #, c-format msgid "(+%ld for BOM)" @@ -4548,6 +4562,10 @@ msgid "E244: Illegal charset name \"%s\" msgstr "E244: Nevalida nomo de signaro \"%s\" en nomo de tiparo \"%s\"" #, c-format +msgid "E244: Illegal quality name \"%s\" in font name \"%s\"" +msgstr "E244: Nevalida nomo de kvalito \"%s\" en nomo de tiparo \"%s\"" + +#, c-format msgid "E245: Illegal char '%c' in font name \"%s\"" msgstr "E245: Nevalida signo '%c' en nomo de tiparo \"%s\"" @@ -4724,6 +4742,7 @@ msgstr "E376: Nevalida %%%c en prefikso de formata ĉeno" msgid "E377: Invalid %%%c in format string" msgstr "E377: Nevalida %%%c en formata ĉeno" +#. nothing found msgid "E378: 'errorformat' contains no pattern" msgstr "E378: 'errorformat' enhavas neniun Åablonon" @@ -5786,6 +5805,9 @@ msgstr "" "\n" "--- Klavoj de terminalo ---" +msgid "Cannot open $VIMRUNTIME/rgb.txt" +msgstr "Ne povas malfermi $VIMRUNTIME/rgb.txt" + msgid "new shell started\n" msgstr "nova Åelo lanĉita\n" @@ -5802,7 +5824,7 @@ msgstr "E881: Nombro de linioj ÅanÄiÄis neatendite" #. must display the prompt msgid "No undo possible; continue anyway" -msgstr "Malfaro neebla; daÅrigi tamene" +msgstr "Malfaro neebla; tamen daÅrigi" #, c-format msgid "E828: Cannot open undo file for writing: %s" @@ -6819,9 +6841,6 @@ msgstr "sennoma funkcio %s ne ekzistas" msgid "function %s does not exist" msgstr "funkcio %s ne ekzistas" -msgid "function constructor does not accept keyword arguments" -msgstr "konstruilo de funkcio ne akceptas Ålosilvortajn argumentojn" - #, c-format msgid "failed to run function %s" msgstr "malsukcesis ruli funkcion %s" @@ -6909,6 +6928,10 @@ msgid "unable to convert %s to vim dicti msgstr "ne povis konverti %s al vim-vortaro" #, c-format +msgid "unable to convert %s to vim list" +msgstr "ne povis konverti %s al vim-listo" + +#, c-format msgid "unable to convert %s to vim structure" msgstr "ne povis konverti %s al vim-strukturo"
--- a/src/po/fr.po +++ b/src/po/fr.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: Vim(Français)\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:06+0200\n" "Last-Translator: Dominique Pellé <dominique.pelle@gmail.com>\n" "Language-Team: \n" "Language: fr\n" @@ -238,8 +238,8 @@ msgstr "E917: Impossible d'utiliser un c msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel" msgstr "" -"E912: Impossible d'utiliser ch_evalexpr()/ch_sendexpr() avec un canal brut ou " -"nl" +"E912: Impossible d'utiliser ch_evalexpr()/ch_sendexpr() avec un canal brut " +"ou nl" msgid "E906: not an open channel" msgstr "E906: pas un canal ouvert" @@ -497,6 +497,9 @@ msgstr "E714: Liste requise" msgid "E715: Dictionary required" msgstr "E715: Dictionnaire requis" +msgid "E928: String required" +msgstr "E928: Chaine requis" + # DB : Suggestion #, c-format msgid "E118: Too many arguments for function: %s" @@ -777,7 +780,7 @@ msgstr "E240: Pas de connexion au serveu # AB - La version française est meilleure que la version anglaise. #, c-format msgid "E241: Unable to send to %s" -msgstr "E241: L'envoi au serveur %s à échoué" +msgstr "E241: L'envoi au serveur %s a échoué" msgid "E277: Unable to read a server reply" msgstr "E277: Impossible de lire la réponse du serveur" @@ -795,6 +798,10 @@ msgstr "argument de reverse()" msgid "E258: Unable to send to client" msgstr "E258: La réponse n'a pas pu être envoyée au client" +#, c-format +msgid "E927: Invalid action: '%s'" +msgstr "E927: Action invalide : « %s »" + msgid "sort() argument" msgstr "argument de sort()" @@ -1095,6 +1102,10 @@ msgstr " ÉCHEC" msgid "E137: Viminfo file is not writable: %s" msgstr "E137: L'écriture dans le fichier %s est interdite" +#, c-format +msgid "E929: Too many viminfo temp files, like %s!" +msgstr "E929: Trop de fichiers temporaires viminfo, comme %s!" + # 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 @@ -1442,7 +1453,7 @@ msgid "E162: No write since last change msgstr "E162: Le tampon %s n'a pas été enregistré" 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)" msgid "E163: There is only one file to edit" msgstr "E163: Il n'y a qu'un seul fichier à éditer" @@ -1916,6 +1927,9 @@ msgstr "expression" msgid "Input Line" msgstr "ligne de saisie" +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" @@ -2172,11 +2186,6 @@ msgstr "1 caractère" msgid "%lld characters" msgstr "%lld caractères" -#. Explicit typecast avoids warning on Mac OS X 10.6 -#, c-format -msgid "%ld characters" -msgstr "%ld caractères" - msgid "[noeol]" msgstr "[noeol]" @@ -2871,6 +2880,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" @@ -2881,6 +2891,7 @@ 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" #, c-format msgid "E625: cannot open cscope database: %s" @@ -3187,6 +3198,9 @@ msgstr "Impossible d'ouvrir pour la sort msgid "Vim: Error: Failure to start gvim from NetBeans\n" msgstr "Vim : Erreur : Impossible de démarrer gvim depuis NetBeans\n" +msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n" +msgstr "Vim : Erreur : Cette version de Vim ne fonctionne pas dans un terminal Cygwin\n" + msgid "Vim: Warning: Output is not to a terminal\n" msgstr "Vim : Alerte : La sortie ne s'effectue pas sur un terminal\n" @@ -4514,30 +4528,30 @@ msgid "%ld Cols; " msgstr "%ld Colonnes ; " #, c-format -msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes" -msgstr "" -"%s%ld sur %ld Lignes ; %ld sur %ld Mots ; %ld sur %ld Octets sélectionnés" +msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes" +msgstr "" +"%s%ld sur %ld Lignes ; %lld sur %lld Mots ; %lld sur %lld Octets sélectionnés" #, c-format msgid "" -"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld " -"Bytes" -msgstr "" -"%s%ld sur %ld Lignes ; %ld sur %ld Mots ; %ld sur %ld Caractères ; %ld sur " -"%ld octets sélectionnés" - -#, c-format -msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld" -msgstr "" -"Colonne %s sur %s ; Ligne %ld sur %ld ; Mot %ld sur %ld ; Octet %ld sur %ld" +"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of " +"%lld Bytes" +msgstr "" +"%s%ld sur %ld Lignes ; %lld sur %lld Mots ; %lld sur %lld Caractères ; %lld sur " +"%lld octets sélectionnés" + +#, c-format +msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld" +msgstr "" +"Colonne %s sur %s ; Ligne %ld sur %ld ; Mot %lld sur %lld ; Octet %lld sur %lld" #, c-format msgid "" -"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of " -"%ld" -msgstr "" -"Colonne %s sur %s ; Ligne %ld sur %ld ; Mot %ld sur %ld ; Caractère %ld sur " -"%ld ; Octet %ld sur %ld" +"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte " +"%lld of %lld" +msgstr "" +"Colonne %s sur %s ; Ligne %ld sur %ld ; Mot %lld sur %lld ; Caractère %lld sur " +"%lld ; Octet %lld sur %lld" #, c-format msgid "(+%ld for BOM)" @@ -4799,6 +4813,10 @@ msgid "E244: Illegal charset name \"%s\" msgstr "E244: Jeu de caractères \"%s\" invalide dans le nom de fonte \"%s\"" #, c-format +msgid "E244: Illegal quality name \"%s\" in font name \"%s\"" +msgstr "E244: Nom de qualité \"%s\" invalide dans le nom de fonte \"%s\"" + +#, c-format msgid "E245: Illegal char '%c' in font name \"%s\"" msgstr "E245: Caractère '%c' invalide dans le nom de fonte \"%s\"" @@ -4975,6 +4993,7 @@ msgstr "E376: %%%c invalide dans le préfixe de la chaîne de format" msgid "E377: Invalid %%%c in format string" msgstr "E377: %%%c invalide dans la chaîne de format" +#. nothing found msgid "E378: 'errorformat' contains no pattern" msgstr "E378: 'errorformat' ne contient aucun motif" @@ -6048,6 +6067,9 @@ msgstr "" "\n" "--- Touches du terminal ---" +msgid "Cannot open $VIMRUNTIME/rgb.txt" +msgstr "Impossible d'ouvrir $VIMRUNTIME/rgb.txt" + msgid "new shell started\n" msgstr "nouveau shell démarré\n" @@ -7099,9 +7121,6 @@ msgstr "la fonction sans nom %s n'existe msgid "function %s does not exist" msgstr "la fonction %s n'existe pas" -msgid "function constructor does not accept keyword arguments" -msgstr "le constructeur de fonction n'accepte pas les arguments nommés" - #, c-format msgid "failed to run function %s" msgstr "exécution de la fonction %s a échoué" @@ -7152,7 +7171,7 @@ msgstr "le nom de marque doit être un seul caractère" #, c-format msgid "expected vim.Buffer object, but got %s" -msgstr "attendu un objet objet vim.Buffer, mais reçu %s" +msgstr "attendu un objet vim.Buffer, mais reçu %s" #, c-format msgid "failed to switch to buffer %d" @@ -7189,6 +7208,10 @@ msgid "unable to convert %s to vim dicti msgstr "impossible de convertir %s à un dictionnaire vim" #, c-format +msgid "unable to convert %s to vim list" +msgstr "impossible de convertir %s à une liste de vim" + +#, c-format msgid "unable to convert %s to vim structure" msgstr "impossible de convertir %s à une structure de vim"