# HG changeset patch # User vimboss # Date 1087384762 0 # Node ID 7edf9b6e4c3625af951f0acddbd3dbac618dced3 # Parent 3fc0f57ecb91686b33630dcac973ab9d7db31c6e Various changes diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1,4 +1,4 @@ -*change.txt* For Vim version 7.0aa. Last change: 2004 May 08 +*change.txt* For Vim version 7.0aa. Last change: 2004 Jun 15 VIM REFERENCE MANUAL by Bram Moolenaar @@ -963,8 +963,9 @@ 9. Last search pattern register "/ 1. Unnamed register "" *quote_quote* *quotequote* Vim fills this register with text deleted with the "d", "c", "s", "x" commands or copied with the yank "y" command, regardless of whether or not a specific -register was used (e.g. "xdd). An exception is the '_' register: "_dd does -not store the deleted text in any register. Vim uses the contents of this +register was used (e.g. "xdd). This is like the unnamed register is pointing +to the last used register. An exception is the '_' register: "_dd does not +store the deleted text in any register. Vim uses the contents of this register for any put command (p or P) which does not specify a register. Additionally you can access it with the name '"'. This means you have to type two double quotes. Writing to the "" register writes to register "0. diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1,4 +1,4 @@ -*editing.txt* For Vim version 7.0aa. Last change: 2004 Apr 28 +*editing.txt* For Vim version 7.0aa. Last change: 2004 Jun 14 VIM REFERENCE MANUAL by Bram Moolenaar @@ -338,6 +338,7 @@ This also works for most other systems, backticks must be around the whole item. It is not possible to have text directly before the first or just after the last backtick. + *`=* You can have the backticks expanded as a Vim expression, instead of an external command, by using the syntax `={expr}` e.g. > :let foo='bar' diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt --- a/runtime/doc/fold.txt +++ b/runtime/doc/fold.txt @@ -1,4 +1,4 @@ -*fold.txt* For Vim version 7.0aa. Last change: 2004 May 20 +*fold.txt* For Vim version 7.0aa. Last change: 2004 Jun 14 VIM REFERENCE MANUAL by Bram Moolenaar @@ -564,7 +564,7 @@ When using an operator, a closed fold is deletes the whole closed fold under the cursor. For Ex commands the range is adjusted to always start at the first line of a -fold and end at the last line of a fold. Thus this command: > +closed fold and end at the last line of a closed fold. Thus this command: > :s/foo/bar/g when used with the cursor on a closed fold, will replace "foo" with "bar" in all lines of the fold. diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt --- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -1,4 +1,4 @@ -*gui.txt* For Vim version 7.0aa. Last change: 2004 Jun 02 +*gui.txt* For Vim version 7.0aa. Last change: 2004 Jun 15 VIM REFERENCE MANUAL by Bram Moolenaar @@ -932,6 +932,22 @@ This section describes other features wh else echo "Boring old console" endif +< *setting-guifont* +- When you use the same vimrc file on various systems, you can use something + like this to set options specifically for each type of GUI: > + + if has("gui_running") + if has("gui_gtk2") + :set guifont=Luxi\ Mono\ 12 + elseif has("gui_kde") + :set guifont=Luxi\ Mono/12/-1/5/50/0/0/0/1/0 + elseif has("x11") + " Also for GTK 1 + :set guifont=*-lucidatypewriter-medium-r-normal-*-*-180-*-*-m-*-* + elseif has("gui_win32") + :set guifont=Luxi_Mono:h12:cANSI + endif + endif ============================================================================== 7. Shell Commands *gui-shell* diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.0aa. Last change: 2004 Jun 08 +*options.txt* For Vim version 7.0aa. Last change: 2004 Jun 15 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2795,31 +2795,42 @@ A jump table for the options with a shor the font cannot be found you will get an error message. To try other font names a list can be specified, font names separated with commas. The first valid font is used. + When 'guifontset' is not empty, 'guifont' is not used. + Spaces after a comma are ignored. To include a comma in a font name precede it with a backslash. Setting an option requires an extra backslash before a space and a backslash. See also |option-backslash|. For example: > :set guifont=Screen15,\ 7x13,font\\,with\\,commas -< will make vim try to use the font "Screen15" first, and if it fails it +< will make Vim try to use the font "Screen15" first, and if it fails it will try to use "7x13" and then "font,with,commas" instead. + + If none of the fonts can be loaded, Vim will keep the current setting. + If an empty font list is given, Vim will try using other resource + settings (for X, it will use the Vim.font resource), and finally it + will try some builtin default which should always be there ("7x13" in + the case of X). The font names given should be "normal" fonts. Vim + will try to find the related bold and italic fonts. + + For Win32, GTK and Photon only: > + :set guifont=* +< will bring up a font requester, where you can pick the font you want. + + The font name depends on the GUI used. See |setting-guifont| for a + way to set 'guifont' for various systems. + For the GTK+ 2 GUI the font name looks like this: > :set guifont=Andale\ Mono\ 11 < That's all. XLFDs are no longer accepted. *E236* Note that the fonts must be mono-spaced (all characters have the same - width). + width). An exception is GTK 2: all fonts are accepted, but + mono-spaced fonts look best. + To preview a font on X11, you might be able to use the "xfontsel" program. The "xlsfonts" program gives a list of all available fonts. - For Win32, GTK and Photon only: > - :set guifont=* -< will bring up a font requester, where you can pick the font you want. - If none of the fonts can be loaded, vim will keep the current setting. - If an empty font list is given, vim will try using other resource - settings (for X, it will use the Vim.font resource), and finally it - will try some builtin default which should always be there ("7x13" in - the case of X). The font names given should be "normal" fonts. Vim - will try to find the related bold and italic fonts. + For the Win32 GUI *E244* *E245* - takes these options in the font name: hXX - height is XX (points, can be floating-point) @@ -2913,7 +2924,7 @@ A jump table for the options with a shor global {not in Vi} {only available when compiled with GUI enabled} - This option only has an effect in the GUI version of vim. It is a + This option only has an effect in the GUI version of Vim. It is a sequence of letters which describes what components and options of the GUI should be used. To avoid problems with flags that are added in the future, use the @@ -4484,10 +4495,11 @@ A jump table for the options with a shor system('lpr' . (&printdevice == '' ? '' : ' -P' . &printdevice) . ' ' . v:fname_in) . delete(v:fname_in) + v:shell_error < - On MS-Windows machines the default is to copy the file to the - currently specified printdevice: > - - system('copy' . ' ' . v:fname_in . ' "' . &printdevice . '"') + On MS-Dos, MS-Windows and OS/2 machines the default is to copy the + file to the currently specified printdevice: > + + system('copy' . ' ' . v:fname_in . (&printdevice == '' + ? ' LPT1:' : (' \"' . &printdevice . '\"'))) . delete(v:fname_in) < On VMS machines the default is to send the file to either the default diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1,4 +1,4 @@ -*starting.txt* For Vim version 7.0aa. Last change: 2004 May 28 +*starting.txt* For Vim version 7.0aa. Last change: 2004 Jun 15 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1019,6 +1019,11 @@ Once Vim has done this once, it will set To change it later, use a ":let" command like this: > :let $VIMRUNTIME = "/home/piet/vim/vim54" +In case you need the value of $VIMRUNTIME in a shell (e.g., for a script that +greps in the help files) you might be able to use this: > + + VIMRUNTIME=`vim -e -T dumb --cmd 'exe "set t_cm=\"|echo $VIMRUNTIME|quit' | tr -d '\015' ` + ============================================================================== 6. Suspending *suspend* diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 7.0aa. Last change: 2004 Jun 09 +*syntax.txt* For Vim version 7.0aa. Last change: 2004 Jun 15 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1348,7 +1348,7 @@ definitions in java.vim or by creating y original one and then adds the code to highlight functions. In java 1.1 the functions System.out.println() and System.err.println() should -only be used for debugging. Therefor it is possible to highlight debugging +only be used for debugging. Therefore it is possible to highlight debugging statements differently. To do this you must add the following definition in your startup file: > :let java_highlight_debug=1 diff --git a/runtime/doc/tags b/runtime/doc/tags --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -3844,6 +3844,7 @@ ZZ editing.txt /*ZZ* `. motion.txt /*`.* `0 motion.txt /*`0* `< motion.txt /*`<* +`= editing.txt /*`=* `> motion.txt /*`>* `A motion.txt /*`A* `[ motion.txt /*`[* @@ -4018,6 +4019,7 @@ bufnr() eval.txt /*bufnr()* bufwinnr() eval.txt /*bufwinnr()* bug-fixes-5 version5.txt /*bug-fixes-5* bug-fixes-6 version6.txt /*bug-fixes-6* +bug-fixes-7 version7.txt /*bug-fixes-7* bug-reports intro.txt /*bug-reports* bugreport.vim intro.txt /*bugreport.vim* bugs intro.txt /*bugs* @@ -4166,6 +4168,7 @@ command-mode intro.txt /*command-mode* compatible-default starting.txt /*compatible-default* compile-changes-5 version5.txt /*compile-changes-5* compile-changes-6 version6.txt /*compile-changes-6* +compile-changes-7 version7.txt /*compile-changes-7* compiler-manx quickfix.txt /*compiler-manx* compiler-pyunit quickfix.txt /*compiler-pyunit* compiler-select quickfix.txt /*compiler-select* @@ -5056,12 +5059,14 @@ improved-sessions version5.txt /*improve improved-viminfo version5.txt /*improved-viminfo* improvements-5 version5.txt /*improvements-5* improvements-6 version6.txt /*improvements-6* +improvements-7 version7.txt /*improvements-7* inactive-buffer windows.txt /*inactive-buffer* include-search tagsrch.txt /*include-search* inclusive motion.txt /*inclusive* incomp-small-6 version6.txt /*incomp-small-6* incompatible-5 version5.txt /*incompatible-5* incompatible-6 version6.txt /*incompatible-6* +incompatible-7 version7.txt /*incompatible-7* indent() eval.txt /*indent()* indent-expression indent.txt /*indent-expression* indent.txt indent.txt /*indent.txt* @@ -5378,6 +5383,7 @@ netterm-mouse options.txt /*netterm-mous network pi_netrw.txt /*network* new-5 version5.txt /*new-5* new-6 version6.txt /*new-6* +new-7 version7.txt /*new-7* new-GTK-GUI version5.txt /*new-GTK-GUI* new-Select-mode version5.txt /*new-Select-mode* new-View version6.txt /*new-View* @@ -5387,6 +5393,7 @@ new-cmdwin version6.txt /*new-cmdwin* new-color-schemes version6.txt /*new-color-schemes* new-commands version5.txt /*new-commands* new-commands-5.4 version5.txt /*new-commands-5.4* +new-data-types version7.txt /*new-data-types* new-debug-itf version6.txt /*new-debug-itf* new-debug-mode version6.txt /*new-debug-mode* new-diff-mode version6.txt /*new-diff-mode* @@ -5405,6 +5412,7 @@ new-global-values version6.txt /*new-glo new-highlighting version5.txt /*new-highlighting* new-indent-flex version6.txt /*new-indent-flex* new-items-6 version6.txt /*new-items-6* +new-items-7 version7.txt /*new-items-7* new-line-continuation version5.txt /*new-line-continuation* new-multi-byte version5.txt /*new-multi-byte* new-multi-lang version6.txt /*new-multi-lang* @@ -5794,6 +5802,7 @@ setbufvar() eval.txt /*setbufvar()* setcmdpos() eval.txt /*setcmdpos()* setline() eval.txt /*setline()* setreg() eval.txt /*setreg()* +setting-guifont gui.txt /*setting-guifont* setwinvar() eval.txt /*setwinvar()* sftp pi_netrw.txt /*sftp* sgml-syntax syntax.txt /*sgml-syntax* @@ -6387,6 +6396,7 @@ version-variable eval.txt /*version-vari version4.txt version4.txt /*version4.txt* version5.txt version5.txt /*version5.txt* version6.txt version6.txt /*version6.txt* +version7.txt version7.txt /*version7.txt* vi-differences vi_diff.txt /*vi-differences* vi: options.txt /*vi:* vi_diff.txt vi_diff.txt /*vi_diff.txt* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.0aa. Last change: 2004 Jun 13 +*todo.txt* For Vim version 7.0aa. Last change: 2004 Jun 16 VIM REFERENCE MANUAL by Bram Moolenaar @@ -30,22 +30,241 @@ be worked on, but only if you sponsor Vi *known-bugs* -------------------- Known bugs and current work ----------------------- -GTK2: font dialog uses font size zero when 'guifont' is "Courier". Patch from -Yasuhiro Matsumoto, 2004 June 8. +This example doesn't work: + :e `=foo . ".c" ` +Inside `` don't use " as the start of a comment. +Also don't expand % or #. -Python indent: # aser: still adds extra indent. +Corrections for docs from A3. Skip ones already done. For version 7.0: - Include many PATCHES: + 9 Win32 GuI: The print dialog uses a font which doesn't display multi-byte + messages. Include patch from Vipin Aravind? Update from Yasuhiro + Matsumoto. + 8 ":winpos" doesn't work. Patch from Vipin Aravind. + 8 Add GTK 2.3 file dialog support. Patch by Grahame Bowland, 2004 Mar 15, + but it doesn't use "initdir" or "dflt". (will update patch) + 8 On Sinix SYS_NMLN isn't defined. Include patch from Cristiano De + Michele. He no longer has such a machine. + 8 Add file locking. Lock a file when starting to edit it with flock() or + fcntl(). This patch has advisory file locking while reading/writing + the file: ~/vim/patches/kahn_file_locking . + Do we still want this/ + 8 Add buffer-local autocommands? Reduces overhead for autocommands that + trigger often (inserting a character, switching mode). + :au Event do-something + E.g.: + :au BufEnter menu enable ... + :au BufLeave menu disable ... + Patch from Yakov Lerner, including test (2004 Jan 7). + He'll send updated patch. + Autocommands: + VimResized - When the Vim window has been resized (SIGWINCH) + patch from Yakov Lerner, 2003 July 24. + He'll write documentation and send updated patch. - Include the kvim patch. http://freenux.org/vim/ (Mickael Marchand) Do not add Qtopia yet, it doesn't work very well. + Mickael will update the patch before 21st. + --- responses above + 7 Make "5dd" on last-but-one-line not delete anything (Vi compatible). + Add flag in 'cpoptions' for this. When not present, "2dd" in the last + line should delete the last line. Patch from greenx 2002 Apr 11. + 8 Accelerators don't work in a dialog. Include patch from Martin Dalecki + (Jan 3, tested by David Harrison). Should work with Alt-o then. + 7 Use accelerators for the Motif file selection dialog. Patch from + Martin Dalecki 2002 Jan 11. + 8 Add a few more command names to the menus. Patch from Jiri Brezina + (28 feb 2002). + 8 Patch to add 'transparency' option. Disadvantage: it's slow. (Eckehard + Berns, 2004 May 9) http://ecki.to/vim-icns/TransBack.diff + 8 Patches from "Rain Dog" Cucka: + - guifont selector (2002 Dec 15) + - scrollbar (2002 Dec 8) + - Quartz fonts (2002 Dec 8) + 7 ATTENTION dialog choices are more logical when "Delete it' appears + before "Quit". Patch by Robert Webb, 2004 May 3. + 8 Unix: When libcall() fails there is no clear error message. Johannes + Zellner has a patch for this. + 8 ":hardcopy": + - Patch to append CTRL-D to PostScript output (Mike Williams, 2004 Jun + 14) + - support printing multi-byte characters. Patch from Motonobu + Ichimura. New (better) patch from Mike Williams (2004 Jan 20) + 9 Merge in ideas from ~/vim/patches/tutor.txt (Gabriel Zachmann) + 8 Add patch from Muraoka Taro (Mar 16) to support input method on Mac? + - Include flipcase patch: ~/vim/patches/wall.flipcase2 ? Make it work + for multi-byte characters. + 7 Add patch from Wall for this one ( ~/Mail/oldmail/wall/in.00019 ): + 'flipcase' variable: upper/lowercase pairs. + Insert comma's between pairs and allow a range, make it look like + 'isfname'. E.g. ":set flipcase=a-zA-Z,xX,23-33:143-153". The colon to + separate the from and to part is optional. + - Win32: add options to print dialog. Patch from Vipin Aravind. + - Patch to add highlighting for whitespace. (Tom Schumm, 2003 Jul 5) + use the patch that keeps using HLF_8 if HLF_WS has not + been given values. + Add section in help files for these highlight groups? + 8 "fg" and "bg" don't work in an xterm. Get default colors from xterm + with an ESC sequence. Ideas in: ~/vim/patches/vikas.xtermcolors . + 7 Add "DefaultFG" and "DefaultBG" for the colors of the menu. (Martin + Dalecki has a patch for Motif) + - Add possibility to highlight specific columns (for Fortran). Or put a + line in between columns (e.g. for 'textwidth'). + Patch to add 'hlcolumn' from Vit Stradal, 2004 May 20. + 9 Add cursor-column highlighting. Enable it with 'cursorcolumn' option, + set highlighting with "CursorColumn" group. Useful for aligning text. + Also cursor-row highlighting. Patch from Yasuhiro Matsumoto for + underlining the cursor line, 2004 Mar 24. + Alternatie: when 'number' is set highlight the number of the current + line. + 7 Be able to call a function while passing on a variable number of + arguments: + :function Foo(abc, ...) + : call Bar(a:abc, a:*) + Charles Campbell has a patch for this + 8 Add ":n" to fnamemodify(): normalize path, remove "../" when possible. + Aric Blumer has a patch for this. + 8 Add functions: + tr(expr, from, to) translate chars (Patch from Ron Aaron, Apr 8 + 2004) + strrep() Repeat a string (patch from Christophe Poucet, + 2003 Sep 12, also contains XX) + Alt: repeat(expr, count) werkt ook voor lists. + mousex() mousey() get position of mouse pointer (patch by Ross + Presser) + He will send a new patch. + Is this really useful? + --- + multibyteidx(string, idx) Byte index in multi-byte character. + Patch by Ilya Sher, 2004 Feb 25 + menuprop({name}, {idx}, {what}) + Get menu property of menu {name} item {idx}. + menuprop("", 1, "name") returns "File". + menuprop("File", 1, "n") returns "nmenu + File.Open..." argument. + Patch by Ilya Sher, 2004 Apr 22 + mapname({idx}, mode) return the name of the idx'th mapping. + Patch by Ilya Sher, 2004 Mar 4. + match({pat}, {string} [,start] [,count]) get index of count'th match + Patch by Ilya Sher, 2004 Mar 31 + find() find file in 'path' (patch from Johannes + Zellner 2001 Dec 20) + realname() Get user name (first, last, full) + user_fullname() patch by Nikolai Weibull, Nov + 3 2002) + getfperm() file permissions, in form "rwxrwxrwx" + (patch from Nikolai Weibull 2003 Jan 13) + getftype() "file", "dir", "link", "other"? + (patch from Nikolai Weibull 2003 Jan 13) + setbufline() set line in any buffer (patch from Yegappan + Lakshmanan, 2003 Jan 21) + winnr("$") Get number of windows. (patch from Nikolai + Weibull 2003 Jan 13) (another patch from + Yegappan Lakshmanan, 2003 Aug 31) + search() Add optional offset argument. + Add 'n' flag. (patch from Nikolai Weibull + 2003 Jan 13) + confirm() add "flags" argument, with 'v' for vertical + layout and 'c' for console dialog. (Haegg) + Flemming Madsen has a patch for the 'c' flag + (2003 May 13) + system({cmd}, {expr}) Filter {expr} through the shell command + {cmd} and return the result. + (Patch from Yegappan Lakshmanan) + raisewin() raise gvim window (see HierAssist patch for + Tcl implementation ~/vim/HierAssist/ ) + gettext() Translate a message. (Patch from Yasuhiro + Matsumoto) How to get the messages into the + .po files? + 7 Add "nbsp" in 'listchars'? Patch from David Blanchet, 2003 Jul 28. + 7 Add patch from Benoit Cerrina to integrate Vim and Perl functions + better. Now also works for Ruby (2001 Nov 10) + 7 Add 'taglistfiles' option, show file name and type when listing matching + tags name with CTRL-D completion. Patch from Yegappan Lakshmanan. + 7 Motif: use the menu font consistently. Patch from Martin Dalecki 2002 + Jan 11. + - Motif: add 3D shading for the menu entries? Patch from Martin Dalecki. + 8 Add expression-expansion, so that the user can define his own kind of + completion. Patch from Taro Muraoka, 2003 Aug 26. + 7 Completion of network shares, patch by Yasuhiro Matsumoto. + 9 When 'autoindent' is set, hitting twice, while there is text after + the cursor, doesn't delete the autoindent in the resulting blank line. + (Rich Wales) This is Vi compatible, but it looks like a bug. Rich has + a suggestion for a patch to fix this. + e-mail to Rich bounced. + 7 Make ":startinsert" command work directly for functions and scripts? + Also make it possible to append (it's difficult at end of line). + And add ":startreplace" (patch by Charles Campbell, 2004 Jan 9, + http://www.erols.com/astronaut/vim/index.html#Patch) + 8 Text objects: Add "a'" and 'a"': a single or double quoted string. + (Tim Chase) Patch from Taro Muraoka (2003 Dec 16). + 7 For Visual mode: Command to do a search for the string in the marked + area. Only when fewer than two lines. Use "g/" and "gb". Patch from + Yegappan Lakshmanan. + 7 When 'rightleft' is set, the search pattern should be displayed right + to left as well? See patch of Dec 26. (Nadim Shaikli) + 8 Add patch from Charles Campbell to have ":0file!" remove the name of + the current buffer. (2003 June 17) + 8 Make it possible to delete marks. Charles Campbell has a patch that + does this with the markclear() function (2004 Jan 9). And the + ":delmark" command (2004 Feb 9) + 7 Win32: Add patch for 5-button mouse. (Michael Geddes 2001 Nov 26) + 8 Lock all used memory so that it doesn't get swapped to disk (uncrypted). + Patch by Jason Holt, 2003 May 23. + 7 Support a stronger encryption. Jason Holt implemented AES (May 6 2003). + 7 Add ! register, for shell commands. (patch from Grenie) + 7 Add the MzScheme interface. Patch on http://iamphet.nm.ru/scheme/ + (Sergey Khorev) + 8 Make 'statusline' local, so that each window can have a different + value. But should it also be local to a buffer? (Yegappan Lakshmanan + has a patch, 2002 feb 15) + 8 In the gzip plugin, also recognize *.gz.orig, *.gz.bak, etc. Like it's + done for filetype detection. Patch from Walter Briscoe, 2003 Jul 1. + 7 Add a "-@ filelist" argument: read file names from a file. (David + Kotchan has a patch for it) + 8 Add term entries for function keys on xterm with alt and ctrl (new in + pl 94). E.g., Control adds ";5" in "[20;5~". Find a generic way + to prepend a modifier in console mode, to avoid having to specify each + individual modified key. + Steve Wall has a patch (2002 Mar 12) for adding function keys up to 37, + with modifiers. + 8 Include a connection to an external program through a pipe? See + patches from Felbinger for a mathematica interface. + Or use emacs server kind of thing? + 7 Add an option to set the width of the 'number' column. Eight + positions is often more than needed. Or adjust the width to the + length of the file? + Add patch that adds 'numberlen' option. (James Harvey) + Other patch with min and max from Emmanuel Renieris (2002 Jul 24) + Other patch without an option by Gilles Roy (2002 Jul 25) + 7 Add ":justify" command. Patch from Vit Stradal 2002 Nov 25. + - findmatch() should be adjusted for Lisp. See remark at + get_lisp_indent(). Esp. \( and \) should be skipped. (Dorai Sitaram, + incomplete patch Mar 18) + 8 Sorting of filenames for completion is wrong on systems that ignore + case of filenames. Add 'ignorefncase' option. When set, case in + filenames is ignored for sorting them. Patch by Mike Williams: + ~/vim/patches/ignorefncase. Also change what matches? Or use another + option name. +- Change ga_room into ga_maxlen, so that it doesn't need to be + incremented/decremented each time. - new DATA TYPES: lists, dictionaries and function references. + Check old patch from Robert Webb for array support. Add type checking? See ~/vim/ideas.txt. - Add SPELLCHECKER, with easy to add support for many languages. + 8 Add spell checking. Use "ispell -a" somehow. + ~/vim/patches/wm_vim-5_4d.zip can be used as an example (includes + ispell inside Vim). Gautam Iyer has an example with "aspell". + "engspchk" from Charles Campbell is a good way. Support for + approximate-regexps will help (agrep http://www.tgries.de/agrep/). - REFACTORING: The main() function is very long. Move parts to separate functions, especially loops. Ideas from Walter Briscoe (2003 Apr 3, 2004 Feb 9). +- Improve the interface between the generic GUI code and the system-specific + code. Generic code handles text window with scrollbars, system-specific + code menu, toolbar, etc. - Store messages to allow SCROLLING BACK for all commands. And other "less" like commands. - "INTELLISENSE". First cleanup the Insert-mode completion. @@ -81,6 +300,7 @@ 7 Support WINDOW TABS. Works like sev - STICKY CURSOR: Add a way of scrolling that leaves the cursor where it is. Especially when using the scrollbar. Typing a cursor-movement command scrolls back to where the cursor is. +8 Support four composing characters, needed for Hebrew. (Ron Aaron) Vi incompatibility: @@ -135,9 +355,6 @@ 7 Add flag in 'cpoptions' that makes < (Sayre). 7 Add flag in 'cpoptions' that makes operator (yank, filter) not move the cursor, at least when cancelled. (default Vi compatible). -7 Make "5dd" on last-but-one-line not delete anything (Vi compatible). - Add flag in 'cpoptions' for this. When not present, "2dd" in the last - line should delete the last line. Patch from greenx 2002 Apr 11. 7 This Vi-trick doesn't work: "Q" to go to Ex mode, then "g/pattern/visual". In Vi you can edit in visual mode, and when doing "Q" you jump to the next match. Nvi can do it too. @@ -210,8 +427,6 @@ 8 Win32: When clicking on the gvim tit Put focus event in input buffer and let generic Vim code handle it? 8 When activating the Vim window with mouse click, don't move cursor to mouse position. Catch WM_MOUSEACTIVATE. (Luevelsmeyer) -9 The print dialog uses a font which doesn't display multi-byte messages. - Include patch from Vipin Aravind? Update from Yasuhiro Matsumoto. 8 Win32: When mouse is hidden and in the toolbar, moving it won't make it appear. (Sami Salonen) 8 Windows NT: writing to aux.* makes Vim hang. (Acevedo) @@ -311,10 +526,6 @@ 5 When starting gvim with all the defa Motif GUI: 8 Popup menu ordering is wrong. -8 Accelerators don't work in a dialog. Include patch from Martin Dalecki - (Jan 3, tested by David Harrison). Should work with Alt-o then. -7 Use accelerators for the Motif file selection dialog. Patch from Martin - Dalecki 2002 Jan 11. 7 Use XmStringCreateLocalized() instead of XmStringCreateSimple()? David Harrison says it's OK (it exists in Motif 1.2). 8 The texts in the find/replace dialog don't use the right font. @@ -344,7 +555,6 @@ 8 When fontset support is enabled, set doesn't work. 8 Menu priority for sub-menus for: Amiga, BeOS. 8 Add menu separators for Amiga, RISCOS. -8 Add a few more command names. Patch from Jiri Brezina (28 feb 2002). 8 Add way to specify the file filter for the browse dialog. At least for browse(). 8 Add dialog for search/replace to other GUIs? Tk has something for this, @@ -491,7 +701,6 @@ 9 tmpnam() uses file in root of file s a Netware network drive. Use same function as for Win32 GUI? 8 In os_win32.h, HAVE_STRICMP and HAVE_STRNICMP are defined only if __GNUC__ is not defined. Shouldn't that be the other way around? -8 ":winpos" doesn't work. Patch from Vipin Aravind. 7 Use SetConsoleCP() and SetConsoleOutputCP() to implement 'termencoding'? Avoids that input and output work differently. Need to be restored when exiting. @@ -516,12 +725,6 @@ 7 Loading the Perl library only works 8 Inputting Unicode characters does not work in the terminal. They appear to arrive as upper and lower bytes. (David Brown, 2004 April 17) 8 Typing Unicode characters doesn't work at all in the GUI. -8 Patch to add 'transparency' option. Disadvantage: it's slow. (Eckehard - Berns, 2004 May 9) http://ecki.to/vim-icns/TransBack.diff -8 Patches from "Rain Dog" Cucka: - - guifont selector (2002 Dec 15) - - scrollbar (2002 Dec 8) - - Quartz fonts (2002 Dec 8) 9 Problems in Carbon version for OS X: (Benji Fisher) - keyboard shortcuts in the menus get lost. 8 The Vim/About menu doesn't work. @@ -563,8 +766,6 @@ 7 After running "make test" the window when compiled with Python (threading). 7 The messages for "vim --help" and "vim --version" don't use 'termencoding'. -7 ATTENTION dialog choices are more logical when "Delete it' appears before - "Quit". Patch by Robert Webb, 2004 May 3. 8 When 'scrollbind' is set, a window won't scroll horizontally if the cursor line is too short. Add a word in 'scrollopt' to allow moving the cursor to longer line that is visible. A similar thing is done for the GUI when @@ -651,8 +852,6 @@ 9 When getting focus while writing a l 9 The "Error detected while processing modelines" message should have an error number. 7 The message in bt_dontwrite_msg() could be clearer. -8 Unix: When libcall() fails there is no clear error message. Johannes - Zellner has a patch for this. 8 The script ID that is stored with an option and displayed with ":verbose set" isn't reset when the option is set internally. For example when 'foldlevel' is set from 'foldlevelstart'. @@ -678,13 +877,10 @@ 7 When 'mousefocus' is set and switchi 8 When using CTRL-D after ":help", restrict the number of matches to a thousand, otherwise using CTRL-D without an argument takes too long. 8 ":hardcopy": - - Patch to append CTRL-D to PostScript output (Mike Williams, 2004 Jun 11) - Using the cterm_color[] table is wrong when t_colors is > 16. - Need to handle unprintable characters. - Win32: On a B&W printer syntax highlighting isn't visible. Perform dithering to make grey text? - - support printing multi-byte characters. Patch from Motonobu Ichimura. - New (better) patch from Mike Williams (2004 Jan 20) - Add a flag in 'printoptions' to add an empty page to make the total number even. "addempty"? (Mike Williams) - Should interpreted CTRL-L as a page break. @@ -817,7 +1013,6 @@ 8 When "cm" termcap entry is missing, it. (Lohner) Try out with "vt100" entry, cm replaced with cX. 7 When an include file starts with "../", the check for already visiting this file doesn't work. Need to simplify the file name. -8 On Sinix SYS_NMLN isn't defined. Include patch from Cristiano De Michele. 7 The names and comments for the arguments of do_browse() are confusing. "dflt" isn't the default file name when "initdir" is not NULL and "initdir" is the default path to be used. @@ -927,7 +1122,6 @@ Problems that will (probably) not be sol Documentation: 8 Extend usr_27.txt a bit. (Adam Seyfarth) -9 Merge in ideas from ~/vim/patches/tutor.txt (Gabriel Zachmann) 7 Add a section on debugging scripts in the user manual. 9 Make the Reference Manual more precise. For each command mention: - change to cursor position and curswant @@ -989,9 +1183,6 @@ 9 Add buffer-local menu. Should offer disabling it. Be careful that tear-offs don't disappear (keep one empty item?). Alternative: use BufEnter and BufLeave autocommands. -8 Add file locking. Lock a file when starting to edit it with flock() or - fcntl(). This patch has advisory file locking while reading/writing the - file: ~/vim/patches/kahn_file_locking . 8 make a vimtutor script for Amiga and other systems. 7 Add the arguments for configure to the ":version" output? @@ -1065,14 +1256,10 @@ 7 When converting a file fails, mentio so that the user can fix the problem. 8 Add configure option to be able to disable using the iconv library. (Udo Schweigert) -8 Add patch from Muraoka Taro (Mar 16) to support input method on Mac? 9 'aleph' should be set to 1488 for Unicode. (Zvi Har'El) 8 Should add test for using various commands with multi-byte characters. -- Include flipcase patch: ~/vim/patches/wall.flipcase2 ? Make it work for - multi-byte characters. 8 'infercase' doesn't work with multi-byte characters. 8 toupper() function doesn't handle byte count changes. -8 Support four composing characters, needed for Hebrew. (Ron Aaron) 8 "ga" should show all composing characters, also if there are more than 2. 7 When searching, should order of composing characters be ignored? 8 Should implement 'delcombine' for command line editing. @@ -1122,7 +1309,6 @@ Printing: - Win32: when 'printfont' is empty use 'guifont'. - Unix: Use some dialog box to do the obvious settings (paper size, printer name, portrait/landscape, etc). -- Win32: add options to print dialog. Patch from Vipin Aravind. - PostScript: only works for 7-bit ASCII and EBCDIC. Should support different 'encoding' values somehow. - Allow specifying the paper size, instead of using a standard size. Same @@ -1133,10 +1319,6 @@ 8 Make the foreground color darkening Syntax highlighting: -- Patch to add highlighting for whitespace. (Tom Schumm, 2003 Jul 5) - use the patch that keeps using HLF_8 if HLF_WS has not - been given values. - Add section in help files for these highlight groups? 8 Make ":syn off" use 'runtimepath' instead of $VIMRUNTIME. (Gary Johnson) Should do the same for ":syn on" and ":syn manual". 8 Support "containedin" argument for ":syn include", so that the defined @@ -1184,8 +1366,6 @@ 8 When listing syntax items, try to so re-insert the [] if possible. 8 Make it possible to use color of text for Visual highlight group (like for the Cursor). -8 "fg" and "bg" don't work in an xterm. Get default colors from xterm with - an ESC sequence. Ideas in: ~/vim/patches/vikas.xtermcolors . 8 Make it possible to only highlight a sub-expression of a match. Like using "\1" in a ":s" command. 8 Support for deleting syntax items: @@ -1204,8 +1384,6 @@ 8 Make it possible to use "inverted" h character. For Visual mode. (xterm-selection already does this). 8 Highlight non-printable characters with "SpecialChar", linked to "Special". Display them with the digraph characters, if possible. -7 Add "DefaultFG" and "DefaultBG" for the colors of the menu. (Martin - Dalecki has a patch for Motif) 8 Highlight the clipboard-selection with a highlight group. 8 Be able to reset highlighting to its original (default) values. 7 Be able to write current highlighting to a file as commands, similar to @@ -1236,11 +1414,6 @@ 7 Wild idea: Not only set highlighting 7 CTRL-] checks the highlight group for finding out what the tag is. 7 Add an explanation how a list of words can be used to highlight misspelled words. -8 Add spell checking. Use "ispell -a" somehow. - ~/vim/patches/wm_vim-5_4d.zip can be used as an example (includes ispell - inside Vim). Gautam Iyer has an example with "aspell". "engspchk" from - Charles Campbell is a good way. Support for approximate-regexps will help - (agrep http://www.tgries.de/agrep/). 7 Command line completion for ":find" should search in 'path'. 8 Add more command line completion for :syntax. 8 Add more command line completion for :highlight. @@ -1267,9 +1440,6 @@ 6 Add possibility to have background c - Make it possible to add "contains" items for all items in a group. Useful when extending an already existing syntax file. - Add line-continuation pattern for non-syncing items too? -- Add possibility to highlight specific columns (for Fortran). Or put a - line in between columns (e.g. for 'textwidth'). - Patch to add 'hlcolumn' from Vit Stradal, 2004 May 20. - Add possibility to highlight the whole line, including the right margin (for comment blocks). - Add 'hlmatch' option: List of flags: @@ -1303,11 +1473,6 @@ 8 Add referring to key options with "& 8 Allow range for ":exec". Pass it on to the executed command. (Webb) 8 exists("&&option") tests if 'option' is actually implemented. Useful for 'shellslash', for example. -7 Be able to call a function while passing on a variable number of - arguments: - :function Foo(abc, ...) - : call Bar(a:abc, a:*) - Charles Campbell has a patch for this 8 Have a look at VSEL. Would it be useful to include? (Bigham) 8 Add ":fungroup" command, to group function definitions together. When encountered, all functions in the group are removed. Suggest using an @@ -1329,26 +1494,10 @@ 7 Pre-parse or compile Vim scripts int file belongs to a sourced script? 7 Add "n" flag to search() function, just like searchpair(). (Alexey Marinichev) -8 Add ":n" to fnamemodify(): normalize path, remove "../" when possible. - Aric Blumer has a patch for this. 7 Add argument to winwidth() to subtract the space taken by 'foldcolumn', signs and/or 'number'. 8 Add functions: - multibyteidx(string, idx) Byte index in multi-byte character. - Patch by Ilya Sher, 2004 Feb 25 - menuprop({name}, {idx}, {what}) - Get menu property of menu {name} item {idx}. - menuprop("", 1, "name") returns "File". - menuprop("File", 1, "n") returns "nmenu - File.Open..." argument. - Patch by Ilya Sher, 2004 Apr 22 - mapname({idx}, mode) return the name of the idx'th mapping. - Patch by Ilya Sher, 2004 Mar 4. - match({pat}, {string} [,start] [,count]) get index of count'th match - Patch by Ilya Sher, 2004 Mar 31 sprintf(format, arg, ..) How to prevent a crash??? - mousex() mousey() get position of mouse pointer (patch by Ross - Presser) attributes() return file protection flags "drwxrwxrwx" mkdir(dir) Create directory copy(from, to) Copy a file @@ -1360,48 +1509,15 @@ 8 Add functions: Visual block mode. tagtype(tag) get type of tag (also checks if it exists) getacp() Win32: get codepage (Glenn Maynard) - tr(expr, from, to) translate chars (Patch from Ron Aaron, Apr 8 - 2004) - find() find file in 'path' (patch from Johannes - Zellner 2001 Dec 20) - realname() Get user name (first, last, full) - user_fullname() patch by Nikolai Weibull, Nov - 3 2002) - getfperm() file permissions, in form "rwxrwxrwx" - (patch from Nikolai Weibull 2003 Jan 13) - getftype() "file", "dir", "link", "other"? - (patch from Nikolai Weibull 2003 Jan 13) - setbufline() set line in any buffer (patch from Yegappan - Lakshmanan, 2003 Jan 21) getbufline() get line from any buffer deletebufline() delete line in any buffer appendbufline() append line in any buffer - winnr("$") Get number of windows. (patch from Nikolai - Weibull 2003 Jan 13) (another patch from - Yegappan Lakshmanan, 2003 Aug 31) - search() Add optional offset argument. - Add 'n' flag. (patch from Nikolai Weibull - 2003 Jan 13) sort() Sort a newline-separated string. Also: ":sort". libcall() Allow more than one argument. libcallext() Like libcall(), but using a callback function to allow the library to execute a command or evaluate an expression. - confirm() add "flags" argument, with 'v' for vertical - layout and 'c' for console dialog. (Haegg) - Flemming Madsen has a patch for the 'c' flag - (2003 May 13) - system({cmd}, {expr}) Filter {expr} through the shell command - {cmd} and return the result. - (Patch from Yegappan Lakshmanan) - raisewin() raise gvim window (see HierAssist patch for - Tcl implementation ~/vim/HierAssist/ ) - gettext() Translate a message. (Patch from Yasuhiro - Matsumoto) How to get the messages into the - .po files? - strrep() Repeat a string (patch from Christophe Poucet, - 2003 Sep 12, also contains XX) char2hex() convert char string to hex string. XX hex2char() convert hex string to char string. XX 7 Make bufname("'0") return the buffer name from mark '0. How to get the @@ -1440,12 +1556,6 @@ 7 Add function to generate unique numb 7 Automatically load a function from a file when it is called. Need an option for the search path. (Sekera) 7 Persistent variables: "p:var"; stored in viminfo file and sessions files. -7 Include support for arrays? Patch from Robert Webb. - This is restricted to fixed-size arrays indexed by number. Better: Use - associative arrays: a[5] = 3, a["some"] = 'x'. Implement by translating - into ordinary variables: a[5] is "-a-5", a["some"] is "a-some", a[5][6] is - "a-5-6". But how to do array assignment and concatenation? - Alternative: use dictionaries, like Python. Robustness: @@ -1617,7 +1727,6 @@ 8 Add a ":refresh [winnr]" command, to an event handler where ":normal" can't be used. Also useful when 'lazyredraw' is set in a mapping. 7 Make 'list' and 'linebreak' work together. -7 Add "nbsp" in 'listchars'? Patch from David Blanchet, 2003 Jul 28. Scrolling: @@ -1655,8 +1764,6 @@ 8 Some compilers don't give an error f Perl interface: 8 Rename typemap file to something else? -7 Add patch from Benoit Cerrina to integrate Vim and Perl functions better. - Now also works for Ruby (2001 Nov 10) 7 Make buffers accessed as Perl arrays. (Clark) 7 Make it possible to compile with non-ANSI C? 6 Tcl/Tk has the "load" command: load a shared library (.so or .dll). @@ -1710,8 +1817,6 @@ 7 Support "col:99" extra field, to pos 7 Better support for jumping to where a function or variable is used. Use the id-utils, with a connection to "gid" (Emacs can do it too). Add ":idselect", which uses an "ID" database (made by "mkid") like "tselect". -7 Add 'taglistfiles' option, show file name and type when listing matching - tags name with CTRL-D completion. Patch from Yegappan Lakshmanan. Security: @@ -1758,8 +1863,6 @@ 7 The "-P" argument only works for the GUI: -8 Add GTK 2.3 file dialog support. Patch by Grahame Bowland, 2004 Mar 15, - but it doesn't use "initdir" or "dflt". 8 Make inputdialog() work for Photon, Amiga, RiscOS. - cannot be mapped. Should be possible to recognize this as a normal "-" with the Ctrl modifier. @@ -1781,8 +1884,6 @@ 8 Make the split into system independe explicit. There are too many #ifdefs in gui.c. If possible, separate the Vim code completely from the GUI code, to allow running them in separate processes. -8 Support a background bitmap. Useful for marking a column. Patch from - Heather Downs (GTK) and Vince Negri (Win32). 7 X11: Support cursorColor resource and "-cr" argument. 8 X11 (and others): CTRL-; is not different from ';'. Set the modifier mask to include CTRL for keys where CTRL produces the same ASCII code. @@ -1793,8 +1894,6 @@ 8 Should take font from xterm where gv 8 Selecting font names in X11 is difficult, make a script or something to select one. Martin Dalecki has a font selector for Motif, but it needs a bit more work. -7 Motif: use the menu font consistently. Patch from Martin Dalecki 2002 Jan - 11. 8 Visual highlighting should keep the same font (bold, italic, etc.). 8 Add flag to 'guioptions' to not put anything in the clipboard at all? 8 Should support a way to use keys that we don't recognize yet. Add a @@ -1838,7 +1937,6 @@ 7 Motif: For a confirm() dialog should close the dialog. - Motif steals from us, to pop up menus with the keyboard. How do we get it back if we want it? -- Motif: add 3D shading for the menu entries? Patch from Martin Dalecki. - Paste in Insert mode should not do autowrap etc. Or maybe this should be changeable with an option? - Put a nice picture in the icon (but how do we do that?). @@ -1898,13 +1996,6 @@ 7 Add something to break the autocomma 8 When editing "tt.gz", which is in DOS format, 'fileformat' stays at "unix", thus writing the file changes it. Somehow detect that the read command used dos fileformat. Same for 'fileencoding'. -8 Add buffer-local autocommands? Reduces overhead for autocommands that - trigger often (inserting a character, switching mode). - :au Event do-something - E.g.: - :au BufEnter menu enable ... - :au BufLeave menu disable ... - Patch from Yakov Lerner, including test (2004 Jan 7). - Add events to autocommands: Error - When an error happens NormalEnter - Entering Normal mode @@ -1937,8 +2028,6 @@ 8 Add buffer-local autocommands? Redu that marks can be updated. HierAssist has patch to add BufChangePre, BufChangePost and RevertBuf. (Shah) WinResized - When a window has been resized - VimResized - When the Vim window has been resized (SIGWINCH) - patch from Yakov Lerner, 2003 July 24. - Add autocommand to be executed every so many seconds? For writing the file now and then ('autosave'). *'autosave'* *'as'* *'noautosave'* *'noas'* @@ -1961,8 +2050,6 @@ 8 The code has become too complex. Re 8 Add option to set different behavior for Insert mode completion: - ignore/match case - different characters than 'iskeyword' -8 Add expression-expansion, so that the user can define his own kind of - completion. Patch from Taro Muraoka, 2003 Aug 26. 8 Add a command to undo the completion, go back to the original text. 8 Use the class information in the tags file to do context-sensitive completion. After "foo." complete all member functions/variables of @@ -2045,7 +2132,6 @@ 8 With command line completion after ' file name, so it can be edited. Also with modifiers, such as "%:h". 8 When completing command names, either sort them on the long name, or list them with the optional part inside []. -7 Completion of network shares, patch by Yasuhiro Matsumoto. 7 Completion of ":map x ": fill in the current mapping, so that it can be edited. (Sven Guckes) 7 Add completion for when entering an expression after CTRL-R= and "=. @@ -2083,10 +2169,6 @@ Command line history: Insert mode: -9 When 'autoindent' is set, hitting twice, while there is text after - the cursor, doesn't delete the autoindent in the resulting blank line. - (Rich Wales) This is Vi compatible, but it looks like a bug. Rich has a - suggestion for a patch to fix this. 8 When using CTRL-O in Insert mode, then executing an insert command "a" or "i", should we return to Insert mode after ? (Eggink) Perhaps it can be allowed a single time, to be able to do @@ -2094,10 +2176,6 @@ 8 When using CTRL-O in Insert mode, th ":map 5aabc" works only once from Insert mode. 7 Use CTRL-G to repeat what follows. Useful for inserting a character multiple times or repeating CTRL-Y. -7 Make ":startinsert" command work directly for functions and scripts? - Also make it possible to append (it's difficult at end of line). - And add ":startreplace" (patch by Charles Campbell, 2004 Jan 9, - http://www.erols.com/astronaut/vim/index.html#Patch) 7 Use 'matchpairs' for 'showmatch': When inserting a character check if it appears in the rhs of 'matchpairs'. - In Insert mode (and command line editing?): Allow undo of the last typed @@ -2261,8 +2339,6 @@ 7 Add objects with backwards extension deletes the current and previous sentence. (Jens Paulus) 7 Add "g{" and "g}" to move to the first/last character of a paragraph (instead of the line just before/after a paragraph as with "{" and "}"). -8 Add "a'" and 'a"': a single or double quoted string. (Tim Chase) - Patch from Taro Muraoka (2003 Dec 16). 6 Ignore comment leaders for objects. Make "das" work in reply-email. 5 Make it possible to use syntax group matches as a text object. For example, define a "ccItem" group, then do "da" to delete one. @@ -2308,7 +2384,7 @@ 7 With blockwise Visual mode and "c", 7 CTRL-V :s should substitute only in the block, not to whole lines. (David Young is working on this) 7 Filtering a block should only apply to the block, not to the whole lines. - When the number of lines is increased, add lines. When decreased, padd with + When the number of lines is increased, add lines. When decreased, pad with spaces or delete? Use ":`<,`>" on the command line. 8 After filtering the Visual area, make "gv" select the filtered text? Currently "gv" only selects a single line, not useful. @@ -2323,9 +2399,6 @@ 7 In Visual block mode, need to be abl the right column, and then use up/down movements to select the line, without changing the column. 6 ":left" and ":right" should work in Visual block mode. -7 For Visual mode: Command to do a search for the string in the marked area. - Only when fewer than two lines. Use "g/" and "gb". Patch from Yegappan - Lakshmanan. 7 CTRL-I and CTRL-O should work in Visual mode, but only jump to marks in the current buffer. 7 CTRL-A and CTRL-X should increase/decrease all numbers in the Visual area. @@ -2460,8 +2533,6 @@ 7 Add an option to accept a match at t search(). (Brett) 7 Add pattern item to use properties of Unicode characters. In Perl it's "\p{L}" for a letter. See Regular Expression Pocket Reference. -7 When 'rightleft' is set, the search pattern should be displayed right to - left as well? See patch of Dec 26. (Nadim Shaikli) 8 Would it be possible to allow ":23,45/pat/flags" to search for "pat" in lines 23 to 45? Or does this conflict with Ex range syntax? 8 Allow identical pairs in 'matchpairs'. Restrict the search to the current @@ -2590,8 +2661,6 @@ 7 Add an undo tree: When making a chan Buffer list: -8 Add patch from Charles Campbell to have ":0file!" remove the name of the - current buffer. (2003 June 17) 7 Command to execute a command in another buffer: ":inbuf {bufname} {cmd}". Also for other windows: ":inwin {winnr} {cmd}". How to make sure that this works properly for all commands, and still be able to return to the @@ -2769,9 +2838,6 @@ 7 Make a list of file marks in a separ to jump to the mark (in current window or new window). Start it with ":browse marks"? 6 Add a menu that lists the Marks like ":marks". (Amerige) -8 Make it possible to delete marks. Charles Campbell has a patch that does - this with the markclear() function (2004 Jan 9). And the ":delmark" - command (2004 Feb 9) 7 For ":jumps", ":tags" and ":marks", for not loaded buffers, remember the text at the mark. Highlight the column with the mark. 7 Highlight each mark in some way (With "Mark" highlight group). @@ -2855,7 +2921,6 @@ 5 Add commands to bookmark lines, disp Mouse support: -7 Win32: Add patch for 5-button mouse. (Michael Geddes 2001 Nov 26) 8 Add 'o' flag to 'mouse'? 7 Be able to set a 'mouseshape' for the popup menu. 8 Add 'mouse' flag, which sets a behavior like Visual mode, but automatic @@ -2872,9 +2937,6 @@ 7 Checkout sysmouse() for FreeBSD cons Crypt and security: 8 Also crypt the swapfile, each block separately. Change mf_write() and mf_read(). How to get b_p_key to these functions? -7 Support a stronger encryption. Jason Holt implemented AES (May 6 2003). -8 Lock all used memory so that it doesn't get swapped to disk (uncrypted). - Patch by Jason Holt, 2003 May 23. Argument list: @@ -2904,7 +2966,7 @@ 6 When yanking into the unnamed regist to position of previous deleted (to swap foo and bar in " + foo") 8 Should be able to yank and delete into the "/ register. How to take care of the flags (offset, magic)? -7 Add ! register, for shell commands. (patch from Grenie) + Debug mode: 7 Add something to enable debugging when a remote message is received. @@ -2919,8 +2981,6 @@ 7 Make the debug mode history availabl Various improvements: 8 Add ":rename" command: rename the file of the current buffer and rename the buffer. Buffer may be modified. -7 Add the MzScheme interface. Patch on http://iamphet.nm.ru/scheme/ - (Sergey Khorev) 6 In the quickfix window statusline add the command used to get the list of errors, e.g. ":make foo", ":grep something *.c". 6 Python interface: add vim.message() function. (Michal Vitecek, 2002 Nov 5) @@ -2933,13 +2993,8 @@ 7 Add an invisible buffer which can be to manipulate text without changing the window layout. 8 Add a command to revert to the saved version of file; undo or redo until all changes are gone. -8 Make 'statusline' local, so that each window can have a different value. - But should it also be local to a buffer? (Yegappan Lakshmanan has a patch, - 2002 feb 15) 7 Add a ":cpfile", go in the other direction as ":cnfile". 6 "vim -q -" should read the list of errors from stdin. (Gautam Mudunuri) -8 In the gzip plugin, also recognize *.gz.orig, *.gz.bak, etc. Like it's - done for filetype detection. Patch from Walter Briscoe, 2003 Jul 1. 8 Add "--remote-fail": When contacting the server fails, exit Vim. Add "--remote-self": When contacting the server fails, do it in this Vim. Overrules the default of "--remote-send" to fail and "--remote" to do it @@ -2953,16 +3008,8 @@ 8 Add the possibility to set 'fileform CR characters. For example, for "dos" files remove CR characters at the end of the line, so that a file with mixed line endings is cleaned up. To just not display the CR characters: Add a flag to 'display'? -7 Add a "-@ filelist" argument: read file names from a file. (David Kotchan - has a patch for it) 7 Some compilers give error messages in which the file name does not have a path. Be able to specify that 'path' is used for these files. -8 Add term entries for function keys on xterm with alt and ctrl (new in pl - 94). E.g., Control adds ";5" in "[20;5~". Find a generic way to - prepend a modifier in console mode, to avoid having to specify each - individual modified key. - Steve Wall has a patch (2002 Mar 12) for adding function keys up to 37, - with modifiers. 7 Xterm sends O3F for . Similarly for other , , etc. Combinations of Alt, Ctrl and Shift are also possible. Recognize these to avoid inserting the raw byte sequence, handle like the key @@ -2984,26 +3031,13 @@ 7 Add %s to 'keywordprg': replace with 8 Support printing on Unix. Can use "lpansi.c" as an example. (Bookout) 8 Add put command that replaces the text under it. Esp. for blockwise Visual mode. -7 Enhance termreponse stuff: Add t_CV(?): pattern of term response, use +7 Enhance termresponse stuff: Add t_CV(?): pattern of term response, use regexp: "\e\[[>?][0-9;]*c", but only check just after sending t_RV. 7 Add "g|" command: move to N'th column from the left margin (after wrapping and applying 'leftcol'). Works as "|" like what "g0" is to "0". -7 Add patch from Wall for this one ( ~/Mail/oldmail/wall/in.00019 ): - 'flipcase' variable: upper/lowercase pairs. - Insert comma's between pairs and allow a range, make it look like - 'isfname'. E.g. ":set flipcase=a-zA-Z,xX,23-33:143-153". The colon to - separate the from and to part is optional. 7 Support setting 'equalprg' to a user function name. -9 Add cursor-column highlighting. Enable it with 'cursorcolumn' option, set - highlighting with "CursorColumn" group. Useful for aligning text. - Also cursor-row highlighting. - Patch from Yasuhiro Matsumoto for underlining the cursor line, 2004 Mar 24. - Alternatie: when 'number' is set highlight the number of the current line. 7 Highlight the characters after the end-of-line differently. 7 When 'whichwrap' contains "l", "$dl" should join lines? -8 Include a connection to an external program through a pipe? See patches - from Felbinger for a mathematica interface. - Or use emacs server kind of thing? 8 Add an argument to configure to use $CFLAGS and not modify it? (Mooney) 8 Enabling features is a mix of configure arguments and defines in feature.h. How to make this consistent? Feature.h is required for @@ -3043,11 +3077,6 @@ 7 "g CTRL-O" jumps back to last used b 7 Add a history of recently accessed buffer. Maybe make "2 CTRL-^" jump to the 2nd previously visited buffer, "3 CTRL-^" to the third, etc. Or use "3 g CTRL-^" for this? -7 Add an option to set the width of the 'number' column. Eight positions is - often more than needed. Or adjust the width to the length of the file? - Add patch that adds 'numberlen' option. (James Harvey) - Other patch with min and max from Emmanuel Renieris (2002 Jul 24) - Other patch without an option by Gilles Roy (2002 Jul 25) - Add code to disable the CAPS key when going from Insert to Normal mode. - Set date/protection/etc. of the patchfile the same as the original file. - Use growarray for termcodes[] in term.c @@ -3075,7 +3104,6 @@ 7 Add a way to change an operator to a 9 When using ":w " it's possible that this file is loaded in another buffer. Give a warning right away, don't wait for a shell command. - Make 'smartcase' work even though 'ic' isn't set (Webb). -7 Add ":justify" command. Patch from Vit Stradal 2002 Nov 25. 7 When formatting text, allow to break the line at a number of characters. Use an option for this: 'breakchars'? Useful for formatting Fortran code. - Add flag to 'formatoptions' to be able to format book-style paragraphs @@ -3101,8 +3129,6 @@ 7 Should ":cd" for MS-DOS go to $HOME, - Make "gq" work on the last line in the file. Maybe for every operator? 8 findmatchlimit() should be able to skip comments. Solves problem of matching the '{' in /* if (foo) { */ (Fiveash) -- findmatch() should be adjusted for Lisp. See remark at get_lisp_indent(). - Esp. \( and \) should be skipped. (Dorai Sitaram, incomplete patch Mar 18) - Add more redirecting of Ex commands: :redir @> register (append) :redir # bufname @@ -3335,11 +3361,6 @@ 8 Allow opening an unnamed buffer with - Support mapping for replace mode and "r" command (Vi doesn't do this)? 5 Add 'ignorefilecase' option: Ignore case when expanding file names. ":e ma" would also find "Makefile" on Unix. -8 Sorting of filenames for completion is wrong on systems that ignore case - of filenames. Add 'ignorefncase' option. When set, case in filenames is - ignored for sorting them. Patch by Mike Williams: - ~/vim/patches/ignorefncase. Also change what matches? Or use another - option name. 8 Should be able to compile Vim in another directory, with $(srcdir) set to where the sources are. Add $(srcdir) in the Makefile in a lot of places. (Netherton) diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -1,4 +1,4 @@ -*various.txt* For Vim version 7.0aa. Last change: 2004 May 01 +*various.txt* For Vim version 7.0aa. Last change: 2004 Jun 14 VIM REFERENCE MANUAL by Bram Moolenaar @@ -431,7 +431,8 @@ N *+X11* Unix only: can restore window *:verb* *:verbose* :[count]verb[ose] {command} Execute {command} with 'verbose' set to [count]. If - [count] is omitted one is used. + [count] is omitted one is used. ":0verbose" can be + used to set 'verbose' to zero. The additional use of ":silent" makes messages generated but not displayed. The combination of ":silent" and ":verbose" can be diff --git a/runtime/indent/python.vim b/runtime/indent/python.vim --- a/runtime/indent/python.vim +++ b/runtime/indent/python.vim @@ -2,7 +2,7 @@ " Language: Python " Maintainer: Bram Moolenaar " Original Author: David Bustos -" Last Change: 2003 Sep 08 +" Last Change: 2004 Jun 15 " Only load this indent file when no other was loaded. if exists("b:did_indent") @@ -36,7 +36,7 @@ function GetPythonIndent(lnum) " If the start of the line is in a string don't change the indent. if has('syntax_items') - \ && synIDattr(synID(a:lnum, 1, 1), "name") == "pythonString" + \ && synIDattr(synID(a:lnum, 1, 1), "name") =~ "String$" return -1 endif @@ -56,7 +56,7 @@ function GetPythonIndent(lnum) let parlnum = searchpair('(', '', ')', 'nbW', \ "line('.') < " . (plnum - s:maxoff) . " ? dummy :" \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')" - \ . " =~ 'python\\(Comment\\|String\\)'") + \ . " =~ '\\(Comment\\|String\\)$'") if parlnum > 0 let plindent = indent(parlnum) let plnumstart = parlnum @@ -75,14 +75,14 @@ function GetPythonIndent(lnum) let p = searchpair('(', '', ')', 'bW', \ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :" \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')" - \ . " =~ 'python\\(Comment\\|String\\)'") + \ . " =~ '\\(Comment\\|String\\)$'") if p > 0 if p == plnum " When the start is inside parenthesis, only indent one 'shiftwidth'. let pp = searchpair('(', '', ')', 'bW', \ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :" \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')" - \ . " =~ 'python\\(Comment\\|String\\)'") + \ . " =~ '\\(Comment\\|String\\)$'") if pp > 0 return indent(plnum) + &sw endif @@ -102,7 +102,7 @@ function GetPythonIndent(lnum) let col = 0 while col < pline_len if pline[col] == '#' && (!has('syntax_items') - \ || synIDattr(synID(plnum, col + 1, 1), "name") == "pythonComment") + \ || synIDattr(synID(plnum, col + 1, 1), "name") =~ "Comment$") let pline = strpart(pline, 0, col) break endif diff --git a/runtime/lang/menu_ru_ru.koi8-r.vim b/runtime/lang/menu_ru_ru.koi8-r.vim --- a/runtime/lang/menu_ru_ru.koi8-r.vim +++ b/runtime/lang/menu_ru_ru.koi8-r.vim @@ -155,11 +155,12 @@ menutrans Fold\ Met&hod &\ menutrans Create\ &Foldzf &\ zf menutrans &Delete\ Foldzd &\ zd menutrans Delete\ &All\ FoldszD \ &\ zD -menutrans Fold\ column\ &width &\ \ +menutrans Fold\ col&umn\ width &\ \ ">>>->>>----------- Tools/Folds/Fold Method menutrans M&anual & menutrans I&ndent & menutrans E&xpression & +menutrans S&yntax & menutrans Ma&rker & ">>>--------------- Tools/Diff menutrans &Update & @@ -177,6 +178,7 @@ menutrans &Show\ filetypes\ in\ menu \ \ \ \ \ & menutrans Set\ '&syntax'\ only &\ \ \ 'syntax' menutrans Set\ '&filetype'\ too \ &\ \ 'filetype' menutrans &Off & +menutrans &Manual & menutrans A&utomatic & menutrans on/off\ for\ &This\ file /\ \ &\ menutrans Co&lor\ test \ & diff --git a/src/Makefile b/src/Makefile --- a/src/Makefile +++ b/src/Makefile @@ -432,7 +432,7 @@ CClink = $(CC) #CONF_OPT_FEAT = --with-features=small #CONF_OPT_FEAT = --with-features=normal #CONF_OPT_FEAT = --with-features=big -#CONF_OPT_FEAT = --with-features=huge +CONF_OPT_FEAT = --with-features=huge # COMPILED BY - For including a specific e-mail address for ":version". #CONF_OPT_COMPBY = "--with-compiledby=John Doe " @@ -493,7 +493,7 @@ CClink = $(CC) # Often used for GCC: mixed optimizing, lot of optimizing, debugging #CFLAGS = -g -O2 -fno-strength-reduce -Wall -Wshadow -Wmissing-prototypes -#CFLAGS = -g -O2 -fno-strength-reduce -Wall -Wmissing-prototypes +CFLAGS = -g -O2 -fno-strength-reduce -Wall -Wmissing-prototypes #CFLAGS = -O6 -fno-strength-reduce -Wall -Wshadow -Wmissing-prototypes #CFLAGS = -g -DDEBUG -Wall -Wshadow -Wmissing-prototypes #CFLAGS = -g -O2 -DSTARTUPTIME=\"vimstartup\" -fno-strength-reduce -Wall -Wmissing-prototypes diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -431,8 +431,7 @@ dbg_parsearg(arg) vim_free(q); if (p == NULL) return FAIL; - bp->dbg_name = fix_fname(p); - vim_free(p); + bp->dbg_name = p; #ifdef MACOS_CLASSIC if (bp->dbg_name != NULL) slash_n_colon_adjust(bp->dbg_name); diff --git a/src/ex_docmd.c b/src/ex_docmd.c --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -487,6 +487,62 @@ struct while_cookie static char_u *get_while_line __ARGS((int c, void *cookie, int indent)); static int store_while_line __ARGS((garray_T *gap, char_u *line)); static void free_cmdlines __ARGS((garray_T *gap)); + +/* Struct to save a few things while debugging. Used in do_cmdline() only. */ +struct dbg_stuff +{ + int trylevel; + int force_abort; + except_T *caught_stack; + char_u *vv_exception; + char_u *vv_throwpoint; + int did_emsg; + int got_int; + int did_throw; + int need_rethrow; + int check_cstack; + except_T *current_exception; +}; + +static void save_dbg_stuff __ARGS((struct dbg_stuff *dsp)); +static void restore_dbg_stuff __ARGS((struct dbg_stuff *dsp)); + + static void +save_dbg_stuff(dsp) + struct dbg_stuff *dsp; +{ + dsp->trylevel = trylevel; trylevel = 0; + dsp->force_abort = force_abort; force_abort = FALSE; + dsp->caught_stack = caught_stack; caught_stack = NULL; + dsp->vv_exception = v_exception(NULL); + dsp->vv_throwpoint = v_throwpoint(NULL); + + /* Necessary for debugging an inactive ":catch", ":finally", ":endtry" */ + dsp->did_emsg = did_emsg; did_emsg = FALSE; + dsp->got_int = got_int; got_int = FALSE; + dsp->did_throw = did_throw; did_throw = FALSE; + dsp->need_rethrow = need_rethrow; need_rethrow = FALSE; + dsp->check_cstack = check_cstack; check_cstack = FALSE; + dsp->current_exception = current_exception; current_exception = NULL; +} + + static void +restore_dbg_stuff(dsp) + struct dbg_stuff *dsp; +{ + suppress_errthrow = FALSE; + trylevel = dsp->trylevel; + force_abort = dsp->force_abort; + caught_stack = dsp->caught_stack; + (void)v_exception(dsp->vv_exception); + (void)v_throwpoint(dsp->vv_throwpoint); + did_emsg = dsp->did_emsg; + got_int = dsp->got_int; + did_throw = dsp->did_throw; + need_rethrow = dsp->need_rethrow; + check_cstack = dsp->check_cstack; + current_exception = dsp->current_exception; +} #endif @@ -625,17 +681,7 @@ do_cmdline(cmdline, getline, cookie, fla char_u *fname = NULL; /* function or script name */ linenr_T *breakpoint = NULL; /* ptr to breakpoint field in cookie */ int *dbg_tick = NULL; /* ptr to dbg_tick field in cookie */ - int saved_trylevel = 0; - int saved_force_abort = 0; - except_T *saved_caught_stack = NULL; - char_u *saved_vv_exception = NULL; - char_u *saved_vv_throwpoint = NULL; - int saved_did_emsg = 0; - int saved_got_int = 0; - int saved_did_throw = 0; - int saved_need_rethrow = 0; - int saved_check_cstack = 0; - except_T *saved_current_exception = NULL; + struct dbg_stuff debug_saved; /* saved things for debug mode */ int initial_trylevel; struct msglist **saved_msg_list = NULL; struct msglist *private_msg_list; @@ -725,21 +771,7 @@ do_cmdline(cmdline, getline, cookie, fla * exception handling (used when debugging). */ else if (flags & DOCMD_EXCRESET) - { - saved_trylevel = trylevel; trylevel = 0; - saved_force_abort = force_abort; force_abort = FALSE; - saved_caught_stack = caught_stack; caught_stack = NULL; - saved_vv_exception = v_exception(NULL); - saved_vv_throwpoint = v_throwpoint(NULL); - /* Necessary for debugging an inactive ":catch", ":finally", or - * ":endtry": */ - saved_did_emsg = did_emsg, did_emsg = FALSE; - saved_got_int = got_int, got_int = FALSE; - saved_did_throw = did_throw, did_throw = FALSE; - saved_need_rethrow = need_rethrow, need_rethrow = FALSE; - saved_check_cstack = check_cstack, check_cstack = FALSE; - saved_current_exception = current_exception; current_exception=NULL; - } + save_dbg_stuff(&debug_saved); initial_trylevel = trylevel; @@ -1326,22 +1358,7 @@ do_cmdline(cmdline, getline, cookie, fla * debugger). */ if (flags & DOCMD_EXCRESET) - { - suppress_errthrow = FALSE; - trylevel = saved_trylevel; - force_abort = saved_force_abort; - caught_stack = saved_caught_stack; - (void)v_exception(saved_vv_exception); - (void)v_throwpoint(saved_vv_throwpoint); - /* Necessary for debugging an inactive ":catch", ":finally", or - * ":endtry": */ - did_emsg = saved_did_emsg; - got_int = saved_got_int; - did_throw = saved_did_throw; - need_rethrow = saved_need_rethrow; - check_cstack = saved_check_cstack; - current_exception = saved_current_exception; - } + restore_dbg_stuff(&debug_saved); msg_list = saved_msg_list; #endif /* FEAT_EVAL */ @@ -1545,8 +1562,7 @@ getline_cookie(getline, cookie) */ #if (_MSC_VER == 1200) /* - * Optimisation bug in VC++ version 6.0 - * TODO: check this is still present after each service pack + * Avoid optimisation bug in VC++ version 6.0 */ # pragma optimize( "g", off ) #endif @@ -1738,8 +1754,9 @@ do_one_cmd(cmdlinep, sourcing, break; if (verbose_save < 0) verbose_save = p_verbose; - p_verbose = atoi((char *)ea.cmd); - if (p_verbose == 0) + if (vim_isdigit(*ea.cmd)) + p_verbose = atoi((char *)ea.cmd); + else p_verbose = 1; ea.cmd = p; continue; diff --git a/src/fileio.c b/src/fileio.c --- a/src/fileio.c +++ b/src/fileio.c @@ -6060,12 +6060,9 @@ buf_check_timestamp(buf, focus) } else { -# ifdef VIMBUDDY - VimBuddyText(tbuf + 9, 2); -# else -# ifdef FEAT_AUTOCMD +# ifdef FEAT_AUTOCMD if (!autocmd_busy) -# endif +# endif { msg_start(); msg_puts_attr(tbuf, hl_attr(HLF_E) + MSG_HIST); @@ -6077,9 +6074,9 @@ buf_check_timestamp(buf, focus) if (emsg_silent == 0) { out_flush(); -# ifdef FEAT_GUI +# ifdef FEAT_GUI if (!focus) -# endif +# endif /* give the user some time to think about it */ ui_delay(1000L, TRUE); @@ -6088,7 +6085,6 @@ buf_check_timestamp(buf, focus) } } already_warned = TRUE; -# endif } vim_free(path); diff --git a/src/message.c b/src/message.c --- a/src/message.c +++ b/src/message.c @@ -557,14 +557,6 @@ emsg(s) else flush_buffers(FALSE); /* flush internal buffers */ did_emsg = TRUE; /* flag for DoOneCmd() */ - -#ifdef VIMBUDDY - if (sourcing_name == NULL) - { - VimBuddyText(s, 2); - return TRUE; - } -#endif } emsg_on_display = TRUE; /* remember there is an error message */ @@ -2574,12 +2566,10 @@ give_warning(message, hl) /* Don't want a hit-enter prompt here. */ ++no_wait_return; + #ifdef FEAT_EVAL set_vim_var_string(VV_WARNINGMSG, message, -1); #endif -#ifdef VIMBUDDY - VimBuddyText(message, 1); -#else vim_free(keep_msg); keep_msg = NULL; if (hl) @@ -2591,7 +2581,7 @@ give_warning(message, hl) msg_didout = FALSE; /* overwrite this message */ msg_nowait = TRUE; /* don't wait for this message */ msg_col = 0; -#endif + --no_wait_return; } diff --git a/src/option.c b/src/option.c --- a/src/option.c +++ b/src/option.c @@ -2657,8 +2657,8 @@ set_init_1() #ifdef FEAT_POSTSCRIPT /* 'printexpr' must be allocated to be able to evaluate it. */ set_string_default("pexpr", -# ifdef MSWIN - (char_u *)"system('copy' . ' ' . v:fname_in . ' \"' . &printdevice . '\"') . delete(v:fname_in)" +# if defined(MSWIN) || defined(MSDOS) || defined(OS2) + (char_u *)"system('copy' . ' ' . v:fname_in . (&printdevice == '' ? ' LPT1:' : (' \"' . &printdevice . '\"'))) . delete(v:fname_in)" # else # ifdef VMS (char_u *)"system('print/delete' . (&printdevice == '' ? '' : ' /queue=' . &printdevice) . ' ' . v:fname_in)" diff --git a/src/po/ru.po b/src/po/ru.po --- a/src/po/ru.po +++ b/src/po/ru.po @@ -1,7 +1,7 @@ # Russian translation for Vim # -# Vim ":help uganda" -# , Vim ":help " +# Об условиях использования читайте в редакторе Vim ":help uganda" +# О людях, делающих Vim читайте в редакторе ":help авторы" # # vassily "vr" ragosin , 2004 # @@ -9,360 +9,360 @@ # msgid "" msgstr "" -"Project-Id-Version: Vim 6.3a\n" +"Project-Id-Version: Vim 6.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-05-10 21:37+0400\n" -"PO-Revision-Date: 2004-05-10 21:37+0400\n" +"POT-Creation-Date: 2004-06-15 09:39+0400\n" +"PO-Revision-Date: 2004-05-19 00:23+0400\n" "Last-Translator: vassily ragosin \n" "Language-Team: vassily ragosin \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=koi8-r\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" #: buffer.c:102 msgid "E82: Cannot allocate any buffer, exiting..." -msgstr "E82: , ..." +msgstr "E82: Невозможно выделить память даже для одного буфера, выход..." #: buffer.c:105 msgid "E83: Cannot allocate buffer, using other one..." -msgstr "E83: , ..." - -#: buffer.c:805 +msgstr "E83: Невозможно выделить память для буфера, используем другой буфер..." + +#: buffer.c:808 #, c-format msgid "E515: No buffers were unloaded" -msgstr "E515: " - -#: buffer.c:807 +msgstr "E515: Ни один буфер не был выгружен из памяти" + +#: buffer.c:810 #, c-format msgid "E516: No buffers were deleted" -msgstr "E516: ̣" - -#: buffer.c:809 +msgstr "E516: Ни один буфер не был удалён" + +#: buffer.c:812 #, c-format msgid "E517: No buffers were wiped out" -msgstr "E517: " - -#: buffer.c:817 +msgstr "E517: Ни один буфер не был очищен" + +#: buffer.c:820 msgid "1 buffer unloaded" -msgstr " " - -#: buffer.c:819 +msgstr "Один буфер выгружен из памяти" + +#: buffer.c:822 #, c-format msgid "%d buffers unloaded" -msgstr " : %d" - -#: buffer.c:824 +msgstr "Всего выгружено буферов из памяти: %d" + +#: buffer.c:827 msgid "1 buffer deleted" -msgstr " ̣" - -#: buffer.c:826 +msgstr "Один буфер удалён" + +#: buffer.c:829 #, c-format msgid "%d buffers deleted" -msgstr " : %d" - -#: buffer.c:831 +msgstr "Всего удалено буферов: %d" + +#: buffer.c:834 msgid "1 buffer wiped out" -msgstr " " - -#: buffer.c:833 +msgstr "Один буфер очищен" + +#: buffer.c:836 #, c-format msgid "%d buffers wiped out" -msgstr " : %d" - -#: buffer.c:894 +msgstr "Всего очищено буферов: %d" + +#: buffer.c:897 msgid "E84: No modified buffer found" -msgstr "E84: Σ " +msgstr "E84: Изменённых буферов не обнаружено" #. back where we started, didn't find anything. -#: buffer.c:933 +#: buffer.c:936 msgid "E85: There is no listed buffer" -msgstr "E85: " - -#: buffer.c:945 +msgstr "E85: Буферы в списке отсутствуют" + +#: buffer.c:948 #, c-format msgid "E86: Buffer %ld does not exist" -msgstr "E86: %ld " - -#: buffer.c:948 +msgstr "E86: Буфер %ld не существует" + +#: buffer.c:951 msgid "E87: Cannot go beyond last buffer" -msgstr "E87: " - -#: buffer.c:950 +msgstr "E87: Это последний буфер" + +#: buffer.c:953 msgid "E88: Cannot go before first buffer" -msgstr "E88: " - -#: buffer.c:988 +msgstr "E88: Это первый буфер" + +#: buffer.c:991 #, c-format msgid "E89: No write since last change for buffer %ld (add ! to override)" -msgstr "E89: %ld (!, )" - -#: buffer.c:1005 +msgstr "E89: Изменения в буфере %ld не сохранены (!, чтобы обойти проверку)" + +#: buffer.c:1008 msgid "E90: Cannot unload last buffer" -msgstr "E90: " - -#: buffer.c:1538 +msgstr "E90: Невозможно выгрузить из памяти последний буфер" + +#: buffer.c:1544 msgid "W14: Warning: List of file names overflow" -msgstr "W14: : ͣ " - -#: buffer.c:1709 +msgstr "W14: Предупреждение: переполнение списка имён файлов" + +#: buffer.c:1716 #, c-format msgid "E92: Buffer %ld not found" -msgstr "E92: %ld " - -#: buffer.c:1940 +msgstr "E92: Буфер %ld не найден" + +#: buffer.c:1947 #, c-format msgid "E93: More than one match for %s" -msgstr "E93: %s" - -#: buffer.c:1942 +msgstr "E93: Несколько соответствий для %s" + +#: buffer.c:1949 #, c-format msgid "E94: No matching buffer for %s" -msgstr "E94: %s " - -#: buffer.c:2337 +msgstr "E94: Нет соответствующего %s буфера" + +#: buffer.c:2344 #, c-format msgid "line %ld" -msgstr " %ld" - -#: buffer.c:2420 +msgstr "строка %ld" + +#: buffer.c:2429 msgid "E95: Buffer with this name already exists" -msgstr "E95: " - -#: buffer.c:2713 -msgid " [Modified]" -msgstr " [Σ]" - -#: buffer.c:2718 -msgid "[Not edited]" -msgstr "[ ]" - -#: buffer.c:2723 -msgid "[New file]" -msgstr "[ ]" +msgstr "E95: Буфер с таким именем уже существует" #: buffer.c:2724 +msgid " [Modified]" +msgstr " [Изменён]" + +#: buffer.c:2729 +msgid "[Not edited]" +msgstr "[Не редактировался]" + +#: buffer.c:2734 +msgid "[New file]" +msgstr "[Новый файл]" + +#: buffer.c:2735 msgid "[Read errors]" -msgstr "[ ]" - -#: buffer.c:2726 fileio.c:2112 +msgstr "[Ошибки чтения]" + +#: buffer.c:2737 fileio.c:2124 msgid "[readonly]" -msgstr "[ ]" - -#: buffer.c:2747 +msgstr "[только для чтения]" + +#: buffer.c:2758 #, c-format msgid "1 line --%d%%--" -msgstr " --%d%%--" - -#: buffer.c:2749 +msgstr "Одна строка --%d%%--" + +#: buffer.c:2760 #, c-format msgid "%ld lines --%d%%--" -msgstr "%ld . --%d%%--" - -#: buffer.c:2756 +msgstr "%ld стр. --%d%%--" + +#: buffer.c:2767 #, c-format msgid "line %ld of %ld --%d%%-- col " -msgstr ". %ld %ld --%d%%-- . " - -#: buffer.c:2864 +msgstr "стр. %ld из %ld --%d%%-- кол. " + +#: buffer.c:2875 msgid "[No file]" -msgstr "[ ]" +msgstr "[Нет файла]" #. must be a help buffer -#: buffer.c:2904 +#: buffer.c:2915 msgid "help" -msgstr "" - -#: buffer.c:3463 screen.c:5075 +msgstr "справка" + +#: buffer.c:3474 screen.c:5079 msgid "[help]" -msgstr "[]" - -#: buffer.c:3495 screen.c:5081 +msgstr "[справка]" + +#: buffer.c:3506 screen.c:5085 msgid "[Preview]" -msgstr "[]" - -#: buffer.c:3775 +msgstr "[Предпросмотр]" + +#: buffer.c:3786 msgid "All" -msgstr "" - -#: buffer.c:3775 +msgstr "Весь" + +#: buffer.c:3786 msgid "Bot" -msgstr "" - -#: buffer.c:3777 +msgstr "Внизу" + +#: buffer.c:3788 msgid "Top" -msgstr "" - -#: buffer.c:4523 +msgstr "Наверху" + +#: buffer.c:4536 #, c-format msgid "" "\n" "# Buffer list:\n" msgstr "" "\n" -"# :\n" - -#: buffer.c:4556 +"# Список буферов:\n" + +#: buffer.c:4569 msgid "[Error List]" -msgstr "[ ]" - -#: buffer.c:4569 memline.c:1520 +msgstr "[Список ошибок]" + +#: buffer.c:4582 memline.c:1521 msgid "[No File]" -msgstr "[ ]" - -#: buffer.c:4882 +msgstr "[Нет файла]" + +#: buffer.c:4895 msgid "" "\n" "--- Signs ---" msgstr "" "\n" -"--- ---" - -#: buffer.c:4901 +"--- Значки ---" + +#: buffer.c:4914 #, c-format msgid "Signs for %s:" -msgstr " %s:" - -#: buffer.c:4907 +msgstr "Значки для %s:" + +#: buffer.c:4920 #, c-format msgid " line=%ld id=%d name=%s" -msgstr " =%ld id=%d =%s" +msgstr " строка=%ld id=%d имя=%s" #: diff.c:139 #, c-format msgid "E96: Can not diff more than %ld buffers" -msgstr "E96: %ld " +msgstr "E96: Следить за отличиями можно не более чем в %ld буферах" #: diff.c:713 msgid "E97: Cannot create diffs" -msgstr "E97: " +msgstr "E97: Невозможно создать файлы отличий" #: diff.c:818 msgid "Patch file" -msgstr "-" +msgstr "Файл-заплатка" #: diff.c:1069 msgid "E98: Cannot read diff output" -msgstr "E98: diff" +msgstr "E98: Невозможно прочитать вывод команды diff" #: diff.c:1819 msgid "E99: Current buffer is not in diff mode" -msgstr "E99: " +msgstr "E99: Активный буфер не находится в режиме отличий" #: diff.c:1831 msgid "E100: No other buffer in diff mode" -msgstr "E100: " +msgstr "E100: Больше нет буферов в режиме отличий" #: diff.c:1839 msgid "E101: More than two buffers in diff mode, don't know which one to use" -msgstr "E101: , " +msgstr "E101: В режиме отличий более двух буферов, не могу выбрать" #: diff.c:1862 #, c-format msgid "E102: Can't find buffer \"%s\"" -msgstr "E102: \"%s\"" +msgstr "E102: Не могу найти буфер \"%s\"" #: diff.c:1868 #, c-format msgid "E103: Buffer \"%s\" is not in diff mode" -msgstr "E103: \"%s\" " +msgstr "E103: Буфер \"%s\" не находится в режиме отличий" #: digraph.c:2199 msgid "E104: Escape not allowed in digraph" -msgstr "E104: Escape " +msgstr "E104: Экранирующий символ Escape нельзя использовать в диграфе" #: digraph.c:2384 msgid "E544: Keymap file not found" -msgstr "E544: " +msgstr "E544: Файл с раскладкой клавиатуры не найден" #: digraph.c:2411 msgid "E105: Using :loadkeymap not in a sourced file" -msgstr "E105: :loadkeymap " +msgstr "E105: Команда :loadkeymap применена вне файла сценария" #: edit.c:40 msgid " Keyword completion (^N^P)" -msgstr " (^N^P)" +msgstr " Автодополнение ключевого слова (^N^P)" #. ctrl_x_mode == 0, ^P/^N compl. #: edit.c:41 msgid " ^X mode (^E^Y^L^]^F^I^K^D^V^N^P)" -msgstr " ^X (^E^Y^L^]^F^I^K^D^V^N^P)" +msgstr " Автодополнение ^X (^E^Y^L^]^F^I^K^D^V^N^P)" #. Scroll has it's own msgs, in it's place there is the msg for local #. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL) -- Acevedo #: edit.c:44 msgid " Keyword Local completion (^N^P)" -msgstr " (^N^P)" +msgstr " Местное автодополнение ключевого слова (^N^P)" #: edit.c:45 msgid " Whole line completion (^L^N^P)" -msgstr " (^L^N^P)" +msgstr " Автодополнение целой строки (^L^N^P)" #: edit.c:46 msgid " File name completion (^F^N^P)" -msgstr " (^F^N^P)" +msgstr " Автодополнение имени файла (^F^N^P)" #: edit.c:47 msgid " Tag completion (^]^N^P)" -msgstr " (^]^N^P)" +msgstr " Автодополнение метки (^]^N^P)" #: edit.c:48 msgid " Path pattern completion (^N^P)" -msgstr " (^N^P)" +msgstr " Автодополнение шаблона пути (^N^P)" #: edit.c:49 msgid " Definition completion (^D^N^P)" -msgstr " (^D^N^P)" +msgstr " Автодополнение определения (^D^N^P)" #: edit.c:51 msgid " Dictionary completion (^K^N^P)" -msgstr " (^K^N^P)" +msgstr " Автодополнение по словарю (^K^N^P)" #: edit.c:52 msgid " Thesaurus completion (^T^N^P)" -msgstr " (^T^N^P)" +msgstr " Автодополнение синонимов (^T^N^P)" #: edit.c:53 msgid " Command-line completion (^V^N^P)" -msgstr " (^V^N^P)" +msgstr " Автодополнение командной строки (^V^N^P)" #: edit.c:56 msgid "Hit end of paragraph" -msgstr " " +msgstr "Конец абзаца" #: edit.c:962 msgid "'thesaurus' option is empty" -msgstr " 'thesaurus'" +msgstr "Не задано значение опции 'thesaurus'" #: edit.c:1166 msgid "'dictionary' option is empty" -msgstr " 'dictionary'" +msgstr "Не задано значение опции 'dictionary'" #: edit.c:2162 #, c-format msgid "Scanning dictionary: %s" -msgstr " : %s" +msgstr "Просмотр словаря: %s" #: edit.c:2368 msgid " (insert) Scroll (^E/^Y)" -msgstr " () (^E/^Y)" +msgstr " (вставка) Прокрутка (^E/^Y)" #: edit.c:2370 msgid " (replace) Scroll (^E/^Y)" -msgstr " () (^E/^Y)" +msgstr " (замена) Прокрутка (^E/^Y)" #: edit.c:2684 #, c-format msgid "Scanning: %s" -msgstr ": %s" +msgstr "Просмотр: %s" #: edit.c:2719 #, c-format msgid "Scanning tags." -msgstr " ." +msgstr "Выполняется поиск среди меток." #: edit.c:3381 msgid " Adding" -msgstr " " +msgstr " Добавление" #. showmode might reset the internal line pointers, so it must #. * be called before line = ml_get(), or when this address is no @@ -370,117 +370,117 @@ msgstr " " #. #: edit.c:3430 msgid "-- Searching..." -msgstr "-- ..." +msgstr "-- Поиск..." #: edit.c:3486 msgid "Back at original" -msgstr " " +msgstr "Исходное слово" #: edit.c:3491 msgid "Word from other line" -msgstr " " +msgstr "Слово из другой строки" #: edit.c:3496 msgid "The only match" -msgstr " " +msgstr "Единственное соответствие" #: edit.c:3555 #, c-format msgid "match %d of %d" -msgstr " %d %d" +msgstr "соответствие %d из %d" #: edit.c:3558 #, c-format msgid "match %d" -msgstr " %d" +msgstr "соответствие %d" #. Skip further arguments but do continue to #. * search for a trailing command. #: eval.c:1024 #, c-format msgid "E106: Unknown variable: \"%s\"" -msgstr "E106: : \"%s\"" +msgstr "E106: Неизвестная переменная: \"%s\"" #: eval.c:1320 #, c-format msgid "E107: Missing braces: %s" -msgstr "E107: : %s" +msgstr "E107: Пропущены скобки: %s" #: eval.c:1435 eval.c:1449 #, c-format msgid "E108: No such variable: \"%s\"" -msgstr "E108: : \"%s\"" +msgstr "E108: Нет такой переменной: \"%s\"" #: eval.c:1705 msgid "E109: Missing ':' after '?'" -msgstr "E109: ':' '?'" +msgstr "E109: Пропущено ':' после '?'" #: eval.c:2327 msgid "E110: Missing ')'" -msgstr "E110: ')'" +msgstr "E110: Пропущена ')'" #: eval.c:2389 msgid "E111: Missing ']'" -msgstr "E111: ']'" +msgstr "E111: Пропущена ']'" #: eval.c:2466 #, c-format msgid "E112: Option name missing: %s" -msgstr "E112: : %s" +msgstr "E112: Не указано имя опции: %s" #: eval.c:2484 #, c-format msgid "E113: Unknown option: %s" -msgstr "E113: : %s" +msgstr "E113: Неизвестная опция: %s" #: eval.c:2555 #, c-format msgid "E114: Missing quote: %s" -msgstr "E114: : %s" +msgstr "E114: Пропущена кавычка: %s" #: eval.c:2698 #, c-format msgid "E115: Missing quote: %s" -msgstr "E115: : %s" +msgstr "E115: Пропущена кавычка: %s" #: eval.c:3054 #, c-format msgid "E116: Invalid arguments for function %s" -msgstr "E116: %s " +msgstr "E116: Параметры для функции %s заданы неверно" #: eval.c:3083 #, c-format msgid "E117: Unknown function: %s" -msgstr "E117: : %s" +msgstr "E117: Неизвестная функция: %s" #: eval.c:3084 #, c-format msgid "E118: Too many arguments for function: %s" -msgstr "E118: %s" +msgstr "E118: Слишком много параметров для функции %s" #: eval.c:3085 #, c-format msgid "E119: Not enough arguments for function: %s" -msgstr "E119: %s" +msgstr "E119: Недостаточно параметров для функции %s" #: eval.c:3086 #, c-format msgid "E120: Using not in a script context: %s" -msgstr "E120: : %s" +msgstr "E120: используется вне сценария: %s" #. #. * Yes this is ugly, I don't particularly like it either. But doing it #. * this way has the compelling advantage that translations need not to #. * be touched at all. See below what 'ok' and 'ync' are used for. #. -#: eval.c:3687 gui.c:4382 gui_gtk.c:2059 +#: eval.c:3687 gui.c:4385 gui_gtk.c:2059 msgid "&Ok" msgstr "&Ok" #: eval.c:4226 #, c-format msgid "+-%s%3ld lines: " -msgstr "+-%s%3ld : " +msgstr "+-%s%3ld строк: " #: eval.c:5477 msgid "" @@ -488,138 +488,138 @@ msgid "" "&Cancel" msgstr "" "&OK\n" -"&" +"О&тмена" #: eval.c:5517 msgid "called inputrestore() more often than inputsave()" -msgstr " inputrestore() , inputsave()" +msgstr "Функция inputrestore() вызывается чаще, чем функция inputsave()" #: eval.c:5977 msgid "E655: Too many symbolic links (cycle?)" -msgstr "E656: (?)" - -#: eval.c:6609 +msgstr "E656: Слишком много символических ссылок (цикл?)" + +#: eval.c:6626 msgid "E240: No connection to Vim server" -msgstr "E240: Vim" - -#: eval.c:6706 +msgstr "E240: Нет связи с сервером Vim" + +#: eval.c:6724 msgid "E277: Unable to read a server reply" -msgstr "E227: " - -#: eval.c:6734 +msgstr "E227: Сервер не отвечает" + +#: eval.c:6752 msgid "E258: Unable to send to client" -msgstr "E258: " - -#: eval.c:6782 +msgstr "E258: Не могу ответить клиенту" + +#: eval.c:6800 #, c-format msgid "E241: Unable to send to %s" -msgstr "E241: %s" - -#: eval.c:6882 +msgstr "E241: Не могу отправить сообщение для %s" + +#: eval.c:6900 msgid "(Invalid)" -msgstr "()" - -#: eval.c:8060 +msgstr "(Неправильно)" + +#: eval.c:8078 #, c-format msgid "E121: Undefined variable: %s" -msgstr "E121: : %s" - -#: eval.c:8492 +msgstr "E121: Неопределенная переменная: %s" + +#: eval.c:8510 #, c-format msgid "E461: Illegal variable name: %s" -msgstr "E461: : %s" - -#: eval.c:8784 +msgstr "E461: Недопустимое имя переменной: %s" + +#: eval.c:8802 #, c-format msgid "E122: Function %s already exists, add ! to replace it" -msgstr "E122: %s . !, ţ." - -#: eval.c:8857 +msgstr "E122: Функция %s уже существует. Добавьте !, чтобы заменить её." + +#: eval.c:8875 #, c-format msgid "E123: Undefined function: %s" -msgstr "E123: : %s" - -#: eval.c:8870 +msgstr "E123: Неопределенная функция: %s" + +#: eval.c:8888 #, c-format msgid "E124: Missing '(': %s" -msgstr "E124: '(': %s" - -#: eval.c:8903 +msgstr "E124: Пропущена '(': %s" + +#: eval.c:8921 #, c-format msgid "E125: Illegal argument: %s" -msgstr "E125: : %s" - -#: eval.c:8982 +msgstr "E125: Недопустимый параметр: %s" + +#: eval.c:9000 msgid "E126: Missing :endfunction" -msgstr "E126: :endfunction" - -#: eval.c:9089 +msgstr "E126: Пропущена команда :endfunction" + +#: eval.c:9107 #, c-format msgid "E127: Cannot redefine function %s: It is in use" -msgstr "E127: %s, " - -#: eval.c:9159 +msgstr "E127: Невозможно переопределить функцию %s, она используется" + +#: eval.c:9177 msgid "E129: Function name required" -msgstr "E129: " - -#: eval.c:9210 +msgstr "E129: Требуется имя функции" + +#: eval.c:9228 #, c-format msgid "E128: Function name must start with a capital: %s" -msgstr "E128: : %s" - -#: eval.c:9402 +msgstr "E128: Имя функции должно начинаться с прописной буквы: %s" + +#: eval.c:9420 #, c-format msgid "E130: Undefined function: %s" -msgstr "E130: %s " - -#: eval.c:9407 +msgstr "E130: Функция %s не определена" + +#: eval.c:9425 #, c-format msgid "E131: Cannot delete function %s: It is in use" -msgstr "E131: %s, " - -#: eval.c:9455 +msgstr "E131: Невозможно удалить функцию %s, она используется" + +#: eval.c:9473 msgid "E132: Function call depth is higher than 'maxfuncdepth'" -msgstr "E132: , 'maxfuncdepth'" +msgstr "E132: Глубина вызова функции больше, чем значение 'maxfuncdepth'" #. always scroll up, don't overwrite -#: eval.c:9508 +#: eval.c:9526 #, c-format msgid "calling %s" -msgstr " %s" - -#: eval.c:9570 +msgstr "вызов %s" + +#: eval.c:9588 #, c-format msgid "%s aborted" -msgstr "%s " - -#: eval.c:9572 +msgstr "%s прервана" + +#: eval.c:9590 #, c-format msgid "%s returning #%ld" -msgstr "%s #%ld" - -#: eval.c:9579 +msgstr "%s возвращает #%ld" + +#: eval.c:9597 #, c-format msgid "%s returning \"%s\"" -msgstr "%s \"%s\"" +msgstr "%s возвращает \"%s\"" #. always scroll up, don't overwrite -#: eval.c:9595 ex_cmds2.c:2365 +#: eval.c:9613 ex_cmds2.c:2370 #, c-format msgid "continuing in %s" -msgstr " %s" - -#: eval.c:9621 +msgstr "продолжение в %s" + +#: eval.c:9639 msgid "E133: :return not inside a function" -msgstr "E133: :return " - -#: eval.c:9952 +msgstr "E133: команда :return вне функции" + +#: eval.c:9970 #, c-format msgid "" "\n" "# global variables:\n" msgstr "" "\n" -"# :\n" +"# глобальные переменные:\n" #: ex_cmds.c:92 #, c-format @@ -638,77 +638,77 @@ msgstr "> %d, Hex %08x, Octal %o" #: ex_cmds.c:430 msgid "E134: Move lines into themselves" -msgstr "E134: " +msgstr "E134: Строки перемещаются сами на себя" #: ex_cmds.c:499 msgid "1 line moved" -msgstr " " +msgstr "Перемещена одна строка" #: ex_cmds.c:501 #, c-format msgid "%ld lines moved" -msgstr " : %ld" +msgstr "Перемещено строк: %ld" #: ex_cmds.c:924 #, c-format msgid "%ld lines filtered" -msgstr " : %ld" +msgstr "Пропущено через фильтр строк: %ld" #: ex_cmds.c:952 msgid "E135: *Filter* Autocommands must not change current buffer" -msgstr "E135: *Filter* " +msgstr "E135: Автокоманды *Filter* не должны изменять активный буфер" #: ex_cmds.c:1037 msgid "[No write since last change]\n" -msgstr "[ ]\n" +msgstr "[Изменения не сохранены]\n" #: ex_cmds.c:1283 #, c-format msgid "%sviminfo: %s in line: " -msgstr "%sviminfo: %s : " +msgstr "%sviminfo: %s в строке: " #: ex_cmds.c:1288 msgid "E136: viminfo: Too many errors, skipping rest of file" msgstr "" -"E136: viminfo: , " +"E136: viminfo: Слишком много ошибок, остальная часть файла будет пропущена" #: ex_cmds.c:1323 #, c-format msgid "Reading viminfo file \"%s\"%s%s%s" -msgstr " viminfo \"%s\"%s%s%s" +msgstr "Чтение файла viminfo \"%s\"%s%s%s" #: ex_cmds.c:1324 msgid " info" -msgstr " " +msgstr " инфо" #: ex_cmds.c:1325 msgid " marks" -msgstr " " +msgstr " отметок" #: ex_cmds.c:1326 msgid " FAILED" -msgstr " " +msgstr " НЕУДАЧНО" #: ex_cmds.c:1418 #, c-format msgid "E137: Viminfo file is not writable: %s" -msgstr "E137: viminfo : %s" +msgstr "E137: Права на запись файла viminfo отсутствуют: %s" #: ex_cmds.c:1543 #, c-format msgid "E138: Can't write viminfo file %s!" -msgstr "E138: viminfo %s!" +msgstr "E138: Невозможно записать файл viminfo %s!" #: ex_cmds.c:1551 #, c-format msgid "Writing viminfo file \"%s\"" -msgstr " viminfo \"%s\"" +msgstr "Запись файла viminfo \"%s\"" #. Write the info: #: ex_cmds.c:1649 #, c-format msgid "# This viminfo file was generated by Vim %s.\n" -msgstr "# viminfo Vim %s.\n" +msgstr "# Этот файл viminfo автоматически создан Vim %s.\n" #: ex_cmds.c:1651 #, c-format @@ -716,121 +716,121 @@ msgid "" "# You may edit it if you're careful!\n" "\n" msgstr "" -"# (!) .\n" +"# Его можно (осторожно!) редактировать.\n" "\n" #: ex_cmds.c:1653 #, c-format msgid "# Value of 'encoding' when this file was written\n" -msgstr "# 'encoding' \n" +msgstr "# Значение опции 'encoding' в момент записи файла\n" #: ex_cmds.c:1752 msgid "Illegal starting char" -msgstr " " - -#: ex_cmds.c:2097 ex_cmds.c:2362 ex_cmds2.c:763 +msgstr "Недопустимый начальный символ" + +#: ex_cmds.c:2097 ex_cmds2.c:761 msgid "Save As" -msgstr " " +msgstr "Сохранить как" #. Overwriting a file that is loaded in another buffer is not a #. * good idea. #: ex_cmds.c:2140 msgid "E139: File is loaded in another buffer" -msgstr "E139: " +msgstr "E139: Файл загружен в другом буфере" #: ex_cmds.c:2174 msgid "Write partial file?" -msgstr " ?" +msgstr "Записать файл частично?" #: ex_cmds.c:2181 msgid "E140: Use ! to write partial buffer" -msgstr "E140: !" +msgstr "E140: Для записи части буфера используйте !" #: ex_cmds.c:2296 #, c-format msgid "Overwrite existing file \"%.*s\"?" -msgstr " \"%.*s\"?" +msgstr "Переписать существующий файл \"%.*s\"?" #: ex_cmds.c:2367 #, c-format msgid "E141: No file name for buffer %ld" -msgstr "E141: %ld " - -#: ex_cmds.c:2405 +msgstr "E141: Буфер %ld не связан с именем файла" + +#: ex_cmds.c:2406 msgid "E142: File not written: Writing is disabled by 'write' option" -msgstr "E142: Σ: 'write'" - -#: ex_cmds.c:2425 +msgstr "E142: Файл не сохранён: запись отключена опцией 'write'" + +#: ex_cmds.c:2426 #, c-format msgid "" "'readonly' option is set for \"%.*s\".\n" "Do you wish to write anyway?" msgstr "" -" \"%.*s\" 'readonly'.\n" -"?" - -#: ex_cmds.c:2597 +"Для \"%.*s\" включена опция 'readonly'.\n" +"Записать?" + +#: ex_cmds.c:2599 msgid "Edit File" -msgstr " " - -#: ex_cmds.c:3205 +msgstr "Редактирование файла" + +#: ex_cmds.c:3206 #, c-format msgid "E143: Autocommands unexpectedly deleted new buffer %s" -msgstr "E143: %s" - -#: ex_cmds.c:3339 +msgstr "E143: Автокоманды неожиданно убили новый буфер %s" + +#: ex_cmds.c:3340 msgid "E144: non-numeric argument to :z" -msgstr "E144: :z " - -#: ex_cmds.c:3424 +msgstr "E144: Параметр команды :z должен быть числом" + +#: ex_cmds.c:3425 msgid "E145: Shell commands not allowed in rvim" -msgstr "E145: rvim." - -#: ex_cmds.c:3531 +msgstr "E145: Использование команд оболочки не допускается в rvim." + +#: ex_cmds.c:3532 msgid "E146: Regular expressions can't be delimited by letters" -msgstr "E146: " - -#: ex_cmds.c:3877 +msgstr "E146: Регулярные выражения не могут разделяться буквами" + +#: ex_cmds.c:3878 #, c-format msgid "replace with %s (y/n/a/q/l/^E/^Y)?" -msgstr " %s? (y/n/a/q/l/^E/^Y)" - -#: ex_cmds.c:4270 +msgstr "заменить на %s? (y/n/a/q/l/^E/^Y)" + +#: ex_cmds.c:4271 msgid "(Interrupted) " -msgstr "()" - -#: ex_cmds.c:4274 +msgstr "(Прервано)" + +#: ex_cmds.c:4275 msgid "1 substitution" -msgstr " " - -#: ex_cmds.c:4276 +msgstr "Одна замена" + +#: ex_cmds.c:4277 #, c-format msgid "%ld substitutions" -msgstr "%ld " - -#: ex_cmds.c:4279 +msgstr "%ld замен" + +#: ex_cmds.c:4280 msgid " on 1 line" -msgstr " " - -#: ex_cmds.c:4281 +msgstr " в одной строке" + +#: ex_cmds.c:4282 #, c-format msgid " on %ld lines" -msgstr " %ld ." - -#: ex_cmds.c:4332 +msgstr " в %ld стр." + +#: ex_cmds.c:4333 msgid "E147: Cannot do :global recursive" -msgstr "E147: :global " - -#: ex_cmds.c:4367 +msgstr "E147: Команда :global не может быть рекурсивной" + +#: ex_cmds.c:4368 msgid "E148: Regular expression missing from global" -msgstr "E148: :global " - -#: ex_cmds.c:4416 +msgstr "E148: В команде :global пропущено регулярное выражение" + +#: ex_cmds.c:4417 #, c-format msgid "Pattern found in every line: %s" -msgstr " : %s" - -#: ex_cmds.c:4497 +msgstr "Соответствие шаблону найдено на каждой строке: %s" + +#: ex_cmds.c:4498 #, c-format msgid "" "\n" @@ -838,1462 +838,1462 @@ msgid "" "$" msgstr "" "\n" -"# :\n" +"# Последняя строка для замены:\n" "$" -#: ex_cmds.c:4598 +#: ex_cmds.c:4599 msgid "E478: Don't panic!" -msgstr "E478: , !" - -#: ex_cmds.c:4650 +msgstr "E478: Спокойствие, только спокойствие!" + +#: ex_cmds.c:4651 #, c-format msgid "E661: Sorry, no '%s' help for %s" -msgstr "E661: , '%s' %s " - -#: ex_cmds.c:4653 +msgstr "E661: к сожалению, справка '%s' для %s отсутствует" + +#: ex_cmds.c:4654 #, c-format msgid "E149: Sorry, no help for %s" -msgstr "E149: %s " - -#: ex_cmds.c:4687 +msgstr "E149: К сожалению справка для %s отсутствует" + +#: ex_cmds.c:4688 #, c-format msgid "Sorry, help file \"%s\" not found" -msgstr ", \"%s\" " - -#: ex_cmds.c:5170 +msgstr "Извините, файл справки \"%s\" не найден" + +#: ex_cmds.c:5191 #, c-format msgid "E150: Not a directory: %s" -msgstr "E150: %s " - -#: ex_cmds.c:5309 +msgstr "E150: %s не является каталогом" + +#: ex_cmds.c:5330 #, c-format msgid "E152: Cannot open %s for writing" -msgstr "E152: %s " - -#: ex_cmds.c:5345 +msgstr "E152: Невозможно открыть %s для записи" + +#: ex_cmds.c:5366 #, c-format msgid "E153: Unable to open %s for reading" -msgstr "E153: %s " - -#: ex_cmds.c:5367 +msgstr "E153: Невозможно открыть %s для чтения" + +#: ex_cmds.c:5388 #, c-format msgid "E670: Mix of help file encodings within a language: %s" -msgstr "E670: : %s" - -#: ex_cmds.c:5445 +msgstr "E670: Файлы справки используют разные кодировки для одного языка: %s" + +#: ex_cmds.c:5466 #, c-format msgid "E154: Duplicate tag \"%s\" in file %s" -msgstr "E154: \"%s\" %s" - -#: ex_cmds.c:5557 +msgstr "E154: Повторяющаяся метка \"%s\" в файле %s" + +#: ex_cmds.c:5578 #, c-format msgid "E160: Unknown sign command: %s" -msgstr "E160: %s" - -#: ex_cmds.c:5577 +msgstr "E160: Неизвестная команда значка %s" + +#: ex_cmds.c:5598 msgid "E156: Missing sign name" -msgstr "E156: " - -#: ex_cmds.c:5623 +msgstr "E156: Пропущено имя значка" + +#: ex_cmds.c:5644 msgid "E612: Too many signs defined" -msgstr "E612: " - -#: ex_cmds.c:5691 +msgstr "E612: Определено слишком много значков" + +#: ex_cmds.c:5712 #, c-format msgid "E239: Invalid sign text: %s" -msgstr "E239: : %s" - -#: ex_cmds.c:5722 ex_cmds.c:5913 +msgstr "E239: Неправильный текст значка: %s" + +#: ex_cmds.c:5743 ex_cmds.c:5934 #, c-format msgid "E155: Unknown sign: %s" -msgstr "E155: : %s" - -#: ex_cmds.c:5771 +msgstr "E155: Неизвестный значок: %s" + +#: ex_cmds.c:5792 msgid "E159: Missing sign number" -msgstr "E159: " - -#: ex_cmds.c:5853 +msgstr "E159: Пропущен номер значка" + +#: ex_cmds.c:5874 #, c-format msgid "E158: Invalid buffer name: %s" -msgstr "E158: : %s" - -#: ex_cmds.c:5892 +msgstr "E158: Неправильное имя буфера: %s" + +#: ex_cmds.c:5913 #, c-format msgid "E157: Invalid sign ID: %ld" -msgstr "E157: ID : %ld" - -#: ex_cmds.c:5962 +msgstr "E157: Неправильный ID значка: %ld" + +#: ex_cmds.c:5983 msgid " (NOT FOUND)" -msgstr " ( )" - -#: ex_cmds.c:5964 +msgstr " (НЕ НАЙДЕНО)" + +#: ex_cmds.c:5985 msgid " (not supported)" -msgstr " ( )" - -#: ex_cmds.c:6063 +msgstr " (не поддерживается)" + +#: ex_cmds.c:6084 msgid "[Deleted]" -msgstr "[]" +msgstr "[Удалено]" #: ex_cmds2.c:92 msgid "Entering Debug mode. Type \"cont\" to continue." -msgstr "ޣ . \"cont\"" - -#: ex_cmds2.c:96 ex_docmd.c:966 +msgstr "Включён режим отладки. Для продолжения наберите \"cont\"" + +#: ex_cmds2.c:96 ex_docmd.c:968 #, c-format msgid "line %ld: %s" -msgstr " %ld: %s" +msgstr "строка %ld: %s" #: ex_cmds2.c:98 #, c-format msgid "cmd: %s" -msgstr ": %s" +msgstr "команда: %s" #: ex_cmds2.c:290 #, c-format msgid "Breakpoint in \"%s%s\" line %ld" -msgstr " \"%s%s\" . %ld" +msgstr "Точка остановки в \"%s%s\" стр. %ld" #: ex_cmds2.c:540 #, c-format msgid "E161: Breakpoint not found: %s" -msgstr "E161: : %s" +msgstr "E161: Точка остановки не найдена: %s" #: ex_cmds2.c:566 msgid "No breakpoints defined" -msgstr " " +msgstr "Точки остановки не определены" #: ex_cmds2.c:571 #, c-format msgid "%3d %s %s line %ld" -msgstr "%3d %s %s . %ld" +msgstr "%3d %s %s стр. %ld" #: ex_cmds2.c:786 #, c-format msgid "Save changes to \"%.*s\"?" -msgstr " \"%.*s\"?" - -#: ex_cmds2.c:788 ex_docmd.c:9378 +msgstr "Сохранить изменения в \"%.*s\"?" + +#: ex_cmds2.c:788 ex_docmd.c:9398 msgid "Untitled" -msgstr " " +msgstr "Без имени" #: ex_cmds2.c:915 #, c-format msgid "E162: No write since last change for buffer \"%s\"" -msgstr "E162: Σ \"%s\"" +msgstr "E162: Несохранённые изменения в буфере \"%s\"" #: ex_cmds2.c:984 msgid "Warning: Entered other buffer unexpectedly (check autocommands)" msgstr "" -": ( )" +"Предупреждение: Неожиданный переход в другой буфер (проверьте автокоманды)" #: ex_cmds2.c:1387 msgid "E163: There is only one file to edit" -msgstr "E163: " +msgstr "E163: Для редактирования доступен только один файл" #: ex_cmds2.c:1389 msgid "E164: Cannot go before first file" -msgstr "E164: " +msgstr "E164: Это первый файл" #: ex_cmds2.c:1391 msgid "E165: Cannot go beyond last file" -msgstr "E165: " +msgstr "E165: Это последний файл" #: ex_cmds2.c:1804 #, c-format msgid "E666: compiler not supported: %s" -msgstr "E666: : %s" - -#: ex_cmds2.c:1897 +msgstr "E666: компилятор не поддерживается: %s" + +#: ex_cmds2.c:1901 #, c-format msgid "Searching for \"%s\" in \"%s\"" -msgstr " \"%s\" \"%s\"" - -#: ex_cmds2.c:1919 +msgstr "Поиск \"%s\" в \"%s\"" + +#: ex_cmds2.c:1923 #, c-format msgid "Searching for \"%s\"" -msgstr " \"%s\"" - -#: ex_cmds2.c:1940 +msgstr "Поиск \"%s\"" + +#: ex_cmds2.c:1945 #, c-format msgid "not found in 'runtimepath': \"%s\"" -msgstr " 'runtimepath': \"%s\"" - -#: ex_cmds2.c:1974 +msgstr "не найдено в 'runtimepath': \"%s\"" + +#: ex_cmds2.c:1979 msgid "Source Vim script" -msgstr " Vim" - -#: ex_cmds2.c:2164 +msgstr "Выполнить сценарий Vim" + +#: ex_cmds2.c:2169 #, c-format msgid "Cannot source a directory: \"%s\"" -msgstr " : \"%s\"" - -#: ex_cmds2.c:2202 +msgstr "Нельзя считать каталог: \"%s\"" + +#: ex_cmds2.c:2207 #, c-format msgid "could not source \"%s\"" -msgstr " \"%s\"" - -#: ex_cmds2.c:2204 +msgstr "невозможно считать \"%s\"" + +#: ex_cmds2.c:2209 #, c-format msgid "line %ld: could not source \"%s\"" -msgstr " %ld: \"%s\"" - -#: ex_cmds2.c:2218 +msgstr "строка %ld: невозможно считать \"%s\"" + +#: ex_cmds2.c:2223 #, c-format msgid "sourcing \"%s\"" -msgstr " \"%s\"" - -#: ex_cmds2.c:2220 +msgstr "считывание сценария \"%s\"" + +#: ex_cmds2.c:2225 #, c-format msgid "line %ld: sourcing \"%s\"" -msgstr " %ld: \"%s\"" - -#: ex_cmds2.c:2363 +msgstr "строка %ld: считывание \"%s\"" + +#: ex_cmds2.c:2368 #, c-format msgid "finished sourcing %s" -msgstr " %s " - -#: ex_cmds2.c:2707 +msgstr "считывание сценария %s завершено" + +#: ex_cmds2.c:2712 msgid "W15: Warning: Wrong line separator, ^M may be missing" msgstr "" -"W15: : . ^M" - -#: ex_cmds2.c:2756 +"W15: Предупреждение: неправильный разделитель строки. Возможно пропущено ^M" + +#: ex_cmds2.c:2761 msgid "E167: :scriptencoding used outside of a sourced file" -msgstr "E167: :scriptencoding " - -#: ex_cmds2.c:2789 +msgstr "E167: Команда :scriptencoding используется вне файла сценария" + +#: ex_cmds2.c:2794 msgid "E168: :finish used outside of a sourced file" -msgstr "E168: :finish " - -#: ex_cmds2.c:3238 +msgstr "E168: Команда :finish используется вне файла сценария" + +#: ex_cmds2.c:3243 #, c-format msgid "Page %d" -msgstr " %d" - -#: ex_cmds2.c:3394 +msgstr "Страница %d" + +#: ex_cmds2.c:3399 msgid "No text to be printed" -msgstr " " - -#: ex_cmds2.c:3472 +msgstr "Печатать нечего" + +#: ex_cmds2.c:3477 #, c-format msgid "Printing page %d (%d%%)" -msgstr " . %d (%d%%)" - -#: ex_cmds2.c:3484 +msgstr "Печать стр. %d (%d%%)" + +#: ex_cmds2.c:3489 #, c-format msgid " Copy %d of %d" -msgstr " %d %d" - -#: ex_cmds2.c:3542 +msgstr " Копия %d из %d" + +#: ex_cmds2.c:3547 #, c-format msgid "Printed: %s" -msgstr ": %s" - -#: ex_cmds2.c:3549 +msgstr "Напечатано: %s" + +#: ex_cmds2.c:3554 #, c-format msgid "Printing aborted" -msgstr " " - -#: ex_cmds2.c:3914 +msgstr "Печать прекращена" + +#: ex_cmds2.c:3919 msgid "E455: Error writing to PostScript output file" -msgstr "E455: PostScript" - -#: ex_cmds2.c:4189 +msgstr "E455: Ошибка записи в файл PostScript" + +#: ex_cmds2.c:4194 #, c-format msgid "E624: Can't open file \"%s\"" -msgstr "E624: \"%s\"" - -#: ex_cmds2.c:4199 ex_cmds2.c:4824 +msgstr "E624: Невозможно открыть файл \"%s\"" + +#: ex_cmds2.c:4204 ex_cmds2.c:4829 #, c-format msgid "E457: Can't read PostScript resource file \"%s\"" -msgstr "E457: PostScript \"%s\"" - -#: ex_cmds2.c:4207 +msgstr "E457: Невозможно прочитать файл ресурсов PostScript \"%s\"" + +#: ex_cmds2.c:4212 #, c-format msgid "E618: file \"%s\" is not a PostScript resource file" -msgstr "E618: \"%s\" PostScript" - -#: ex_cmds2.c:4222 ex_cmds2.c:4242 ex_cmds2.c:4257 ex_cmds2.c:4279 +msgstr "E618: файл \"%s\" не является файлом ресурсов PostScript" + +#: ex_cmds2.c:4227 ex_cmds2.c:4247 ex_cmds2.c:4262 ex_cmds2.c:4284 #, c-format msgid "E619: file \"%s\" is not a supported PostScript resource file" -msgstr "E619: \"%s\" PostScript" - -#: ex_cmds2.c:4309 +msgstr "E619: файл \"%s\" не является допустимым файлом ресурсов PostScript" + +#: ex_cmds2.c:4314 #, c-format msgid "E621: \"%s\" resource file has wrong version" -msgstr "E621: \"%s\" " - -#: ex_cmds2.c:4776 +msgstr "E621: файл ресурсов \"%s\" неизвестной версии" + +#: ex_cmds2.c:4781 msgid "E324: Can't open PostScript output file" -msgstr "E324: PostScript" - -#: ex_cmds2.c:4809 +msgstr "E324: Невозможно открыть файл PostScript" + +#: ex_cmds2.c:4814 #, c-format msgid "E456: Can't open file \"%s\"" -msgstr "E456: \"%s\"" - -#: ex_cmds2.c:4928 +msgstr "E456: Невозможно открыть файл \"%s\"" + +#: ex_cmds2.c:4933 msgid "E456: Can't find PostScript resource file \"prolog.ps\"" -msgstr "E456: PostScript \"prolog.ps\" " - -#: ex_cmds2.c:4959 +msgstr "E456: Файл ресурсов PostScript \"prolog.ps\" не найден" + +#: ex_cmds2.c:4964 #, c-format msgid "E456: Can't find PostScript resource file \"%s.ps\"" -msgstr "E456: PostScript \"%s.ps\" " - -#: ex_cmds2.c:4977 +msgstr "E456: Файл ресурсов PostScript \"%s.ps\" не найден" + +#: ex_cmds2.c:4982 #, c-format msgid "E620: Unable to convert from multi-byte to \"%s\" encoding" msgstr "" -"E620: \"%s\" " - -#: ex_cmds2.c:5102 +"E620: Преобразование из мультибайтных символов в кодировку \"%s\" невозможно" + +#: ex_cmds2.c:5107 msgid "Sending to printer..." -msgstr " ..." - -#: ex_cmds2.c:5106 +msgstr "Отправка на печать..." + +#: ex_cmds2.c:5111 msgid "E365: Failed to print PostScript file" -msgstr "E365: PostScript" - -#: ex_cmds2.c:5108 +msgstr "E365: Не удалось выполнить печать файла PostScript" + +#: ex_cmds2.c:5113 msgid "Print job sent." -msgstr " ." - -#: ex_cmds2.c:5618 +msgstr "Задание на печать отправлено." + +#: ex_cmds2.c:5623 #, c-format msgid "Current %slanguage: \"%s\"" -msgstr " %s: \"%s\"" - -#: ex_cmds2.c:5629 +msgstr "Активный %sязык: \"%s\"" + +#: ex_cmds2.c:5634 #, c-format msgid "E197: Cannot set language to \"%s\"" -msgstr "E197: \"%s\"" +msgstr "E197: Невозможно сменить язык на \"%s\"" #: ex_docmd.c:525 msgid "Entering Ex mode. Type \"visual\" to go to Normal mode." -msgstr " Ex. \"visual\"" +msgstr "Переход в режим Ex. Для перехода в Обычный режим наберите \"visual\"" #. must be at EOF #: ex_docmd.c:561 msgid "E501: At end-of-file" -msgstr "E501: " - -#: ex_docmd.c:669 +msgstr "E501: В конце файла" + +#: ex_docmd.c:670 msgid "E169: Command too recursive" -msgstr "E169: C " - -#: ex_docmd.c:1229 +msgstr "E169: Cлишком рекурсивная команда" + +#: ex_docmd.c:1232 #, c-format msgid "E605: Exception not caught: %s" -msgstr "E605: : %s" - -#: ex_docmd.c:1317 +msgstr "E605: Исключительная ситуация не обработана: %s" + +#: ex_docmd.c:1320 msgid "End of sourced file" -msgstr " " - -#: ex_docmd.c:1318 +msgstr "Конец считанного файла" + +#: ex_docmd.c:1321 msgid "End of function" -msgstr " " - -#: ex_docmd.c:1907 +msgstr "Конец функции" + +#: ex_docmd.c:1910 msgid "E464: Ambiguous use of user-defined command" -msgstr "E464: " - -#: ex_docmd.c:1921 +msgstr "E464: Неоднозначное использование команды пользователя" + +#: ex_docmd.c:1924 msgid "E492: Not an editor command" -msgstr "E492: " - -#: ex_docmd.c:2028 +msgstr "E492: Это не команда редактора" + +#: ex_docmd.c:2031 msgid "E493: Backwards range given" -msgstr "E493: " - -#: ex_docmd.c:2037 +msgstr "E493: Задан обратный диапазон" + +#: ex_docmd.c:2040 msgid "Backwards range given, OK to swap" -msgstr " , " - -#: ex_docmd.c:2160 +msgstr "Задан обратный диапазон, меняем границы местами" + +#: ex_docmd.c:2163 msgid "E494: Use w or w>>" -msgstr "E494: w w>>" - -#: ex_docmd.c:3786 +msgstr "E494: Используйте w или w>>" + +#: ex_docmd.c:3789 msgid "E319: Sorry, the command is not available in this version" -msgstr "E319: , " - -#: ex_docmd.c:3989 +msgstr "E319: Извините, эта команда недоступна в данной версии" + +#: ex_docmd.c:3992 msgid "E172: Only one file name allowed" -msgstr "E172: " - -#: ex_docmd.c:4569 -msgid "1 more file to edit. Quit anyway?" -msgstr "1 . ?" +msgstr "E172: Разрешено использовать только одно имя файла" #: ex_docmd.c:4572 +msgid "1 more file to edit. Quit anyway?" +msgstr "1 файл ожидает редактирования. Выйти?" + +#: ex_docmd.c:4575 #, c-format msgid "%d more files to edit. Quit anyway?" -msgstr " (%d). ?" - -#: ex_docmd.c:4579 +msgstr "Есть неотредактированные файлы (%d). Выйти?" + +#: ex_docmd.c:4582 msgid "E173: 1 more file to edit" -msgstr "E173: 1 ." - -#: ex_docmd.c:4581 +msgstr "E173: 1 файл ожидает редактирования." + +#: ex_docmd.c:4584 #, c-format msgid "E173: %ld more files to edit" -msgstr "E173: (%d)." - -#: ex_docmd.c:4676 +msgstr "E173: Есть неотредактированные файлы (%d)." + +#: ex_docmd.c:4679 msgid "E174: Command already exists: add ! to replace it" -msgstr "E174: . ! ." - -#: ex_docmd.c:4787 +msgstr "E174: Команда уже существует. Добавьте ! для замены." + +#: ex_docmd.c:4790 msgid "" "\n" " Name Args Range Complete Definition" msgstr "" "\n" -" . . . " - -#: ex_docmd.c:4876 +" Имя Парам. Диап. Дополн. Определение" + +#: ex_docmd.c:4879 msgid "No user-defined commands found" -msgstr ", ̣ , ." - -#: ex_docmd.c:4908 +msgstr "Команды, определённые пользователем, не обнаружены." + +#: ex_docmd.c:4911 msgid "E175: No attribute specified" -msgstr "E175: " - -#: ex_docmd.c:4960 +msgstr "E175: параметр не задан" + +#: ex_docmd.c:4963 msgid "E176: Invalid number of arguments" -msgstr "E176: " - -#: ex_docmd.c:4975 +msgstr "E176: Неправильное количество параметров" + +#: ex_docmd.c:4978 msgid "E177: Count cannot be specified twice" -msgstr "E177: - " - -#: ex_docmd.c:4985 +msgstr "E177: Число-приставку нельзя указывать дважды" + +#: ex_docmd.c:4988 msgid "E178: Invalid default value for count" -msgstr "E178: - " - -#: ex_docmd.c:5016 +msgstr "E178: Неправильное значение числа-приставки по умолчанию" + +#: ex_docmd.c:5019 msgid "E179: argument required for complete" -msgstr "E179: " - -#: ex_docmd.c:5048 +msgstr "E179: для завершения требуется указать параметр" + +#: ex_docmd.c:5051 #, c-format msgid "E180: Invalid complete value: %s" -msgstr "E180: : %s" - -#: ex_docmd.c:5057 +msgstr "E180: Неправильное значение дополнения: %s" + +#: ex_docmd.c:5060 msgid "E468: Completion argument only allowed for custom completion" msgstr "" -"E468: " - -#: ex_docmd.c:5063 +"E468: Параметр автодополнения можно использовать только с особым дополнением" + +#: ex_docmd.c:5066 msgid "E467: Custom completion requires a function argument" -msgstr "E467: " - -#: ex_docmd.c:5074 +msgstr "E467: Особое дополнение требует указания параметра функции" + +#: ex_docmd.c:5077 #, c-format msgid "E181: Invalid attribute: %s" -msgstr "E181: : %s" - -#: ex_docmd.c:5117 +msgstr "E181: Неправильный атрибут: %s" + +#: ex_docmd.c:5120 msgid "E182: Invalid command name" -msgstr "E182: " - -#: ex_docmd.c:5132 +msgstr "E182: Неправильное имя команды" + +#: ex_docmd.c:5135 msgid "E183: User defined commands must start with an uppercase letter" -msgstr "E183: " - -#: ex_docmd.c:5203 +msgstr "E183: Команда пользователя должна начинаться с заглавной буквы" + +#: ex_docmd.c:5206 #, c-format msgid "E184: No such user-defined command: %s" -msgstr "E184: : %s" - -#: ex_docmd.c:5664 +msgstr "E184: Нет такой команды пользователя: %s" + +#: ex_docmd.c:5667 #, c-format msgid "E185: Cannot find color scheme %s" -msgstr "E185: %s " - -#: ex_docmd.c:5672 +msgstr "E185: Цветовая схема %s не найдена" + +#: ex_docmd.c:5675 msgid "Greetings, Vim user!" -msgstr ", Vim!" - -#: ex_docmd.c:6389 +msgstr "Привет, пользователь Vim!" + +#: ex_docmd.c:6393 msgid "Edit File in new window" -msgstr " " - -#: ex_docmd.c:6684 +msgstr "Редактировать файл в новом окне" + +#: ex_docmd.c:6688 msgid "No swap file" -msgstr " -" - -#: ex_docmd.c:6788 +msgstr "Без своп-файла" + +#: ex_docmd.c:6792 msgid "Append File" -msgstr " " - -#: ex_docmd.c:6852 +msgstr "Добавить файл" + +#: ex_docmd.c:6856 msgid "E186: No previous directory" -msgstr "E186: " - -#: ex_docmd.c:6934 +msgstr "E186: Нет предыдущего каталога" + +#: ex_docmd.c:6938 msgid "E187: Unknown" -msgstr "E187: " - -#: ex_docmd.c:7019 +msgstr "E187: Неизвестно" + +#: ex_docmd.c:7023 msgid "E465: :winsize requires two number arguments" -msgstr "E465: :winsize " - -#: ex_docmd.c:7075 +msgstr "E465: команда :winsize требует указания двух числовых параметров" + +#: ex_docmd.c:7079 #, c-format msgid "Window position: X %d, Y %d" -msgstr " : X %d, Y %d" - -#: ex_docmd.c:7080 +msgstr "Положение окна: X %d, Y %d" + +#: ex_docmd.c:7084 msgid "E188: Obtaining window position not implemented for this platform" -msgstr "E188: " - -#: ex_docmd.c:7090 +msgstr "E188: В данной системе определение положения окна не работает" + +#: ex_docmd.c:7094 msgid "E466: :winpos requires two number arguments" -msgstr "E466: :winpos " - -#: ex_docmd.c:7368 +msgstr "E466: команда :winpos требует указания двух числовых параметров" + +#: ex_docmd.c:7372 msgid "Save Redirection" -msgstr " " - -#: ex_docmd.c:7558 +msgstr "Перенаправление записи" + +#: ex_docmd.c:7562 msgid "Save View" -msgstr " " - -#: ex_docmd.c:7559 +msgstr "Сохранение вида" + +#: ex_docmd.c:7563 msgid "Save Session" -msgstr " " - -#: ex_docmd.c:7561 +msgstr "Сохранение сеанса" + +#: ex_docmd.c:7565 msgid "Save Setup" -msgstr " " - -#: ex_docmd.c:7713 +msgstr "Сохранение настроек" + +#: ex_docmd.c:7717 #, c-format msgid "E189: \"%s\" exists (add ! to override)" -msgstr "E189: \"%s\" (!, )" - -#: ex_docmd.c:7718 +msgstr "E189: \"%s\" существует (!, чтобы обойти проверку)" + +#: ex_docmd.c:7722 #, c-format msgid "E190: Cannot open \"%s\" for writing" -msgstr "E190: \"%s\"" +msgstr "E190: Невозможно открыть для записи \"%s\"" #. set mark -#: ex_docmd.c:7742 +#: ex_docmd.c:7746 msgid "E191: Argument must be a letter or forward/backward quote" -msgstr "E191: / " - -#: ex_docmd.c:7784 +msgstr "E191: Параметр должен быть прямой/обратной кавычкой или буквой" + +#: ex_docmd.c:7788 msgid "E192: Recursive use of :normal too deep" -msgstr "E192: :normal" - -#: ex_docmd.c:8302 +msgstr "E192: Слишком глубокая рекурсия при использовании команды :normal" + +#: ex_docmd.c:8306 msgid "E194: No alternate file name to substitute for '#'" -msgstr "E194: '#'" - -#: ex_docmd.c:8333 +msgstr "E194: Нет соседнего имени файла для замены '#'" + +#: ex_docmd.c:8337 msgid "E495: no autocommand file name to substitute for \"\"" -msgstr "E495: \"\"" - -#: ex_docmd.c:8341 +msgstr "E495: Нет автокомандного имени файла для замены \"\"" + +#: ex_docmd.c:8345 msgid "E496: no autocommand buffer number to substitute for \"\"" -msgstr "E496: \"\"" - -#: ex_docmd.c:8352 +msgstr "E496: Нет автокомандного номера буфера для замены \"\"" + +#: ex_docmd.c:8356 msgid "E497: no autocommand match name to substitute for \"\"" -msgstr "E497: \"\"" - -#: ex_docmd.c:8362 +msgstr "E497: Нет автокомандного имени соответствия для замены \"\"" + +#: ex_docmd.c:8366 msgid "E498: no :source file name to substitute for \"\"" -msgstr "E498: :source \"\"" - -#: ex_docmd.c:8403 +msgstr "E498: нет имени файла :source для замены \"\"" + +#: ex_docmd.c:8407 #, no-c-format msgid "E499: Empty file name for '%' or '#', only works with \":p:h\"" -msgstr "E499: '%' '#', c \":p:h\"" - -#: ex_docmd.c:8405 +msgstr "E499: Пустое имя файла для '%' или '#', возможно только c \":p:h\"" + +#: ex_docmd.c:8409 msgid "E500: Evaluates to an empty string" -msgstr "E500: " - -#: ex_docmd.c:9360 +msgstr "E500: Результатом выражения является пустая строка" + +#: ex_docmd.c:9380 msgid "E195: Cannot open viminfo file for reading" -msgstr "E195: viminfo " - -#: ex_docmd.c:9533 +msgstr "E195: Невозможно открыть файл viminfo для чтения" + +#: ex_docmd.c:9553 msgid "E196: No digraphs in this version" -msgstr "E196: " +msgstr "E196: В этой версии диграфы не работают" #: ex_eval.c:440 msgid "E608: Cannot :throw exceptions with 'Vim' prefix" msgstr "" -"E608: :throw 'Vim'" +"E608: Невозможно выполнить команду :throw для исключений с приставкой 'Vim'" #. always scroll up, don't overwrite #: ex_eval.c:529 #, c-format msgid "Exception thrown: %s" -msgstr " : %s" +msgstr "Исключительная ситуация: %s" #: ex_eval.c:576 #, c-format msgid "Exception finished: %s" -msgstr " : %s" +msgstr "Завершена обработка исключительной ситуации: %s" #: ex_eval.c:577 #, c-format msgid "Exception discarded: %s" -msgstr " : %s" +msgstr "Исключительная ситуация проигнорирована: %s" #: ex_eval.c:620 ex_eval.c:664 #, c-format msgid "%s, line %ld" -msgstr "%s, %ld" +msgstr "%s, строка %ld" #. always scroll up, don't overwrite #: ex_eval.c:638 #, c-format msgid "Exception caught: %s" -msgstr " : %s" +msgstr "Обработка исключительной ситуации: %s" #: ex_eval.c:713 #, c-format msgid "%s made pending" -msgstr "%s " +msgstr "%s выполняет ожидание" #: ex_eval.c:716 #, c-format msgid "%s resumed" -msgstr "%s " +msgstr "%s возобновлено" #: ex_eval.c:720 #, c-format msgid "%s discarded" -msgstr "%s " +msgstr "%s пропущено" #: ex_eval.c:746 msgid "Exception" -msgstr " " +msgstr "Исключительная ситуация" #: ex_eval.c:752 msgid "Error and interrupt" -msgstr " " - -#: ex_eval.c:754 gui.c:4381 +msgstr "Ошибка и прерывание" + +#: ex_eval.c:754 gui.c:4384 msgid "Error" -msgstr "" +msgstr "Ошибка" #. if (pending & CSTP_INTERRUPT) #: ex_eval.c:756 msgid "Interrupt" -msgstr "" +msgstr "Прерывание" #: ex_eval.c:830 msgid "E579: :if nesting too deep" -msgstr "E579: :if" +msgstr "E579: слишком глубоко вложенный :if" #: ex_eval.c:867 msgid "E580: :endif without :if" -msgstr "E580: :endif :if" +msgstr "E580: :endif без :if" #: ex_eval.c:911 msgid "E581: :else without :if" -msgstr "E581: :else :if" +msgstr "E581: :else без :if" #: ex_eval.c:914 msgid "E582: :elseif without :if" -msgstr "E582: :elseif :if" +msgstr "E582: :elseif без :if" #: ex_eval.c:921 msgid "E583: multiple :else" -msgstr "E583: :else" +msgstr "E583: обнаружено несколько :else" #: ex_eval.c:924 msgid "E584: :elseif after :else" -msgstr "E584: :elseif :else" +msgstr "E584: :elseif после :else" #: ex_eval.c:991 msgid "E585: :while nesting too deep" -msgstr "E585: :while" +msgstr "E585: слишком глубоко вложенный :while" #: ex_eval.c:1047 msgid "E586: :continue without :while" -msgstr "E586: :continue :while" +msgstr "E586: :continue без :while" #: ex_eval.c:1087 msgid "E587: :break without :while" -msgstr "E587: :break :while" +msgstr "E587: :break без :while" #: ex_eval.c:1286 msgid "E601: :try nesting too deep" -msgstr "E601: :try" +msgstr "E601: слишком глубоко вложенный :try" #: ex_eval.c:1366 msgid "E603: :catch without :try" -msgstr "E603: :catch :try" +msgstr "E603: :catch без :try" #. Give up for a ":catch" after ":finally" and ignore it. #. * Just parse. #: ex_eval.c:1388 msgid "E604: :catch after :finally" -msgstr "E604: :catch :finally" +msgstr "E604: :catch без :finally" #: ex_eval.c:1521 msgid "E606: :finally without :try" -msgstr "E606: :finally :try" +msgstr "E606: :finally без :try" #. Give up for a multiple ":finally" and ignore it. #: ex_eval.c:1545 msgid "E607: multiple :finally" -msgstr "E607: :finally" +msgstr "E607: обнаружено несколько :finally" #: ex_eval.c:1654 msgid "E602: :endtry without :try" -msgstr "E602: :endtry :try" +msgstr "E602: :endtry без :try" #: ex_eval.c:1986 msgid "E193: :endfunction not inside a function" -msgstr "E193: :endfunction " - -#: ex_getln.c:3296 -msgid "tagname" -msgstr " " +msgstr "E193: команда :endfunction может использоваться только внутри функции" #: ex_getln.c:3299 +msgid "tagname" +msgstr "имя метки" + +#: ex_getln.c:3302 msgid " kind file\n" -msgstr " \n" - -#: ex_getln.c:4752 +msgstr " тип файла\n" + +#: ex_getln.c:4768 msgid "'history' option is zero" -msgstr " 'history' " - -#: ex_getln.c:5023 +msgstr "значение опции 'history' равно нулю" + +#: ex_getln.c:5039 #, c-format msgid "" "\n" "# %s History (newest to oldest):\n" msgstr "" "\n" -"# %s, ( ):\n" - -#: ex_getln.c:5024 +"# %s, история (начиная от свежего к старому):\n" + +#: ex_getln.c:5040 msgid "Command Line" -msgstr " " - -#: ex_getln.c:5025 +msgstr "Командная строка" + +#: ex_getln.c:5041 msgid "Search String" -msgstr " " - -#: ex_getln.c:5026 +msgstr "Строка поиска" + +#: ex_getln.c:5042 msgid "Expression" -msgstr "" - -#: ex_getln.c:5027 +msgstr "Выражение" + +#: ex_getln.c:5043 msgid "Input Line" -msgstr " " - -#: ex_getln.c:5065 +msgstr "Строка ввода" + +#: ex_getln.c:5081 msgid "E198: cmd_pchar beyond the command length" -msgstr "E198: cmd_pchar " - -#: ex_getln.c:5242 +msgstr "E198: cmd_pchar больше длины команды" + +#: ex_getln.c:5258 msgid "E199: Active window or buffer deleted" -msgstr "E199: " - -#: fileio.c:377 +msgstr "E199: Удалено активное окно или буфер" + +#: fileio.c:378 msgid "Illegal file name" -msgstr " " - -#: fileio.c:401 fileio.c:535 fileio.c:2913 fileio.c:2954 +msgstr "Недопустимое имя файла" + +#: fileio.c:402 fileio.c:540 fileio.c:2925 fileio.c:2966 msgid "is a directory" -msgstr " " - -#: fileio.c:403 +msgstr "является каталогом" + +#: fileio.c:404 msgid "is not a file" -msgstr " " - -#: fileio.c:557 fileio.c:4131 +msgstr "не является файлом" + +#: fileio.c:562 fileio.c:4143 msgid "[New File]" -msgstr "[ ]" - -#: fileio.c:590 +msgstr "[Новый файл]" + +#: fileio.c:595 msgid "[Permission Denied]" -msgstr "[ ݣ]" - -#: fileio.c:694 +msgstr "[Доступ запрещён]" + +#: fileio.c:706 msgid "E200: *ReadPre autocommands made the file unreadable" -msgstr "E200: *ReadPre " - -#: fileio.c:696 +msgstr "E200: В результате выполнения автокоманд *ReadPre файл стал нечитаемым" + +#: fileio.c:708 msgid "E201: *ReadPre autocommands must not change current buffer" -msgstr "E201: *ReadPre " - -#: fileio.c:717 +msgstr "E201: автокоманды *ReadPre не должны изменять активный буфер" + +#: fileio.c:729 msgid "Vim: Reading from stdin...\n" -msgstr "Vim: stdin...\n" - -#: fileio.c:723 +msgstr "Vim: выполняется чтение из стандартного потока ввода stdin...\n" + +#: fileio.c:735 msgid "Reading from stdin..." -msgstr " stdin..." +msgstr "Выполняется чтение из стандартного потока ввода stdin..." #. Re-opening the original file failed! -#: fileio.c:1000 +#: fileio.c:1012 msgid "E202: Conversion made file unreadable!" -msgstr "E202: !" - -#: fileio.c:2090 +msgstr "E202: В результате преобразования файл стал нечитаемым!" + +#: fileio.c:2102 msgid "[fifo/socket]" -msgstr "[fifo/]" - -#: fileio.c:2097 +msgstr "[fifo/гнездо]" + +#: fileio.c:2109 msgid "[fifo]" msgstr "[fifo]" -#: fileio.c:2104 +#: fileio.c:2116 msgid "[socket]" -msgstr "[]" - -#: fileio.c:2112 +msgstr "[гнездо]" + +#: fileio.c:2124 msgid "[RO]" msgstr "[RO]" -#: fileio.c:2122 +#: fileio.c:2134 msgid "[CR missing]" -msgstr "[ CR]" - -#: fileio.c:2127 +msgstr "[пропущены символы CR]" + +#: fileio.c:2139 msgid "[NL found]" -msgstr "[ NL]" - -#: fileio.c:2132 +msgstr "[Обнаружены символы NL]" + +#: fileio.c:2144 msgid "[long lines split]" -msgstr "[ ]" - -#: fileio.c:2138 fileio.c:4115 +msgstr "[длинные строки разбиты]" + +#: fileio.c:2150 fileio.c:4127 msgid "[NOT converted]" -msgstr "[ ]" - -#: fileio.c:2143 fileio.c:4120 +msgstr "[БЕЗ преобразований]" + +#: fileio.c:2155 fileio.c:4132 msgid "[converted]" -msgstr "[]" - -#: fileio.c:2150 fileio.c:4145 +msgstr "[перекодировано]" + +#: fileio.c:2162 fileio.c:4157 msgid "[crypted]" -msgstr "[]" - -#: fileio.c:2157 +msgstr "[зашифровано]" + +#: fileio.c:2169 msgid "[CONVERSION ERROR]" -msgstr "[ ]" - -#: fileio.c:2163 +msgstr "[ОШИБКА ПРЕОБРАЗОВАНИЯ]" + +#: fileio.c:2175 #, c-format msgid "[ILLEGAL BYTE in line %ld]" -msgstr "[ %ld]" - -#: fileio.c:2170 +msgstr "[НЕДОПУСТИМЫЙ БАЙТ в строке %ld]" + +#: fileio.c:2182 msgid "[READ ERRORS]" -msgstr "[ ]" - -#: fileio.c:2386 +msgstr "[ОШИБКИ ЧТЕНИЯ]" + +#: fileio.c:2398 msgid "Can't find temp file for conversion" -msgstr " " - -#: fileio.c:2393 +msgstr "Временный файл для перекодирования не найден" + +#: fileio.c:2405 msgid "Conversion with 'charconvert' failed" -msgstr " 'charconvert' " - -#: fileio.c:2396 +msgstr "Преобразование с помощью 'charconvert' не выполнено" + +#: fileio.c:2408 msgid "can't read output of 'charconvert'" -msgstr " 'charconvert'" - -#: fileio.c:2796 +msgstr "невозможно прочитать вывод 'charconvert'" + +#: fileio.c:2808 msgid "E203: Autocommands deleted or unloaded buffer to be written" msgstr "" -"E203: , , ̣ " - -#: fileio.c:2819 +"E203: Буфер, который требовалось записать, удалён или выгружен автокомандой" + +#: fileio.c:2831 msgid "E204: Autocommand changed number of lines in unexpected way" -msgstr "E204: " - -#: fileio.c:2857 +msgstr "E204: Количество строк изменено автокомандой неожиданным образом" + +#: fileio.c:2869 msgid "NetBeans dissallows writes of unmodified buffers" -msgstr "NetBeans Σ " - -#: fileio.c:2865 +msgstr "NetBeans не позволяет выполнять запись неизменённых буферов" + +#: fileio.c:2877 msgid "Partial writes disallowed for NetBeans buffers" -msgstr " NetBeans " - -#: fileio.c:2919 fileio.c:2937 +msgstr "Частичная запись буферов NetBeans не допускается" + +#: fileio.c:2931 fileio.c:2949 msgid "is not a file or writable device" -msgstr " , " - -#: fileio.c:2989 +msgstr "не является файлом или устройством, доступным для записи" + +#: fileio.c:3001 msgid "is read-only (add ! to override)" -msgstr " (!, )" - -#: fileio.c:3335 -msgid "E506: Can't write to backup file (add ! to override)" -msgstr "E506: (!, )" +msgstr "открыт только для чтения (!, чтобы обойти проверку)" #: fileio.c:3347 +msgid "E506: Can't write to backup file (add ! to override)" +msgstr "E506: Запись в резервный файл невозможна (!, чтобы обойти проверку)" + +#: fileio.c:3359 msgid "E507: Close error for backup file (add ! to override)" -msgstr "E507: (!, )" - -#: fileio.c:3349 +msgstr "E507: Ошибка закрытия резервного файла (!, чтобы обойти проверку)" + +#: fileio.c:3361 msgid "E508: Can't read file for backup (add ! to override)" -msgstr "E508: (!, )" - -#: fileio.c:3365 +msgstr "E508: Невозможно прочитать резервный файл (!, чтобы обойти проверку)" + +#: fileio.c:3377 msgid "E509: Cannot create backup file (add ! to override)" -msgstr "E509: (!, )" - -#: fileio.c:3468 +msgstr "E509: Невозможно создать резервный файл (!, чтобы обойти проверку)" + +#: fileio.c:3480 msgid "E510: Can't make backup file (add ! to override)" -msgstr "E510: (!, )" - -#: fileio.c:3530 +msgstr "E510: Невозможно создать резервный файл (!, чтобы обойти проверку)" + +#: fileio.c:3542 msgid "E460: The resource fork would be lost (add ! to override)" -msgstr "E460: (!, )" - -#: fileio.c:3640 +msgstr "E460: Вилка ресурса будет потеряна (!, чтобы обойти проверку)" + +#: fileio.c:3652 msgid "E214: Can't find temp file for writing" -msgstr "E214: " - -#: fileio.c:3658 +msgstr "E214: Временный файл для записи не найден" + +#: fileio.c:3670 msgid "E213: Cannot convert (add ! to write without conversion)" -msgstr "E213: (! )" - -#: fileio.c:3693 +msgstr "E213: Перекодировка невозможна (! для записи без перекодировки)" + +#: fileio.c:3705 msgid "E166: Can't open linked file for writing" -msgstr "E166: " - -#: fileio.c:3697 +msgstr "E166: Невозможно открыть связанный файл для записи" + +#: fileio.c:3709 msgid "E212: Can't open file for writing" -msgstr "E212: " - -#: fileio.c:3959 +msgstr "E212: Невозможно открыть файл для записи" + +#: fileio.c:3971 msgid "E667: Fsync failed" -msgstr "E667: fsync()" - -#: fileio.c:3966 +msgstr "E667: Не удалось выполнить функцию fsync()" + +#: fileio.c:3978 msgid "E512: Close failed" -msgstr "E512: " - -#: fileio.c:4037 +msgstr "E512: Операция закрытия не удалась" + +#: fileio.c:4049 msgid "E513: write error, conversion failed" -msgstr "E513: , " - -#: fileio.c:4043 +msgstr "E513: Ошибка записи, преобразование не удалось" + +#: fileio.c:4055 msgid "E514: write error (file system full?)" -msgstr "E514: ( ?)" - -#: fileio.c:4110 +msgstr "E514: ошибка записи (нет свободного места?)" + +#: fileio.c:4122 msgid " CONVERSION ERROR" -msgstr " " - -#: fileio.c:4126 +msgstr " ОШИБКА ПРЕОБРАЗОВАНИЯ" + +#: fileio.c:4138 msgid "[Device]" -msgstr "[]" - -#: fileio.c:4131 +msgstr "[Устройство]" + +#: fileio.c:4143 msgid "[New]" -msgstr "[]" - -#: fileio.c:4153 +msgstr "[Новый]" + +#: fileio.c:4165 msgid " [a]" msgstr " [a]" -#: fileio.c:4153 +#: fileio.c:4165 msgid " appended" -msgstr " " - -#: fileio.c:4155 +msgstr " добавлено" + +#: fileio.c:4167 msgid " [w]" msgstr " [w]" -#: fileio.c:4155 +#: fileio.c:4167 msgid " written" -msgstr " " - -#: fileio.c:4205 +msgstr " записано" + +#: fileio.c:4217 msgid "E205: Patchmode: can't save original file" -msgstr "E205: : " - -#: fileio.c:4227 +msgstr "E205: Режим заплатки: невозможно сохранение исходного файла" + +#: fileio.c:4239 msgid "E206: patchmode: can't touch empty original file" msgstr "" -"E206: : " - -#: fileio.c:4242 +"E206: Режим заплатки: невозможно сменить параметры пустого исходного файла" + +#: fileio.c:4254 msgid "E207: Can't delete backup file" -msgstr "E207: " - -#: fileio.c:4306 +msgstr "E207: Невозможно удалить резервный файл" + +#: fileio.c:4318 msgid "" "\n" "WARNING: Original file may be lost or damaged\n" msgstr "" "\n" -": ģ\n" - -#: fileio.c:4308 +"ПРЕДУПРЕЖДЕНИЕ: Исходный файл может быть утрачен или повреждён\n" + +#: fileio.c:4320 msgid "don't quit the editor until the file is successfully written!" -msgstr " , !" - -#: fileio.c:4397 +msgstr "не выходите из редактора, пока файл не будет успешно записан!" + +#: fileio.c:4409 msgid "[dos]" msgstr "[dos]" -#: fileio.c:4397 +#: fileio.c:4409 msgid "[dos format]" -msgstr "[ dos]" - -#: fileio.c:4404 +msgstr "[формат dos]" + +#: fileio.c:4416 msgid "[mac]" msgstr "[mac]" -#: fileio.c:4404 +#: fileio.c:4416 msgid "[mac format]" -msgstr "[ mac]" - -#: fileio.c:4411 +msgstr "[формат mac]" + +#: fileio.c:4423 msgid "[unix]" msgstr "[unix]" -#: fileio.c:4411 +#: fileio.c:4423 msgid "[unix format]" -msgstr "[ unix]" - -#: fileio.c:4438 +msgstr "[формат unix]" + +#: fileio.c:4450 msgid "1 line, " -msgstr "1 , " - -#: fileio.c:4440 +msgstr "1 строка, " + +#: fileio.c:4452 #, c-format msgid "%ld lines, " -msgstr ": %ld, " - -#: fileio.c:4443 +msgstr "строк: %ld, " + +#: fileio.c:4455 msgid "1 character" -msgstr "1 " - -#: fileio.c:4445 +msgstr "1 символ" + +#: fileio.c:4457 #, c-format msgid "%ld characters" -msgstr ": %ld" - -#: fileio.c:4455 +msgstr "символов: %ld" + +#: fileio.c:4467 msgid "[noeol]" msgstr "[noeol]" -#: fileio.c:4455 +#: fileio.c:4467 msgid "[Incomplete last line]" -msgstr "[ۣ ]" +msgstr "[Незавершённая последняя строка]" #. don't overwrite messages here #. must give this prompt #. don't use emsg() here, don't want to flush the buffers -#: fileio.c:4474 +#: fileio.c:4486 msgid "WARNING: The file has been changed since reading it!!!" -msgstr ": Σ !!!" - -#: fileio.c:4476 +msgstr "ПРЕДУПРЕЖДЕНИЕ: Файл изменён с момента чтения!!!" + +#: fileio.c:4488 msgid "Do you really want to write to it" -msgstr "أ " - -#: fileio.c:5726 +msgstr "Серьёзно хотите записать в этот файл" + +#: fileio.c:5738 #, c-format msgid "E208: Error writing to \"%s\"" -msgstr "E208: \"%s\"" - -#: fileio.c:5733 +msgstr "E208: Ошибка записи в \"%s\"" + +#: fileio.c:5745 #, c-format msgid "E209: Error closing \"%s\"" -msgstr "E209: \"%s\"" - -#: fileio.c:5736 +msgstr "E209: Ошибка закрытия \"%s\"" + +#: fileio.c:5748 #, c-format msgid "E210: Error reading \"%s\"" -msgstr "E210: \"%s\"" - -#: fileio.c:5970 +msgstr "E210: Ошибка чтения \"%s\"" + +#: fileio.c:5982 msgid "E246: FileChangedShell autocommand deleted buffer" -msgstr "E246: ̣ FileChangedShell" - -#: fileio.c:5977 +msgstr "E246: Буфер удалён при выполнении автокоманды FileChangedShell" + +#: fileio.c:5989 #, c-format msgid "E211: Warning: File \"%s\" no longer available" -msgstr "E211: : \"%s\" " - -#: fileio.c:5991 +msgstr "E211: Предупреждение: файл \"%s\" больше не доступен" + +#: fileio.c:6003 #, c-format msgid "" "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as " "well" msgstr "" -"W12: : \"%s\" Vim " -" " - -#: fileio.c:5994 +"W12: Предупреждение: файл \"%s\" и буфер Vim были изменены независимо друг " +"от друга" + +#: fileio.c:6006 #, c-format msgid "W11: Warning: File \"%s\" has changed since editing started" msgstr "" -"W11: : \"%s\" Σ " - -#: fileio.c:5996 +"W11: Предупреждение: файл \"%s\" был изменён после начала редактирования" + +#: fileio.c:6008 #, c-format msgid "W16: Warning: Mode of file \"%s\" has changed since editing started" msgstr "" -"W16: : \"%s\" Σ " -"" - -#: fileio.c:6006 +"W16: Предупреждение: режим доступа к файлу \"%s\" был изменён после начала " +"редактирования" + +#: fileio.c:6018 #, c-format msgid "W13: Warning: File \"%s\" has been created after editing started" msgstr "" -"W13: : \"%s\" " - -#: fileio.c:6019 +"W13: Предупреждение: файл \"%s\" был создан после начала редактирования" + +#: fileio.c:6031 msgid "See \":help W11\" for more info." -msgstr ". \":help W11\"." - -#: fileio.c:6033 +msgstr "См. дополнительную информацию в \":help W11\"." + +#: fileio.c:6045 msgid "Warning" -msgstr "" - -#: fileio.c:6034 +msgstr "Предупреждение" + +#: fileio.c:6046 msgid "" "&OK\n" "&Load File" msgstr "" "&OK\n" -"& " - -#: fileio.c:6140 +"&Загрузить файл" + +#: fileio.c:6152 #, c-format msgid "E462: Could not prepare for reloading \"%s\"" -msgstr "E462: \"%s\"" - -#: fileio.c:6159 +msgstr "E462: Невозможно подготовиться к перезагрузке \"%s\"" + +#: fileio.c:6171 #, c-format msgid "E321: Could not reload \"%s\"" -msgstr "E321: \"%s\"" - -#: fileio.c:6740 +msgstr "E321: Невозможно выполнить перезагрузку \"%s\"" + +#: fileio.c:6752 msgid "--Deleted--" -msgstr "----" +msgstr "--Удалено--" #. the group doesn't exist -#: fileio.c:6900 +#: fileio.c:6912 #, c-format msgid "E367: No such group: \"%s\"" -msgstr "E367: \"%s\" " - -#: fileio.c:7026 +msgstr "E367: Группа \"%s\" не существует" + +#: fileio.c:7038 #, c-format msgid "E215: Illegal character after *: %s" -msgstr "E215: *: %s" - -#: fileio.c:7038 +msgstr "E215: Недопустимые символы после *: %s" + +#: fileio.c:7050 #, c-format msgid "E216: No such event: %s" -msgstr "E216: : %s" - -#: fileio.c:7040 +msgstr "E216: Несуществующее событие: %s" + +#: fileio.c:7052 #, c-format msgid "E216: No such group or event: %s" -msgstr "E216: : %s" +msgstr "E216: Несуществующая группа или событие: %s" #. Highlight title -#: fileio.c:7198 +#: fileio.c:7210 msgid "" "\n" "--- Auto-Commands ---" msgstr "" "\n" -"--- ---" - -#: fileio.c:7469 +"--- Автокоманды ---" + +#: fileio.c:7481 msgid "E217: Can't execute autocommands for ALL events" -msgstr "E217: " - -#: fileio.c:7492 +msgstr "E217: Невозможно выполнить автокоманды для ВСЕХ событий" + +#: fileio.c:7504 msgid "No matching autocommands" -msgstr " " - -#: fileio.c:7813 +msgstr "Нет подходящих автокоманд" + +#: fileio.c:7825 msgid "E218: autocommand nesting too deep" -msgstr "E218: " - -#: fileio.c:8088 +msgstr "E218: слишком глубоко вложенные автокоманды" + +#: fileio.c:8100 #, c-format msgid "%s Auto commands for \"%s\"" -msgstr "%s \"%s\"" - -#: fileio.c:8096 +msgstr "%s Автокоманды для \"%s\"" + +#: fileio.c:8108 #, c-format msgid "Executing %s" -msgstr " %s" +msgstr "Выполнение %s" #. always scroll up, don't overwrite -#: fileio.c:8164 +#: fileio.c:8176 #, c-format msgid "autocommand %s" -msgstr " %s" - -#: fileio.c:8731 +msgstr "автокоманда %s" + +#: fileio.c:8743 msgid "E219: Missing {." -msgstr "E219: {." - -#: fileio.c:8733 +msgstr "E219: Пропущена {." + +#: fileio.c:8745 msgid "E220: Missing }." -msgstr "E220: }." +msgstr "E220: Пропущена }." #: fold.c:68 msgid "E490: No fold found" -msgstr "E490: " +msgstr "E490: Складок не обнаружено" #: fold.c:593 msgid "E350: Cannot create fold with current 'foldmethod'" msgstr "" -"E350: 'foldmethod'" +"E350: Складка не может быть создана с текущим значением опции 'foldmethod'" #: fold.c:595 msgid "E351: Cannot delete fold with current 'foldmethod'" msgstr "" -"E351: 'foldmethod'" +"E351: Складка не может быть удалена с текущим значением опции 'foldmethod'" #: getchar.c:248 msgid "E222: Add to read buffer" -msgstr "E222: " - -#: getchar.c:2198 +msgstr "E222: Добавление в буфер чтения" + +#: getchar.c:2208 msgid "E223: recursive mapping" -msgstr "E223: " - -#: getchar.c:3077 +msgstr "E223: рекурсивная привязка" + +#: getchar.c:3087 #, c-format msgid "E224: global abbreviation already exists for %s" -msgstr "E224: %s" - -#: getchar.c:3080 +msgstr "E224: уже есть глобальное сокращение для %s" + +#: getchar.c:3090 #, c-format msgid "E225: global mapping already exists for %s" -msgstr "E225: %s" - -#: getchar.c:3212 +msgstr "E225: уже есть глобальная привязка для %s" + +#: getchar.c:3222 #, c-format msgid "E226: abbreviation already exists for %s" -msgstr "E226: %s" - -#: getchar.c:3215 +msgstr "E226: уже есть сокращение для %s" + +#: getchar.c:3225 #, c-format msgid "E227: mapping already exists for %s" -msgstr "E227: %s" - -#: getchar.c:3279 +msgstr "E227: уже есть привязка для %s" + +#: getchar.c:3289 msgid "No abbreviation found" -msgstr " " - -#: getchar.c:3281 +msgstr "Сокращения не найдены" + +#: getchar.c:3291 msgid "No mapping found" -msgstr " " - -#: getchar.c:4173 +msgstr "Привязки не найдены" + +#: getchar.c:4183 msgid "E228: makemap: Illegal mode" -msgstr "E228: makemap: " +msgstr "E228: makemap: недопустимый режим" #: gui.c:220 msgid "E229: Cannot start the GUI" -msgstr "E229: " +msgstr "E229: Невозможно перейти в режим графического интерфейса" #: gui.c:349 #, c-format msgid "E230: Cannot read from \"%s\"" -msgstr "E230: \"%s\"" +msgstr "E230: Невозможно выполнить чтение \"%s\"" #: gui.c:472 msgid "E665: Cannot start GUI, no valid font found" msgstr "" -"E665: . , " +"E665: Невозможно перейти в режим граф. интерфейса, неправильно заданы шрифты" #: gui.c:477 msgid "E231: 'guifontwide' invalid" -msgstr "E231: 'guifontwide'" +msgstr "E231: неправильное значение опции 'guifontwide'" #: gui.c:547 msgid "E599: Value of 'imactivatekey' is invalid" -msgstr "E599: 'imactivatekey'" - -#: gui.c:4061 +msgstr "E599: неправильное значение опции 'imactivatekey'" + +#: gui.c:4064 #, c-format msgid "E254: Cannot allocate color %s" -msgstr "E254: %s" +msgstr "E254: Невозможно назначить цвет %s" #: gui_at_fs.c:300 msgid " " -msgstr "< > " +msgstr "<нельзя открыть> " #: gui_at_fs.c:1136 #, c-format msgid "E616: vim_SelFile: can't get font %s" -msgstr "E616: vim_SelFile: %s " +msgstr "E616: vim_SelFile: шрифт %s не найден" #: gui_at_fs.c:2781 msgid "E614: vim_SelFile: can't return to current directory" -msgstr "E614: vim_SelFile: " +msgstr "E614: vim_SelFile: возврат в текущий каталог невозможен" #: gui_at_fs.c:2801 msgid "Pathname:" -msgstr " :" +msgstr "Путь к файлу:" #: gui_at_fs.c:2807 msgid "E615: vim_SelFile: can't get current directory" -msgstr "E615: vim_SelFile: " +msgstr "E615: vim_SelFile: не могу найти текущий каталог" #: gui_at_fs.c:2815 gui_motif.c:1623 msgid "OK" -msgstr "" +msgstr "Да" #: gui_at_fs.c:2815 gui_gtk.c:2731 gui_motif.c:1618 gui_motif.c:2849 msgid "Cancel" -msgstr "" +msgstr "Отмена" #: gui_at_sb.c:486 msgid "Scrollbar Widget: Could not get geometry of thumb pixmap." -msgstr " : " +msgstr "Полоса прокрутки: не могу определить геометрию ползунка" #: gui_athena.c:2047 gui_motif.c:1871 msgid "Vim dialog" -msgstr " Vim" - -#: gui_beval.c:101 gui_w32.c:3829 +msgstr "Диалоговое окно Vim" + +#: gui_beval.c:101 gui_w32.c:3978 msgid "E232: Cannot create BalloonEval with both message and callback" msgstr "" -"E232: \"\" , , , " -" " +"E232: \"Пузырь\" для вычислений, включающий и сообщение, и обратный вызов, " +"не может быть создан" #: gui_gtk.c:1607 msgid "Vim dialog..." -msgstr " Vim..." - -#: gui_gtk.c:2060 message.c:2993 +msgstr "Диалоговое окно Vim..." + +#: gui_gtk.c:2060 message.c:2999 msgid "" "&Yes\n" "&No\n" "&Cancel" msgstr "" -"&\n" -"&\n" -"&" +"&Да\n" +"&Нет\n" +"О&тмена" #: gui_gtk.c:2268 msgid "Input _Methods" -msgstr " " +msgstr "Методы Ввода" #: gui_gtk.c:2534 gui_motif.c:2768 msgid "VIM - Search and Replace..." -msgstr "VIM - ..." +msgstr "VIM - Поиск и замена..." #: gui_gtk.c:2542 gui_motif.c:2770 msgid "VIM - Search..." -msgstr "VIM - ..." +msgstr "VIM - Поиск..." #: gui_gtk.c:2574 gui_motif.c:2888 msgid "Find what:" -msgstr " :" +msgstr "Что ищем:" #: gui_gtk.c:2592 gui_motif.c:2920 msgid "Replace with:" -msgstr " :" +msgstr "На что заменяем:" #. whole word only button #: gui_gtk.c:2624 gui_motif.c:3036 msgid "Match whole word only" -msgstr " " +msgstr "Только точные соответствия" #. match case button #: gui_gtk.c:2635 gui_motif.c:3048 msgid "Match case" -msgstr " " +msgstr "Регистрозависимые соответствия" #: gui_gtk.c:2645 gui_motif.c:2990 msgid "Direction" -msgstr "" +msgstr "Направление" #. 'Up' and 'Down' buttons #: gui_gtk.c:2657 gui_motif.c:3002 msgid "Up" -msgstr "" +msgstr "Вверх" #: gui_gtk.c:2661 gui_motif.c:3010 msgid "Down" -msgstr "" +msgstr "Вниз" #: gui_gtk.c:2683 gui_gtk.c:2685 gui_motif.c:2792 msgid "Find Next" -msgstr " " +msgstr "Найти следующее" #: gui_gtk.c:2702 gui_gtk.c:2704 gui_motif.c:2809 msgid "Replace" -msgstr "" +msgstr "Замена" #: gui_gtk.c:2715 gui_gtk.c:2717 gui_motif.c:2822 msgid "Replace All" -msgstr " " +msgstr "Заменить все" #: gui_gtk_x11.c:2327 msgid "Vim: Received \"die\" request from session manager\n" -msgstr "Vim: \n" +msgstr "Vim: Получен запрос на прекращение работы от диспетчера сеансов\n" #: gui_gtk_x11.c:3519 msgid "Vim: Main window unexpectedly destroyed\n" -msgstr "Vim: \n" +msgstr "Vim: Основное окно было неожиданно закрыто\n" #: gui_gtk_x11.c:4138 msgid "Font Selection" -msgstr " " +msgstr "Выбор шрифта" #: gui_gtk_x11.c:6035 ui.c:2120 msgid "Used CUT_BUFFER0 instead of empty selection" -msgstr " CUT_BUFFER0" +msgstr "Вместо пустого выделения используется CUT_BUFFER0" #: gui_motif.c:1617 gui_motif.c:1620 msgid "Filter" -msgstr "" +msgstr "Фильтр" #: gui_motif.c:1619 msgid "Directories" -msgstr "" +msgstr "Каталоги" #: gui_motif.c:1621 msgid "Help" -msgstr "" +msgstr "Справка" #: gui_motif.c:1622 msgid "Files" -msgstr "" +msgstr "Файлы" #: gui_motif.c:1624 msgid "Selection" -msgstr "" +msgstr "Выделение" #: gui_motif.c:2835 msgid "Undo" -msgstr "" +msgstr "Отмена" #: gui_riscos.c:952 #, c-format msgid "E610: Can't load Zap font '%s'" -msgstr "E610: Zap '%s'" +msgstr "E610: Невозможно загрузить шрифт Zap '%s'" #: gui_riscos.c:1048 #, c-format msgid "E611: Can't use font %s" -msgstr "E611: %s" +msgstr "E611: Невозможно использовать шрифт %s" #: gui_riscos.c:3270 msgid "" @@ -2301,46 +2301,54 @@ msgid "" "Sending message to terminate child process.\n" msgstr "" "\n" -" -.\n" - -#: gui_w32.c:829 +"Отправка сообщения для уничтожения процесса-потомка.\n" + +#: gui_w32.c:839 +msgid "E671: Cannot find window title \"%s\"" +msgstr "E671: Окно с заголовком \"%s\" не обнаружено" + +#: gui_w32.c:847 #, c-format msgid "E243: Argument not supported: \"-%s\"; Use the OLE version." -msgstr "E243: : \"-%s\"; OLE." - -#: gui_w48.c:2090 +msgstr "E243: Параметр не поддерживается: \"-%s\"; используйте версию OLE." + +#: gui_w32.c:1100 +msgid "E672: Unable to open window inside MDI application" +msgstr "E672: Невозможно открыть окно внутри приложения MDI" + +#: gui_w48.c:2163 msgid "Find string (use '\\\\' to find a '\\')" -msgstr " ( '\\\\' '\\')" - -#: gui_w48.c:2115 +msgstr "Поиск строки (используйте '\\\\' для поиска '\\')" + +#: gui_w48.c:2188 msgid "Find & Replace (use '\\\\' to find a '\\')" -msgstr " ( '\\\\' '\\')" +msgstr "Поиск и замена (используйте '\\\\' для поиска '\\')" #: gui_x11.c:1537 msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect" msgstr "" -"Vim E458: , " -" " +"Vim E458: невозможно выделить запись в таблице цвета, некоторые цветамогут " +"отображаться неправильно" #: gui_x11.c:2118 #, c-format msgid "E250: Fonts for the following charsets are missing in fontset %s:" -msgstr "E250: %s :" +msgstr "E250: в наборе шрифтов %s отсутствуют шрифты для следующих кодировок:" #: gui_x11.c:2161 #, c-format msgid "E252: Fontset name: %s" -msgstr "E252: : %s" +msgstr "E252: Набор шрифтов: %s" #: gui_x11.c:2162 #, c-format msgid "Font '%s' is not fixed-width" -msgstr " '%s' " +msgstr "Шрифт '%s' не является моноширинным" #: gui_x11.c:2181 #, c-format msgid "E253: Fontset name: %s\n" -msgstr "E253: : %s\n" +msgstr "E253: Набор шрифтов: %s\n" #: gui_x11.c:2182 #, c-format @@ -2353,13 +2361,14 @@ msgid "Font1: %s\n" msgstr "Font1: %s\n" #: gui_x11.c:2184 +#, c-format msgid "Font%ld width is not twice that of font0\n" -msgstr " font%ld font0\n" +msgstr "Ширина шрифта font%ld должна быть вдвое больше ширины шрифта font0\n" #: gui_x11.c:2185 #, c-format msgid "Font0 width: %ld\n" -msgstr " font0: %ld\n" +msgstr "Ширина шрифта font0: %ld\n" #: gui_x11.c:2186 #, c-format @@ -2367,165 +2376,165 @@ msgid "" "Font1 width: %ld\n" "\n" msgstr "" -" font1: %ld\n" +"Ширина шрифта font1: %ld\n" "\n" #: hangulin.c:610 msgid "E256: Hangul automata ERROR" -msgstr "256 " +msgstr "У256Ж ОШИБКА автоматики Хангыл" #: if_cscope.c:77 msgid "Add a new database" -msgstr " " +msgstr "Добавить новую базу данных" #: if_cscope.c:79 msgid "Query for a pattern" -msgstr " " +msgstr "Запрос по шаблону" #: if_cscope.c:81 msgid "Show this message" -msgstr " " +msgstr "Показать это сообщение" #: if_cscope.c:83 msgid "Kill a connection" -msgstr " " +msgstr "Убить соединение" #: if_cscope.c:85 msgid "Reinit all connections" -msgstr " " +msgstr "Заново инициализировать все соединения" #: if_cscope.c:87 msgid "Show connections" -msgstr " " +msgstr "Показать соединения" #: if_cscope.c:95 #, c-format msgid "E560: Usage: cs[cope] %s" -msgstr "E560: : cs[cope] %s" +msgstr "E560: Использование: cs[cope] %s" #: if_cscope.c:124 msgid "This cscope command does not support splitting the window.\n" -msgstr " cscope .\n" +msgstr "Эта команда cscope не поддерживает разделение окна.\n" #: if_cscope.c:175 msgid "E562: Usage: cstag " -msgstr "E562: : cstag <>" +msgstr "E562: Использование: cstag <имя>" #: if_cscope.c:231 msgid "E257: cstag: tag not found" -msgstr "E257: cstag: " +msgstr "E257: cstag: метка не найдена" #: if_cscope.c:409 #, c-format msgid "E563: stat(%s) error: %d" -msgstr " stat(%s): %d" +msgstr "ошибка stat(%s): %d" #: if_cscope.c:419 msgid "E563: stat error" -msgstr "E563: stat" +msgstr "E563: ошибка stat" #: if_cscope.c:516 #, c-format msgid "E564: %s is not a directory or a valid cscope database" -msgstr "E564: %s cscope" +msgstr "E564: %s не является каталогом или именем базы cscope" #: if_cscope.c:534 #, c-format msgid "Added cscope database %s" -msgstr " cscope %s" +msgstr "Добавлена база данных cscope %s" #: if_cscope.c:589 #, c-format msgid "E262: error reading cscope connection %ld" -msgstr "E262: cscope %d" +msgstr "E262: ошибка получения информации от соединения cscope %d" #: if_cscope.c:694 msgid "E561: unknown cscope search type" -msgstr "E561: cscope" +msgstr "E561: неизвестный тип поиска cscope" #: if_cscope.c:736 msgid "E566: Could not create cscope pipes" -msgstr "E566: cscope" +msgstr "E566: Невозможно создать трубу для cscope" #: if_cscope.c:753 msgid "E622: Could not fork for cscope" -msgstr "E622: fork() cscope" +msgstr "E622: Невозможно выполнить fork() для cscope" #: if_cscope.c:847 if_cscope.c:897 msgid "cs_create_connection exec failed" -msgstr " cs_create_connection" +msgstr "не удалось выполнить cs_create_connection" #: if_cscope.c:898 msgid "E623: Could not spawn cscope process" -msgstr "E623: cscope" +msgstr "E623: Не удалось запустить процесс cscope" #: if_cscope.c:911 msgid "cs_create_connection: fdopen for to_fp failed" -msgstr "cs_create_connection: fdopen to_fp" +msgstr "cs_create_connection: не удалось выполнить fdopen для to_fp" #: if_cscope.c:913 msgid "cs_create_connection: fdopen for fr_fp failed" -msgstr "cs_create_connection: fdopen fr_fp" +msgstr "cs_create_connection: не удалось выполнить fdopen для fr_fp" #: if_cscope.c:951 msgid "E567: no cscope connections" -msgstr "E567: cscope " +msgstr "E567: соединений с cscope не создано" #: if_cscope.c:1025 #, c-format msgid "E259: no matches found for cscope query %s of %s" -msgstr "E259: cscope %s %s" +msgstr "E259: не найдено соответствий по запросу cscope %s для %s" #: if_cscope.c:1082 #, c-format msgid "E469: invalid cscopequickfix flag %c for %c" -msgstr "E469: cscopequickfix %c %c" +msgstr "E469: неправильный флаг cscopequickfix %c для %c" #: if_cscope.c:1152 msgid "cscope commands:\n" -msgstr " cscope:\n" +msgstr "команды cscope:\n" #: if_cscope.c:1155 #, c-format msgid "%-5s: %-30s (Usage: %s)" -msgstr "%-5s: %-30s (: %s)" +msgstr "%-5s: %-30s (Использование: %s)" #: if_cscope.c:1253 #, c-format msgid "E625: cannot open cscope database: %s" -msgstr "E625: cscope: %s" +msgstr "E625: невозможно открыть базу данных cscope: %s" #: if_cscope.c:1271 msgid "E626: cannot get cscope database information" -msgstr "E626: cscope " +msgstr "E626: информация о базе данных cscope не доступна" #: if_cscope.c:1296 msgid "E568: duplicate cscope database not added" -msgstr "E568: cscope " +msgstr "E568: данная база данных cscope уже подсоединена" #: if_cscope.c:1307 msgid "E569: maximum number of cscope connections reached" -msgstr "E569: cscope" +msgstr "E569: достигнуто максимальное значение открытых соединений с cscope" #: if_cscope.c:1424 #, c-format msgid "E261: cscope connection %s not found" -msgstr "E261: cscope %s " +msgstr "E261: соединение с cscope %s не обнаружено" #: if_cscope.c:1458 #, c-format msgid "cscope connection %s closed" -msgstr " cscope " +msgstr "соединение с cscope закрыто" #. should not reach here #: if_cscope.c:1598 msgid "E570: fatal error in cs_manage_matches" -msgstr "E570: cs_manage_matches" +msgstr "E570: критическая ошибка в cs_manage_matches" #: if_cscope.c:1848 #, c-format msgid "Cscope tag: %s" -msgstr " cscope: %s" +msgstr "Метка cscope: %s" #: if_cscope.c:1870 msgid "" @@ -2533,328 +2542,328 @@ msgid "" " # line" msgstr "" "\n" -" # " +" # строка" #: if_cscope.c:1872 msgid "filename / context / line\n" -msgstr " / / \n" +msgstr "имя файла / контекст / строка\n" #: if_cscope.c:1990 #, c-format msgid "E609: Cscope error: %s" -msgstr "E609: cscope: %s" +msgstr "E609: Ошибка cscope: %s" #: if_cscope.c:2176 msgid "All cscope databases reset" -msgstr " cscope" +msgstr "Перезагрузка всех баз данных cscope" #: if_cscope.c:2244 msgid "no cscope connections\n" -msgstr " cscope \n" +msgstr "соединения с cscope отсутствуют\n" #: if_cscope.c:2248 msgid " # pid database name prepend path\n" -msgstr " # pid \n" +msgstr " # pid база данных начальный путь\n" #: if_python.c:436 msgid "" "E263: Sorry, this command is disabled, the Python library could not be " "loaded." msgstr "" -"E263: , " +"E263: К сожалению эта команда не работает, поскольку не загружена библиотека " "Python" #: if_python.c:500 msgid "E659: Cannot invoke Python recursively" -msgstr "E659: Python" +msgstr "E659: Невозможно выполнить рекурсивный вызов Python" #: if_python.c:701 msgid "can't delete OutputObject attributes" -msgstr " OutputObject" +msgstr "невозможно удалить атрибуты OutputObject" #: if_python.c:708 msgid "softspace must be an integer" -msgstr " softspace " +msgstr "значение softspace должно быть целым числом" #: if_python.c:716 msgid "invalid attribute" -msgstr " " +msgstr "неправильный атрибут" #: if_python.c:755 if_python.c:769 msgid "writelines() requires list of strings" -msgstr "writelines() " +msgstr "writelines() требует указания списка строк" #: if_python.c:895 msgid "E264: Python: Error initialising I/O objects" -msgstr "E264: Python: I/O" +msgstr "E264: Python: Ошибка инициализации объектов I/O" #: if_python.c:1080 if_tcl.c:1402 msgid "invalid expression" -msgstr " " +msgstr "неправильное выражение" #: if_python.c:1094 if_tcl.c:1407 msgid "expressions disabled at compile time" -msgstr " " +msgstr "выражения отключены при компиляции" #: if_python.c:1107 msgid "attempt to refer to deleted buffer" -msgstr " " +msgstr "попытка сослаться на уничтоженный буфер" #: if_python.c:1122 if_python.c:1163 if_python.c:1227 if_tcl.c:1214 msgid "line number out of range" -msgstr " " +msgstr "запредельный номер строки" #: if_python.c:1362 #, c-format msgid "" -msgstr "< () %8lX>" +msgstr "<объект буфера (удален) в %8lX>" #: if_python.c:1453 if_tcl.c:836 msgid "invalid mark name" -msgstr " " +msgstr "неправильное имя отметки" #: if_python.c:1733 msgid "no such buffer" -msgstr " " +msgstr "нет такого буфера" #: if_python.c:1821 msgid "attempt to refer to deleted window" -msgstr " " +msgstr "попытка сослаться на закрытое окно" #: if_python.c:1866 msgid "readonly attribute" -msgstr " " +msgstr "атрибут доступен только для чтения" #: if_python.c:1879 msgid "cursor position outside buffer" -msgstr " " +msgstr "позиция курсора находится вне буфера" #: if_python.c:1956 #, c-format msgid "" -msgstr "< () %.8lX>" +msgstr "<объект окна (удален) в %.8lX>" #: if_python.c:1968 #, c-format msgid "" -msgstr "< () %.8lX>" +msgstr "<объект окна (неизвестен) в %.8lX>" #: if_python.c:1970 #, c-format msgid "" -msgstr "< %d>" +msgstr "<окно %d>" #: if_python.c:2046 msgid "no such window" -msgstr " " +msgstr "нет такого окна" #: if_python.c:2307 if_python.c:2341 if_python.c:2396 if_python.c:2464 #: if_python.c:2586 if_python.c:2638 if_tcl.c:684 if_tcl.c:729 if_tcl.c:803 #: if_tcl.c:873 if_tcl.c:1999 msgid "cannot save undo information" -msgstr " " +msgstr "невозможно сохранить информацию об отмене операции" #: if_python.c:2309 if_python.c:2403 if_python.c:2475 msgid "cannot delete line" -msgstr " " +msgstr "невозможно удалить строку" #: if_python.c:2346 if_python.c:2491 if_tcl.c:690 if_tcl.c:2021 msgid "cannot replace line" -msgstr " " +msgstr "невозможно заменить строку" #: if_python.c:2509 if_python.c:2588 if_python.c:2646 msgid "cannot insert line" -msgstr " " +msgstr "невозможно вставить строку" #: if_python.c:2750 msgid "string cannot contain newlines" -msgstr " " +msgstr "строка не может содержать символ новой строки" #: if_ruby.c:422 msgid "" "E266: Sorry, this command is disabled, the Ruby library could not be loaded." msgstr "" -"E266: , " +"E266: К сожалению эта команда не работает, поскольку не загружена библиотека " "Ruby." #: if_ruby.c:485 #, c-format msgid "E273: unknown longjmp status %d" -msgstr "E273: longjmp %d" +msgstr "E273: неизвестное состояние longjmp %d" #: if_sniff.c:67 msgid "Toggle implementation/definition" -msgstr " /" +msgstr "Переключение между реализацией/определением" #: if_sniff.c:68 msgid "Show base class of" -msgstr " " +msgstr "Показать базовый класс " #: if_sniff.c:69 msgid "Show overridden member function" -msgstr " " +msgstr "Показать перегруженные функции" #: if_sniff.c:70 msgid "Retrieve from file" -msgstr " " +msgstr "Получение из файла" #: if_sniff.c:71 msgid "Retrieve from project" -msgstr " " +msgstr "Получение из проекта" #: if_sniff.c:73 msgid "Retrieve from all projects" -msgstr " " +msgstr "Получение из всех проектов" #: if_sniff.c:74 msgid "Retrieve" -msgstr "" +msgstr "Получение" #: if_sniff.c:75 msgid "Show source of" -msgstr " " +msgstr "Показать исходный код" #: if_sniff.c:76 msgid "Find symbol" -msgstr " " +msgstr "Найти символ" #: if_sniff.c:77 msgid "Browse class" -msgstr " " +msgstr "Просмотр класса" #: if_sniff.c:78 msgid "Show class in hierarchy" -msgstr " " +msgstr "Показать класс в иерархии" #: if_sniff.c:79 msgid "Show class in restricted hierarchy" -msgstr " " +msgstr "Показать класс в ограниченной иерархии" #: if_sniff.c:80 msgid "Xref refers to" -msgstr "Xref " +msgstr "Xref ссылается на" #: if_sniff.c:81 msgid "Xref referred by" -msgstr " xref " +msgstr "Ссылка на xref из" #: if_sniff.c:82 msgid "Xref has a" -msgstr "Xref " +msgstr "Xref имеет" #: if_sniff.c:83 msgid "Xref used by" -msgstr "Xref " +msgstr "Xref используется" #: if_sniff.c:84 msgid "Show docu of" -msgstr " docu" +msgstr "Показать docu" #: if_sniff.c:85 msgid "Generate docu for" -msgstr " docu" +msgstr "Создать docu" #: if_sniff.c:97 msgid "" "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in " "$PATH).\n" msgstr "" -" SNiFF+. ." -"(sniffemacs $PATH).\n" +"Невозможно подсоединиться к SNiFF+. Проверьте настройки окружения." +"(sniffemacs должны быть указаны в переменной $PATH).\n" #: if_sniff.c:425 msgid "E274: Sniff: Error during read. Disconnected" -msgstr "E274: Sniff: . " +msgstr "E274: Sniff: Ошибка во время чтения. Отсоединение" #: if_sniff.c:553 msgid "SNiFF+ is currently " -msgstr " SNiFF+ " +msgstr "В настоящий момент SNiFF+ " #: if_sniff.c:555 msgid "not " -msgstr " " +msgstr "не " #: if_sniff.c:556 msgid "connected" -msgstr "Σ" +msgstr "подсоединён" #: if_sniff.c:592 #, c-format msgid "E275: Unknown SNiFF+ request: %s" -msgstr "E275: SNiFF+: %s" +msgstr "E275: Неизвестный запрос SNiFF+: %s" #: if_sniff.c:605 msgid "E276: Error connecting to SNiFF+" -msgstr "E276: SNiFF+" +msgstr "E276: Ошибка соединения со SNiFF+" #: if_sniff.c:1009 msgid "E278: SNiFF+ not connected" -msgstr "E278: SNiFF+ Σ" +msgstr "E278: SNiFF+ не подсоединён" #: if_sniff.c:1018 msgid "E279: Not a SNiFF+ buffer" -msgstr "E279: SNiFF+" +msgstr "E279: Это не буфер SNiFF+" #: if_sniff.c:1083 msgid "Sniff: Error during write. Disconnected" -msgstr "Sniff: . " +msgstr "Sniff: Ошибка во время записи. Отсоединение" #: if_tcl.c:418 msgid "invalid buffer number" -msgstr " " +msgstr "неправильный номер буфера" #: if_tcl.c:464 if_tcl.c:931 if_tcl.c:1110 msgid "not implemented yet" -msgstr " " +msgstr "пока не реализовано" #: if_tcl.c:501 msgid "unknown option" -msgstr " " +msgstr "неизвестная опция" #. ??? #: if_tcl.c:774 msgid "cannot set line(s)" -msgstr " " +msgstr "невозможно назначить строку или строки" #: if_tcl.c:845 msgid "mark not set" -msgstr " " +msgstr "отметка не установлена" #: if_tcl.c:851 if_tcl.c:1066 #, c-format msgid "row %d column %d" -msgstr " %d %d" +msgstr "ряд %d колонка %d" #: if_tcl.c:881 msgid "cannot insert/append line" -msgstr " " +msgstr "невозможно вставить или добавить строку" #: if_tcl.c:1268 msgid "unknown flag: " -msgstr " : " +msgstr "неизвестный флаг: " #: if_tcl.c:1338 msgid "unknown vimOption" -msgstr " vimOption" +msgstr "неизвестная vimOption" #: if_tcl.c:1423 msgid "keyboard interrupt" -msgstr " " +msgstr "клавиатурное прерывание" #: if_tcl.c:1428 msgid "vim error" -msgstr " vim" +msgstr "ошибка vim" #: if_tcl.c:1471 msgid "cannot create buffer/window command: object is being deleted" -msgstr " : " +msgstr "невозможно создать команду буфера или окна: объект в процессе удаления" #: if_tcl.c:1545 msgid "" "cannot register callback command: buffer/window is already being deleted" msgstr "" -" : " -" " +"невозможно зарегистрировать команду с обратным вызовом: буфер или окно в " +"процессе удаления" #. This should never happen. Famous last word? #: if_tcl.c:1562 @@ -2862,142 +2871,142 @@ msgid "" "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim." "org" msgstr "" -"E280: TCL: ģ ?! " -" vim-dev@vim.org" +"E280: КРИТИЧЕСКАЯ ОШИБКА TCL: повреждён список ссылок?! Сообщите об этом по " +"адресу vim-dev@vim.org" #: if_tcl.c:1563 msgid "cannot register callback command: buffer/window reference not found" msgstr "" -" : " -" " +"невозможно зарегистрировать команду с обратным вызовом: ссылка на буфер или " +"окно не обнаружена" #: if_tcl.c:1724 msgid "" "E571: Sorry, this command is disabled: the Tcl library could not be loaded." msgstr "" -"E571: , " +"E571: К сожалению эта команда не работает, поскольку не загружена библиотека " "Tcl" #: if_tcl.c:1886 msgid "" "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org" msgstr "" -"E281: TCL: ?! " +"E281: ОШИБКА TCL: Код выхода не является целым числом?! Сообщите об этом в " "vim-dev@vim.org" #: if_tcl.c:2007 msgid "cannot get line" -msgstr " " +msgstr "невозможно получить строку" #: if_xcmdsrv.c:225 msgid "Unable to register a command server name" -msgstr " " +msgstr "Невозможно зарегистрировать имя сервера команд" #: if_xcmdsrv.c:473 msgid "E248: Failed to send command to the destination program" -msgstr "E248: " +msgstr "E248: Отправка команды в другую программу не удалась" #: if_xcmdsrv.c:747 #, c-format msgid "E573: Invalid server id used: %s" -msgstr "E573: id : %s" +msgstr "E573: Используется неправильный id сервера: %s" #: if_xcmdsrv.c:1110 msgid "E251: VIM instance registry property is badly formed. Deleted!" msgstr "" -"E251: VIM . " -"!" +"E251: Неправильно сформировано значение данного процесса VIM в реестре. " +"Удалено!" #: main.c:60 msgid "Unknown option" -msgstr " " +msgstr "Неизвестный аргумент" #: main.c:62 msgid "Too many edit arguments" -msgstr " " +msgstr "Слишком много аргументов редактирования" #: main.c:64 msgid "Argument missing after" -msgstr " " +msgstr "Пропущен аргумент после" #: main.c:66 msgid "Garbage after option" -msgstr " " +msgstr "Мусор после аргумента" #: main.c:68 msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments" msgstr "" -" \"+\", \"-c \" \"--cmd \"" +"Слишком много аргументов \"+команда\", \"-c команда\" или \"--cmd команда\"" #: main.c:70 msgid "Invalid argument for" -msgstr " " - -#: main.c:466 +msgstr "Недопустимые аргументы для" + +#: main.c:469 msgid "This Vim was not compiled with the diff feature." msgstr "" -" Vim " - -#: main.c:932 +"Данный Vim был скомпилирован с выключенной особенностью просмотра отличий" + +#: main.c:935 msgid "Attempt to open script file again: \"" -msgstr " : \"" - -#: main.c:941 +msgstr "Попытка повторного открытия файла сценария: \"" + +#: main.c:944 msgid "Cannot open for reading: \"" -msgstr " : \"" - -#: main.c:985 +msgstr "Невозможно открыть для чтения: \"" + +#: main.c:988 msgid "Cannot open for script output: \"" -msgstr " : \"" - -#: main.c:1132 +msgstr "Невозможно открыть для вывода сценария: \"" + +#: main.c:1135 #, c-format msgid "%d files to edit\n" -msgstr " : %d\n" - -#: main.c:1233 +msgstr "Файлов для редактирования: %d\n" + +#: main.c:1236 msgid "Vim: Warning: Output is not to a terminal\n" -msgstr "Vim: : \n" - -#: main.c:1235 +msgstr "Vim: Предупреждение: Вывод осуществляется не на терминал\n" + +#: main.c:1238 msgid "Vim: Warning: Input is not from a terminal\n" -msgstr "Vim: : \n" +msgstr "Vim: Предупреждение: Ввод происходит не с терминала\n" #. just in case.. -#: main.c:1297 +#: main.c:1306 msgid "pre-vimrc command line" -msgstr " vimrc" - -#: main.c:1338 +msgstr "командная строка перед выполнением vimrc" + +#: main.c:1347 #, c-format msgid "E282: Cannot read from \"%s\"" -msgstr "E282: \"%s\"" - -#: main.c:2411 +msgstr "E282: Невозможно выполнить чтение из \"%s\"" + +#: main.c:2420 msgid "" "\n" "More info with: \"vim -h\"\n" msgstr "" "\n" -" : \"vim -h\"\n" - -#: main.c:2444 +"Дополнительная информация: \"vim -h\"\n" + +#: main.c:2453 msgid "[file ..] edit specified file(s)" -msgstr "[ ..] " - -#: main.c:2445 +msgstr "[файл ..] редактирование указанных файлов" + +#: main.c:2454 msgid "- read text from stdin" -msgstr "- stdin" - -#: main.c:2446 +msgstr "- чтение текста из потока ввода stdin" + +#: main.c:2455 msgid "-t tag edit file where tag is defined" -msgstr "-t " - -#: main.c:2448 -msgid "-q [errorfile] edit file with first error" -msgstr "-q [ ] " +msgstr "-t метка редактирование файла с указанной меткой" #: main.c:2457 +msgid "-q [errorfile] edit file with first error" +msgstr "-q [файл ошибок] редактирование файла с первой ошибкой" + +#: main.c:2466 msgid "" "\n" "\n" @@ -3005,21 +3014,21 @@ msgid "" msgstr "" "\n" "\n" -":" - -#: main.c:2460 +"Использование:" + +#: main.c:2469 msgid " vim [arguments] " -msgstr " vim [] " - -#: main.c:2464 +msgstr " vim [аргументы] " + +#: main.c:2473 msgid "" "\n" " or:" msgstr "" "\n" -" :" - -#: main.c:2467 +" или:" + +#: main.c:2476 msgid "" "\n" "\n" @@ -3027,414 +3036,414 @@ msgid "" msgstr "" "\n" "\n" -":\n" - -#: main.c:2468 -msgid "--\t\t\tOnly file names after this" -msgstr "--\t\t\t " - -#: main.c:2470 -msgid "--literal\t\tDon't expand wildcards" -msgstr "--literal\t\t " - -#: main.c:2473 -msgid "-register\t\tRegister this gvim for OLE" -msgstr "-register\t\t gvim OLE" - -#: main.c:2474 -msgid "-unregister\t\tUnregister gvim for OLE" -msgstr "-unregister\t\t gvim OLE" +"Аргументы:\n" #: main.c:2477 -msgid "-g\t\t\tRun using GUI (like \"gvim\")" -msgstr "-g\t\t\t ( \"gvim\")" - -#: main.c:2478 -msgid "-f or --nofork\tForeground: Don't fork when starting GUI" -msgstr "-f --nofork\t : fork GUI" - -#: main.c:2480 -msgid "-v\t\t\tVi mode (like \"vi\")" -msgstr "-v\t\t\t Vi ( \"vi\")" - -#: main.c:2481 -msgid "-e\t\t\tEx mode (like \"ex\")" -msgstr "-e\t\t\t Ex ( \"ex\")" +msgid "--\t\t\tOnly file names after this" +msgstr "--\t\t\tДалее указываются только имена файлов" + +#: main.c:2479 +msgid "--literal\t\tDon't expand wildcards" +msgstr "--literal\t\tНе выполнять подстановку по маске" #: main.c:2482 -msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")" -msgstr "-s\t\t\t () ( \"ex\")" - -#: main.c:2484 -msgid "-d\t\t\tDiff mode (like \"vimdiff\")" -msgstr "-d\t\t\t ( \"vimdiff\")" +msgid "-register\t\tRegister this gvim for OLE" +msgstr "-register\t\tЗарегистрировать этот gvim для OLE" + +#: main.c:2483 +msgid "-unregister\t\tUnregister gvim for OLE" +msgstr "-unregister\t\tОтключить регистрацию данного gvim для OLE" #: main.c:2486 -msgid "-y\t\t\tEasy mode (like \"evim\", modeless)" -msgstr "-y\t\t\t ( \"evim\", )" +msgid "-g\t\t\tRun using GUI (like \"gvim\")" +msgstr "-g\t\t\tЗапустить с графическим интерфейсом (как \"gvim\")" #: main.c:2487 -msgid "-R\t\t\tReadonly mode (like \"view\")" -msgstr "-R\t\t\t ( \"view\")" - -#: main.c:2488 -msgid "-Z\t\t\tRestricted mode (like \"rvim\")" -msgstr "-Z\t\t\t ( \"rvim\")" +msgid "-f or --nofork\tForeground: Don't fork when starting GUI" +msgstr "-f или --nofork\tВ активной задаче: Не выполнять fork при запуске GUI" #: main.c:2489 -msgid "-m\t\t\tModifications (writing files) not allowed" -msgstr "-m\t\t\t ( )" +msgid "-v\t\t\tVi mode (like \"vi\")" +msgstr "-v\t\t\tРежим Vi (как \"vi\")" #: main.c:2490 -msgid "-M\t\t\tModifications in text not allowed" -msgstr "-M\t\t\t " +msgid "-e\t\t\tEx mode (like \"ex\")" +msgstr "-e\t\t\tРежим Ex (как \"ex\")" #: main.c:2491 -msgid "-b\t\t\tBinary mode" -msgstr "-b\t\t\t " +msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")" +msgstr "-s\t\t\tТихий (пакетный) режим (только для \"ex\")" #: main.c:2493 -msgid "-l\t\t\tLisp mode" -msgstr "-l\t\t\t Lisp" +msgid "-d\t\t\tDiff mode (like \"vimdiff\")" +msgstr "-d\t\t\tРежим отличий (как \"vimdiff\")" #: main.c:2495 -msgid "-C\t\t\tCompatible with Vi: 'compatible'" -msgstr "-C\t\t\t Vi: 'compatible'" +msgid "-y\t\t\tEasy mode (like \"evim\", modeless)" +msgstr "-y\t\t\tПростой режим (как \"evim\", безрежимный)" #: main.c:2496 -msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'" -msgstr "-N\t\t\t Vi: 'nocompatible'" +msgid "-R\t\t\tReadonly mode (like \"view\")" +msgstr "-R\t\t\tТолько для чтения (как \"view\")" #: main.c:2497 -msgid "-V[N]\t\tVerbose level" -msgstr "-V[N]\t\t " +msgid "-Z\t\t\tRestricted mode (like \"rvim\")" +msgstr "-Z\t\t\tОграниченный режим (как \"rvim\")" #: main.c:2498 -msgid "-D\t\t\tDebugging mode" -msgstr "-D\t\t\t " +msgid "-m\t\t\tModifications (writing files) not allowed" +msgstr "-m\t\t\tБез возможности сохранения изменений (записи файлов)" #: main.c:2499 -msgid "-n\t\t\tNo swap file, use memory only" -msgstr "-n\t\t\t -, " +msgid "-M\t\t\tModifications in text not allowed" +msgstr "-M\t\t\tБез возможности внесения изменений в текст" #: main.c:2500 -msgid "-r\t\t\tList swap files and exit" -msgstr "-r\t\t\t - " - -#: main.c:2501 -msgid "-r (with file name)\tRecover crashed session" -msgstr "-r ( )\t ۣ " +msgid "-b\t\t\tBinary mode" +msgstr "-b\t\t\tБинарный режим" #: main.c:2502 -msgid "-L\t\t\tSame as -r" -msgstr "-L\t\t\t , -r" +msgid "-l\t\t\tLisp mode" +msgstr "-l\t\t\tРежим Lisp" #: main.c:2504 -msgid "-f\t\t\tDon't use newcli to open window" -msgstr "-f\t\t\t newcli " +msgid "-C\t\t\tCompatible with Vi: 'compatible'" +msgstr "-C\t\t\tРежим совместимости с Vi: 'compatible'" #: main.c:2505 -msgid "-dev \t\tUse for I/O" -msgstr "-dev <>\t\t I/O <>" +msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'" +msgstr "-N\t\t\tРежим неполной совместимости с Vi: 'nocompatible'" + +#: main.c:2506 +msgid "-V[N]\t\tVerbose level" +msgstr "-V[N]\t\tУровень подробности сообщений" + +#: main.c:2507 +msgid "-D\t\t\tDebugging mode" +msgstr "-D\t\t\tРежим отладки" #: main.c:2508 -msgid "-A\t\t\tstart in Arabic mode" -msgstr "-A\t\t\t " +msgid "-n\t\t\tNo swap file, use memory only" +msgstr "-n\t\t\tБез своп-файла, используется только память" + +#: main.c:2509 +msgid "-r\t\t\tList swap files and exit" +msgstr "-r\t\t\tВывести список своп-файлов и завершить работу" + +#: main.c:2510 +msgid "-r (with file name)\tRecover crashed session" +msgstr "-r (с именем файла)\tВосстановить аварийно завершённый сеанс" #: main.c:2511 -msgid "-H\t\t\tStart in Hebrew mode" -msgstr "-H\t\t\t \"\"" +msgid "-L\t\t\tSame as -r" +msgstr "-L\t\t\tТо же, что и -r" + +#: main.c:2513 +msgid "-f\t\t\tDon't use newcli to open window" +msgstr "-f\t\t\tНе использовать newcli для открытия окна" #: main.c:2514 -msgid "-F\t\t\tStart in Farsi mode" -msgstr "-F\t\t\t \"\"" - -#: main.c:2516 -msgid "-T \tSet terminal type to " -msgstr "-T <>\t <>" +msgid "-dev \t\tUse for I/O" +msgstr "-dev <устройство>\t\tИспользовать для I/O указанное <устройство>" #: main.c:2517 -msgid "-u \t\tUse instead of any .vimrc" -msgstr "-u \t\t .vimrc" - -#: main.c:2519 -msgid "-U \t\tUse instead of any .gvimrc" -msgstr "-U \t\t .gvimrc" - -#: main.c:2521 -msgid "--noplugin\t\tDon't load plugin scripts" -msgstr "--noplugin\t\t " - -#: main.c:2522 -msgid "-o[N]\t\tOpen N windows (default: one for each file)" -msgstr "-o[N]\t\t N ( : )" +msgid "-A\t\t\tstart in Arabic mode" +msgstr "-A\t\t\tЗапуск в Арабском режиме" + +#: main.c:2520 +msgid "-H\t\t\tStart in Hebrew mode" +msgstr "-H\t\t\tЗапуск в режиме \"Иврит\"" #: main.c:2523 -msgid "-O[N]\t\tLike -o but split vertically" -msgstr "-O[N]\t\t , -o, " - -#: main.c:2524 -msgid "+\t\t\tStart at end of file" -msgstr "+\t\t\t " +msgid "-F\t\t\tStart in Farsi mode" +msgstr "-F\t\t\tЗапуск в режиме \"Фарси\"" #: main.c:2525 -msgid "+\t\tStart at line " -msgstr "+\t\t " - -#: main.c:2527 -msgid "--cmd \tExecute before loading any vimrc file" -msgstr "--cmd <>\t <> vimrc" - -#: main.c:2529 -msgid "-c \t\tExecute after loading the first file" -msgstr "-c <>\t\t <> " +msgid "-T \tSet terminal type to " +msgstr "-T <терминал>\tНазначить указанный тип <терминала>" + +#: main.c:2526 +msgid "-u \t\tUse instead of any .vimrc" +msgstr "-u \t\tИспользовать вместо любых файлов .vimrc" + +#: main.c:2528 +msgid "-U \t\tUse instead of any .gvimrc" +msgstr "-U \t\tИспользовать вместо любых файлов .gvimrc" #: main.c:2530 -msgid "-S \t\tSource file after loading the first file" -msgstr "-S <>\t\t <> " +msgid "--noplugin\t\tDon't load plugin scripts" +msgstr "--noplugin\t\tНе загружать сценарии модулей" #: main.c:2531 -msgid "-s \tRead Normal mode commands from file " -msgstr "-s <>\t <>" +msgid "-o[N]\t\tOpen N windows (default: one for each file)" +msgstr "-o[N]\t\tОткрыть N окон (по умолчанию: по одному на каждый файл)" #: main.c:2532 -msgid "-w \tAppend all typed commands to file " -msgstr "-w <>\t ģ <>" +msgid "-O[N]\t\tLike -o but split vertically" +msgstr "-O[N]\t\tТо же, что и -o, но с вертикальным разделением окон" #: main.c:2533 -msgid "-W \tWrite all typed commands to file " -msgstr "-W <>\t ģ <>" - -#: main.c:2535 -msgid "-x\t\t\tEdit encrypted files" -msgstr "-x\t\t\t " +msgid "+\t\t\tStart at end of file" +msgstr "+\t\t\tНачать редактирование в конце файла" + +#: main.c:2534 +msgid "+\t\tStart at line " +msgstr "+\t\tНачать редактирование в строке с номером " + +#: main.c:2536 +msgid "--cmd \tExecute before loading any vimrc file" +msgstr "--cmd <команда>\tВыполнить <команду> перед загрузкой файла vimrc" + +#: main.c:2538 +msgid "-c \t\tExecute after loading the first file" +msgstr "-c <команда>\t\tВыполнить <команду> после загрузки первого файла" #: main.c:2539 -msgid "-display \tConnect vim to this particular X-server" -msgstr "-display <>\t vim X" +msgid "-S \t\tSource file after loading the first file" +msgstr "-S <сеанс>\t\tПрочитать сценарий <сеанса> после загрузки первого файла" + +#: main.c:2540 +msgid "-s \tRead Normal mode commands from file " +msgstr "-s <сценарий>\tПрочитать команды Обычного режима из файла <сценария>" #: main.c:2541 -msgid "-X\t\t\tDo not connect to X server" -msgstr "-X\t\t\t X" +msgid "-w \tAppend all typed commands to file " +msgstr "-w <сценарий>\tДобавлять все введённые команды в файл <сценария>" + +#: main.c:2542 +msgid "-W \tWrite all typed commands to file " +msgstr "-W <сценарий>\tЗаписать все введённые команды в файл <сценария>" #: main.c:2544 +msgid "-x\t\t\tEdit encrypted files" +msgstr "-x\t\t\tРедактирование зашифрованных файлов" + +#: main.c:2548 +msgid "-display \tConnect vim to this particular X-server" +msgstr "-display <экран>\tПодсоединить vim к указанному серверу X" + +#: main.c:2550 +msgid "-X\t\t\tDo not connect to X server" +msgstr "-X\t\t\tНе выполнять соединение с сервером X" + +#: main.c:2553 msgid "--remote \tEdit in a Vim server if possible" -msgstr "--remote <>\t <> Vim" - -#: main.c:2545 +msgstr "--remote <файлы>\tПо возможности редактировать <файлы> на сервере Vim" + +#: main.c:2554 msgid "--remote-silent Same, don't complain if there is no server" -msgstr "--remote-silent <> , " - -#: main.c:2546 +msgstr "--remote-silent <файлы> То же, но без жалоб на отсутствие сервера" + +#: main.c:2555 msgid "" "--remote-wait As --remote but wait for files to have been edited" msgstr "" -"--remote-wait <> , --remote, " - -#: main.c:2547 +"--remote-wait <файлы> То же, что и --remote, но с ожиданием завершения" + +#: main.c:2556 msgid "" "--remote-wait-silent Same, don't complain if there is no server" msgstr "" -"--remote-wait-silent <> , " - -#: main.c:2548 -msgid "--remote-send \tSend to a Vim server and exit" -msgstr "--remote-send <>\t <> Vim " - -#: main.c:2549 -msgid "--remote-expr \tEvaluate in a Vim server and print result" -msgstr "--remote-expr <>\t <> Vim " - -#: main.c:2550 -msgid "--serverlist\t\tList available Vim server names and exit" -msgstr "--serverlist\t\t ͣ Vim " - -#: main.c:2551 -msgid "--servername \tSend to/become the Vim server " -msgstr "" -"--servername <>\t / Vim <>" - -#: main.c:2554 -msgid "-i \t\tUse instead of .viminfo" -msgstr "-i \t\t .viminfo " - -#: main.c:2556 -msgid "-h or --help\tPrint Help (this message) and exit" -msgstr "-h --help\t ( ) " +"--remote-wait-silent <файлы> То же, но без жалоб на отсутствие сервера" #: main.c:2557 +msgid "--remote-send \tSend to a Vim server and exit" +msgstr "--remote-send <кнопки>\tОтправить <кнопки> на сервер Vim и выйти" + +#: main.c:2558 +msgid "--remote-expr \tEvaluate in a Vim server and print result" +msgstr "--remote-expr <выраж>\tВычислить <выраж> на сервере Vim и напечатать" + +#: main.c:2559 +msgid "--serverlist\t\tList available Vim server names and exit" +msgstr "--serverlist\t\tПоказать список имён серверов Vim и завершить работу" + +#: main.c:2560 +msgid "--servername \tSend to/become the Vim server " +msgstr "" +"--servername <имя>\tОтправить на/стать сервером Vim с указанным <именем>" + +#: main.c:2563 +msgid "-i \t\tUse instead of .viminfo" +msgstr "-i \t\tИспользовать вместо .viminfo файл " + +#: main.c:2565 +msgid "-h or --help\tPrint Help (this message) and exit" +msgstr "-h или --help\tВывести справку (это сообщение) и завершить работу" + +#: main.c:2566 msgid "--version\t\tPrint version information and exit" -msgstr "--version\t\t Vim " - -#: main.c:2561 +msgstr "--version\t\tВывести информацию о версии Vim и завершить работу" + +#: main.c:2570 msgid "" "\n" "Arguments recognised by gvim (Motif version):\n" msgstr "" "\n" -" gvim ( Motif):\n" - -#: main.c:2565 +"Аргументы для gvim (версия Motif):\n" + +#: main.c:2574 msgid "" "\n" "Arguments recognised by gvim (neXtaw version):\n" msgstr "" "\n" -" gvim ( neXtaw):\n" - -#: main.c:2567 +"Аргументы для gvim (версия neXtaw):\n" + +#: main.c:2576 msgid "" "\n" "Arguments recognised by gvim (Athena version):\n" msgstr "" "\n" -" gvim ( Athena):\n" - -#: main.c:2571 -msgid "-display \tRun vim on " -msgstr "-display <>\t vim <>" - -#: main.c:2572 -msgid "-iconic\t\tStart vim iconified" -msgstr "-iconic\t\t vim ף " - -#: main.c:2574 -msgid "-name \t\tUse resource as if vim was " -msgstr "-name <>\t\t , vim <>" - -#: main.c:2575 -msgid "\t\t\t (Unimplemented)\n" -msgstr "\t\t\t ( )\n" - -#: main.c:2577 -msgid "-background \tUse for the background (also: -bg)" -msgstr "" -"-background <>\t <> (: -bg)" - -#: main.c:2578 -msgid "-foreground \tUse for normal text (also: -fg)" -msgstr "" -"-foreground <>\t <> (: -fg)" - -#: main.c:2579 main.c:2599 -msgid "-font \t\tUse for normal text (also: -fn)" -msgstr "-font <>\t\t <> (: -fn)" +"Аргументы для gvim (версия Athena):\n" #: main.c:2580 -msgid "-boldfont \tUse for bold text" -msgstr "-boldfont <>\t <> " +msgid "-display \tRun vim on " +msgstr "-display <дисплей>\tЗапустить vim на указанном <дисплее>" #: main.c:2581 -msgid "-italicfont \tUse for italic text" -msgstr "-italicfont <>\t <> " - -#: main.c:2582 main.c:2600 -msgid "-geometry \tUse for initial geometry (also: -geom)" -msgstr "" -"-geometry <>\t <> (: -geom)" +msgid "-iconic\t\tStart vim iconified" +msgstr "-iconic\t\tЗапустить vim в свёрнутом виде" #: main.c:2583 -msgid "-borderwidth \tUse a border width of (also: -bw)" -msgstr "-borderwidth <>\t <> (: -bw)" +msgid "-name \t\tUse resource as if vim was " +msgstr "-name <имя>\t\tИспользовать ресурс, как если бы vim был <именем>" #: main.c:2584 -msgid "-scrollbarwidth Use a scrollbar width of (also: -sw)" -msgstr "" -"-scrollbarwidth <> (: -sw)" +msgid "\t\t\t (Unimplemented)\n" +msgstr "\t\t\t (Не реализовано)\n" #: main.c:2586 -msgid "-menuheight \tUse a menu bar height of (also: -mh)" -msgstr "-menuheight <>\t <> (: -mh)" - -#: main.c:2588 main.c:2601 -msgid "-reverse\t\tUse reverse video (also: -rv)" -msgstr "-reverse\t\t (: -rv)" +msgid "-background \tUse for the background (also: -bg)" +msgstr "" +"-background <цвет>\tИспользовать указанный <цвет> для фона (также: -bg)" + +#: main.c:2587 +msgid "-foreground \tUse for normal text (also: -fg)" +msgstr "" +"-foreground <цвет>\tИспользовать <цвет> для обычного текста (также: -fg)" + +#: main.c:2588 main.c:2608 +msgid "-font \t\tUse for normal text (also: -fn)" +msgstr "-font <шрифт>\t\tИспользовать <шрифт> для обычного текста (также: -fn)" #: main.c:2589 -msgid "+reverse\t\tDon't use reverse video (also: +rv)" -msgstr "+reverse\t\t (: +rv)" +msgid "-boldfont \tUse for bold text" +msgstr "-boldfont <шрифт>\tИспользовать <шрифт> для жирного текста" #: main.c:2590 -msgid "-xrm \tSet the specified resource" -msgstr "-xrm <>\t <>" +msgid "-italicfont \tUse for italic text" +msgstr "-italicfont <шрифт>\tИспользовать <шрифт> для наклонного текста" + +#: main.c:2591 main.c:2609 +msgid "-geometry \tUse for initial geometry (also: -geom)" +msgstr "" +"-geometry <геометрия>\tИспользовать начальную <геометрию> (также: -geom)" + +#: main.c:2592 +msgid "-borderwidth \tUse a border width of (also: -bw)" +msgstr "-borderwidth <ширина>\tИспользовать <ширину> бордюра (также: -bw)" #: main.c:2593 +msgid "-scrollbarwidth Use a scrollbar width of (also: -sw)" +msgstr "" +"-scrollbarwidth <ширина> Использовать ширину полосы прокрутки (также: -sw)" + +#: main.c:2595 +msgid "-menuheight \tUse a menu bar height of (also: -mh)" +msgstr "-menuheight <высота>\tИспользовать <высоту> меню (также: -mh)" + +#: main.c:2597 main.c:2610 +msgid "-reverse\t\tUse reverse video (also: -rv)" +msgstr "-reverse\t\tИспользовать инверсный видеорежим (также: -rv)" + +#: main.c:2598 +msgid "+reverse\t\tDon't use reverse video (also: +rv)" +msgstr "+reverse\t\tНе использовать инверсный видеорежим (также: +rv)" + +#: main.c:2599 +msgid "-xrm \tSet the specified resource" +msgstr "-xrm <ресурс>\tУстановить указанный <ресурс>" + +#: main.c:2602 msgid "" "\n" "Arguments recognised by gvim (RISC OS version):\n" msgstr "" "\n" -" gvim ( RISC OS):\n" - -#: main.c:2594 +"Аргументы для gvim (версия RISC OS):\n" + +#: main.c:2603 msgid "--columns \tInitial width of window in columns" -msgstr "--columns <>\t " - -#: main.c:2595 +msgstr "--columns <число>\tПервоначальная ширина окна в колонках" + +#: main.c:2604 msgid "--rows \tInitial height of window in rows" -msgstr "--rows <>\t " - -#: main.c:2598 +msgstr "--rows <число>\tПервоначальная высота окна в строках" + +#: main.c:2607 msgid "" "\n" "Arguments recognised by gvim (GTK+ version):\n" msgstr "" "\n" -" gvim ( GTK+):\n" - -#: main.c:2602 +"Аргументы для gvim (версия GTK+):\n" + +#: main.c:2611 msgid "-display \tRun vim on (also: --display)" msgstr "" -"-display <>\t vim <> (: --display)" - -#: main.c:2604 +"-display <дисплей>\tЗапустить vim на указанном <дисплее> (также: --display)" + +#: main.c:2613 msgid "--role \tSet a unique role to identify the main window" msgstr "" -"--role <>\t <> " - -#: main.c:2606 +"--role <роль>\tУстановить уникальную <роль> для идентификации главного окна" + +#: main.c:2615 msgid "--socketid \tOpen Vim inside another GTK widget" -msgstr "--socketid \t Vim GTK" - -#: main.c:2609 +msgstr "--socketid \tОткрыть Vim внутри другого компонента GTK" + +#: main.c:2618 msgid "-P \tOpen Vim inside parent application" -msgstr "-P < >\t Vim " - -#: main.c:2847 +msgstr "-P <заголовок родителя>\tОткрыть Vim в родительском приложении" + +#: main.c:2856 msgid "No display" -msgstr " " +msgstr "Нет дисплея" #. Failed to send, abort. -#: main.c:2862 +#: main.c:2871 msgid ": Send failed.\n" -msgstr ": .\n" +msgstr ": Отправка не удалась.\n" #. Let vim start normally. -#: main.c:2868 +#: main.c:2877 msgid ": Send failed. Trying to execute locally\n" -msgstr ": . \n" - -#: main.c:2906 main.c:2927 +msgstr ": Отправка не удалась. Попытка местного выполнения\n" + +#: main.c:2915 main.c:2936 #, c-format msgid "%d of %d edited" -msgstr " %d %d" - -#: main.c:2949 +msgstr "отредактировано %d из %d" + +#: main.c:2958 msgid "No display: Send expression failed.\n" -msgstr " : .\n" - -#: main.c:2961 +msgstr "Нет дисплея: отправка выражения не удалась.\n" + +#: main.c:2970 msgid ": Send expression failed.\n" -msgstr ": .\n" +msgstr ": Отправка выражения не удалась.\n" #: mark.c:709 msgid "No marks set" -msgstr " " +msgstr "Нет установленных отметок" #: mark.c:711 #, c-format msgid "E283: No marks matching \"%s\"" -msgstr "E283: , \"%s\"" +msgstr "E283: Нет отметок, совпадающих с \"%s\"" #. Highlight title #: mark.c:722 @@ -3443,7 +3452,7 @@ msgid "" "mark line col file/text" msgstr "" "\n" -" /" +"отмет стр кол файл/текст" #. Highlight title #: mark.c:760 @@ -3452,7 +3461,7 @@ msgid "" " jump line col file/text" msgstr "" "\n" -" /" +"прыжок стр кол файл/текст" #. Highlight title #: mark.c:805 @@ -3461,7 +3470,7 @@ msgid "" "change line col text" msgstr "" "\n" -". " +"измен. стр кол текст" #: mark.c:1281 #, c-format @@ -3470,7 +3479,7 @@ msgid "" "# File marks:\n" msgstr "" "\n" -"# :\n" +"# Глобальные отметки:\n" #. Write the jumplist with -' #: mark.c:1316 @@ -3480,7 +3489,7 @@ msgid "" "# Jumplist (newest first):\n" msgstr "" "\n" -"# ( ):\n" +"# Список прыжков (сначала более свежие):\n" #: mark.c:1412 #, c-format @@ -3489,476 +3498,476 @@ msgid "" "# History of marks within files (newest to oldest):\n" msgstr "" "\n" -"# ( ):\n" +"# История местных отметок (от более свежих к старым):\n" #: mark.c:1501 msgid "Missing '>'" -msgstr " '>'" +msgstr "Пропущена '>'" #: mbyte.c:467 msgid "E543: Not a valid codepage" -msgstr "E543: " +msgstr "E543: Недопустимое имя кодировки" #: mbyte.c:4431 msgid "E284: Cannot set IC values" -msgstr "E284: " +msgstr "E284: Невозможно назначить значения контекста ввода" #: mbyte.c:4583 msgid "E285: Failed to create input context" -msgstr "E285: " +msgstr "E285: Невозможно создать контекст ввода" #: mbyte.c:4741 msgid "E286: Failed to open input method" -msgstr "E286: " +msgstr "E286: Неудачная попытка открыть метод ввода" #: mbyte.c:4752 msgid "E287: Warning: Could not set destroy callback to IM" msgstr "" -"E287: : . " -"" +"E287: Предупреждение: невозможно назначить обр. вызов уничтожения метода " +"ввода" #: mbyte.c:4758 msgid "E288: input method doesn't support any style" -msgstr "E288: " +msgstr "E288: метод ввода не поддерживает стили" #: mbyte.c:4815 msgid "E289: input method doesn't support my preedit type" msgstr "" -"E289: " +"E289: метод ввода не поддерживает мой тип предварительного редактирования" #: mbyte.c:4889 msgid "E290: over-the-spot style requires fontset" -msgstr "E290: \" \" " +msgstr "E290: стиль \"над местом\" требует указания шрифтового набора" #: mbyte.c:4925 msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled" msgstr "" -"E291: GTK+ , 1.2.3. ." +"E291: GTK+ более ранней версии, чем 1.2.3. Область состояния не работает." #: mbyte.c:5232 msgid "E292: Input Method Server is not running" -msgstr "E292: " +msgstr "E292: Сервер метода ввода не запущен" #: memfile.c:488 msgid "E293: block was not locked" -msgstr "E293: " - -#: memfile.c:1005 -msgid "E294: Seek error in swap file read" -msgstr "E294: -" +msgstr "E293: блок не заблокирован" #: memfile.c:1010 +msgid "E294: Seek error in swap file read" +msgstr "E294: Ошибка поиска при чтении своп-файла" + +#: memfile.c:1015 msgid "E295: Read error in swap file" -msgstr "E295: -" - -#: memfile.c:1062 +msgstr "E295: Ошибка чтения своп-файла" + +#: memfile.c:1067 msgid "E296: Seek error in swap file write" -msgstr "E296: -" - -#: memfile.c:1080 +msgstr "E296: Ошибка поиска при записи своп-файла" + +#: memfile.c:1085 msgid "E297: Write error in swap file" -msgstr "E297: -" - -#: memfile.c:1277 +msgstr "E297: Ошибка при записи своп-файла" + +#: memfile.c:1282 msgid "E300: Swap file already exists (symlink attack?)" msgstr "" -"E300: - ( ?)" +"E300: Своп-файл уже существует (атака с использованием символьной ссылки?)" #: memline.c:275 msgid "E298: Didn't get block nr 0?" -msgstr "E298: 0?" +msgstr "E298: Не получен блок номер 0?" #: memline.c:315 msgid "E298: Didn't get block nr 1?" -msgstr "E298: 1?" +msgstr "E298: Не получен блок номер 1?" #: memline.c:333 msgid "E298: Didn't get block nr 2?" -msgstr "E298: 2?" +msgstr "E298: Не получен блок номер 2?" #. could not (re)open the swap file, what can we do???? -#: memline.c:443 +#: memline.c:444 msgid "E301: Oops, lost the swap file!!!" -msgstr "E301: , -!!!" - -#: memline.c:448 +msgstr "E301: Ой, потерялся своп-файл!!!" + +#: memline.c:449 msgid "E302: Could not rename swap file" -msgstr "E302: -" - -#: memline.c:518 +msgstr "E302: Невозможно переименовать своп-файл" + +#: memline.c:519 #, c-format msgid "E303: Unable to open swap file for \"%s\", recovery impossible" msgstr "" -"E303: - \"%s\", " - -#: memline.c:617 +"E303: Не удалось открыть своп-файл для \"%s\", восстановление невозможно" + +#: memline.c:618 msgid "E304: ml_timestamp: Didn't get block 0??" -msgstr "E304: ml_timestamp: 0??" - -#: memline.c:757 +msgstr "E304: ml_timestamp: Не получен блок 0??" + +#: memline.c:758 #, c-format msgid "E305: No swap file found for %s" -msgstr "E305: - %s " - -#: memline.c:767 +msgstr "E305: Своп-файл для %s не найден" + +#: memline.c:768 msgid "Enter number of swap file to use (0 to quit): " msgstr "" -" -, (0 ): " - -#: memline.c:812 +"Введите номер своп-файла, который следует использовать (0 для выхода): " + +#: memline.c:813 #, c-format msgid "E306: Cannot open %s" -msgstr "E306: %s" - -#: memline.c:834 +msgstr "E306: Не могу открыть %s" + +#: memline.c:835 msgid "Unable to read block 0 from " -msgstr " 0 " - -#: memline.c:837 +msgstr "Невозможно прочитать блок 0 из " + +#: memline.c:838 msgid "" "\n" "Maybe no changes were made or Vim did not update the swap file." msgstr "" "\n" -" , Vim -" - -#: memline.c:847 memline.c:864 +"Нет изменений, или Vim не смог обновить своп-файл" + +#: memline.c:848 memline.c:865 msgid " cannot be used with this version of Vim.\n" -msgstr " Vim.\n" - -#: memline.c:849 +msgstr " нельзя использовать в данной версии Vim.\n" + +#: memline.c:850 msgid "Use Vim version 3.0.\n" -msgstr " Vim 3.0.\n" - -#: memline.c:855 +msgstr "Используйте Vim версии 3.0.\n" + +#: memline.c:856 #, c-format msgid "E307: %s does not look like a Vim swap file" -msgstr "E307: %s - Vim" - -#: memline.c:868 +msgstr "E307: %s не является своп-файлом Vim" + +#: memline.c:869 msgid " cannot be used on this computer.\n" -msgstr " .\n" - -#: memline.c:870 +msgstr " нельзя использовать на этом компьютере.\n" + +#: memline.c:871 msgid "The file was created on " -msgstr " " - -#: memline.c:874 +msgstr "Файл был создан " + +#: memline.c:875 msgid "" ",\n" "or the file has been damaged." msgstr "" ",\n" -" ģ." - -#: memline.c:903 +"либо файл был повреждён." + +#: memline.c:904 #, c-format msgid "Using swap file \"%s\"" -msgstr " - \"%s\"" - -#: memline.c:909 +msgstr "Используется своп-файл \"%s\"" + +#: memline.c:910 #, c-format msgid "Original file \"%s\"" -msgstr " \"%s\"" - -#: memline.c:922 +msgstr "Исходный файл \"%s\"" + +#: memline.c:923 msgid "E308: Warning: Original file may have been changed" -msgstr "E308: : Σ" - -#: memline.c:975 +msgstr "E308: Предупреждение: исходный файл мог быть изменён" + +#: memline.c:976 #, c-format msgid "E309: Unable to read block 1 from %s" -msgstr "E309: 1 %s" - -#: memline.c:979 +msgstr "E309: Невозможно прочитать блок 1 из %s" + +#: memline.c:980 msgid "???MANY LINES MISSING" -msgstr "??? " - -#: memline.c:995 +msgstr "???ОТСУТСТВУЕТ МНОГО СТРОК" + +#: memline.c:996 msgid "???LINE COUNT WRONG" -msgstr "??? " - -#: memline.c:1002 +msgstr "???НЕПРАВИЛЬНОЕ ЗНАЧЕНИЕ СЧЕТЧИКА СТРОК" + +#: memline.c:1003 msgid "???EMPTY BLOCK" -msgstr "??? " - -#: memline.c:1028 +msgstr "???ПУСТОЙ БЛОК" + +#: memline.c:1029 msgid "???LINES MISSING" -msgstr "??? " - -#: memline.c:1060 +msgstr "???ОТСУТСТВУЮТ СТРОКИ" + +#: memline.c:1061 #, c-format msgid "E310: Block 1 ID wrong (%s not a .swp file?)" -msgstr "E310: 1 ID (%s .swp?)" - -#: memline.c:1065 +msgstr "E310: неправильный блок 1 ID (%s не является файлом .swp?)" + +#: memline.c:1066 msgid "???BLOCK MISSING" -msgstr "??? " - -#: memline.c:1081 +msgstr "???ПРОПУЩЕН БЛОК" + +#: memline.c:1082 msgid "??? from here until ???END lines may be messed up" -msgstr "??? ???" - -#: memline.c:1097 +msgstr "???строки могут быть испорчены отсюда до ???КОНЦА" + +#: memline.c:1098 msgid "??? from here until ???END lines may have been inserted/deleted" -msgstr "??? ???" - -#: memline.c:1117 +msgstr "???строки могли быть вставлены или удалены отсюда до ???КОНЦА" + +#: memline.c:1118 msgid "???END" -msgstr "???" - -#: memline.c:1143 +msgstr "???КОНЕЦ" + +#: memline.c:1144 msgid "E311: Recovery Interrupted" -msgstr "E311: " - -#: memline.c:1148 +msgstr "E311: Восстановление прервано" + +#: memline.c:1149 msgid "" "E312: Errors detected while recovering; look for lines starting with ???" msgstr "" -"E312: ; . , " -" ???" - -#: memline.c:1150 +"E312: Во время восстановления обнаружены ошибки; см. строки, начинающиеся " +"с ???" + +#: memline.c:1151 msgid "See \":help E312\" for more information." -msgstr ". (\":help E312\")" - -#: memline.c:1155 -msgid "Recovery completed. You should check if everything is OK." -msgstr " . , ӣ ." +msgstr "См. дополнительную информацию в справочнике (\":help E312\")" #: memline.c:1156 +msgid "Recovery completed. You should check if everything is OK." +msgstr "Восстановление завершено. Проверьте, всё ли в порядке." + +#: memline.c:1157 msgid "" "\n" "(You might want to write out this file under another name\n" msgstr "" "\n" -"( \n" - -#: memline.c:1157 -msgid "and run diff with the original file to check for changes)\n" -msgstr " diff).\n" +"(Можете записать файл под другим именем и сравнить его с исходным\n" #: memline.c:1158 +msgid "and run diff with the original file to check for changes)\n" +msgstr "файлом при помощи программы diff).\n" + +#: memline.c:1159 msgid "" "Delete the .swp file afterwards.\n" "\n" msgstr "" -" .swp.\n" +"Затем удалите файл .swp.\n" "\n" #. use msg() to start the scrolling properly -#: memline.c:1214 +#: memline.c:1215 msgid "Swap files found:" -msgstr " -:" - -#: memline.c:1392 +msgstr "Обнаружены своп-файлы:" + +#: memline.c:1393 msgid " In current directory:\n" -msgstr " :\n" - -#: memline.c:1394 +msgstr " В текущем каталоге:\n" + +#: memline.c:1395 msgid " Using specified name:\n" -msgstr " :\n" - -#: memline.c:1398 +msgstr " С указанным именем:\n" + +#: memline.c:1399 msgid " In directory " -msgstr " " - -#: memline.c:1416 +msgstr " В каталоге " + +#: memline.c:1417 msgid " -- none --\n" -msgstr " -- --\n" - -#: memline.c:1488 +msgstr " -- нет --\n" + +#: memline.c:1489 msgid " owned by: " -msgstr " : " - -#: memline.c:1490 +msgstr " владелец: " + +#: memline.c:1491 msgid " dated: " -msgstr " : " - -#: memline.c:1494 memline.c:3684 +msgstr " дата: " + +#: memline.c:1495 memline.c:3685 msgid " dated: " -msgstr " : " - -#: memline.c:1510 +msgstr " дата: " + +#: memline.c:1511 msgid " [from Vim version 3.0]" -msgstr " [ Vim 3.0]" - -#: memline.c:1514 +msgstr " [от Vim версии 3.0]" + +#: memline.c:1515 msgid " [does not look like a Vim swap file]" -msgstr " [ - Vim]" - -#: memline.c:1518 +msgstr " [не является своп-файлом Vim]" + +#: memline.c:1519 msgid " file name: " -msgstr " : " - -#: memline.c:1524 +msgstr " имя файла: " + +#: memline.c:1525 msgid "" "\n" " modified: " msgstr "" "\n" -" Σ: " - -#: memline.c:1525 +" изменён: " + +#: memline.c:1526 msgid "YES" -msgstr "" - -#: memline.c:1525 +msgstr "ДА" + +#: memline.c:1526 msgid "no" -msgstr "" - -#: memline.c:1529 +msgstr "нет" + +#: memline.c:1530 msgid "" "\n" " user name: " msgstr "" "\n" -" : " - -#: memline.c:1536 +" пользователь: " + +#: memline.c:1537 msgid " host name: " -msgstr " : " - -#: memline.c:1538 +msgstr " компьютер: " + +#: memline.c:1539 msgid "" "\n" " host name: " msgstr "" "\n" -" : " - -#: memline.c:1544 +" компьютер: " + +#: memline.c:1545 msgid "" "\n" " process ID: " msgstr "" "\n" -" : " - -#: memline.c:1550 +" процесс: " + +#: memline.c:1551 msgid " (still running)" -msgstr " (ݣ )" - -#: memline.c:1562 +msgstr " (ещё выполняется)" + +#: memline.c:1563 msgid "" "\n" " [not usable with this version of Vim]" msgstr "" "\n" -" [ Vim]" - -#: memline.c:1565 +" [не пригоден для использования с данной версией Vim]" + +#: memline.c:1566 msgid "" "\n" " [not usable on this computer]" msgstr "" "\n" -" [ ]" - -#: memline.c:1570 +" [не пригоден для использования на этом компьютере]" + +#: memline.c:1571 msgid " [cannot be read]" -msgstr " [ ]" - -#: memline.c:1574 +msgstr " [не читается]" + +#: memline.c:1575 msgid " [cannot be opened]" -msgstr " [ ]" - -#: memline.c:1764 +msgstr " [не открывается]" + +#: memline.c:1765 msgid "E313: Cannot preserve, there is no swap file" -msgstr "E313: -, " - -#: memline.c:1817 +msgstr "E313: Невозможно обновить своп-файл, поскольку он не обнаружен" + +#: memline.c:1818 msgid "File preserved" -msgstr "- ̣" - -#: memline.c:1819 +msgstr "Своп-файл обновлён" + +#: memline.c:1820 msgid "E314: Preserve failed" -msgstr "E314: -" - -#: memline.c:1890 +msgstr "E314: Неудачная попытка обновления своп-файла" + +#: memline.c:1891 #, c-format msgid "E315: ml_get: invalid lnum: %ld" -msgstr "E315: ml_get: lnum: %ld" - -#: memline.c:1916 +msgstr "E315: ml_get: неправильное значение lnum: %ld" + +#: memline.c:1917 #, c-format msgid "E316: ml_get: cannot find line %ld" -msgstr "E316: ml_get: %ld" - -#: memline.c:2306 +msgstr "E316: ml_get: невозможно найти строку %ld" + +#: memline.c:2307 msgid "E317: pointer block id wrong 3" -msgstr " 3" - -#: memline.c:2386 +msgstr "неправильное значение указателя блока 3" + +#: memline.c:2387 msgid "stack_idx should be 0" -msgstr " stack_idx 0" - -#: memline.c:2448 +msgstr "значение stack_idx должно быть равно 0" + +#: memline.c:2449 msgid "E318: Updated too many blocks?" -msgstr "E318: ?" - -#: memline.c:2630 +msgstr "E318: Обновлено слишком много блоков?" + +#: memline.c:2631 msgid "E317: pointer block id wrong 4" -msgstr "E317: 4" - -#: memline.c:2657 +msgstr "E317: неправильное значение указателя блока 4" + +#: memline.c:2658 msgid "deleted block 1?" -msgstr "̣ 1?" - -#: memline.c:2857 +msgstr "удалён блок 1?" + +#: memline.c:2858 #, c-format msgid "E320: Cannot find line %ld" -msgstr "E320: %ld " - -#: memline.c:3100 +msgstr "E320: Строка %ld не обнаружена" + +#: memline.c:3101 msgid "E317: pointer block id wrong" -msgstr "E317: " - -#: memline.c:3116 +msgstr "E317: неправильное значение указателя блока" + +#: memline.c:3117 msgid "pe_line_count is zero" -msgstr " pe_line_count " - -#: memline.c:3145 +msgstr "значение pe_line_count равно нулю" + +#: memline.c:3146 #, c-format msgid "E322: line number out of range: %ld past the end" -msgstr "E322: : %ld" - -#: memline.c:3149 +msgstr "E322: номер строки за пределами диапазона: %ld" + +#: memline.c:3150 #, c-format msgid "E323: line count wrong in block %ld" -msgstr "E323: ޣ %ld" - -#: memline.c:3198 +msgstr "E323: неправильное значение счётчика строк в блоке %ld" + +#: memline.c:3199 msgid "Stack size increases" -msgstr " " - -#: memline.c:3244 +msgstr "Размер стека увеличен" + +#: memline.c:3245 msgid "E317: pointer block id wrong 2" -msgstr "E317: 2" - -#: memline.c:3674 -msgid "E325: ATTENTION" -msgstr "E325: " +msgstr "E317: неправильное значение указателя блока 2" #: memline.c:3675 +msgid "E325: ATTENTION" +msgstr "E325: ВНИМАНИЕ" + +#: memline.c:3676 msgid "" "\n" "Found a swap file by the name \"" msgstr "" "\n" -" - \"" - -#: memline.c:3679 +"Обнаружен своп-файл с именем \"" + +#: memline.c:3680 msgid "While opening file \"" -msgstr " : \"" - -#: memline.c:3688 +msgstr "При открытии файла: \"" + +#: memline.c:3689 msgid " NEWER than swap file!\n" -msgstr " , -!\n" +msgstr " Более СВЕЖИЙ, чем своп-файл!\n" #. Some of these messages are long to allow translation to #. * other languages. -#: memline.c:3692 +#: memline.c:3693 msgid "" "\n" "(1) Another program may be editing the same file.\n" @@ -3966,63 +3975,63 @@ msgid "" " different instances of the same file when making changes.\n" msgstr "" "\n" -"(1) , .\n" -" , ,\n" -" .\n" - -#: memline.c:3693 -msgid " Quit, or continue with caution.\n" -msgstr " .\n" +"(1) Возможно, редактирование файла выполняется в другой программе.\n" +" Если это так, то будьте внимательны при внесении изменений,\n" +" чтобы у вас не появилось два разных варианта одного и того же файла.\n" #: memline.c:3694 +msgid " Quit, or continue with caution.\n" +msgstr " Завершите работу или продолжайте с осторожностью.\n" + +#: memline.c:3695 msgid "" "\n" "(2) An edit session for this file crashed.\n" msgstr "" "\n" -"(2) ۣ .\n" - -#: memline.c:3695 +"(2) Предыдущий сеанс редактирования этого файла завершён аварийно.\n" + +#: memline.c:3696 msgid " If this is the case, use \":recover\" or \"vim -r " -msgstr " , \":recover\" \"vim -r " - -#: memline.c:3697 +msgstr " В этом случае, используйте команду \":recover\" или \"vim -r " + +#: memline.c:3698 msgid "" "\"\n" " to recover the changes (see \":help recovery\").\n" msgstr "" "\"\n" -" (. \":help \").\n" - -#: memline.c:3698 +" для восстановления изменений (см. \":help восстановление\").\n" + +#: memline.c:3699 msgid " If you did this already, delete the swap file \"" -msgstr " , - \"" - -#: memline.c:3700 +msgstr " Если вы уже выполняли эту операцию, удалите своп-файл \"" + +#: memline.c:3701 msgid "" "\"\n" " to avoid this message.\n" msgstr "" "\"\n" -" .\n" - -#: memline.c:3714 memline.c:3718 +" чтобы избежать появления этого сообщения в будущем.\n" + +#: memline.c:3715 memline.c:3719 msgid "Swap file \"" -msgstr "- \"" - -#: memline.c:3715 memline.c:3721 +msgstr "Своп-файл \"" + +#: memline.c:3716 memline.c:3722 msgid "\" already exists!" -msgstr "\" !" - -#: memline.c:3724 +msgstr "\" уже существует!" + +#: memline.c:3725 msgid "VIM - ATTENTION" -msgstr "VIM - " - -#: memline.c:3726 +msgstr "VIM - ВНИМАНИЕ" + +#: memline.c:3727 msgid "Swap file already exists!" -msgstr "- !" - -#: memline.c:3730 +msgstr "Своп-файл уже существует!" + +#: memline.c:3731 msgid "" "&Open Read-Only\n" "&Edit anyway\n" @@ -4030,13 +4039,13 @@ msgid "" "&Quit\n" "&Abort" msgstr "" -"&O \n" -"&E \n" -"&R \n" -"&Q \n" -"&A " - -#: memline.c:3732 +"&O Открыть для чтения\n" +"&E Редактировать\n" +"&R Восстановить\n" +"&Q Выход\n" +"&A Прервать" + +#: memline.c:3733 msgid "" "&Open Read-Only\n" "&Edit anyway\n" @@ -4045,40 +4054,40 @@ msgid "" "&Abort\n" "&Delete it" msgstr "" -"&O \n" -"&E \n" -"&R \n" -"&Q \n" -"&A \n" -"&D " - -#: memline.c:3789 +"&O Открыть для чтения\n" +"&E Редактировать\n" +"&R Восстановить\n" +"&Q Выход\n" +"&A Прервать\n" +"&D Удалить" + +#: memline.c:3790 msgid "E326: Too many swap files found" -msgstr "E326: -" +msgstr "E326: Обнаружено слишком много своп-файлов" #: menu.c:64 msgid "E327: Part of menu-item path is not sub-menu" -msgstr "E327: " +msgstr "E327: Компонент пути к элементу меню не является подменю" #: menu.c:65 msgid "E328: Menu only exists in another mode" -msgstr "E328: " +msgstr "E328: Меню в этом режиме не существует" #: menu.c:66 msgid "E329: No menu of that name" -msgstr "E329: " +msgstr "E329: Нет меню с таким именем" #: menu.c:525 msgid "E330: Menu path must not lead to a sub-menu" -msgstr "E330: " +msgstr "E330: Путь к меню не должен вести к подменю" #: menu.c:564 msgid "E331: Must not add menu items directly to menu bar" -msgstr "E331: " +msgstr "E331: Элементы меню нельзя добавлять непосредственно в полоску меню" #: menu.c:570 msgid "E332: Separator cannot be part of a menu path" -msgstr "E332: " +msgstr "E332: Разделители не могут быть компонентом пути к меню" #. Now we have found the matching menu, and we list the mappings #. Highlight title @@ -4088,91 +4097,91 @@ msgid "" "--- Menus ---" msgstr "" "\n" -"--- ---" +"--- Меню ---" #: menu.c:2019 msgid "Tear off this menu" -msgstr " " +msgstr "Оторвать это меню" #: menu.c:2084 msgid "E333: Menu path must lead to a menu item" -msgstr "E333: " +msgstr "E333: Путь к меню должен вести к элементу меню" #: menu.c:2104 #, c-format msgid "E334: Menu not found: %s" -msgstr "E334: : %s" +msgstr "E334: Меню не найдено: %s" #: menu.c:2173 #, c-format msgid "E335: Menu not defined for %s mode" -msgstr "E335: %s" +msgstr "E335: Меню не определено для режима %s" #: menu.c:2211 msgid "E336: Menu path must lead to a sub-menu" -msgstr "E336: " +msgstr "E336: Путь к меню должен вести к подменю" #: menu.c:2232 msgid "E337: Menu not found - check menu names" -msgstr "E337: -- " +msgstr "E337: Меню не найдено -- проверьте имена меню" #: message.c:414 #, c-format msgid "Error detected while processing %s:" -msgstr " %s:" +msgstr "Обнаружена ошибка при обработке %s:" #: message.c:440 #, c-format msgid "line %4ld:" -msgstr " %4ld:" +msgstr "строка %4ld:" #: message.c:647 msgid "[string too long]" -msgstr "[ ]" +msgstr "[слишком длинная строка]" #: message.c:797 msgid "Messages maintainer: Bram Moolenaar " msgstr "" -" : " #: message.c:1025 msgid "Interrupt: " -msgstr ": " +msgstr "Прерывание: " #: message.c:1028 msgid "Hit ENTER to continue" -msgstr " ENTER" +msgstr "Для продолжения нажмите ENTER" #: message.c:1030 msgid "Hit ENTER or type command to continue" -msgstr " ENTER " +msgstr "Для продолжения нажмите ENTER или введите команду" #: message.c:2351 msgid "-- More --" -msgstr "-- --" +msgstr "-- Продолжение следует --" #: message.c:2354 msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)" -msgstr " (RET/BS: , SPACE/b: , d/u: , q: )" +msgstr " (RET/BS: строка, SPACE/b: страница, d/u: полстраницы, q: выход)" #: message.c:2355 msgid " (RET: line, SPACE: page, d: half page, q: quit)" -msgstr " (RET: , SPACE: , d: , q: )" - -#: message.c:2976 message.c:2991 +msgstr " (RET: строка, SPACE: страница, d: полстраницы, q: выход)" + +#: message.c:2982 message.c:2997 msgid "Question" -msgstr "" - -#: message.c:2978 +msgstr "Вопрос" + +#: message.c:2984 msgid "" "&Yes\n" "&No" msgstr "" -"&\n" -"&" - -#: message.c:3011 +"&Да\n" +"&Нет" + +#: message.c:3017 msgid "" "&Yes\n" "&No\n" @@ -4180,65 +4189,65 @@ msgid "" "&Discard All\n" "&Cancel" msgstr "" -"&\n" -"&\n" -" &\n" -"& \n" -"&" - -#: message.c:3052 +"&Да\n" +"&Нет\n" +"Сохранить &все\n" +"&Потерять все\n" +"О&тмена" + +#: message.c:3058 msgid "Save File dialog" -msgstr " " - -#: message.c:3054 +msgstr "Сохранение файла" + +#: message.c:3060 msgid "Open File dialog" -msgstr " " +msgstr "Открытие файла" #. TODO: non-GUI file selector here -#: message.c:3125 +#: message.c:3131 msgid "E338: Sorry, no file browser in console mode" msgstr "" -"E338: , " +"E338: Извините, но в консольном режиме нет проводника по файловой системе" #: misc1.c:2773 msgid "W10: Warning: Changing a readonly file" -msgstr "W10: : " +msgstr "W10: Предупреждение: Изменение файла с правами только для чтения" #: misc1.c:3021 msgid "1 more line" -msgstr " " +msgstr "Добавлена одна строка" #: misc1.c:3023 msgid "1 line less" -msgstr " " +msgstr "Удалена одна строка" #: misc1.c:3028 #, c-format msgid "%ld more lines" -msgstr " : %ld" +msgstr "Добавлено строк: %ld" #: misc1.c:3030 #, c-format msgid "%ld fewer lines" -msgstr " : %ld" +msgstr "Удалено строк: %ld" #: misc1.c:3033 msgid " (Interrupted)" -msgstr " ()" +msgstr " (Прервано)" #: misc1.c:7588 msgid "Vim: preserving files...\n" -msgstr "Vim: ...\n" +msgstr "Vim: сохраняются файлы...\n" #. close all memfiles, without deleting #: misc1.c:7598 msgid "Vim: Finished.\n" -msgstr "Vim: .\n" +msgstr "Vim: Готово.\n" #: misc2.c:695 misc2.c:711 #, c-format msgid "ERROR: " -msgstr ": " +msgstr "ОШИБКА: " #: misc2.c:715 #, c-format @@ -4247,7 +4256,7 @@ msgid "" "[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n" msgstr "" "\n" -"[] .-. %lu-%lu, . %lu, . . %lu\n" +"[байт] всего выдел.-освоб. %lu-%lu, использ. %lu, макс. использ. %lu\n" #: misc2.c:717 #, c-format @@ -4255,59 +4264,59 @@ msgid "" "[calls] total re/malloc()'s %lu, total free()'s %lu\n" "\n" msgstr "" -"[] re/malloc() %lu, free() %lu\n" +"[вызовы] re/malloc() всего %lu, free() всего %lu\n" "\n" #: misc2.c:772 msgid "E340: Line is becoming too long" -msgstr "E340: " +msgstr "E340: Строка становится слишком длинной" #: misc2.c:816 #, c-format msgid "E341: Internal error: lalloc(%ld, )" -msgstr "E341: : lalloc(%ld, )" +msgstr "E341: Внутренняя ошибка: lalloc(%ld, )" #: misc2.c:924 #, c-format msgid "E342: Out of memory! (allocating %lu bytes)" -msgstr "E342: ! ( %lu )" +msgstr "E342: Не хватает памяти! (выделяется %lu байт)" #: misc2.c:2594 #, c-format msgid "Calling shell to execute: \"%s\"" -msgstr " : \"%s\"" +msgstr "Вызов оболочки для исполнения: \"%s\"" #: misc2.c:2816 msgid "E545: Missing colon" -msgstr "E545: " +msgstr "E545: Пропущено двоеточие" #: misc2.c:2818 misc2.c:2845 msgid "E546: Illegal mode" -msgstr "E546: " +msgstr "E546: Недопустимый режим" #: misc2.c:2884 msgid "E547: Illegal mouseshape" -msgstr "E547: " +msgstr "E547: Недопустимая форма курсора" #: misc2.c:2924 msgid "E548: digit expected" -msgstr "E548: " +msgstr "E548: требуется ввести цифру" #: misc2.c:2929 msgid "E549: Illegal percentage" -msgstr "E549: " +msgstr "E549: Недопустимое значение процентов" #: misc2.c:3239 msgid "Enter encryption key: " -msgstr " : " +msgstr "Введите пароль для шифрования: " #: misc2.c:3240 msgid "Enter same key again: " -msgstr " :" +msgstr " Повторите ввод пароля:" #: misc2.c:3250 msgid "Keys don't match!" -msgstr "ģ !" +msgstr "Введённые пароли не совпадают!" #: misc2.c:3799 #, c-format @@ -4315,236 +4324,236 @@ msgid "" "E343: Invalid path: '**[number]' must be at the end of the path or be " "followed by '%s'." msgstr "" -"E343: : '**[]' , " -" '%s'" +"E343: Неправильно задан путь: '**[число]' должно быть либо в конце пути, " +"либо за ним должно следовать '%s'" #: misc2.c:5078 #, c-format msgid "E344: Can't find directory \"%s\" in cdpath" -msgstr "E344: \"%s\" " +msgstr "E344: Каталог \"%s\" не найден в пути для смены каталога" #: misc2.c:5081 #, c-format msgid "E345: Can't find file \"%s\" in path" -msgstr "E345: \"%s\" " +msgstr "E345: Файл \"%s\" в известных каталогах не найден" #: misc2.c:5087 #, c-format msgid "E346: No more directory \"%s\" found in cdpath" -msgstr "E346: \"%s\"" +msgstr "E346: В пути смены каталога больше нет каталогов \"%s\"" #: misc2.c:5090 #, c-format msgid "E347: No more file \"%s\" found in path" -msgstr "E347: \"%s\"" +msgstr "E347: В известных каталогах больше нет файлов \"%s\"" #: misc2.c:5324 msgid "E550: Missing colon" -msgstr "E550: " +msgstr "E550: Пропущено двоеточие" #: misc2.c:5336 msgid "E551: Illegal component" -msgstr "E551: " +msgstr "E551: Недопустимый компонент" #: misc2.c:5344 msgid "E552: digit expected" -msgstr "E552: " +msgstr "E552: Требуется указать цифру" #. Get here when the server can't be found. #: netbeans.c:396 msgid "Cannot connect to Netbeans #2" -msgstr " Netbeans #2" +msgstr "Невозможно соединиться с Netbeans #2" #: netbeans.c:404 msgid "Cannot connect to Netbeans" -msgstr " NetBeans" +msgstr "Невозможно соединиться с NetBeans" #: netbeans.c:450 #, c-format msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\"" msgstr "" -"E668: NetBeans: \"%s\"" +"E668: Неправильный режим доступа к информации о соединении с NetBeans: \"%s\"" #: netbeans.c:749 msgid "read from Netbeans socket" -msgstr " NetBeans" +msgstr "чтение из гнезда NetBeans" #: netbeans.c:1643 #, c-format msgid "E658: NetBeans connection lost for buffer %ld" -msgstr "E658: NetBeans %ld" - -#: normal.c:2980 +msgstr "E658: Потеряно соединение с NetBeans для буфера %ld" + +#: normal.c:2983 msgid "Warning: terminal cannot highlight" -msgstr ": " - -#: normal.c:3276 +msgstr "Предупреждение: терминал не может выполнять подсветку" + +#: normal.c:3279 msgid "E348: No string under cursor" -msgstr "E348: " - -#: normal.c:3278 +msgstr "E348: Нет строки в позиции курсора" + +#: normal.c:3281 msgid "E349: No identifier under cursor" -msgstr "E349: " - -#: normal.c:4519 +msgstr "E349: Нет имени в позиции курсора" + +#: normal.c:4522 msgid "E352: Cannot erase folds with current 'foldmethod'" msgstr "" -"E352: 'foldmethod'" - -#: normal.c:6740 +"E352: Невозможно стереть складки с текущим значением опции 'foldmethod'" + +#: normal.c:6743 msgid "E664: changelist is empty" -msgstr "E664: " - -#: normal.c:6742 +msgstr "E664: список изменений пустой" + +#: normal.c:6745 msgid "E662: At start of changelist" -msgstr "E662: " - -#: normal.c:6744 +msgstr "E662: В начале списка изменений" + +#: normal.c:6747 msgid "E663: At end of changelist" -msgstr "E662: " - -#: normal.c:8005 +msgstr "E662: В конце списка изменений" + +#: normal.c:8009 msgid "Type :quit to exit Vim" -msgstr " :quit Vim" +msgstr "Введите :quit для выхода из Vim" #: ops.c:294 #, c-format msgid "1 line %sed 1 time" -msgstr " 1 (%s 1 )" +msgstr "Изменены отступы в 1 строке (%s 1 раз)" #: ops.c:296 #, c-format msgid "1 line %sed %d times" -msgstr " 1 (%s %d )" +msgstr "Изменены отступы в 1 строке (%s %d раз)" #: ops.c:301 #, c-format msgid "%ld lines %sed 1 time" -msgstr " , %ld (%s 1 )" +msgstr "Изменены отступы, %ld строк (%s 1 раз)" #: ops.c:304 #, c-format msgid "%ld lines %sed %d times" -msgstr " , %ld (%s %d )" +msgstr "Изменены отступы, %ld строк (%s %d раз)" #: ops.c:662 #, c-format msgid "%ld lines to indent... " -msgstr " (%ld)..." +msgstr "Изменяются отступы строках (%ld)..." #: ops.c:712 msgid "1 line indented " -msgstr "Σ " +msgstr "Изменён отступ в одной строке " #: ops.c:714 #, c-format msgid "%ld lines indented " -msgstr " (%ld) " +msgstr "Изменены отступы в строках (%ld) " #. must display the prompt -#: ops.c:1675 +#: ops.c:1688 msgid "cannot yank; delete anyway" -msgstr " , " - -#: ops.c:2261 +msgstr "скопировать не удалось, удаление выполнено" + +#: ops.c:2274 msgid "1 line changed" -msgstr " 1 " - -#: ops.c:2263 +msgstr "изменена 1 строка" + +#: ops.c:2276 #, c-format msgid "%ld lines changed" -msgstr " : %ld" - -#: ops.c:2647 +msgstr "изменено строк: %ld" + +#: ops.c:2660 #, c-format msgid "freeing %ld lines" -msgstr " : %ld" - -#: ops.c:2928 +msgstr "очищено строк: %ld" + +#: ops.c:2941 msgid "1 line yanked" -msgstr " " - -#: ops.c:2930 +msgstr "скопирована одна строка" + +#: ops.c:2943 #, c-format msgid "%ld lines yanked" -msgstr " : %ld" - -#: ops.c:3215 +msgstr "скопировано строк: %ld" + +#: ops.c:3228 #, c-format msgid "E353: Nothing in register %s" -msgstr "E353: %s " +msgstr "E353: В регистре %s ничего нет" #. Highlight title -#: ops.c:3766 +#: ops.c:3779 msgid "" "\n" "--- Registers ---" msgstr "" "\n" -"--- ---" - -#: ops.c:5075 +"--- Регистры ---" + +#: ops.c:5088 msgid "Illegal register name" -msgstr " " - -#: ops.c:5163 +msgstr "Недопустимое имя регистра" + +#: ops.c:5176 #, c-format msgid "" "\n" "# Registers:\n" msgstr "" "\n" -"# :\n" - -#: ops.c:5213 +"# Регистры:\n" + +#: ops.c:5226 #, c-format msgid "E574: Unknown register type %d" -msgstr "E574: %d" - -#: ops.c:5698 +msgstr "E574: Неизвестный тип регистра %d" + +#: ops.c:5711 #, c-format msgid "E354: Invalid register name: '%s'" -msgstr "E354: : '%s'" - -#: ops.c:6058 +msgstr "E354: Недопустимое имя регистра: '%s'" + +#: ops.c:6071 #, c-format msgid "%ld Cols; " -msgstr ": %ld; " - -#: ops.c:6065 +msgstr "Колонок: %ld; " + +#: ops.c:6078 #, c-format msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes" -msgstr " %s%ld %ld ; %ld %ld ; %ld %ld " - -#: ops.c:6081 +msgstr "Выделено %s%ld из %ld строк; %ld из %ld слов; %ld из %ld байт" + +#: ops.c:6094 #, c-format msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld" -msgstr ". %s %s; . %ld %ld; %ld %ld; %ld %ld" - -#: ops.c:6092 +msgstr "Кол. %s из %s; стр. %ld из %ld; слово %ld из %ld; байт %ld из %ld" + +#: ops.c:6105 #, c-format msgid "(+%ld for BOM)" -msgstr "(+%ld ޣ BOM)" +msgstr "(+%ld с учётом BOM)" #: option.c:1643 msgid "%<%f%h%m%=Page %N" -msgstr "%<%f%h%m%=. %N" +msgstr "%<%f%h%m%=Стр. %N" #: option.c:2092 msgid "Thanks for flying Vim" -msgstr " Vim" +msgstr "Благодарим за использование Vim" #: option.c:3419 option.c:3535 msgid "E518: Unknown option" -msgstr "E518: " +msgstr "E518: Неизвестная опция" #: option.c:3432 msgid "E519: Option not supported" -msgstr "E519: " +msgstr "E519: Опция не поддерживается" #: option.c:3457 msgid "E520: Not allowed in a modeline" -msgstr "E520: " +msgstr "E520: Не допускается в режимной строке" #: option.c:3522 msgid "" @@ -4552,319 +4561,319 @@ msgid "" "\tLast set from " msgstr "" "\n" -"\t " +"\tВ последний раз опция изменена в " #: option.c:3661 msgid "E521: Number required after =" -msgstr "E521: = " +msgstr "E521: После = требуется указать число" #: option.c:3989 option.c:4619 msgid "E522: Not found in termcap" -msgstr "E522: termcap" +msgstr "E522: Не обнаружено в termcap" #: option.c:4064 #, c-format msgid "E539: Illegal character <%s>" -msgstr "E539: <%s>" +msgstr "E539: Недопустимый символ <%s>" #: option.c:4611 msgid "E529: Cannot set 'term' to empty string" -msgstr "E529: 'term' " +msgstr "E529: Значение опции 'term' не может быть пустой строкой" #: option.c:4614 msgid "E530: Cannot change term in GUI" -msgstr "E530: " +msgstr "E530: В графическом интерфейсе изменять терминал невозможно" #: option.c:4616 msgid "E531: Use \":gui\" to start the GUI" -msgstr "E531: \":gui\"" +msgstr "E531: Для запуска графического интерфейса используйте \":gui\"" #: option.c:4645 msgid "E589: 'backupext' and 'patchmode' are equal" -msgstr "E589: 'backupext' 'patchmode' " +msgstr "E589: значения опций 'backupext' и 'patchmode' равны" #: option.c:4860 msgid "E617: Cannot be changed in the GTK+ 2 GUI" -msgstr "E617: GTK+ 2" +msgstr "E617: Не может быть изменено в графическом интерфейсе GTK+ 2" #: option.c:5016 msgid "E524: Missing colon" -msgstr "E524: " +msgstr "E524: Пропущено двоеточие" #: option.c:5018 msgid "E525: Zero length string" -msgstr "E525: " +msgstr "E525: Строка с нулевой длиной" #: option.c:5086 #, c-format msgid "E526: Missing number after <%s>" -msgstr "E526: <%s>" +msgstr "E526: Пропущено число после <%s>" #: option.c:5100 msgid "E527: Missing comma" -msgstr "E527: " +msgstr "E527: Пропущена запятая" #: option.c:5107 msgid "E528: Must specify a ' value" -msgstr "E528: '" +msgstr "E528: Необходимо указать значение для '" #: option.c:5148 msgid "E595: contains unprintable or wide character" -msgstr "E595: " +msgstr "E595: содержит непечатный символ или символ двойной ширины" #: option.c:5197 msgid "E596: Invalid font(s)" -msgstr "E596: " +msgstr "E596: Неправильные шрифты" #: option.c:5205 msgid "E597: can't select fontset" -msgstr "E597: " +msgstr "E597: невозможно выбрать шрифтовой набор" #: option.c:5207 msgid "E598: Invalid fontset" -msgstr "E598: " +msgstr "E598: Неправильный шрифтовой набор" #: option.c:5214 msgid "E533: can't select wide font" -msgstr "E533: " +msgstr "E533: невозможно выбрать шрифт с символами двойной ширины" #: option.c:5216 msgid "E534: Invalid wide font" -msgstr "E534: " +msgstr "E534: Неправильный шрифт с символами двойной ширины" #: option.c:5486 #, c-format msgid "E535: Illegal character after <%c>" -msgstr "E535: <%c>" +msgstr "E535: Неправильный символ после <%c>" #: option.c:5597 msgid "E536: comma required" -msgstr "E536: " +msgstr "E536: требуется запятая" #: option.c:5607 #, c-format msgid "E537: 'commentstring' must be empty or contain %s" msgstr "" -"E537: 'commentstring' " -" %s" - -#: option.c:5679 +"E537: Значение опция 'commentstring' должно быть пустой строкой или " +"содержать %s" + +#: option.c:5682 msgid "E538: No mouse support" -msgstr "E538: " - -#: option.c:5947 +msgstr "E538: Мышь не поддерживается" + +#: option.c:5950 msgid "E540: Unclosed expression sequence" -msgstr "E540: " - -#: option.c:5951 +msgstr "E540: Незакрытая последовательность выражения" + +#: option.c:5954 msgid "E541: too many items" -msgstr "E541: " - -#: option.c:5953 +msgstr "E541: слишком много элементов" + +#: option.c:5956 msgid "E542: unbalanced groups" -msgstr "E542: " - -#: option.c:6193 +msgstr "E542: несбалансированные группы" + +#: option.c:6196 msgid "E590: A preview window already exists" -msgstr "E590: " - -#: option.c:6450 +msgstr "E590: Окно предпросмотра уже есть" + +#: option.c:6453 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'" msgstr "" -"W17: UTF-8, ':set encoding=utf-8'" - -#: option.c:6783 +"W17: Арабский требует использования UTF-8, введите ':set encoding=utf-8'" + +#: option.c:6786 #, c-format msgid "E593: Need at least %d lines" -msgstr "E593: %d " - -#: option.c:6793 +msgstr "E593: Нужно хотя бы %d строк" + +#: option.c:6796 #, c-format msgid "E594: Need at least %d columns" -msgstr "E594: %d " - -#: option.c:7100 +msgstr "E594: Нужно хотя бы %d колонок" + +#: option.c:7103 #, c-format msgid "E355: Unknown option: %s" -msgstr "E355: : %s" - -#: option.c:7220 +msgstr "E355: Неизвестная опция: %s" + +#: option.c:7223 msgid "" "\n" "--- Terminal codes ---" msgstr "" "\n" -"--- ---" - -#: option.c:7222 +"--- Терминальные коды ---" + +#: option.c:7225 msgid "" "\n" "--- Global option values ---" msgstr "" "\n" -"--- ---" - -#: option.c:7224 +"--- Глобальные значения опций ---" + +#: option.c:7227 msgid "" "\n" "--- Local option values ---" msgstr "" "\n" -"--- ---" - -#: option.c:7226 +"--- Местные значения опций ---" + +#: option.c:7229 msgid "" "\n" "--- Options ---" msgstr "" "\n" -"--- ---" - -#: option.c:7932 +"--- Опции ---" + +#: option.c:7935 msgid "E356: get_varp ERROR" -msgstr "E356: get_varp" - -#: option.c:8903 +msgstr "E356: ОШИБКА get_varp" + +#: option.c:8906 #, c-format msgid "E357: 'langmap': Matching character missing for %s" -msgstr "E357: 'langmap': %s" - -#: option.c:8937 +msgstr "E357: 'langmap': Нет соответствующего символа для %s" + +#: option.c:8940 #, c-format msgid "E358: 'langmap': Extra characters after semicolon: %s" -msgstr "E358: 'langmap': : %s" +msgstr "E358: 'langmap': Лишние символы после точки с запятой: %s" #: os_amiga.c:280 msgid "cannot open " -msgstr " " +msgstr "невозможно открыть " #: os_amiga.c:314 msgid "VIM: Can't open window!\n" -msgstr "VIM: !\n" +msgstr "VIM: Невозможно открыть окно!\n" #: os_amiga.c:338 msgid "Need Amigados version 2.04 or later\n" -msgstr " Amigados 2.04 \n" +msgstr "Необходима Amigados версии 2.04 или более поздней\n" #: os_amiga.c:344 #, c-format msgid "Need %s version %ld\n" -msgstr " %s %ld\n" +msgstr "Необходима %s версии %ld\n" #: os_amiga.c:416 msgid "Cannot open NIL:\n" -msgstr " NIL:\n" +msgstr "Невозможно открыть NIL:\n" #: os_amiga.c:427 msgid "Cannot create " -msgstr " " +msgstr "Невозможно создать " #: os_amiga.c:905 #, c-format msgid "Vim exiting with %d\n" -msgstr " Vim %d\n" - -#: os_amiga.c:937 +msgstr "Прекращение работы Vim с кодом %d\n" + +#: os_amiga.c:941 msgid "cannot change console mode ?!\n" -msgstr " ?!\n" - -#: os_amiga.c:1003 +msgstr "невозможно сменить режим консоли?!\n" + +#: os_amiga.c:1012 msgid "mch_get_shellsize: not a console??\n" -msgstr "mch_get_shellsize: ??\n" +msgstr "mch_get_shellsize: не в консоли??\n" #. if Vim opened a window: Executing a shell may cause crashes -#: os_amiga.c:1152 +#: os_amiga.c:1161 msgid "E360: Cannot execute shell with -f option" -msgstr "E360: -f" - -#: os_amiga.c:1193 os_amiga.c:1283 +msgstr "E360: Невозможно выполнить оболочку с аргументом -f" + +#: os_amiga.c:1202 os_amiga.c:1292 msgid "Cannot execute " -msgstr " " - -#: os_amiga.c:1196 os_amiga.c:1293 +msgstr "Невозможно выполнить " + +#: os_amiga.c:1205 os_amiga.c:1302 msgid "shell " -msgstr " " - -#: os_amiga.c:1216 os_amiga.c:1318 +msgstr "оболочка " + +#: os_amiga.c:1225 os_amiga.c:1327 msgid " returned\n" -msgstr " \n" - -#: os_amiga.c:1459 +msgstr " завершила работу\n" + +#: os_amiga.c:1468 msgid "ANCHOR_BUF_SIZE too small." -msgstr " ANCHOR_BUF_SIZE." - -#: os_amiga.c:1463 +msgstr "слишком малая величина ANCHOR_BUF_SIZE." + +#: os_amiga.c:1472 msgid "I/O ERROR" -msgstr " /" - -#: os_mswin.c:539 +msgstr "ОШИБКА ВВОДА/ВЫВОДА" + +#: os_mswin.c:548 msgid "...(truncated)" -msgstr "...()" - -#: os_mswin.c:641 +msgstr "...(обрезано)" + +#: os_mswin.c:650 msgid "'columns' is not 80, cannot execute external commands" -msgstr " 'columns' 80, " - -#: os_mswin.c:1973 +msgstr "Значение опции 'columns' не равно 80, внешние программы не выполняются" + +#: os_mswin.c:1982 msgid "E237: Printer selection failed" -msgstr "E327: " - -#: os_mswin.c:2013 +msgstr "E327: Неудачное завершение выбора принтера" + +#: os_mswin.c:2022 #, c-format msgid "to %s on %s" -msgstr " %s %s" - -#: os_mswin.c:2028 +msgstr "в %s на %s" + +#: os_mswin.c:2037 #, c-format msgid "E613: Unknown printer font: %s" -msgstr "E613: : %s" - -#: os_mswin.c:2077 os_mswin.c:2087 +msgstr "E613: Неизвестный шрифт принтера: %s" + +#: os_mswin.c:2086 os_mswin.c:2096 #, c-format msgid "E238: Print error: %s" -msgstr "E238: : %s" - -#: os_mswin.c:2088 +msgstr "E238: Ошибка печати: %s" + +#: os_mswin.c:2097 msgid "Unknown" -msgstr "" - -#: os_mswin.c:2115 +msgstr "Неизвестно" + +#: os_mswin.c:2124 #, c-format msgid "Printing '%s'" -msgstr " '%s'" - -#: os_mswin.c:3204 +msgstr "Печать '%s'" + +#: os_mswin.c:3213 #, c-format msgid "E244: Illegal charset name \"%s\" in font name \"%s\"" -msgstr "E244: \"%s\" \"%s\"" - -#: os_mswin.c:3212 +msgstr "E244: Недопустимое имя кодировки \"%s\" в имени шрифта \"%s\"" + +#: os_mswin.c:3221 #, c-format msgid "E245: Illegal char '%c' in font name \"%s\"" -msgstr "E245: '%c' \"%s\"" +msgstr "E245: Недопустимый символ '%c' в имени шрифта \"%s\"" #: os_riscos.c:1259 msgid "E366: Invalid 'osfiletype' option - using Text" -msgstr "E366: 'osfiletype' -- Text" +msgstr "E366: Недопустимое значение опции 'osfiletype' -- используется Text" #: os_unix.c:927 msgid "Vim: Double signal, exiting\n" -msgstr "Vim: , \n" +msgstr "Vim: Двойной сигнал, завершение работы\n" #: os_unix.c:933 #, c-format msgid "Vim: Caught deadly signal %s\n" -msgstr "Vim: %s\n" +msgstr "Vim: Получен убийственный сигнал %s\n" #: os_unix.c:936 #, c-format msgid "Vim: Caught deadly signal\n" -msgstr "Vim: \n" +msgstr "Vim: Получен убийственный сигнал\n" #: os_unix.c:1199 #, c-format msgid "Opening the X display took %ld msec" -msgstr " X %ld msec" +msgstr "Открытие дисплея X заняло %ld msec" #: os_unix.c:1226 msgid "" @@ -4872,531 +4881,531 @@ msgid "" "Vim: Got X error\n" msgstr "" "\n" -"Vim: X\n" - -#: os_unix.c:1334 +"Vim: Ошибка X\n" + +#: os_unix.c:1338 msgid "Testing the X display failed" -msgstr " X " - -#: os_unix.c:1473 +msgstr "Проверка дисплея X завершена неудачно" + +#: os_unix.c:1477 msgid "Opening the X display timed out" -msgstr " X ģ " - -#: os_unix.c:3227 os_unix.c:3907 +msgstr "Открытие дисплея X не выполнено в отведённое время" + +#: os_unix.c:3234 os_unix.c:3914 msgid "" "\n" "Cannot execute shell " msgstr "" "\n" -" " - -#: os_unix.c:3275 +"Невозможно запустить оболочку " + +#: os_unix.c:3282 msgid "" "\n" "Cannot execute shell sh\n" msgstr "" "\n" -" sh\n" - -#: os_unix.c:3279 os_unix.c:3913 +"Невозможно запустить оболочку sh\n" + +#: os_unix.c:3286 os_unix.c:3920 msgid "" "\n" "shell returned " msgstr "" "\n" -" " - -#: os_unix.c:3414 +"Оболочка завершила работу " + +#: os_unix.c:3421 msgid "" "\n" "Cannot create pipes\n" msgstr "" "\n" -" \n" - -#: os_unix.c:3429 +"Невозможно создать трубы\n" + +#: os_unix.c:3436 msgid "" "\n" "Cannot fork\n" msgstr "" "\n" -" fork()\n" - -#: os_unix.c:3920 +"Невозможно выполнить fork()\n" + +#: os_unix.c:3927 msgid "" "\n" "Command terminated\n" msgstr "" "\n" -" \n" - -#: os_unix.c:4184 os_unix.c:4309 os_unix.c:5975 +"Выполнение команды прервано\n" + +#: os_unix.c:4191 os_unix.c:4316 os_unix.c:5982 msgid "XSMP lost ICE connection" -msgstr "XSMP ICE" - -#: os_unix.c:5558 +msgstr "XSMP утеряно соединение ICE" + +#: os_unix.c:5565 msgid "Opening the X display failed" -msgstr " X" - -#: os_unix.c:5880 +msgstr "Неудачное открытие дисплея X" + +#: os_unix.c:5887 msgid "XSMP handling save-yourself request" -msgstr "XSMP " - -#: os_unix.c:5999 +msgstr "XSMP обрабатывает запрос самосохранения" + +#: os_unix.c:6006 msgid "XSMP opening connection" -msgstr "XSMP " - -#: os_unix.c:6018 +msgstr "XSMP открывает соединение" + +#: os_unix.c:6025 msgid "XSMP ICE connection watch failed" -msgstr "XSMP ICE" - -#: os_unix.c:6038 +msgstr "XSMP потеряно слежение за соединением ICE" + +#: os_unix.c:6045 #, c-format msgid "XSMP SmcOpenConnection failed: %s" -msgstr "XSMP SmcOpenConnection: %s" +msgstr "XSMP неудачно выполнено SmcOpenConnection: %s" #: os_vms_mms.c:59 msgid "At line" -msgstr " " +msgstr "В строке" #: os_w32exe.c:65 msgid "Could not allocate memory for command line." -msgstr " ." +msgstr "Невозможно выделить память для командной строки." #: os_w32exe.c:66 os_w32exe.c:89 os_w32exe.c:100 msgid "VIM Error" -msgstr " VIM" +msgstr "Ошибка VIM" #: os_w32exe.c:89 msgid "Could not load vim32.dll!" -msgstr " vim32.dll!" +msgstr "Невозможно загрузить vim32.dll!" #: os_w32exe.c:99 msgid "Could not fix up function pointers to the DLL!" -msgstr " DLL!" - -#: os_win16.c:342 os_win32.c:3216 +msgstr "Невозможно исправить указатели функций для DLL!" + +#: os_win16.c:342 os_win32.c:3248 #, c-format msgid "shell returned %d" -msgstr " %d" - -#: os_win32.c:2674 +msgstr "завершение работы оболочки с кодом %d" + +#: os_win32.c:2706 #, c-format msgid "Vim: Caught %s event\n" -msgstr "Vim: %s\n" - -#: os_win32.c:2676 +msgstr "Vim: Перехвачено событие %s\n" + +#: os_win32.c:2708 msgid "close" -msgstr "" - -#: os_win32.c:2678 +msgstr "закрытие" + +#: os_win32.c:2710 msgid "logoff" -msgstr "" - -#: os_win32.c:2679 +msgstr "отключение" + +#: os_win32.c:2711 msgid "shutdown" -msgstr "" - -#: os_win32.c:3169 +msgstr "завершение" + +#: os_win32.c:3201 msgid "E371: Command not found" -msgstr "E371: " - -#: os_win32.c:3182 +msgstr "E371: Команда не найдена" + +#: os_win32.c:3214 msgid "" "VIMRUN.EXE not found in your $PATH.\n" "External commands will not pause after completion.\n" "See :help win32-vimrun for more information." msgstr "" -"VIMRUN.EXE , $PATH.\n" -" .\n" -" :help win32-vimrun" - -#: os_win32.c:3185 +"VIMRUN.EXE не найден в пути, заданном в $PATH.\n" +"Внешние команды не будут останавливаться после выполнения.\n" +"Дополнительная информация в :help win32-vimrun" + +#: os_win32.c:3217 msgid "Vim Warning" -msgstr " Vim" +msgstr "Предупреждение Vim" #: quickfix.c:258 #, c-format msgid "E372: Too many %%%c in format string" -msgstr "E372: %%%c" +msgstr "E372: В строке формата слишком много %%%c" #: quickfix.c:271 #, c-format msgid "E373: Unexpected %%%c in format string" -msgstr "E373: %%%c " +msgstr "E373: Неожиданный элемент %%%c в строке формата" #: quickfix.c:325 msgid "E374: Missing ] in format string" -msgstr "E374: ]" +msgstr "E374: В строке формата пропущена ]" #: quickfix.c:339 #, c-format msgid "E375: Unsupported %%%c in format string" -msgstr "E375: %%%c " +msgstr "E375: %%%c не поддерживается в строке формата" #: quickfix.c:357 #, c-format msgid "E376: Invalid %%%c in format string prefix" -msgstr "E376: %%%c " +msgstr "E376: Недопустимый %%%c в приставке в строке формата" #: quickfix.c:365 #, c-format msgid "E377: Invalid %%%c in format string" -msgstr "E377: %%%c " +msgstr "E377: Недопустимый %%%c в строке формата" #: quickfix.c:391 msgid "E378: 'errorformat' contains no pattern" -msgstr "E378: 'errorformat' " +msgstr "E378: В значении опции 'errorformat' отсутствует шаблон" #: quickfix.c:501 msgid "E379: Missing or empty directory name" -msgstr "E379: " +msgstr "E379: имя каталога не задано или равно пустой строке" #: quickfix.c:990 msgid "E553: No more items" -msgstr "E553: " +msgstr "E553: Больше нет элементов" #: quickfix.c:1229 #, c-format msgid "(%d of %d)%s%s: " -msgstr "(%d %d)%s%s: " +msgstr "(%d из %d)%s%s: " #: quickfix.c:1231 msgid " (line deleted)" -msgstr " ( )" +msgstr " (строка удалена)" #: quickfix.c:1444 msgid "E380: At bottom of quickfix stack" -msgstr "E380: " +msgstr "E380: Внизу стека быстрых исправлений" #: quickfix.c:1453 msgid "E381: At top of quickfix stack" -msgstr "E381: " +msgstr "E381: Наверху стека быстрых исправлений" #: quickfix.c:1465 #, c-format msgid "error list %d of %d; %d errors" -msgstr " %d %d; %d " +msgstr "список ошибок %d из %d; %d ошибок" #: quickfix.c:1943 msgid "E382: Cannot write, 'buftype' option is set" msgstr "" -"E382: , 'buftype' " +"E382: Запись невозможна, значение опции 'buftype' не является пустой строкой" #: regexp.c:319 #, c-format msgid "E369: invalid item in %s%%[]" -msgstr "E369: %s%%[]" +msgstr "E369: недопустимый элемент в %s%%[]" #: regexp.c:838 msgid "E339: Pattern too long" -msgstr "E339: " +msgstr "E339: Слишком длинный шаблон" #: regexp.c:1009 msgid "E50: Too many \\z(" -msgstr "E50: \\z(" +msgstr "E50: Слишком много \\z(" #: regexp.c:1020 #, c-format msgid "E51: Too many %s(" -msgstr "E51: %s(" +msgstr "E51: Слишком много %s(" #: regexp.c:1077 msgid "E52: Unmatched \\z(" -msgstr "E52: \\z(" +msgstr "E52: Нет пары для \\z(" #: regexp.c:1081 #, c-format msgid "E53: Unmatched %s%%(" -msgstr "E53: %s%%(" +msgstr "E53: Нет пары для %s%%(" #: regexp.c:1083 #, c-format msgid "E54: Unmatched %s(" -msgstr "E54: %s(" +msgstr "E54: Нет пары для %s(" #: regexp.c:1088 #, c-format msgid "E55: Unmatched %s)" -msgstr "E55: %s)" +msgstr "E55: Нет пары для %s)" #: regexp.c:1258 #, c-format msgid "E56: %s* operand could be empty" -msgstr "E56: %s*" +msgstr "E56: возможно пустой операнд %s*" #: regexp.c:1261 #, c-format msgid "E57: %s+ operand could be empty" -msgstr "E57: %s+" +msgstr "E57: возможно пустой операнд %s+" #: regexp.c:1316 #, c-format msgid "E59: invalid character after %s@" -msgstr "E59: %s@" +msgstr "E59: недопустимый символ после %s@" #: regexp.c:1344 #, c-format msgid "E58: %s{ operand could be empty" -msgstr "E58: %s{" +msgstr "E58: возможно пустой операнд %s{" #: regexp.c:1354 #, c-format msgid "E60: Too many complex %s{...}s" -msgstr "E60: %s{...}" +msgstr "E60: Слишком много сложных конструкций %s{...}" #: regexp.c:1370 #, c-format msgid "E61: Nested %s*" -msgstr "E61: %s*" +msgstr "E61: Вложенные %s*" #: regexp.c:1373 #, c-format msgid "E62: Nested %s%c" -msgstr "E62: %s%c" +msgstr "E62: Вложенные %s%c" #: regexp.c:1491 msgid "E63: invalid use of \\_" -msgstr "E63: \\_" +msgstr "E63: недопустимое использование \\_" #: regexp.c:1536 #, c-format msgid "E64: %s%c follows nothing" -msgstr "E64: %s%c " +msgstr "E64: %s%c ни за чем не следует" #: regexp.c:1592 msgid "E65: Illegal back reference" -msgstr "E65: " +msgstr "E65: Недопустимая обратная ссылка" #: regexp.c:1605 msgid "E66: \\z( not allowed here" -msgstr "E66: \\z( " +msgstr "E66: \\z( не может быть использовано здесь" #: regexp.c:1624 msgid "E67: \\z1 et al. not allowed here" -msgstr "E67: \\z1 .. " +msgstr "E67: \\z1 и т.п. не могут быть использованы здесь" #: regexp.c:1635 msgid "E68: Invalid character after \\z" -msgstr "E68: \\z" +msgstr "E68: Недопустимый символ после \\z" #: regexp.c:1684 #, c-format msgid "E69: Missing ] after %s%%[" -msgstr "E69: ] %s%%[" +msgstr "E69: Пропущена ] после %s%%[" #: regexp.c:1700 #, c-format msgid "E70: Empty %s%%[]" -msgstr "E70: %s%%[]" +msgstr "E70: Пустое %s%%[]" #: regexp.c:1760 #, c-format msgid "E71: Invalid character after %s%%" -msgstr "E71: %s%%" +msgstr "E71: Недопустимый символ после %s%%" #: regexp.c:2557 #, c-format msgid "E554: Syntax error in %s{...}" -msgstr "E554: %s{...}" +msgstr "E554: Синтаксическая ошибка в %s{...}" #: regexp.c:2863 regexp.c:3016 msgid "E361: Crash intercepted; regexp too complex?" msgstr "" -"E361: : " -"?" +"E361: Предотвращено аварийное завершение: слишком сложное регулярное " +"выражение?" #: regexp.c:3004 regexp.c:3013 msgid "E363: pattern caused out-of-stack error" -msgstr "E363: " +msgstr "E363: применение шаблона привело к ошибке выхода за пределы стека" #: regexp.c:3258 msgid "External submatches:\n" -msgstr " :\n" +msgstr "Внешние подсоответствия:\n" #: screen.c:2184 #, c-format msgid "+--%3ld lines folded " -msgstr "+--%3ld " - -#: screen.c:7996 -msgid " VREPLACE" -msgstr " " +msgstr "+--%3ld строк в складке" #: screen.c:8000 +msgid " VREPLACE" +msgstr " ВИРТУАЛЬНАЯ ЗАМЕНА" + +#: screen.c:8004 msgid " REPLACE" -msgstr " " - -#: screen.c:8005 +msgstr " ЗАМЕНА" + +#: screen.c:8009 msgid " REVERSE" -msgstr " " - -#: screen.c:8007 +msgstr " ОБРАТНАЯ" + +#: screen.c:8011 msgid " INSERT" -msgstr " " - -#: screen.c:8010 -msgid " (insert)" -msgstr " ()" - -#: screen.c:8012 -msgid " (replace)" -msgstr " ()" +msgstr " ВСТАВКА" #: screen.c:8014 +msgid " (insert)" +msgstr " (вставка)" + +#: screen.c:8016 +msgid " (replace)" +msgstr " (замена)" + +#: screen.c:8018 msgid " (vreplace)" -msgstr " ( )" - -#: screen.c:8017 +msgstr " (виртуальная замена)" + +#: screen.c:8021 msgid " Hebrew" -msgstr " " - -#: screen.c:8028 +msgstr " Иврит" + +#: screen.c:8032 msgid " Arabic" -msgstr " " - -#: screen.c:8031 -msgid " (lang)" -msgstr " ()" +msgstr " Арабский" #: screen.c:8035 +msgid " (lang)" +msgstr " (язык)" + +#: screen.c:8039 msgid " (paste)" -msgstr " ()" - -#: screen.c:8048 -msgid " VISUAL" -msgstr " " - -#: screen.c:8049 -msgid " VISUAL LINE" -msgstr " " - -#: screen.c:8050 -msgid " VISUAL BLOCK" -msgstr " " - -#: screen.c:8051 -msgid " SELECT" -msgstr " " +msgstr " (вклейка)" #: screen.c:8052 -msgid " SELECT LINE" -msgstr " " +msgid " VISUAL" +msgstr " ВИЗУАЛЬНЫЙ РЕЖИМ" #: screen.c:8053 +msgid " VISUAL LINE" +msgstr " ВИЗУАЛЬНАЯ СТРОКА" + +#: screen.c:8054 +msgid " VISUAL BLOCK" +msgstr " ВИЗУАЛЬНЫЙ БЛОК" + +#: screen.c:8055 +msgid " SELECT" +msgstr " ВЫДЕЛЕНИЕ" + +#: screen.c:8056 +msgid " SELECT LINE" +msgstr " ВЫДЕЛЕНИЕ СТРОКИ" + +#: screen.c:8057 msgid " SELECT BLOCK" -msgstr " " - -#: screen.c:8068 screen.c:8131 +msgstr " ВЫДЕЛЕНИЕ БЛОКА" + +#: screen.c:8072 screen.c:8135 msgid "recording" -msgstr "" +msgstr "запись" #: search.c:37 msgid "search hit TOP, continuing at BOTTOM" -msgstr " " +msgstr "поиск будет продолжен с КОНЦА документа" #: search.c:38 msgid "search hit BOTTOM, continuing at TOP" -msgstr " " +msgstr "поиск будет продолжен с НАЧАЛА документа" #: search.c:526 #, c-format msgid "E383: Invalid search string: %s" -msgstr "E383: : %s" +msgstr "E383: Неправильная строка поиска: %s" #: search.c:853 #, c-format msgid "E384: search hit TOP without match for: %s" -msgstr "E384: ; %s " +msgstr "E384: поиск закончен в НАЧАЛЕ документа; %s не найдено" #: search.c:856 #, c-format msgid "E385: search hit BOTTOM without match for: %s" -msgstr "E385: ; %s " +msgstr "E385: поиск закончен в КОНЦЕ документа; %s не найдено" #: search.c:1249 msgid "E386: Expected '?' or '/' after ';'" -msgstr "E386: ';' '?' '/'" - -#: search.c:3759 +msgstr "E386: После ';' ожидается ввод '?' или '/'" + +#: search.c:3768 msgid " (includes previously listed match)" -msgstr " ( )" +msgstr " (включает раннее показанные соответствия)" #. cursor at status line -#: search.c:3779 +#: search.c:3788 msgid "--- Included files " -msgstr "--- ޣ " - -#: search.c:3781 +msgstr "--- Включённые файлы " + +#: search.c:3790 msgid "not found " -msgstr " " - -#: search.c:3782 +msgstr "не найдено " + +#: search.c:3791 msgid "in path ---\n" -msgstr " ---\n" - -#: search.c:3839 +msgstr "по пути ---\n" + +#: search.c:3848 msgid " (Already listed)" -msgstr " ( )" - -#: search.c:3841 +msgstr " (Уже показано)" + +#: search.c:3850 msgid " NOT FOUND" -msgstr " " - -#: search.c:3893 +msgstr " НЕ НАЙДЕНО" + +#: search.c:3902 #, c-format msgid "Scanning included file: %s" -msgstr " ޣ : %s" - -#: search.c:4111 +msgstr "Просмотр включённых файлов: %s" + +#: search.c:4120 msgid "E387: Match is on current line" -msgstr "E387: " - -#: search.c:4254 +msgstr "E387: Соответствие в текущей строке" + +#: search.c:4263 msgid "All included files were found" -msgstr " ޣ " - -#: search.c:4256 +msgstr "Найдены все включённые файлы" + +#: search.c:4265 msgid "No included files" -msgstr "ޣ " - -#: search.c:4272 +msgstr "Включённых файлов нет" + +#: search.c:4281 msgid "E388: Couldn't find definition" -msgstr "E388: " - -#: search.c:4274 +msgstr "E388: Определение не найдено" + +#: search.c:4283 msgid "E389: Couldn't find pattern" -msgstr "E389: " +msgstr "E389: Шаблон не найден" #: syntax.c:3050 #, c-format msgid "E390: Illegal argument: %s" -msgstr "E390: : %s" +msgstr "E390: Недопустимый аргумент: %s" #: syntax.c:3230 #, c-format msgid "E391: No such syntax cluster: %s" -msgstr "E391: %s " +msgstr "E391: Синтаксический кластер %s не найден" #: syntax.c:3394 msgid "No Syntax items defined for this buffer" -msgstr " " +msgstr "Синтаксические элементы для данного буфера не определены" #: syntax.c:3402 msgid "syncing on C-style comments" -msgstr " C" +msgstr "Синхронизация по комментариям в стиле языка C" #: syntax.c:3410 msgid "no syncing" -msgstr " " +msgstr "без синхронизации" #: syntax.c:3413 msgid "syncing starts " -msgstr " " +msgstr "синхронизация начата " #: syntax.c:3415 syntax.c:3490 msgid " lines before top line" -msgstr " " +msgstr " строк перед верхней строкой" #: syntax.c:3420 msgid "" @@ -5404,7 +5413,7 @@ msgid "" "--- Syntax sync items ---" msgstr "" "\n" -"--- ---" +"--- Элементы синхронизации синтаксиса ---" #: syntax.c:3425 msgid "" @@ -5412,7 +5421,7 @@ msgid "" "syncing on items" msgstr "" "\n" -" " +"синхронизация по элементам" #: syntax.c:3431 msgid "" @@ -5420,214 +5429,214 @@ msgid "" "--- Syntax items ---" msgstr "" "\n" -"--- ---" +"--- Синтаксические элементы ---" #: syntax.c:3454 #, c-format msgid "E392: No such syntax cluster: %s" -msgstr "E392: %s " +msgstr "E392: Синтаксический кластер %s не найден" #: syntax.c:3480 msgid "minimal " -msgstr " " +msgstr "минимум " #: syntax.c:3487 msgid "maximal " -msgstr " " +msgstr "максимум " #: syntax.c:3499 msgid "; match " -msgstr "; " +msgstr "; соответствие " #: syntax.c:3501 msgid " line breaks" -msgstr " " +msgstr " переносов строк" #: syntax.c:4135 msgid "E393: group[t]here not accepted here" -msgstr "E393: group[t]here" +msgstr "E393: здесь нельзя использовать group[t]here" #: syntax.c:4159 #, c-format msgid "E394: Didn't find region item for %s" -msgstr "E394: %s " +msgstr "E394: Элемент области для %s не найден" #: syntax.c:4187 msgid "E395: contains argument not accepted here" -msgstr "E395: contains" +msgstr "E395: здесь нельзя использовать аргумент contains" #: syntax.c:4198 msgid "E396: containedin argument not accepted here" -msgstr "E396: containedin" +msgstr "E396: здесь нельзя использовать аргумент containedin" #: syntax.c:4276 msgid "E397: Filename required" -msgstr "E397: " +msgstr "E397: Требуется указать имя файла" #: syntax.c:4614 #, c-format msgid "E398: Missing '=': %s" -msgstr "E398: '=': %s" +msgstr "E398: Пропущено '=': %s" #: syntax.c:4772 #, c-format msgid "E399: Not enough arguments: syntax region %s" -msgstr "E399: : %s" +msgstr "E399: Не хватает аргументов: синтаксический регион %s" #: syntax.c:5103 msgid "E400: No cluster specified" -msgstr "E400: " +msgstr "E400: Кластер не указан" #: syntax.c:5140 #, c-format msgid "E401: Pattern delimiter not found: %s" -msgstr "E401: : %s" +msgstr "E401: Не найден разделитель шаблонов: %s" #: syntax.c:5215 #, c-format msgid "E402: Garbage after pattern: %s" -msgstr "E402: : %s" +msgstr "E402: Мусор после шаблона: %s" #: syntax.c:5305 msgid "E403: syntax sync: line continuations pattern specified twice" msgstr "" -"E403: : " +"E403: синхронизация синтаксиса: шаблон продолжений строки указан дважды" #: syntax.c:5362 #, c-format msgid "E404: Illegal arguments: %s" -msgstr "E404: : %s" +msgstr "E404: Недопустимые аргументы: %s" #: syntax.c:5412 #, c-format msgid "E405: Missing equal sign: %s" -msgstr "E405: : %s" +msgstr "E405: Пропущен знак равенства: %s" #: syntax.c:5418 #, c-format msgid "E406: Empty argument: %s" -msgstr "E406: : %s" +msgstr "E406: Пустой аргумент: %s" #: syntax.c:5445 #, c-format msgid "E407: %s not allowed here" -msgstr "E407: %s " +msgstr "E407: %s не допускается в этом месте" #: syntax.c:5452 #, c-format msgid "E408: %s must be first in contains list" -msgstr "E408: %s contains" +msgstr "E408: %s должно быть первым в списке contains" #: syntax.c:5522 #, c-format msgid "E409: Unknown group name: %s" -msgstr "E409: : %s" +msgstr "E409: Неизвестная группа: %s" #: syntax.c:5755 #, c-format msgid "E410: Invalid :syntax subcommand: %s" -msgstr "E410: :syntax: %s" +msgstr "E410: Неправильная подкоманда :syntax: %s" #: syntax.c:6136 #, c-format msgid "E411: highlight group not found: %s" -msgstr "E411: %s " +msgstr "E411: группа подсветки синтаксиса %s не найдена" #: syntax.c:6160 #, c-format msgid "E412: Not enough arguments: \":highlight link %s\"" -msgstr "E412: : \":highlight link %s\"" +msgstr "E412: Не хватает аргументов: \":highlight link %s\"" #: syntax.c:6167 #, c-format msgid "E413: Too many arguments: \":highlight link %s\"" -msgstr "E413: : \":highlight link %s\"" +msgstr "E413: Слишком много аргументов: \":highlight link %s\"" #: syntax.c:6187 msgid "E414: group has settings, highlight link ignored" -msgstr "E414: , " +msgstr "E414: у группы есть собственные настройки, ссылка игнорируется" #: syntax.c:6316 #, c-format msgid "E415: unexpected equal sign: %s" -msgstr "E415: : %s" +msgstr "E415: неожиданный знак равенства: %s" #: syntax.c:6352 #, c-format msgid "E416: missing equal sign: %s" -msgstr "E416: : %s" +msgstr "E416: пропущен знак равенства: %s" #: syntax.c:6380 #, c-format msgid "E417: missing argument: %s" -msgstr "E417: : %s" +msgstr "E417: пропущен аргумент: %s" #: syntax.c:6417 #, c-format msgid "E418: Illegal value: %s" -msgstr "E418: : %s" +msgstr "E418: Недопустимое значение: %s" #: syntax.c:6536 msgid "E419: FG color unknown" -msgstr "E419: " +msgstr "E419: Неизвестный цвет текста" #: syntax.c:6547 msgid "E420: BG color unknown" -msgstr "E420: " +msgstr "E420: Неизвестный цвет фона" #: syntax.c:6608 #, c-format msgid "E421: Color name or number not recognized: %s" -msgstr "E421: : %s" +msgstr "E421: Имя или номер цвета не известно: %s" #: syntax.c:6814 #, c-format msgid "E422: terminal code too long: %s" -msgstr "E422: : %s" +msgstr "E422: слишком длинный код терминала: %s" #: syntax.c:6861 #, c-format msgid "E423: Illegal argument: %s" -msgstr "E423: : %s" +msgstr "E423: Недопустимый аргумент: %s" #: syntax.c:7390 msgid "E424: Too many different highlighting attributes in use" -msgstr "E424: " +msgstr "E424: Используется слишком много разных атрибутов подсветки синтаксиса" #: syntax.c:7911 msgid "E669: Unprintable character in group name" -msgstr "E669: " +msgstr "E669: Непечатный символ в имени группы" #. This is an error, but since there previously was no check only #. * give a warning. #: syntax.c:7918 msgid "W18: Invalid character in group name" -msgstr "W18: " +msgstr "W18: Недопустимый символ в имени группы" #: tag.c:90 msgid "E555: at bottom of tag stack" -msgstr "E555: " +msgstr "E555: внизу стека меток" #: tag.c:91 msgid "E556: at top of tag stack" -msgstr "E556: " +msgstr "E556: наверху стека меток" #: tag.c:412 msgid "E425: Cannot go before first matching tag" -msgstr "E425: " +msgstr "E425: Невозможно перейти в позицию до первой совпадающей метки" #: tag.c:550 #, c-format msgid "E426: tag not found: %s" -msgstr "E426: : %s" +msgstr "E426: Метка не найдена: %s" #: tag.c:583 msgid " # pri kind tag" -msgstr " # " +msgstr " # при тип метка" #: tag.c:586 msgid "file\n" -msgstr "\n" +msgstr "файл\n" #. #. * Ask to select a tag from the list. @@ -5635,39 +5644,39 @@ msgstr "\n" #. #: tag.c:744 msgid "Enter nr of choice ( to abort): " -msgstr " ( ):" +msgstr "Выберите нужный номер ( для отказа):" #: tag.c:784 msgid "E427: There is only one matching tag" -msgstr "E427: " +msgstr "E427: Есть только одна совпадающая метка" #: tag.c:786 msgid "E428: Cannot go beyond last matching tag" -msgstr "E428: " +msgstr "E428: Невозможно перейти в позицию за последней совпадающей меткой" #: tag.c:810 #, c-format msgid "File \"%s\" does not exist" -msgstr " \"%s\" " +msgstr "Файл \"%s\" не существует" #. Give an indication of the number of matching tags #: tag.c:823 #, c-format msgid "tag %d of %d%s" -msgstr " %d %d%s" +msgstr "метка %d из %d%s" #: tag.c:826 msgid " or more" -msgstr " " +msgstr " и более" #: tag.c:828 msgid " Using tag with different case!" -msgstr " !" +msgstr " Используется метка с символами в другом регистре!" #: tag.c:872 #, c-format msgid "E429: File \"%s\" does not exist" -msgstr "E429: \"%s\" " +msgstr "E429: Файл \"%s\" не существует" #. Highlight title #: tag.c:941 @@ -5676,74 +5685,74 @@ msgid "" " # TO tag FROM line in file/text" msgstr "" "\n" -" # . /" +" # К метке ОТ стр. в файле/тексте" #: tag.c:1363 #, c-format msgid "Searching tags file %s" -msgstr " %s" +msgstr "Поиск в файле меток %s" #: tag.c:1550 #, c-format msgid "E430: Tag file path truncated for %s\n" -msgstr "E430: %s \n" +msgstr "E430: Путь к файлу меток %s обрезан\n" #: tag.c:2203 #, c-format msgid "E431: Format error in tags file \"%s\"" -msgstr "E431: \"%s\"" +msgstr "E431: Ошибка формата в файле меток \"%s\"" #: tag.c:2207 #, c-format msgid "Before byte %ld" -msgstr " %ld" +msgstr "Перед байтом %ld" #: tag.c:2240 #, c-format msgid "E432: Tags file not sorted: %s" -msgstr "E432: : %s" +msgstr "E432: Файл меток не отсортирован: %s" #. never opened any tags file #: tag.c:2280 msgid "E433: No tags file" -msgstr "E433: " +msgstr "E433: Файл меток не обнаружен" #: tag.c:3016 msgid "E434: Can't find tag pattern" -msgstr "E434: " +msgstr "E434: Не найден шаблон метки" #: tag.c:3027 msgid "E435: Couldn't find tag, just guessing!" -msgstr "E435: , !" +msgstr "E435: Метка не найдена, пытаемся угадать!" #: term.c:1759 msgid "' not known. Available builtin terminals are:" -msgstr "' . :" +msgstr "' не известен. Доступны встроенные терминалы:" #: term.c:1783 msgid "defaulting to '" -msgstr " '" +msgstr "по умолчанию '" #: term.c:2141 msgid "E557: Cannot open termcap file" -msgstr "E557: termcap" +msgstr "E557: Невозможно открыть файл termcap" #: term.c:2145 msgid "E558: Terminal entry not found in terminfo" -msgstr "E558: terminfo " +msgstr "E558: В terminfo нет записи об этом терминале" #: term.c:2147 msgid "E559: Terminal entry not found in termcap" -msgstr "E559: termcap " +msgstr "E559: В termcap нет записи об этом терминале" #: term.c:2306 #, c-format msgid "E436: No \"%s\" entry in termcap" -msgstr "E436: termcap \"%s\"" +msgstr "E436: В termcap нет записи \"%s\"" #: term.c:2780 msgid "E437: terminal capability \"cm\" required" -msgstr "E437: \"cm\"" +msgstr "E437: требуется способность терминала \"cm\"" #. Highlight title #: term.c:4990 @@ -5752,907 +5761,905 @@ msgid "" "--- Terminal keys ---" msgstr "" "\n" -"--- ---" +"--- Кнопки терминала ---" #: ui.c:258 msgid "new shell started\n" -msgstr " \n" +msgstr "запуск новой оболочки\n" #: ui.c:1841 msgid "Vim: Error reading input, exiting...\n" -msgstr "Vim: , ...\n" +msgstr "Vim: Ошибка чтения ввода, выход...\n" #. must display the prompt #: undo.c:405 msgid "No undo possible; continue anyway" -msgstr " ; " +msgstr "Отмена невозможна; продолжать выполнение" #: undo.c:561 msgid "E438: u_undo: line numbers wrong" -msgstr "E438: u_undo: " +msgstr "E438: u_undo: неправильные номера строк" #: undo.c:757 msgid "1 change" -msgstr " " +msgstr "Единственное изменение" #: undo.c:759 #, c-format msgid "%ld changes" -msgstr ": %ld" +msgstr "Изменений: %ld" #: undo.c:812 msgid "E439: undo list corrupt" -msgstr "E439: ģ " +msgstr "E439: Повреждён список отмены" #: undo.c:844 msgid "E440: undo line missing" -msgstr "E440: " +msgstr "E440: потеряна строка отмены" #. Only MS VC 4.1 and earlier can do Win32s -#: version.c:721 +#: version.c:707 msgid "" "\n" "MS-Windows 16/32 bit GUI version" msgstr "" "\n" -" MS-Windows 16/32 " - -#: version.c:723 +"Версия с графическим интерфейсом для MS-Windows 16/32 бит" + +#: version.c:709 msgid "" "\n" "MS-Windows 32 bit GUI version" msgstr "" "\n" -" MS-Windows 32 " - -#: version.c:726 +"Версия с графическим интерфейсом для MS-Windows 32 бит" + +#: version.c:712 msgid " in Win32s mode" -msgstr " Win32s" - -#: version.c:728 +msgstr " в режиме Win32s" + +#: version.c:714 msgid " with OLE support" -msgstr " OLE" - -#: version.c:731 +msgstr " с поддержкой OLE" + +#: version.c:717 msgid "" "\n" "MS-Windows 32 bit console version" msgstr "" "\n" -" MS-Windows 32 " - -#: version.c:735 +"Консольная версия для MS-Windows 32 бит" + +#: version.c:721 msgid "" "\n" "MS-Windows 16 bit version" msgstr "" "\n" -" MS-Windows 16 " - -#: version.c:739 +"Версия для MS-Windows 16 бит" + +#: version.c:725 msgid "" "\n" "32 bit MS-DOS version" msgstr "" "\n" -" MS-DOS 32 " - -#: version.c:741 +"Версия для MS-DOS 32 бит" + +#: version.c:727 msgid "" "\n" "16 bit MS-DOS version" msgstr "" "\n" -" MS-DOS 16 " - -#: version.c:747 +"Версия для MS-DOS 16 бит" + +#: version.c:733 msgid "" "\n" "MacOS X (unix) version" msgstr "" "\n" -" MacOS X (unix)" - -#: version.c:749 +"Версия для MacOS X (unix)" + +#: version.c:735 msgid "" "\n" "MacOS X version" msgstr "" "\n" -" MacOS X" - -#: version.c:752 +"Версия для MacOS X" + +#: version.c:738 msgid "" "\n" "MacOS version" msgstr "" "\n" -" MacOS" - -#: version.c:757 +"Версия для MacOS" + +#: version.c:743 msgid "" "\n" "RISC OS version" msgstr "" "\n" -" RISC OS" - -#: version.c:767 +"Версия для RISC OS" + +#: version.c:753 msgid "" "\n" "Included patches: " msgstr "" "\n" -": " - -#: version.c:793 version.c:1161 +"Заплатки: " + +#: version.c:779 version.c:1147 msgid "Modified by " -msgstr " , ӣ " - -#: version.c:800 +msgstr "С изменениями, внесёнными " + +#: version.c:786 msgid "" "\n" "Compiled " msgstr "" "\n" -" " - -#: version.c:803 +"Скомпилирован " + +#: version.c:789 msgid "by " msgstr " " -#: version.c:815 +#: version.c:801 msgid "" "\n" "Huge version " msgstr "" "\n" -" " - -#: version.c:818 +"Огромная версия " + +#: version.c:804 msgid "" "\n" "Big version " msgstr "" "\n" -" " - -#: version.c:821 +"Большая версия " + +#: version.c:807 msgid "" "\n" "Normal version " msgstr "" "\n" -" " - -#: version.c:824 +"Обычная версия " + +#: version.c:810 msgid "" "\n" "Small version " msgstr "" "\n" -" " - -#: version.c:826 +"Малая версия " + +#: version.c:812 msgid "" "\n" "Tiny version " msgstr "" "\n" -" \"\" " - -#: version.c:832 +"Версия \"Кроха\" " + +#: version.c:818 msgid "without GUI." -msgstr " ." - -#: version.c:837 +msgstr "без графического интерфейса." + +#: version.c:823 msgid "with GTK2-GNOME GUI." -msgstr " GTK2-GNOME." - -#: version.c:839 +msgstr "с графическим интерфейсом GTK2-GNOME." + +#: version.c:825 msgid "with GTK-GNOME GUI." -msgstr " GTK-GNOME." - -#: version.c:843 +msgstr "с графическим интерфейсом GTK-GNOME." + +#: version.c:829 msgid "with GTK2 GUI." -msgstr " GTK2." - -#: version.c:845 +msgstr "с графическим интерфейсом GTK2." + +#: version.c:831 msgid "with GTK GUI." -msgstr " GTK." - -#: version.c:850 +msgstr "с графическим интерфейсом GTK." + +#: version.c:836 msgid "with X11-Motif GUI." -msgstr " X11-Motif." - -#: version.c:854 +msgstr "с графическим интерфейсом X11-Motif." + +#: version.c:840 msgid "with X11-neXtaw GUI." -msgstr " X11-neXtaw." - -#: version.c:856 +msgstr "с графическим интерфейсом X11-neXtaw." + +#: version.c:842 msgid "with X11-Athena GUI." -msgstr " X11-Athena." - -#: version.c:860 +msgstr "с графическим интерфейсом X11-Athena." + +#: version.c:846 msgid "with BeOS GUI." -msgstr " BeOS." - -#: version.c:863 +msgstr "с графическим интерфейсом BeOS." + +#: version.c:849 msgid "with Photon GUI." -msgstr " Photon." - -#: version.c:866 +msgstr "с графическим интерфейсом Photon." + +#: version.c:852 msgid "with GUI." -msgstr " ." - -#: version.c:869 +msgstr "с графическим интерфейсом." + +#: version.c:855 msgid "with Carbon GUI." -msgstr " Carbon." +msgstr "с графическим интерфейсом Carbon." + +#: version.c:858 +msgid "with Cocoa GUI." +msgstr "с графическим интерфейсом Cocoa." + +#: version.c:861 +msgid "with (classic) GUI." +msgstr "с классическим графическим интерфейсом." #: version.c:872 -msgid "with Cocoa GUI." -msgstr " Cocoa." - -#: version.c:875 -msgid "with (classic) GUI." -msgstr " ." - -#: version.c:886 msgid " Features included (+) or not (-):\n" -msgstr " ޣ (+) ޣ (-) :\n" - -#: version.c:898 +msgstr " Включённые (+) и отключённые (-) особенности:\n" + +#: version.c:884 msgid " system vimrc file: \"" -msgstr " vimrc: \"" - -#: version.c:903 +msgstr " общесистемный файл vimrc: \"" + +#: version.c:889 msgid " user vimrc file: \"" -msgstr " vimrc: \"" - -#: version.c:908 +msgstr " пользовательский файл vimrc: \"" + +#: version.c:894 msgid " 2nd user vimrc file: \"" -msgstr " vimrc: \"" - -#: version.c:913 +msgstr " второй пользовательский файл vimrc: \"" + +#: version.c:899 msgid " 3rd user vimrc file: \"" -msgstr " vimrc: \"" - -#: version.c:918 +msgstr " третий пользовательский файл vimrc: \"" + +#: version.c:904 msgid " user exrc file: \"" -msgstr " exrc: \"" +msgstr " пользовательский файл exrc: \"" + +#: version.c:909 +msgid " 2nd user exrc file: \"" +msgstr " второй пользовательский файл exrc: \"" + +#: version.c:915 +msgid " system gvimrc file: \"" +msgstr " общесистемный файл gvimrc: \"" + +#: version.c:919 +msgid " user gvimrc file: \"" +msgstr " пользовательский файл gvimrc: \"" #: version.c:923 -msgid " 2nd user exrc file: \"" -msgstr " exrc: \"" - -#: version.c:929 -msgid " system gvimrc file: \"" -msgstr " gvimrc: \"" - -#: version.c:933 -msgid " user gvimrc file: \"" -msgstr " gvimrc: \"" - -#: version.c:937 msgid "2nd user gvimrc file: \"" -msgstr " gvimrc: \"" - -#: version.c:942 +msgstr " второй пользовательский файл gvimrc: \"" + +#: version.c:928 msgid "3rd user gvimrc file: \"" -msgstr " gvimrc: \"" +msgstr " третий пользовательский файл gvimrc: \"" + +#: version.c:935 +msgid " system menu file: \"" +msgstr " общесистемный файл меню: \"" + +#: version.c:943 +msgid " fall-back for $VIM: \"" +msgstr " значение $VIM по умолчанию: \"" #: version.c:949 -msgid " system menu file: \"" -msgstr " : \"" - -#: version.c:957 -msgid " fall-back for $VIM: \"" -msgstr " $VIM : \"" - -#: version.c:963 msgid " f-b for $VIMRUNTIME: \"" -msgstr " $VIMRUNTIME : \"" - -#: version.c:967 +msgstr " значение $VIMRUNTIME по умолчанию: \"" + +#: version.c:953 msgid "Compilation: " -msgstr " : " - -#: version.c:973 +msgstr "Параметры компиляции: " + +#: version.c:959 msgid "Compiler: " -msgstr ": " - -#: version.c:978 +msgstr "Компилятор: " + +#: version.c:964 msgid "Linking: " -msgstr ": " - -#: version.c:983 +msgstr "Сборка: " + +#: version.c:969 msgid " DEBUG BUILD" -msgstr " " +msgstr " ОТЛАДОЧНАЯ СБОРКА" + +#: version.c:1008 +msgid "VIM - Vi IMproved" +msgstr "VIM ::: Vi IMproved (Улучшенный Vi) ::: Русская версия" + +#: version.c:1010 +msgid "version " +msgstr "версия " + +#: version.c:1011 +msgid "by Bram Moolenaar et al." +msgstr "Брам Мооленаар и другие" + +#: version.c:1015 +msgid "Vim is open source and freely distributable" +msgstr "Vim это свободно распространяемая программа с открытым кодом" + +#: version.c:1017 +msgid "Help poor children in Uganda!" +msgstr "Бедным детям в Уганде нужна ваша помощь!" + +#: version.c:1018 +msgid "type :help iccf for information " +msgstr "наберите :help iccf для дополнительной информации" + +#: version.c:1020 +msgid "type :q to exit " +msgstr "наберите :q чтобы выйти из программы " + +#: version.c:1021 +msgid "type :help or for on-line help" +msgstr "наберите :help или для получения справки " #: version.c:1022 -msgid "VIM - Vi IMproved" -msgstr "VIM ::: Vi IMproved ( Vi) ::: " - -#: version.c:1024 -msgid "version " -msgstr " " +msgid "type :help version6 for version info" +msgstr "наберите :help version6 чтобы узнать об этой версии " #: version.c:1025 -msgid "by Bram Moolenaar et al." -msgstr " " - -#: version.c:1029 -msgid "Vim is open source and freely distributable" -msgstr "Vim " - -#: version.c:1031 -msgid "Help poor children in Uganda!" -msgstr " !" - -#: version.c:1032 -msgid "type :help iccf for information " -msgstr " :help iccf " - -#: version.c:1034 -msgid "type :q to exit " -msgstr " :q " - -#: version.c:1035 -msgid "type :help or for on-line help" -msgstr " :help " - -#: version.c:1036 -msgid "type :help version6 for version info" -msgstr " :help version6 " - -#: version.c:1039 msgid "Running in Vi compatible mode" -msgstr " Vi- " - -#: version.c:1040 +msgstr "Работа в Vi-совместимом режиме" + +#: version.c:1026 msgid "type :set nocp for Vim defaults" -msgstr " :set nocp Vim " - -#: version.c:1041 +msgstr "наберите :set nocp для перехода в режим Vim " + +#: version.c:1027 msgid "type :help cp-default for info on this" -msgstr " :help cp-default " - -#: version.c:1056 +msgstr "наберите :help cp-default для дополнительной информации" + +#: version.c:1042 msgid "menu Help->Orphans for information " -msgstr " -> " - -#: version.c:1058 +msgstr "меню Справка->Сироты для получения информации " + +#: version.c:1044 msgid "Running modeless, typed text is inserted" -msgstr " , ģ " - -#: version.c:1059 +msgstr "Безрежимная работы, вставка введённого текста" + +#: version.c:1045 msgid "menu Edit->Global Settings->Toggle Insert Mode " -msgstr " -> -> " - -#: version.c:1060 +msgstr "меню Правка->Общие Настройки->Режим Вставки " + +#: version.c:1046 msgid " for two modes " -msgstr " " - -#: version.c:1064 +msgstr " для двух режимов " + +#: version.c:1050 msgid "menu Edit->Global Settings->Toggle Vi Compatible" -msgstr " -> -> Vi " - -#: version.c:1065 +msgstr "меню Правка->Общие Настройки->Совместимость с Vi " + +#: version.c:1051 msgid " for Vim defaults " -msgstr " Vim " - -#: version.c:1112 +msgstr " для перехода в режим Vim " + +#: version.c:1098 msgid "Sponsor Vim development!" -msgstr " Vim!" - -#: version.c:1113 +msgstr "Помогите в разработке Vim!" + +#: version.c:1099 msgid "Become a registered Vim user!" -msgstr " Vim!" - -#: version.c:1116 +msgstr "Станьте зарегистрированным пользователем Vim!" + +#: version.c:1102 msgid "type :help sponsor for information " -msgstr " :help sponsor " - -#: version.c:1117 +msgstr "наберите :help sponsor для получения информации " + +#: version.c:1103 msgid "type :help register for information " -msgstr " :help register " - -#: version.c:1119 +msgstr "наберите :help register для получения информации " + +#: version.c:1105 msgid "menu Help->Sponsor/Register for information " -msgstr " ->/ " - -#: version.c:1129 +msgstr "меню Справка->Помощь/Регистрация для получения информации " + +#: version.c:1115 msgid "WARNING: Windows 95/98/ME detected" -msgstr ": Windows 95/98/ME" - -#: version.c:1132 +msgstr "ПРЕДУПРЕЖДЕНИЕ: обнаружена Windows 95/98/ME" + +#: version.c:1118 msgid "type :help windows95 for info on this" -msgstr " :help windows95 " +msgstr "наберите :help windows95 для получения информации " #: window.c:203 msgid "E441: There is no preview window" -msgstr "E441: " +msgstr "E441: Окно предпросмотра отсутствует" #: window.c:581 msgid "E442: Can't split topleft and botright at the same time" -msgstr "E442: " +msgstr "E442: Окно не может быть одновременно слева вверху и справа внизу" #: window.c:1340 msgid "E443: Cannot rotate when another window is split" -msgstr "E443: , " +msgstr "E443: Невозможно поменять местами, пока другое окно разделено" #: window.c:1836 msgid "E444: Cannot close last window" -msgstr "E444: " +msgstr "E444: Нельзя закрыть последнее окно" #: window.c:2567 msgid "Already only one window" -msgstr " " +msgstr "На экране всего одно окно" #: window.c:2614 msgid "E445: Other window contains changes" -msgstr "E445: Σ " +msgstr "E445: В другом окне есть несохранённые изменения" #: window.c:4480 msgid "E446: No file name under cursor" -msgstr "E446: " +msgstr "E446: Нет имени файла в позиции курсора" #: window.c:4599 #, c-format msgid "E447: Can't find file \"%s\" in path" -msgstr "E447: \"%s\" " - -#: if_perl.xs:326 globals.h:1232 +msgstr "E447: Файл \"%s\" не найден по известным путям" + +#: if_perl.xs:326 globals.h:1241 #, c-format msgid "E370: Could not load library %s" -msgstr "E370: %s" +msgstr "E370: Невозможно загрузить библиотеку %s" #: if_perl.xs:554 msgid "Sorry, this command is disabled: the Perl library could not be loaded." msgstr "" -", : Perl" +"Извините, данная команда отключена: невозможно загрузить библиотеку Perl" #: if_perl.xs:607 msgid "E299: Perl evaluation forbidden in sandbox without the Safe module" msgstr "" -"E299: Perl " +"E299: Не допускается вычисление Perl в песочнице без модуля безопасности" #: GvimExt/gvimext.cpp:583 msgid "Edit with &multiple Vims" -msgstr " & Vim-" +msgstr "Редактировать в &разных Vim-ах" #: GvimExt/gvimext.cpp:589 msgid "Edit with single &Vim" -msgstr " & Vim" +msgstr "Редактировать в &одном Vim" #: GvimExt/gvimext.cpp:598 msgid "&Diff with Vim" -msgstr "& Vim" +msgstr "&Сравнить с помощью Vim" #: GvimExt/gvimext.cpp:611 msgid "Edit with &Vim" -msgstr "& Vim" +msgstr "Ре&дактировать с помощью Vim" #. Now concatenate #: GvimExt/gvimext.cpp:633 msgid "Edit with existing Vim - &" -msgstr " Vim - &" +msgstr "Редактировать в запущенном Vim - &" #: GvimExt/gvimext.cpp:746 msgid "Edits the selected file(s) with Vim" -msgstr " Vim" +msgstr "Редактировать выделенные файлы с помощью Vim" #: GvimExt/gvimext.cpp:885 GvimExt/gvimext.cpp:966 msgid "Error creating process: Check if gvim is in your path!" -msgstr " : gvim !" +msgstr "Ошибка создания процесса: проверьте доступность gvim в пути!" #: GvimExt/gvimext.cpp:886 GvimExt/gvimext.cpp:900 GvimExt/gvimext.cpp:967 msgid "gvimext.dll error" -msgstr " gvimext.dll" +msgstr "ошибка gvimext.dll" #: GvimExt/gvimext.cpp:899 msgid "Path length too long!" -msgstr " !" - -#: globals.h:1022 +msgstr "Слишком длинный путь!" + +#: globals.h:1031 msgid "--No lines in buffer--" -msgstr "-- --" +msgstr "-- Нет строк в буфере --" #. #. * The error messages that can be shared are included here. #. * Excluded are errors that are only used once and debugging messages. #. -#: globals.h:1185 +#: globals.h:1194 msgid "E470: Command aborted" -msgstr "E470: " - -#: globals.h:1186 -msgid "E471: Argument required" -msgstr "E471: " - -#: globals.h:1187 -msgid "E10: \\ should be followed by /, ? or &" -msgstr "E10: \\ /, ? &" - -#: globals.h:1189 -msgid "E11: Invalid in command-line window; executes, CTRL-C quits" -msgstr "" -"E11: ; , CTRL-C " - -#: globals.h:1191 -msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search" -msgstr "" -"E12: exrc/vimrc " - -#: globals.h:1193 -msgid "E171: Missing :endif" -msgstr "E171: :endif" - -#: globals.h:1194 -msgid "E600: Missing :endtry" -msgstr "E600: :endtry" +msgstr "E470: Выполнение команды прервано" #: globals.h:1195 -msgid "E170: Missing :endwhile" -msgstr "E170: :endwhile" +msgid "E471: Argument required" +msgstr "E471: Требуется указать параметр" #: globals.h:1196 -msgid "E588: :endwhile without :while" -msgstr "E588: :endwhile :while" +msgid "E10: \\ should be followed by /, ? or &" +msgstr "E10: После \\ должен идти символ /, ? или &" #: globals.h:1198 -msgid "E13: File exists (add ! to override)" -msgstr "E13: ( !)" - -#: globals.h:1199 -msgid "E472: Command failed" -msgstr "E472: " - -#: globals.h:1201 -#, c-format -msgid "E234: Unknown fontset: %s" -msgstr "E234: : %s" +msgid "E11: Invalid in command-line window; executes, CTRL-C quits" +msgstr "" +"E11: Недопустимо в окне командной строки; выполнение, CTRL-C выход" + +#: globals.h:1200 +msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search" +msgstr "" +"E12: Команда не допускается в exrc/vimrc в текущем каталоге или поиске меток" + +#: globals.h:1202 +msgid "E171: Missing :endif" +msgstr "E171: Отсутствует команда :endif" + +#: globals.h:1203 +msgid "E600: Missing :endtry" +msgstr "E600: Отсутствует команда :endtry" + +#: globals.h:1204 +msgid "E170: Missing :endwhile" +msgstr "E170: Отсутствует команда :endwhile" #: globals.h:1205 -#, c-format -msgid "E235: Unknown font: %s" -msgstr "E235: : %s" +msgid "E588: :endwhile without :while" +msgstr "E588: Команда :endwhile без парной команды :while" + +#: globals.h:1207 +msgid "E13: File exists (add ! to override)" +msgstr "E13: Файл существует (для перезаписи добавьте !)" #: globals.h:1208 -#, c-format -msgid "E236: Font \"%s\" is not fixed-width" -msgstr "E236: \"%s\" " +msgid "E472: Command failed" +msgstr "E472: Не удалось выполнить команду" #: globals.h:1210 -msgid "E473: Internal error" -msgstr "E473: " - -#: globals.h:1211 -msgid "Interrupted" -msgstr "" - -#: globals.h:1212 -msgid "E14: Invalid address" -msgstr "E14: " - -#: globals.h:1213 -msgid "E474: Invalid argument" -msgstr "E474: " +#, c-format +msgid "E234: Unknown fontset: %s" +msgstr "E234: Неизвестный шрифтовой набор: %s" #: globals.h:1214 #, c-format -msgid "E475: Invalid argument: %s" -msgstr "E475: : %s" - -#: globals.h:1216 -#, c-format -msgid "E15: Invalid expression: %s" -msgstr "E15: : %s" - -#: globals.h:1218 -msgid "E16: Invalid range" -msgstr "E16: " +msgid "E235: Unknown font: %s" +msgstr "E235: Неизвестный шрифт: %s" + +#: globals.h:1217 +#, c-format +msgid "E236: Font \"%s\" is not fixed-width" +msgstr "E236: Шрифт \"%s\" не является моноширинным шрифтом" #: globals.h:1219 -msgid "E476: Invalid command" -msgstr "E476: " +msgid "E473: Internal error" +msgstr "E473: Внутренняя ошибка" + +#: globals.h:1220 +msgid "Interrupted" +msgstr "Прервано" #: globals.h:1221 -#, c-format -msgid "E17: \"%s\" is a directory" -msgstr "E17: \"%s\" " - -#: globals.h:1224 -msgid "E18: Unexpected characters before '='" -msgstr "E18: '=' " +msgid "E14: Invalid address" +msgstr "E14: Недопустимый адрес" + +#: globals.h:1222 +msgid "E474: Invalid argument" +msgstr "E474: Недопустимый аргумент" + +#: globals.h:1223 +#, c-format +msgid "E475: Invalid argument: %s" +msgstr "E475: Недопустимый аргумент: %s" + +#: globals.h:1225 +#, c-format +msgid "E15: Invalid expression: %s" +msgstr "E15: Недопустимое выражение: %s" #: globals.h:1227 -#, c-format -msgid "E364: Library call failed for \"%s()\"" -msgstr "E364: \"%s()\" " +msgid "E16: Invalid range" +msgstr "E16: Недопустимый диапазон" + +#: globals.h:1228 +msgid "E476: Invalid command" +msgstr "E476: Недопустимая команда" + +#: globals.h:1230 +#, c-format +msgid "E17: \"%s\" is a directory" +msgstr "E17: \"%s\" является каталогом" #: globals.h:1233 -#, c-format -msgid "E448: Could not load library function %s" -msgstr "E448: %s " - -#: globals.h:1235 -msgid "E19: Mark has invalid line number" -msgstr "E19: " +msgid "E18: Unexpected characters before '='" +msgstr "E18: Перед '=' обнаружены неожиданные символы" #: globals.h:1236 +#, c-format +msgid "E364: Library call failed for \"%s()\"" +msgstr "E364: Неудачный вызов функции \"%s()\" из библиотеки" + +#: globals.h:1242 +#, c-format +msgid "E448: Could not load library function %s" +msgstr "E448: Не удалось загрузить функцию %s из библиотеки" + +#: globals.h:1244 +msgid "E19: Mark has invalid line number" +msgstr "E19: Отметка указывает на неправильный номер строки" + +#: globals.h:1245 msgid "E20: Mark not set" -msgstr " " - -#: globals.h:1237 -msgid "E21: Cannot make changes, 'modifiable' is off" -msgstr "E21: , 'modifiable'" - -#: globals.h:1238 -msgid "E22: Scripts nested too deep" -msgstr "E22: " - -#: globals.h:1239 -msgid "E23: No alternate file" -msgstr "E23: " - -#: globals.h:1240 -msgid "E24: No such abbreviation" -msgstr "E24: " - -#: globals.h:1241 -msgid "E477: No ! allowed" -msgstr "E477: ! " - -#: globals.h:1243 -msgid "E25: GUI cannot be used: Not enabled at compile time" -msgstr "" -"E25: " -"" +msgstr "Отметка не определена" #: globals.h:1246 -msgid "E26: Hebrew cannot be used: Not enabled at compile time\n" -msgstr "E26: \n" +msgid "E21: Cannot make changes, 'modifiable' is off" +msgstr "E21: Изменения невозможны, так как отключена опция 'modifiable'" + +#: globals.h:1247 +msgid "E22: Scripts nested too deep" +msgstr "E22: Слишком глубоко вложенные сценарии" + +#: globals.h:1248 +msgid "E23: No alternate file" +msgstr "E23: Соседний файл не существует" #: globals.h:1249 -msgid "E27: Farsi cannot be used: Not enabled at compile time\n" -msgstr "E27: \n" +msgid "E24: No such abbreviation" +msgstr "E24: Нет такого сокращения" + +#: globals.h:1250 +msgid "E477: No ! allowed" +msgstr "E477: ! не допускается" #: globals.h:1252 -msgid "E800: Arabic cannot be used: Not enabled at compile time\n" -msgstr "E800: \n" +msgid "E25: GUI cannot be used: Not enabled at compile time" +msgstr "" +"E25: Возможность использования графического интерфейса выключена при " +"компиляции" #: globals.h:1255 -#, c-format -msgid "E28: No such highlight group name: %s" -msgstr "E28: %s " - -#: globals.h:1257 -msgid "E29: No inserted text yet" -msgstr "E29: " +msgid "E26: Hebrew cannot be used: Not enabled at compile time\n" +msgstr "E26: Иврит выключен при компиляции\n" #: globals.h:1258 -msgid "E30: No previous command line" -msgstr "E30: " - -#: globals.h:1259 -msgid "E31: No such mapping" -msgstr "E31: " - -#: globals.h:1260 -msgid "E479: No match" -msgstr "E479: " +msgid "E27: Farsi cannot be used: Not enabled at compile time\n" +msgstr "E27: Фарси выключено при компиляции\n" #: globals.h:1261 -#, c-format -msgid "E480: No match: %s" -msgstr "E480: : %s" - -#: globals.h:1262 -msgid "E32: No file name" -msgstr "E32: " - -#: globals.h:1263 -msgid "E33: No previous substitute regular expression" -msgstr "E33: " +msgid "E800: Arabic cannot be used: Not enabled at compile time\n" +msgstr "E800: Арабский выключен при компиляции\n" #: globals.h:1264 -msgid "E34: No previous command" -msgstr "E34: " - -#: globals.h:1265 -msgid "E35: No previous regular expression" -msgstr "E35: " +#, c-format +msgid "E28: No such highlight group name: %s" +msgstr "E28: Группа подсветки синтаксиса %s не существует" #: globals.h:1266 -msgid "E481: No range allowed" -msgstr "E481: " +msgid "E29: No inserted text yet" +msgstr "E29: Пока нет вставленного текста" + +#: globals.h:1267 +msgid "E30: No previous command line" +msgstr "E30: Предыдущей командной строки нет" #: globals.h:1268 -msgid "E36: Not enough room" -msgstr "E36: " +msgid "E31: No such mapping" +msgstr "E31: Такой привязки не существует" + +#: globals.h:1269 +msgid "E479: No match" +msgstr "E479: Нет соответствия" + +#: globals.h:1270 +#, c-format +msgid "E480: No match: %s" +msgstr "E480: Нет соответствия: %s" #: globals.h:1271 -#, c-format -msgid "E247: no registered server named \"%s\"" -msgstr "E247: \"%s\" " +msgid "E32: No file name" +msgstr "E32: Нет имени файла" + +#: globals.h:1272 +msgid "E33: No previous substitute regular expression" +msgstr "E33: Нет предыдущего регулярного выражения для замены" #: globals.h:1273 -#, c-format -msgid "E482: Can't create file %s" -msgstr "E482: %s" +msgid "E34: No previous command" +msgstr "E34: Нет предыдущей команды" #: globals.h:1274 -msgid "E483: Can't get temp file name" -msgstr "E483: " +msgid "E35: No previous regular expression" +msgstr "E35: Нет предыдущего регулярного выражения" #: globals.h:1275 -#, c-format -msgid "E484: Can't open file %s" -msgstr "E484: %s" - -#: globals.h:1276 -#, c-format -msgid "E485: Can't read file %s" -msgstr "E485: %s" +msgid "E481: No range allowed" +msgstr "E481: Использование диапазона не допускается" #: globals.h:1277 -msgid "E37: No write since last change (add ! to override)" -msgstr "E37: ( !, )" - -#: globals.h:1278 -msgid "E38: Null argument" -msgstr "E38: " +msgid "E36: Not enough room" +msgstr "E36: Недостаточно места" #: globals.h:1280 -msgid "E39: Number expected" -msgstr "E39: " +#, c-format +msgid "E247: no registered server named \"%s\"" +msgstr "E247: сервер \"%s\" не зарегистрирован" + +#: globals.h:1282 +#, c-format +msgid "E482: Can't create file %s" +msgstr "E482: Невозможно создать файл %s" #: globals.h:1283 -#, c-format -msgid "E40: Can't open errorfile %s" -msgstr "E40: %s" +msgid "E483: Can't get temp file name" +msgstr "E483: Невозможно получить имя временного файла" + +#: globals.h:1284 +#, c-format +msgid "E484: Can't open file %s" +msgstr "E484: Невозможно открыть файл %s" + +#: globals.h:1285 +#, c-format +msgid "E485: Can't read file %s" +msgstr "E485: Невозможно прочитать файл %s" #: globals.h:1286 -msgid "E233: cannot open display" -msgstr "E233: " - -#: globals.h:1288 -msgid "E41: Out of memory!" -msgstr "E41: !" - -#: globals.h:1290 -msgid "Pattern not found" -msgstr " " +msgid "E37: No write since last change (add ! to override)" +msgstr "E37: Изменения не сохранены (добавьте !, чтобы обойти проверку)" + +#: globals.h:1287 +msgid "E38: Null argument" +msgstr "E38: Нулевой аргумент" + +#: globals.h:1289 +msgid "E39: Number expected" +msgstr "E39: Требуется число" #: globals.h:1292 #, c-format +msgid "E40: Can't open errorfile %s" +msgstr "E40: Не удалось открыть файл ошибок %s" + +#: globals.h:1295 +msgid "E233: cannot open display" +msgstr "E233: невозможно открыть дисплей" + +#: globals.h:1297 +msgid "E41: Out of memory!" +msgstr "E41: Не хватает памяти!" + +#: globals.h:1299 +msgid "Pattern not found" +msgstr "Шаблон не найден" + +#: globals.h:1301 +#, c-format msgid "E486: Pattern not found: %s" -msgstr "E486: : %s" - -#: globals.h:1293 -msgid "E487: Argument must be positive" -msgstr "E487: " - -#: globals.h:1295 -msgid "E459: Cannot go back to previous directory" -msgstr "E459: " - -#: globals.h:1299 -msgid "E42: No Errors" -msgstr "E42: " - -#: globals.h:1301 -msgid "E43: Damaged match string" -msgstr "E43: " +msgstr "E486: Шаблон не найден: %s" #: globals.h:1302 -msgid "E44: Corrupted regexp program" -msgstr "E44: " - -#: globals.h:1303 -msgid "E45: 'readonly' option is set (add ! to override)" -msgstr "" -"E45: 'readonly' ( !, )" - -#: globals.h:1305 -#, c-format -msgid "E46: Cannot set read-only variable \"%s\"" -msgstr "E46: \"%s\"" +msgid "E487: Argument must be positive" +msgstr "E487: Параметр должен быть положительным числом" + +#: globals.h:1304 +msgid "E459: Cannot go back to previous directory" +msgstr "E459: Возврат в предыдущий каталог невозможен" #: globals.h:1308 -msgid "E47: Error while reading errorfile" -msgstr "E47: " +msgid "E42: No Errors" +msgstr "E42: Ошибок нет" + +#: globals.h:1310 +msgid "E43: Damaged match string" +msgstr "E43: Повреждена строка соответствия" #: globals.h:1311 +msgid "E44: Corrupted regexp program" +msgstr "E44: Программа обработки регулярных выражений повреждена" + +#: globals.h:1312 +msgid "E45: 'readonly' option is set (add ! to override)" +msgstr "" +"E45: Включена опция 'readonly' (добавьте !, чтобы не обращать внимания)" + +#: globals.h:1314 +#, c-format +msgid "E46: Cannot set read-only variable \"%s\"" +msgstr "E46: Невозможно изменить доступную только для чтения переменную \"%s\"" + +#: globals.h:1317 +msgid "E47: Error while reading errorfile" +msgstr "E47: Ошибка при чтении файла ошибок" + +#: globals.h:1320 msgid "E48: Not allowed in sandbox" -msgstr "E48: " - -#: globals.h:1313 +msgstr "E48: Не допускается в песочнице" + +#: globals.h:1322 msgid "E523: Not allowed here" -msgstr "E523: " - -#: globals.h:1316 -msgid "E359: Screen mode setting not supported" -msgstr "E359: " - -#: globals.h:1318 -msgid "E49: Invalid scroll size" -msgstr "E49: " - -#: globals.h:1319 -msgid "E91: 'shell' option is empty" -msgstr "E91: 'shell' " - -#: globals.h:1321 -msgid "E255: Couldn't read in sign data!" -msgstr "E255: !" - -#: globals.h:1323 -msgid "E72: Close error on swap file" -msgstr "E72: -" - -#: globals.h:1324 -msgid "E73: tag stack empty" -msgstr "E73: " +msgstr "E523: Здесь не разрешено" #: globals.h:1325 -msgid "E74: Command too complex" -msgstr "E74: " - -#: globals.h:1326 -msgid "E75: Name too long" -msgstr "E75: " +msgid "E359: Screen mode setting not supported" +msgstr "E359: Данный режим экрана не поддерживается" #: globals.h:1327 -msgid "E76: Too many [" -msgstr "E76: [" +msgid "E49: Invalid scroll size" +msgstr "E49: Недопустимый размер прокрутки" #: globals.h:1328 -msgid "E77: Too many file names" -msgstr "E77: ͣ " - -#: globals.h:1329 -msgid "E488: Trailing characters" -msgstr "E488: " +msgid "E91: 'shell' option is empty" +msgstr "E91: Значением опции 'shell' является пустая строка" #: globals.h:1330 -msgid "E78: Unknown mark" -msgstr "E78: " - -#: globals.h:1331 -msgid "E79: Cannot expand wildcards" -msgstr "E79: " +msgid "E255: Couldn't read in sign data!" +msgstr "E255: Невозможно прочитать данные о значках!" + +#: globals.h:1332 +msgid "E72: Close error on swap file" +msgstr "E72: Ошибка закрытия своп-файла" #: globals.h:1333 -msgid "E591: 'winheight' cannot be smaller than 'winminheight'" -msgstr "" -"E591: 'winheight' 'winminheight'" +msgid "E73: tag stack empty" +msgstr "E73: Стек меток пустой" + +#: globals.h:1334 +msgid "E74: Command too complex" +msgstr "E74: Слишком сложная команда" #: globals.h:1335 -msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'" -msgstr "" -"E592: 'winwidth' 'winminwidth'" +msgid "E75: Name too long" +msgstr "E75: Слишком длинное имя" + +#: globals.h:1336 +msgid "E76: Too many [" +msgstr "E76: Слишком много символов [" + +#: globals.h:1337 +msgid "E77: Too many file names" +msgstr "E77: Слишком много имён файлов" #: globals.h:1338 -msgid "E80: Error while writing" -msgstr "E80: " +msgid "E488: Trailing characters" +msgstr "E488: Лишние символы на хвосте" #: globals.h:1339 -msgid "Zero count" -msgstr " ޣ" - -#: globals.h:1341 -msgid "E81: Using not in a script context" -msgstr "E81: " +msgid "E78: Unknown mark" +msgstr "E78: Неизвестная отметка" + +#: globals.h:1340 +msgid "E79: Cannot expand wildcards" +msgstr "E79: Невозможно выполнить подстановку по маске" + +#: globals.h:1342 +msgid "E591: 'winheight' cannot be smaller than 'winminheight'" +msgstr "" +"E591: Значение опции 'winheight' не может быть меньше значения 'winminheight'" #: globals.h:1344 -msgid "E449: Invalid expression received" -msgstr "E449: " +msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'" +msgstr "" +"E592: Значение опции 'winwidth' не может быть меньше значения 'winminwidth'" #: globals.h:1347 +msgid "E80: Error while writing" +msgstr "E80: Ошибка при записи" + +#: globals.h:1348 +msgid "Zero count" +msgstr "Нулевое значение счётчика" + +#: globals.h:1350 +msgid "E81: Using not in a script context" +msgstr "E81: Использование вне контекста сценария" + +#: globals.h:1353 +msgid "E449: Invalid expression received" +msgstr "E449: Получено недопустимое выражение" + +#: globals.h:1356 msgid "E463: Region is guarded, cannot modify" -msgstr "E463: " - -#~ msgid "\"\n" -#~ msgstr "\"\n" +msgstr "E463: Невозможно изменить охраняемую область" + diff --git a/src/search.c b/src/search.c --- a/src/search.c +++ b/src/search.c @@ -1138,10 +1138,11 @@ do_search(oap, dirc, pat, count, options /* * If there is a character offset, subtract it from the current * position, so we don't get stuck at "?pat?e+2" or "/pat/s-2". + * Skip this if pos.col is near MAXCOL (closed fold). * This is not done for a line offset, because then we would not be vi * compatible. */ - if (!spats[0].off.line && spats[0].off.off) + if (!spats[0].off.line && spats[0].off.off && pos.col < MAXCOL - 2) { if (spats[0].off.off > 0) { @@ -1209,7 +1210,7 @@ do_search(oap, dirc, pat, count, options retval = 2; /* pattern found, line offset added */ } - else + else if (pos.col < MAXCOL - 2) /* just in case */ { /* to the right, check for end of file */ if (spats[0].off.off > 0) @@ -4404,7 +4405,7 @@ read_viminfo_search_pattern(virp, force) if (lp[3] == 'L') off_line = TRUE; if (lp[4] == 'E') - off_end = TRUE; + off_end = SEARCH_END; lp += 5; off = getdigits(&lp); } diff --git a/src/structs.h b/src/structs.h --- a/src/structs.h +++ b/src/structs.h @@ -56,7 +56,7 @@ typedef struct growarray { int ga_len; /* current number of items used */ int ga_room; /* number of unused items at the end */ - int ga_itemsize; /* sizeof one item */ + int ga_itemsize; /* sizeof(item) */ int ga_growsize; /* number of items to grow each time */ void *ga_data; /* pointer to the first item */ } garray_T;